Merge pull request #6182 from lenewsad/UpdateWin10Include

ShannonLeavitt · web-flow · commit 8e9d54f9c5e5 · 2021-11-19T15:55:53.000-06:00
Updated include and bookmarks
diff --git a/memdocs/autopilot/add-devices.md b/memdocs/autopilot/add-devices.md
@@ -52,7 +52,7 @@ For more information about registering HoloLens 2 devices with Windows Autopilot
 ## Prerequisites
 
 - [Intune subscription](../intune/fundamentals/licenses.md)
-- [Windows automatic enrollment enabled](../intune/enrollment/windows-enroll.md#enable-windows-10-automatic-enrollment)
+- [Windows automatic enrollment enabled](../intune/enrollment/windows-enroll.md#enable-windows-automatic-enrollment)
 - [Azure Active Directory Premium subscription](/azure/active-directory/active-directory-get-started-premium) <!--&#40;[trial subscription](https://go.microsoft.com/fwlink/?LinkID=816845)&#41;-->
 
 ## Required permissions
diff --git a/memdocs/autopilot/existing-devices.md b/memdocs/autopilot/existing-devices.md
@@ -56,7 +56,7 @@ To enable and configure the enrollment and status page:
 
 1. Open [Intune in the Azure portal](https://aka.ms/intuneportal).
 2. Access **Intune > Device enrollment > Windows enrollment** and [Set up an enrollment status page](/intune/windows-enrollment-status). 
-3. Access **Azure Active Directory > Mobility (MDM and MAM) > Microsoft Intune** and [Configure automatic MDM enrollment](/configmgr/mdm/deploy-use/enroll-hybrid-windows#enable-windows-10-automatic-enrollment) and configure the MDM user scope for some or all users. 
+3. Access **Azure Active Directory > Mobility (MDM and MAM) > Microsoft Intune** and [Configure automatic MDM enrollment](/configmgr/mdm/deploy-use/enroll-hybrid-windows#enable-windows-automatic-enrollment) and configure the MDM user scope for some or all users. 
 
 See the following examples.
 
diff --git a/memdocs/configmgr/comanage/how-to-monitor.md b/memdocs/configmgr/comanage/how-to-monitor.md
@@ -91,7 +91,7 @@ There are hundreds of possible errors. The following table lists the most common
 
 | Error | Description |
 |---------|---------|
-| 2147549183 (0x8000FFFF) | MDM enrollment hasn't been configured yet on Azure AD, or the enrollment URL isn't expected.<br><br>[Enable automatic enrollment](/intune/windows-enroll#enable-windows-10-automatic-enrollment) |
+| 2147549183 (0x8000FFFF) | MDM enrollment hasn't been configured yet on Azure AD, or the enrollment URL isn't expected.<br><br>[Enable automatic enrollment](/intune/windows-enroll#enable-windows-automatic-enrollment) |
 | 2149056536 (0x80180018)<br>MENROLL_E_USERLICENSE | License of user is in bad state blocking enrollment<br><br>[Assign licenses to users](/intune/licenses-assign) |
 | 2149056555 (0x8018002B)<br>MENROLL_E_MDM_NOT_CONFIGURED | When trying to automatically enroll to Intune, but the Azure AD configuration isn't fully applied. This issue should be transient, as the device retries after a short time. |
 | 2149056554 (0x‭8018002A‬)<br>&nbsp; | The user canceled the operation<br><br>If MDM enrollment requires multi-factor authentication, and the user hasn't signed in with a supported second factor, Windows displays a toast notification to the user to enroll. If the user doesn't respond to toast notification, this error occurs. This issue should be transient, as Configuration Manager will retry and prompt the user. Users should use multi-factor authentication when they sign in to Windows. Also educate them to expect this behavior, and if prompted, take action. |
diff --git a/memdocs/configmgr/comanage/overview.md b/memdocs/configmgr/comanage/overview.md
@@ -112,7 +112,7 @@ Enabling co-management itself doesn't require that you onboard your site with Az
 
 - [Set up Intune](/intune/setup-steps)  
 
-- [Enable automatic enrollment](/intune/windows-enroll#enable-windows-10-automatic-enrollment)  
+- [Enable automatic enrollment](/intune/windows-enroll#enable-windows-automatic-enrollment)  
 
 ### Windows
 
diff --git a/memdocs/configmgr/comanage/quickstart-upgrade-win10.md b/memdocs/configmgr/comanage/quickstart-upgrade-win10.md
@@ -24,7 +24,7 @@ In the following video, senior program manager Rob York and product marketing ma
 
 Among other platform advancements, Windows 10 and later supports auto-enrollment. This behavior makes a device automatically enroll to Intune when it joined Azure Active Directory (Azure AD).
 
-For more information, see [Enable Windows automatic enrollment](../../intune/enrollment/windows-enroll.md#enable-windows-10-automatic-enrollment).
+For more information, see [Enable Windows automatic enrollment](../../intune/enrollment/windows-enroll.md#enable-windows-automatic-enrollment).
 
 ## How to do it
 
diff --git a/memdocs/intune/apps/intune-management-extension.md b/memdocs/intune/apps/intune-management-extension.md
@@ -210,7 +210,7 @@ To see if the device is auto-enrolled, you can:
   4. Open the `MDMDiagReport` in a web browser.
   5. Search for the **MDMDeviceWithAAD** property. If the property exists, the device is auto-enrolled. If this property doesn't exist, then the device isn't auto-enrolled.
 
-[Enable Windows 10 automatic enrollment](../enrollment/windows-enroll.md#enable-windows-10-automatic-enrollment) includes the steps to configure automatic enrollment in Intune.
+[Enable Windows 10 automatic enrollment](../enrollment/windows-enroll.md#enable-windows-automatic-enrollment) includes the steps to configure automatic enrollment in Intune.
 
 ### Issue: PowerShell scripts do not run
 
diff --git a/memdocs/intune/enrollment/device-enrollment.md b/memdocs/intune/enrollment/device-enrollment.md
@@ -64,7 +64,7 @@ By default, devices for all platforms are allowed to enroll in Intune. However,
 |:---:|:---:|:---:|:---:|:---:|
 |**[BYOD](#bring-your-own-device)** | No | Yes | No | [More information](windows-enroll.md)|
 |**[DEM](#device-enrollment-manager)**| No |No |No |[More information](device-enrollment-manager-enroll.md)|
-|**Auto-enroll** | No |Yes |No | [More information](windows-enroll.md#enable-windows-10-automatic-enrollment)|
+|**Auto-enroll** | No |Yes |No | [More information](windows-enroll.md#enable-windows-automatic-enrollment)|
 |**Autopilot** |Yes |Yes |No | [More information](../../autopilot/enrollment-autopilot.md)
 |**Bulk enroll** |No |No |No | [More information](windows-bulk-enroll.md) |
 |**Co-management** |No |Yes |No | [More information](/configmgr/core/clients/manage/co-management-overview)
diff --git a/memdocs/intune/enrollment/enrollment-method-capab.md b/memdocs/intune/enrollment/enrollment-method-capab.md
@@ -35,7 +35,7 @@ ms.collection: M365-identity-device-management
 There are several methods to enroll your workforce's devices in Intune. Each method has different best practices and capabilities, as shown in the tables below.
 
 ## Best practices by enrollment method
-| **Best practices** | **[Azure AD joined](windows-enroll.md#enable-windows-10-automatic-enrollment)**|**[Azure AD joined with Autopilot (User driven mode)](../../autopilot/enrollment-autopilot.md)** |**[Azure AD joined with Autopilot (Self deploying mode)](../../autopilot/enrollment-autopilot.md)** |**[Bulk](windows-bulk-enroll.md)**|**[DEM](device-enrollment-manager-enroll.md)** | **[BYOD](device-enrollment.md#bring-your-own-device)** | **[GPO](/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy)** | **[Co-management](/configmgr/core/clients/manage/co-management-overview)** |
+| **Best practices** | **[Azure AD joined](windows-enroll.md#enable-windows-automatic-enrollment)**|**[Azure AD joined with Autopilot (User driven mode)](../../autopilot/enrollment-autopilot.md)** |**[Azure AD joined with Autopilot (Self deploying mode)](../../autopilot/enrollment-autopilot.md)** |**[Bulk](windows-bulk-enroll.md)**|**[DEM](device-enrollment-manager-enroll.md)** | **[BYOD](device-enrollment.md#bring-your-own-device)** | **[GPO](/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy)** | **[Co-management](/configmgr/core/clients/manage/co-management-overview)** |
 |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
 |Commonly used in EDU|![X](./media/enrollment-method-capab/xmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|
 |Devices can be used as shared devices|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|
@@ -44,7 +44,7 @@ There are several methods to enroll your workforce's devices in Intune. Each met
 
 ## Capabilities by enrollment method
 
-| **Capabilities** | **[Azure AD joined](windows-enroll.md#enable-windows-10-automatic-enrollment)**|**[Azure AD joined with Autopilot (User driven mode)](../../autopilot/enrollment-autopilot.md)** |**[Azure AD joined with Autopilot (Self deploying mode)](../../autopilot/enrollment-autopilot.md)** |**[Bulk](windows-bulk-enroll.md)**|**[DEM](device-enrollment-manager-enroll.md)** | **[BYOD](device-enrollment.md#bring-your-own-device)** | **[GPO](/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy)** | **[Co-management](/configmgr/core/clients/manage/co-management-overview)** |
+| **Capabilities** | **[Azure AD joined](windows-enroll.md#enable-windows-automatic-enrollment)**|**[Azure AD joined with Autopilot (User driven mode)](../../autopilot/enrollment-autopilot.md)** |**[Azure AD joined with Autopilot (Self deploying mode)](../../autopilot/enrollment-autopilot.md)** |**[Bulk](windows-bulk-enroll.md)**|**[DEM](device-enrollment-manager-enroll.md)** | **[BYOD](device-enrollment.md#bring-your-own-device)** | **[GPO](/windows/client-management/mdm/enroll-a-windows-10-device-automatically-using-group-policy)** | **[Co-management](/configmgr/core/clients/manage/co-management-overview)** |
 |:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
 |Conditional Access                                      |![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)\*\*|![Check](./media/enrollment-method-capab/checkmark.png)\*\*|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|
 |User gets associated with the device                    |![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![X](./media/enrollment-method-capab/xmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|![Check](./media/enrollment-method-capab/checkmark.png)|
diff --git a/memdocs/intune/enrollment/enrollment-restrictions-set.md b/memdocs/intune/enrollment/enrollment-restrictions-set.md
@@ -154,11 +154,11 @@ The following methods qualify as being authorized as a Windows corporate enrollm
 - The device enrolls through GPO, or [automatic enrollment from Configuration Manager for co-management](/configmgr/comanage/quickstart-paths#bkmk_path1).
  
 The following enrollments are marked as corporate by Intune. But since they don't offer the Intune administrator per-device control, they'll be blocked:
-- [Automatic MDM enrollment](windows-enroll.md#enable-windows-10-automatic-enrollment) with [Azure Active Directory join during Windows setup](/azure/active-directory/device-management-azuread-joined-devices-frx)\*.
-- [Automatic MDM enrollment](windows-enroll.md#enable-windows-10-automatic-enrollment) with [Azure Active Directory join from Windows Settings](/azure/active-directory/user-help/user-help-register-device-on-network)\*.
+- [Automatic MDM enrollment](windows-enroll.md#enable-windows-automatic-enrollment) with [Azure Active Directory join during Windows setup](/azure/active-directory/device-management-azuread-joined-devices-frx)\*.
+- [Automatic MDM enrollment](windows-enroll.md#enable-windows-automatic-enrollment) with [Azure Active Directory join from Windows Settings](/azure/active-directory/user-help/user-help-register-device-on-network)\*.
  
 The following personal enrollment methods will also be blocked:
-- [Automatic MDM enrollment](windows-enroll.md#enable-windows-10-automatic-enrollment) with [Add Work Account from Windows Settings](/azure/active-directory/user-help/user-help-join-device-on-network)\*.
+- [Automatic MDM enrollment](windows-enroll.md#enable-windows-automatic-enrollment) with [Add Work Account from Windows Settings](/azure/active-directory/user-help/user-help-join-device-on-network)\*.
 - [MDM enrollment only]( /windows/client-management/mdm/mdm-enrollment-of-windows-devices#connecting-personally-owned-devices-bring-your-own-device) option from Windows Settings.
 
 \* These won't be blocked if registered with Autopilot.
diff --git a/memdocs/intune/enrollment/windows-bulk-enroll.md b/memdocs/intune/enrollment/windows-bulk-enroll.md
@@ -42,7 +42,7 @@ Azure AD users are standard users on these devices and receive assigned Intune p
 ## Prerequisites for Windows devices bulk enrollment
 
 - Devices running Windows 11 or Windows 10 Creator update (build 1709) or later  
-- [Windows automatic enrollment](windows-enroll.md#enable-windows-10-automatic-enrollment)
+- [Windows automatic enrollment](windows-enroll.md#enable-windows-automatic-enrollment)
 
 ## Create a provisioning package
 
diff --git a/memdocs/intune/enrollment/windows-enroll.md b/memdocs/intune/enrollment/windows-enroll.md
@@ -41,7 +41,7 @@ This article helps IT administrators simplify Windows enrollment for their users
 
 As an Intune admin, you can simplify enrollment in the following ways:
 
-- [Enable automatic enrollment](#enable-windows-10-automatic-enrollment) (Azure AD Premium required).
+- [Enable automatic enrollment](#enable-windows-automatic-enrollment) (Azure AD Premium required).
 - [CNAME registration](#simplify-windows-enrollment-without-azure-ad-premium).
 - [Enable bulk enrollment](windows-bulk-enroll.md) (Azure AD Premium and Windows Configuration Designer required).
 
@@ -52,7 +52,7 @@ Two factors determine how you can simplify Windows device enrollment:
 
 | | **Azure AD Premium** | **Other AD** |
 |----------|---------------|---------------|  
-| **Windows 10/11** | [Automatic enrollment](#enable-windows-10-automatic-enrollment) | User enrollment |
+| **Windows 10/11** | [Automatic enrollment](#enable-windows-automatic-enrollment) | User enrollment |
 | **Earlier Windows versions** | User enrollment | User enrollment |
 
 Organizations that can use automatic enrollment can also configure [bulk enroll devices](windows-bulk-enroll.md) by using the Windows Configuration Designer app.
diff --git a/memdocs/intune/fundamentals/cloud-configuration.md b/memdocs/intune/fundamentals/cloud-configuration.md
@@ -107,7 +107,7 @@ Using Microsoft Endpoint Manager, you can use a guided scenario to deploy a clou
 - [Set the MDM authority to Intune](mdm-authority-set.md). The mobile device management (MDM) authority setting determines how you manage your devices. As an IT admin, you must set an MDM authority before users can enroll devices for management.
 - Enable automatic enrollment for Windows 10 devices. For more information, see:
   - [Quickstart: Set up automatic enrollment for Windows 10 devices](../enrollment/quickstart-setup-auto-enrollment.md)
-  - [Enable Windows 10 automatic enrollment](../enrollment/windows-enroll.md#enable-windows-10-automatic-enrollment)
+  - [Enable Windows 10 automatic enrollment](../enrollment/windows-enroll.md#enable-windows-automatic-enrollment)
 
 - Sign in as the Intune Service Administrator, also known as the Intune Administrator. For more information on the roles in Intune, see [Role-based access control (RBAC) with Microsoft Intune](role-based-access-control.md).
 
diff --git a/memdocs/intune/fundamentals/guided-scenarios-cloud-managed-pc.md b/memdocs/intune/fundamentals/guided-scenarios-cloud-managed-pc.md
@@ -82,7 +82,7 @@ The final step allows you to review a summary of the settings you configured. On
 ### Verification
 
 1. Verify that the selected is assigned MDM user scope
-    - Ensure [MDM User scope](../enrollment/windows-enroll.md#enable-windows-10-automatic-enrollment) is:
+    - Ensure [MDM User scope](../enrollment/windows-enroll.md#enable-windows-automatic-enrollment) is:
         - Set to **All** for the **Microsoft Intune** app or,
         - Set to **Some**. Also, add the user group created by this guided scenario.
 2. Verify that the selected user is able to join devices to Azure Active Directory.
diff --git a/memdocs/intune/includes/win10-automatic-enrollment-aad.md b/memdocs/intune/includes/win10-automatic-enrollment-aad.md
@@ -1,6 +1,6 @@
-## Enable Windows 10 automatic enrollment
+## Enable Windows automatic enrollment
 
-Automatic enrollment lets users enroll their Windows 10 devices in Intune. To enroll, users add their work account to their personally owned devices or join corporate-owned devices to Azure Active Directory. In the background, the device registers and joins Azure Active Directory. Once registered, the device is managed with Intune.
+Automatic enrollment lets users enroll their Windows devices in Intune. To enroll, users add their work account to their personally owned devices or join corporate-owned devices to Azure Active Directory. In the background, the device registers and joins Azure Active Directory. Once registered, the device is managed with Intune.
 
 **Prerequisites**
 
