Merge Conflicts

Author: Brenduns

memdocs/analytics/enroll-configmgr.md

@@ -33,10 +33,7 @@ Before you start this tutorial, make sure you have the following prerequisites:
 
 ### Licensing Prerequisites
 
-Endpoint analytics is included in the following plans:
-
-- [Enterprise Mobility + Security E3](https://www.microsoftvolumelicensing.com/ProductResults.aspx?doc=Product%20Terms,OST&fid=51) or higher
-- [Microsoft 365 Enterprise E3](https://www.microsoft.com/en-us/microsoft-365/enterprise?rtc=1) or higher.
+Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
 
 ## Endpoint analytics permissions
 

memdocs/analytics/enroll-intune.md

@@ -43,10 +43,7 @@ To enroll devices to Endpoint analytics, they need to send required functional d
 
 ### Licensing Prerequisites
 
-Endpoint analytics is included in the following plans:
-
-- [Enterprise Mobility + Security E3](https://www.microsoftvolumelicensing.com/ProductResults.aspx?doc=Product%20Terms,OST&fid=51) or higher
-- [Microsoft 365 Enterprise E3](https://www.microsoft.com/en-us/microsoft-365/enterprise?rtc=1) or higher.
+Devices enrolled in Endpoint analytics need a valid license for the use of Microsoft Endpoint Manager. For more information, see [Microsoft Intune licensing](../intune/fundamentals/licenses.md) or [Microsoft Endpoint Configuration Manager licensing](../configmgr/core/understand/learn-more-editions.md).
 
 ### Endpoint analytics permissions
 

memdocs/autopilot/autopilot-device-guidelines.md

@@ -36,6 +36,7 @@ The following best practices ensure that devices can easily be provisioned as pa
 - Before shipping devices to an Autopilot customer or channel partner, the OEM should upload 4K Hardware Hashes to Microsoft by using the CBR report. The hashes should be collected using the OA3 Tool RS3+ run in Audit mode on full OS.
 - Microsoft requires that OEM shipping drivers get published to Windows Update within 30 days of the CBR submission date. System firmware and driver updates are published to Windows Update within 14 days.
 - The OEM ensures that the PKID provisioned in the SMBIOS is passed on to the channel.
+- When using a VM for Autopilot testing, assign at least 2 processors and 4gb of memory. This will help to prevent application install issues in Windows 10 devices with the [May 11, 2021 cumulative update](https://support.microsoft.com/topic/may-11-2021-kb5003173-os-builds-19041-985-19042-985-and-19043-985-2824ace2-eabe-4c3c-8a49-06e249f52527) installed. *Note: The [minimum system requirements](/windows/whats-new/windows-11-requirements#virtual-machine-support) for Windows 11 are 2 processors and 4gb memory.
 
 ## Software best practice guidelines for Windows Autopilot
 
@@ -47,4 +48,4 @@ The following best practices ensure that devices can easily be provisioned as pa
 ## Next steps
 
 [Windows Autopilot customer consent](registration-auth.md)<br>
-[Motherboard replacement scenario guidance](autopilot-mbr.md)<br>
+[Motherboard replacement scenario guidance](autopilot-mbr.md)<br>

memdocs/autopilot/pre-provision.md

@@ -149,6 +149,8 @@ If the pre-provisioning process completed successfully and the device was reseal
 - If using Hybrid Azure AD Join, the device will reboot; after the reboot, enter the user's Active Directory credentials.
 - Additional policies and apps will be delivered to the device, as tracked by the Enrollment Status Page (ESP). Once complete, the user can access the desktop.
 
+A change was made in the 2021.09C release to re-run the device ESP during the user flow so that both device and user ESP will be run when the user logs in. This change allows ESP to install additional policies that may have been assigned to the device after it was provisioned in the technician phase.  
+
 > [!NOTE]
 > If the Microsoft Account Sign-In Assistant (wlidsvc) is disabled during the Technician Flow, the Azure AD sign in option may not show. Instead, users are asked to accept the EULA, and create a local account, which may not be what you want.
 

memdocs/configmgr/comanage/faq.yml

@@ -7,7 +7,7 @@ metadata:
   ms.author: aaroncz
   ms.reviewer: crosorio
   manager: dougeby
-  ms.date: 01/10/2021
+  ms.date: 01/26/2022
   ms.topic: reference
   ms.prod: configuration-manager
   ms.technology: configmgr-comanage
@@ -122,6 +122,9 @@ sections:
 
           For more information, see [How to prepare internet-based devices for co-management](how-to-prepare-win10.md).
 
+          > [!NOTE]
+          > You can't deploy the Configuration Manager client while provisioning a new computer in Windows Autopilot user-driven mode for hybrid Azure AD join. This limitation is due to the identity change of the device during the Azure AD-join process. Deploy the Configuration Manager client after the Autopilot process.<!-- CMADO-10205503 --> For alternative options to install the client, see [Client installation methods in Configuration Manager](../core/clients/deploy/plan/client-installation-methods.md).
+
       - question: |
           How do I manage updates for Windows and Microsoft 365 apps?
         answer: |

memdocs/configmgr/comanage/quickstart-autopilot.md

@@ -31,9 +31,9 @@ Windows Autopilot supports several scenarios, all of which are maximized with co
 
 - With Windows Autopilot for existing devices, use Configuration Manager to migrate an existing device from earlier versions of Windows and Active Directory to later versions of Windows and Azure AD
 
-<!--In the following video, senior program manager Danny Guillory and principal program manager Andrew McMurray discuss and demo Windows Autopilot with co-management:
+In the following video, senior program manager Danny Guillory and principal program manager Andrew McMurray discuss and demo Windows Autopilot with co-management:
 
-> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/Using-Windows-Autopilot-with-Co-Management/player] -->
+> [!VIDEO https://aka.ms/docs/player?id=86b3188d-1f01-4655-b001-2274f072e910]
 
 ## Benefits
 

memdocs/configmgr/comanage/quickstart-client-health.md

@@ -16,9 +16,9 @@ ms.localizationpriority: medium
 
 The health of your network is directly connected to the health of the devices moving in and out of it. Intune can communicate with an unhealthy client, even when it isn't on your network. Use co-management to combine this feature with Configuration Manager's ability to report back 98% of known healthy clients. Then you can detect, assess, and provide visibility across all clients in real time. Intune also adds the support needed for compliance upgrades across all connected clients.
 
-<!--In the following video, senior program manager Rob York and product marketing manager Locky Ainley discuss and demo client health with co-management:
+In the following video, senior program manager Rob York and product marketing manager Locky Ainley discuss and demo client health with co-management:
 
-> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/Client-Health-Monitoring-with-Co-Management/player]-->
+> [!VIDEO https://aka.ms/docs/player?id=ed0d8d8a-1125-42bb-9561-a07618a13cea]
 
 ## Benefits
 

memdocs/configmgr/comanage/quickstart-conditional-access.md

@@ -16,9 +16,9 @@ ms.localizationpriority: medium
 
 Conditional Access makes sure that only trusted users can access organizational resources on trusted devices using trusted apps. It's built from scratch in the cloud. Whether you're managing devices with Intune or extending your Configuration Manager deployment with co-management, it works the same way.
 
-<!--In the following video, senior program manager Joey Glocke and product marketing manager Locky Ainley discuss and demo Conditional Access with co-management:
+In the following video, senior program manager Joey Glocke and product marketing manager Locky Ainley discuss and demo Conditional Access with co-management:
 
-> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/The-Security-Benefits-of-Conditional-Access/player] -->
+> [!VIDEO https://aka.ms/docs/player?id=18f4da94-2409-4a4e-86c1-b74262fea18a]
 
 With co-management, Intune evaluates every device in your network to determine how trustworthy it is. It does this evaluation in the following two ways:
 

memdocs/configmgr/comanage/quickstart-fasttrack.md

@@ -16,9 +16,9 @@ ms.localizationpriority: medium
 
 The FastTrack organization is a large group of Microsoft engineers who specialize in helping all types of organizations deploy Microsoft 365 apps, including setting up co-management. If you need assistance with co-management prerequisites, enabling co-management, or switching workloads, request assistance from [Microsoft FastTrack](https://microsoft.com/fasttrack/).
 
-<!--In the following video, senior program manager Patrick McSweeney and product marketing manager Locky Ainley discuss and demo FastTrack for Microsoft 365:
+In the following video, senior program manager Patrick McSweeney and product marketing manager Locky Ainley discuss and demo FastTrack for Microsoft 365:
 
-> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/How-to-Request-Assistance-from-FastTrack/player]-->
+> [!VIDEO https://aka.ms/docs/player?id=937c04ef-6325-4a86-ba49-6ff7b7838aeb]
 
 To make a request for assistance from FastTrack:
 

memdocs/configmgr/comanage/quickstart-hybrid-aad.md

@@ -18,9 +18,9 @@ In the cloud, identity is the new control plane. Azure Active Directory (Azure A
 
 For more information on device-based conditional access, see [How To: Require managed devices for cloud app access with conditional access](/azure/active-directory/conditional-access/require-managed-devices).
 
-<!--In the following video, senior program manager Sandeep Deo and product marketing manager Adam Harbour discuss and demo Azure AD for co-management:
+In the following video, senior program manager Sandeep Deo and product marketing manager Adam Harbour discuss and demo Azure AD for co-management:
 
-> [!VIDEO https://channel9.msdn.com/Series/Endpoint-Zone/Embedding-Co-management-With-Azure-Active-Directory/player]-->
+> [!VIDEO https://aka.ms/docs/player?id=f0631aa5-2d11-4552-af00-b9dbb1318ed1]
 
 Azure AD provides two options for company-owned devices to suit your organization's needs: