mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-05-12 21:37:22 +00:00
fixed broken links
This commit is contained in:
parent
65e1b86a4e
commit
c738cad97d
@ -706,19 +706,6 @@ The following table shows the scenarios supported by this customization.
|
||||
>- MultivariantProvisionedSPN means the value that you set for the MultivariantProvisionedSPN setting.
|
||||
>- SIM 1 or SIM 2 is the default friendly name for the SIM in slot 1 or slot 2.
|
||||
|
||||
<<<<<<< HEAD
|
||||
|Multivariant setting set?|SPN provisioned?|MSISDN (last 4 digits: 1234, for example) provisioned?|Default SIM name|
|
||||
|:---|:---|:---|:---|
|
||||
|Yes|Yes|Yes|*MultivariantProvisionedSPN*1234 or *MultivariantProvisionedSPN*" "1234|
|
||||
|Yes|No|No|*MultivariantProvisionedSPN* (up to 16 characters)|
|
||||
|Yes|Yes|No|*MultivariantProvisionedSPN* (up to 16 characters)|
|
||||
|Yes|No|Yes|*MultivariantProvisionedSPN*1234 or *MultivariantProvisionedSPN*" "1234|
|
||||
|No|Yes|Yes|If SPN string >= 12: *SPN*1234</br></br>If SPN string < 12: *SPN*" "1234|
|
||||
|No|No|No|*SIM 1* or *SIM 2*|
|
||||
|No|Yes|No|SPN (up to 16 characters)|
|
||||
|No|No|Yes|*SIM 1* or *SIM 2*|
|
||||
=======
|
||||
|
||||
Multivariant setting set?|SPN provisioned?|MSISDN (last four digits: 1234, for example) provisioned?|Default SIM name
|
||||
--- | --- | --- | ---
|
||||
Yes|Yes|Yes|*MultivariantProvisionedSPN*1234 or *MultivariantProvisionedSPN*" "1234
|
||||
@ -729,4 +716,4 @@ No|Yes|Yes|If SPN string >= 12: *SPN*1234</br></br>If SPN string < 12: *SPN*" "1
|
||||
No|No|No|*SIM 1* or *SIM 2*
|
||||
No|Yes|No|SPN (up to 16 characters)
|
||||
No|No|Yes|*SIM 1* or *SIM 2*
|
||||
>>>>>>> c5dd9e14c2... Acrolinx enhancement
|
||||
|
||||
|
@ -20,7 +20,7 @@ ms.custom: seo-marvel-apr2020
|
||||
|
||||
This topic provides a brief overview of Microsoft 365 and describes how to use a free 90-day trial account to review some of the benefits of Microsoft 365.
|
||||
|
||||
[Microsoft 365](https://www.microsoft.com/microsoft-365) is a new offering from Microsoft that combines [Windows 10](https://www.microsoft.com/windows/features) with [Office 365](https://www.microsoft.com/microsoft-365/office-365), and [Enterprise Mobility and Security](https://www.microsoft.com/cloud-platform/enterprise-mobility-security) (EMS). See the [Microsoft 365 Enterprise poster](#m365-enterprise-poster) for an overview.
|
||||
[Microsoft 365](https://www.microsoft.com/microsoft-365) is a new offering from Microsoft that combines [Windows 10](https://www.microsoft.com/windows/features) with [Office 365](https://www.microsoft.com/microsoft-365/office-365), and [Enterprise Mobility and Security](https://www.microsoft.com/cloud-platform/enterprise-mobility-security) (EMS). See the [Microsoft 365 Enterprise poster](#microsoft-365-enterprise-poster) for an overview.
|
||||
|
||||
For Windows 10 deployment, Microsoft 365 includes a fantastic deployment advisor that can walk you through the entire process of deploying Windows 10. The wizard supports multiple Windows 10 deployment methods, including:
|
||||
|
||||
@ -45,11 +45,7 @@ You can check out the Microsoft 365 deployment advisor and other resources for f
|
||||
>[!NOTE]
|
||||
>If you have not run a setup guide before, you will see the **Prepare your environment** guide first. This is to make sure you have basics covered like domain verification and a method for adding users. At the end of the "Prepare your environment" guide, there will be a **Ready to continue** button that sends you to the original guide that was selected.
|
||||
|
||||
<<<<<<< HEAD
|
||||
1. [Explore Microsoft 365](https://www.microsoft.com/microsoft-365/business/).
|
||||
=======
|
||||
1. [Obtain a free Microsoft 365 trial](/office365/admin/try-or-buy-microsoft-365).
|
||||
>>>>>>> c5dd9e14c2... Acrolinx enhancement
|
||||
2. Check out the [Microsoft 365 deployment advisor](https://aka.ms/microsoft365setupguide).
|
||||
3. Also check out the [Windows Analytics deployment advisor](/mem/configmgr/desktop-analytics/overview). This advisor will walk you through deploying [Desktop Analytics](/mem/configmgr/desktop-analytics/overview).
|
||||
|
||||
|
@ -55,7 +55,7 @@ Microsoft 365 is a new offering from Microsoft that combines
|
||||
- Office 365
|
||||
- Enterprise Mobility and Security (EMS).
|
||||
|
||||
See [Deploy Windows 10 with Microsoft 365](deploy-m365.md) for an overview, which now includes a link to download a nifty [Microsoft 365 Enterprise poster](deploy-m365.md#m365-enterprise-poster).
|
||||
See [Deploy Windows 10 with Microsoft 365](deploy-m365.md) for an overview, which now includes a link to download a nifty [Microsoft 365 Enterprise poster](deploy-m365.md#microsoft-365-enterprise-poster).
|
||||
|
||||
## Windows 10 servicing and support
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user