Merge branch 'main' of https://github.com/MicrosoftDocs/windows-docs-pr into uc-wkbk

windows/client-management/index.yml

@@ -34,7 +34,7 @@ landingContent:
           - text: Create mandatory user profiles
             url: mandatory-user-profile.md
           - text: Mobile device management (MDM)
-            url: mdm/index.md
+            url: mdm/index.yml
           - text: MDM for device updates
             url: mdm/device-update-management.md
           - text: Mobile device enrollment

windows/client-management/mdm/change-history-for-mdm-documentation.md

@@ -162,7 +162,7 @@ This article lists new and updated articles for the Mobile Device Management (MD
 |--- | ---|
 |[Policy CSP - Storage](policy-csp-storage.md)|Added the following new policies: AllowStorageSenseGlobal, ConfigStorageSenseGlobalCadence, AllowStorageSenseTemporaryFilesCleanup, ConfigStorageSenseRecycleBinCleanupThreshold, ConfigStorageSenseDownloadsCleanupThreshold, and ConfigStorageSenseCloudContentCleanupThreshold.|
 |[SharedPC CSP](sharedpc-csp.md)|Updated values and supported operations.|
-|[Mobile device management](index.md)|Updated information about MDM Security Baseline.|
+|[Mobile device management](index.yml)|Updated information about MDM Security Baseline.|
 
 ## December 2018
 

windows/client-management/mdm/implement-server-side-mobile-application-management.md

@@ -1,18 +1,18 @@
 ---
-title: Implement server-side support for mobile application management on Windows
+title: Support for mobile application management on Windows
 description: Learn about implementing the Windows version of mobile application management (MAM), which is a lightweight solution for managing company data access and security on personal devices.
 ms.author: dansimp
 ms.topic: article
 ms.prod: w10
 ms.technology: windows
 author: dansimp
-ms.date: 06/26/2017
+ms.date: 08/03/2022
 ms.reviewer:
 manager: dansimp
 ---
 
 
-# Implement server-side support for mobile application management on Windows 
+# Support for mobile application management on Windows
 
 The Windows version of mobile application management (MAM) is a lightweight solution for managing company data access and security on personal devices. MAM support is built into Windows on top of Windows Information Protection (WIP), starting in Windows 10, version 1703.
 

windows/client-management/mdm/index.yml

@@ -0,0 +1,79 @@
+### YamlMime:Landing
+
+title: Mobile Device Management # < 60 chars
+summary: Find out how to enroll Windows devices and manage company security policies and business applications. # < 160 chars
+
+metadata:
+  title: Mobile Device Management # Required; page title displayed in search results. Include the brand. < 60 chars.
+  description: Find out how to enroll Windows devices and manage company security policies and business applications. # Required; article description that is displayed in search results. < 160 chars.
+  ms.topic: landing-page # Required
+  services: windows-10
+  ms.prod: windows
+  ms.collection:
+    - windows-10
+    - highpri
+  ms.custom: intro-hub-or-landing
+  author: vinaypamnani-msft
+  ms.author: vinpa
+  manager: aaroncz
+  ms.date: 08/04/2022
+  localization_priority: medium
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+
+landingContent:
+  # Cards and links should be based on top customer tasks or top subjects
+  # Start card title with a verb
+  # Card (optional)
+  - title: Device enrollment
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: Mobile device enrollment
+            url: mobile-device-enrollment.md
+      - linkListType: concept
+        links:
+          - text: Enroll Windows devices
+            url: mdm-enrollment-of-windows-devices.md
+          - text: Automatic enrollment using Azure AD
+            url: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
+          - text: Automatic enrollment using Group Policy
+            url: enroll-a-windows-10-device-automatically-using-group-policy.md
+          - text: Bulk enrollment
+            url: bulk-enrollment-using-windows-provisioning-tool.md
+
+  # Card (optional)
+  - title: Device management
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: Enterprise settings, policies, and app management
+            url: windows-mdm-enterprise-settings.md
+      - linkListType: concept
+        links:
+          - text: Enterprise app management
+            url: enterprise-app-management.md
+          - text: Device updates management
+            url: device-update-management.md
+          - text: Secured-core PC configuration lock
+            url: config-lock.md
+          - text: Diagnose MDM failures
+            url: diagnose-mdm-failures-in-windows-10.md
+
+  # Card (optional)
+  - title: CSP reference
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: Configuration service provider reference
+            url: configuration-service-provider-reference.md
+      - linkListType: reference
+        links:
+          - text: Policy CSP
+            url: policy-configuration-service-provider.md
+          - text: Policy CSP - Update
+            url: policy-csp-update.md
+          - text: DynamicManagement CSP
+            url: dynamicmanagement-csp.md
+          - text: BitLocker CSP
+            url: bitlocker-csp.md

windows/client-management/mdm/mdm-overview.md

@@ -1,19 +1,18 @@
 ---
-title: Mobile device management
+title: Mobile Device Management overview
 description: Windows 10 and Windows 11 provide an enterprise-level solution to mobile management, to help IT pros comply with security policies while avoiding compromise of user's privacy.
-MS-HAID:
+ms.date: 08/04/2022
-- 'p\_phDeviceMgmt.provisioning\_and\_device\_management'
-- 'p\_phDeviceMgmt.mobile\_device\_management\_windows\_mdm'
-ms.topic: overview
-ms.prod: w10
 ms.technology: windows
-author: aczechowski
+ms.topic: article
-ms.author: aaroncz
+ms.prod: w10
+ms.localizationpriority: medium
+author: vinaypamnani-msft
+ms.author: vinpa
+manager: aaroncz
 ms.collection: highpri
-ms.date: 06/03/2022
 ---
 
-# Mobile device management
+# Mobile Device Management overview
 
 Windows 10 and Windows 11 provide an enterprise management solution to help IT pros manage company security policies and business applications, while avoiding compromise of the users' privacy on their personal devices. A built-in management component can communicate with the management server.
 
@@ -43,7 +42,6 @@ For more information about the MDM policies defined in the MDM security baseline
 - [MDM Security baseline for Windows 10, version 2004](https://download.microsoft.com/download/2/C/4/2C418EC7-31E0-4A74-8928-6DCD512F9A46/2004-MDM-SecurityBaseLine-Document.zip)
 - [MDM Security baseline for Windows 10, version 1909](https://download.microsoft.com/download/2/C/4/2C418EC7-31E0-4A74-8928-6DCD512F9A46/1909-MDM-SecurityBaseLine-Document.zip)
 - [MDM Security baseline for Windows 10, version 1903](https://download.microsoft.com/download/2/C/4/2C418EC7-31E0-4A74-8928-6DCD512F9A46/1903-MDM-SecurityBaseLine-Document.zip)
-
 - [MDM Security baseline for Windows 10, version 1809](https://download.microsoft.com/download/2/C/4/2C418EC7-31E0-4A74-8928-6DCD512F9A46/1809-MDM-SecurityBaseLine-Document-[Preview].zip)
 
 For information about the MDM policies defined in the Intune security baseline, see [Windows security baseline settings for Intune](/mem/intune/protect/security-baseline-settings-mdm-all).

windows/client-management/mdm/toc.yml

@@ -1,40 +1,15 @@
 items:
-- name: Mobile device management
+  - name: Mobile Device Management
-  href: index.md
+    href: index.yml
     items:
+      - name: Overview
+        items:
+          - name: MDM overview
+            href: mdm-overview.md
           - name: What's new in MDM enrollment and management
             href: new-in-windows-mdm-enrollment-management.md
-      items: 
           - name: Change history for MDM documentation
             href: change-history-for-mdm-documentation.md
-    - name: Mobile device enrollment
-      href: mobile-device-enrollment.md
-      items: 
-        - name: MDM enrollment of Windows devices
-          href: mdm-enrollment-of-windows-devices.md
-          items: 
-            - name: "Azure AD and Microsoft Intune: Automatic MDM enrollment in the new Portal"
-              href: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
-        - name: Enroll a Windows 10 device automatically using Group Policy
-          href: enroll-a-windows-10-device-automatically-using-group-policy.md
-        - name: Federated authentication device enrollment
-          href: federated-authentication-device-enrollment.md
-        - name: Certificate authentication device enrollment
-          href: certificate-authentication-device-enrollment.md
-        - name: On-premises authentication device enrollment
-          href: on-premise-authentication-device-enrollment.md
-    - name: Understanding ADMX policies
-      href: understanding-admx-backed-policies.md
-    - name: Enable ADMX policies in MDM
-      href: enable-admx-backed-policies-in-mdm.md
-    - name: Win32 and Desktop Bridge app policy configuration
-      href: win32-and-centennial-app-policy-configuration.md
-    - name: Implement server-side support for mobile application management on Windows
-      href: implement-server-side-mobile-application-management.md
-    - name: Diagnose MDM failures in Windows 10
-      href: diagnose-mdm-failures-in-windows-10.md
-    - name: Deploy and configure App-V apps using MDM
-      href: appv-deploy-and-config.md
       - name: Azure Active Directory integration with MDM
         href: azure-active-directory-integration-with-mdm.md
         items:
@@ -42,17 +17,42 @@ items:
             href: add-an-azure-ad-tenant-and-azure-ad-subscription.md
           - name: Register your free Azure Active Directory subscription
             href: register-your-free-azure-active-directory-subscription.md
-    - name: Enterprise app management
+      - name: Device enrollment
-      href: enterprise-app-management.md
+        href: mobile-device-enrollment.md
-    - name: Mobile device management (MDM) for device updates
+        items:
-      href: device-update-management.md
+          - name: MDM enrollment of Windows devices
+            href: mdm-enrollment-of-windows-devices.md
+          - name: "Azure AD and Microsoft Intune: Automatic MDM enrollment"
+            href: azure-ad-and-microsoft-intune-automatic-mdm-enrollment-in-the-new-portal.md
+          - name: Enroll a Windows 10 device automatically using Group Policy
+            href: enroll-a-windows-10-device-automatically-using-group-policy.md
           - name: Bulk enrollment
             href: bulk-enrollment-using-windows-provisioning-tool.md
-    - name: Secured-Core PC Configuration Lock
+          - name: Federated authentication device enrollment
-      href: config-lock.md
+            href: federated-authentication-device-enrollment.md
+          - name: Certificate authentication device enrollment
+            href: certificate-authentication-device-enrollment.md
+          - name: On-premises authentication device enrollment
+            href: on-premise-authentication-device-enrollment.md
+          - name: Disconnecting a device from MDM (unenrollment)
+            href: disconnecting-from-mdm-unenrollment.md
+      - name: Understanding ADMX policies
+        href: understanding-admx-backed-policies.md
+        items:
+          - name: Enable ADMX policies in MDM
+            href: enable-admx-backed-policies-in-mdm.md
+          - name: Win32 and Desktop Bridge app policy configuration
+            href: win32-and-centennial-app-policy-configuration.md
+      - name: Enterprise settings, policies, and app management
+        href: windows-mdm-enterprise-settings.md
+        items:
+          - name: Enterprise app management
+            href: enterprise-app-management.md
+            items:
+              - name: Deploy and configure App-V apps using MDM
+                href: appv-deploy-and-config.md
               - name: Management tool for the Microsoft Store for Business
                 href: management-tool-for-windows-store-for-business.md
-      items: 
               - name: REST API reference for Microsoft Store for Business
                 href: rest-api-reference-windows-store-for-business.md
                 items:
@@ -82,26 +82,31 @@ items:
                     href: bulk-assign-and-reclaim-seats-from-user.md
                   - name: Get seats assigned to a user
                     href: get-seats-assigned-to-a-user.md
+          - name: Mobile device management (MDM) for device updates
+            href: device-update-management.md
+          - name: Secured-Core PC Configuration Lock
+            href: config-lock.md
           - name: Certificate renewal
             href: certificate-renewal-windows-mdm.md
-    - name: Disconnecting from the management infrastructure (unenrollment)
+      - name: Using PowerShell scripting with the WMI Bridge Provider
-      href: disconnecting-from-mdm-unenrollment.md
+        href: using-powershell-scripting-with-the-wmi-bridge-provider.md
-    - name: Enterprise settings, policies, and app management
+      - name: WMI providers supported in Windows 10
-      href: windows-mdm-enterprise-settings.md
+        href: wmi-providers-supported-in-windows.md
+      - name: Diagnose MDM failures in Windows 10
+        href: diagnose-mdm-failures-in-windows-10.md
       - name: Push notification support for device management
         href: push-notification-windows-mdm.md
+      - name: MAM support for device management
+        href: implement-server-side-mobile-application-management.md
       - name: OMA DM protocol support
         href: oma-dm-protocol-support.md
+        items:
           - name: Structure of OMA DM provisioning files
             href: structure-of-oma-dm-provisioning-files.md
           - name: Server requirements for OMA DM
             href: server-requirements-windows-mdm.md
           - name: DMProcessConfigXMLFiltered
             href: dmprocessconfigxmlfiltered.md
-    - name: Using PowerShell scripting with the WMI Bridge Provider
-      href: using-powershell-scripting-with-the-wmi-bridge-provider.md
-    - name: WMI providers supported in Windows 10
-      href: wmi-providers-supported-in-windows.md
       - name: Configuration service provider reference
         href: configuration-service-provider-reference.md
         items:

windows/client-management/toc.yml

@@ -31,7 +31,7 @@ items:
     - name: Mobile device management (MDM)
       items:
         - name: Mobile Device Management
-          href: mdm/index.md
+          href: mdm/index.yml
     - name: Configuration Service Provider (CSP)
       items:
         - name: CSP reference

windows/deployment/windows-autopatch/deploy/windows-autopatch-register-devices.md

@@ -1,7 +1,7 @@
 ---
 title: Register your devices
 description:  This article details how to register devices in Autopatch
-ms.date: 07/06/2022
+ms.date: 08/04/2022
 ms.prod: w11
 ms.technology: windows
 ms.topic: how-to
@@ -21,13 +21,14 @@ Before Microsoft can manage your devices in Windows Autopatch, you must have dev
 Windows Autopatch can take over software update management of supported devices as soon as an IT admin decides to have their tenant managed by the service. The Windows Autopatch software update management scope includes:
 
 - [Windows quality updates](../operate/windows-autopatch-wqu-overview.md)
+- [Windows feature updates](../operate/windows-autopatch-fu-overview.md)
 - [Microsoft 365 Apps for enterprise updates](../operate/windows-autopatch-microsoft-365-apps-enterprise.md)
 - [Microsoft Edge updates](../operate/windows-autopatch-edge.md)
 - [Microsoft Teams updates](../operate/windows-autopatch-teams.md)
 
 ### About the use of an Azure AD group to register devices
 
-You must choose what devices to manage with Windows Autopatch by either adding them through direct membership or by nesting other Azure AD dynamic/assigned groups into the **Windows Autopatch Device Registration** Azure AD assigned group. Windows Autopatch automatically runs every hour to discover new devices added to this group. Once new devices are discovered, Windows Autopatch attempts to register these devices.
+You must choose what devices to manage with Windows Autopatch by either adding them through direct membership or by nesting other Azure AD dynamic/assigned groups into the **Windows Autopatch Device Registration** Azure AD assigned group. Windows Autopatch automatically runs its discover devices function every hour to discover new devices added to this group. Once new devices are discovered, Windows Autopatch attempts to register these devices.
 
 > [!NOTE]
 > Devices that are intended to be managed by the Windows Autopatch service **must** be added into the **Windows Autopatch Device Registration** Azure AD assigned group. Devices can only be added to this group if they have an Azure AD device ID. Windows Autopatch scans the Azure AD group hourly to discover newly added devices to be registered. You can also use the **Discover devices** button in either the Ready or Not ready tab to register devices on demand.
@@ -48,7 +49,7 @@ Azure AD groups synced up from:
 > The **Windows Autopatch Device Registration** Azure AD group only supports one level of Azure AD nested groups.
 
 > [!TIP]
-> You can also use the **Discover Devices** button in either the Ready or Not ready tab to discover devices from the Windows Autopatch Device Registration Azure AD group on demand.
+> You can also use the **Discover Devices** button in either the Ready or Not ready tab to discover devices from the **Windows Autopatch Device Registration** Azure AD group on demand.
 
 ### Clean up dual state of Hybrid Azure AD joined and Azure registered devices in your Azure AD tenant
 
@@ -78,7 +79,7 @@ To be eligible for Windows Autopatch management, devices must meet a minimum set
 	> [!NOTE]
 	> Windows Autopatch doesn't support device emulators that don't generate Serial number, Model and Manufacturer. Devices that use a non-supported device emulator fail the **Intune or Cloud-Attached** pre-requisite check. Additionally, devices with duplicated serial numbers will fail to register with Windows Autopatch.
 
-See [Windows Autopatch Prerequisites](../prepare/windows-autopatch-prerequisites.md) for more details.
+For more information, see [Windows Autopatch Prerequisites](../prepare/windows-autopatch-prerequisites.md).
 
 ## About the Ready and Not ready tabs
 
@@ -111,7 +112,7 @@ Registering your devices in Windows Autopatch does the following:
 
 ## Steps to register devices
 
-### Physical devices
+Any device (either physical or virtual) that contains an Azure AD device ID can be added into the **Windows Autopatch Device Registration** Azure AD group to be registered with Windows Autopatch.
 
 **To register physical devices into Windows Autopatch:**
 
@@ -126,15 +127,9 @@ Registering your devices in Windows Autopatch does the following:
 
 Once devices or Azure AD groups containing devices are added to the **Windows Autopatch Device Registration** group, Windows Autopatch discovers these devices, and runs software-based prerequisite checks to try to register them with its service.
 
-### Virtual devices
+### Windows Autopatch on Windows 365 Enterprise Workloads
 
-#### Windows Autopatch on Windows 365 Enterprise Workloads
+With Windows 365 Enterprise, IT admins are given the option to register devices with the Windows Autopatch service as part of the Windows 365 provisioning policy creation. This option provides a seamless experience for admins and users to ensure your Cloud PCs are always up to date. When IT admins decide to manage their Windows 365 Cloud PCs with Windows Autopatch, the Windows 365 provisioning policy creation process calls Windows Autopatch device registration APIs to register devices on behalf of the IT admin.
-
-With Windows 365 Enterprise, you can include Windows Autopatch onboarding as part of your provision process providing a seamless experience for admins and users to ensure your Cloud PCs are always up to date.
-
-#### Deploy Windows Autopatch on a Windows 365 Provisioning Policy
-
-For general guidance, see [Create a Windows 365 Provisioning Policy](/windows-365/enterprise/create-provisioning-policy).
 
 **To deploy Windows Autopatch on a Windows 365 Provisioning Policy:**
 
@@ -149,20 +144,22 @@ For general guidance, see [Create a Windows 365 Provisioning Policy](/windows-36
 1. Assign your policy accordingly and select **Next**.
 1. Select **Create**. Now your newly provisioned Windows 365 Enterprise Cloud PCs will automatically be enrolled and managed by Windows Autopatch.
 
+For general guidance, see [Create a Windows 365 Provisioning Policy](/windows-365/enterprise/create-provisioning-policy).
+
 #### Deploy Autopatch on Windows 365 for existing Cloud PC
 
-All your existing Windows 365 Enterprise workloads can be registered into Windows Autopatch by leveraging the same method as your physical devices. For more information, see [Physical devices](#physical-devices).
+All your existing Windows 365 Enterprise workloads can be registered into Windows Autopatch by leveraging the same method for any other physical or virtual device. See [steps to register devices](#steps-to-register-devices) for more details.
 
-#### Contact support
+### Contact support for device registration-related incidents
 
-Support is available either through Windows 365, or Windows Autopatch for update related incidents.
+Support is available either through Windows 365, or the Windows Autopatch Service Engineering team for device registration-related incidents.
 
 - For Windows 365 support, see [Get support](/mem/get-support).  
 - For Windows Autopatch support, see [Submit a support request](/windows/deployment/windows-autopatch/operate/windows-autopatch-support-request).  
 
 ## Device management lifecycle scenarios
 
-There's a few more device lifecycle management scenarios to consider when planning to register devices in Windows Autopatch.
+There's a few more device management lifecycle scenarios to consider when planning to register devices in Windows Autopatch.
 
 ### Device refresh
 

windows/deployment/windows-autopatch/prepare/windows-autopatch-prerequisites.md

@@ -1,7 +1,7 @@
 ---
 title: Prerequisites
 description:  This article details the prerequisites needed for Windows Autopatch
-ms.date: 06/30/2022
+ms.date: 08/04/2022
 ms.prod: w11
 ms.technology: windows
 ms.topic: conceptual
@@ -41,7 +41,6 @@ Windows Autopatch is included with Window 10/11 Enterprise E3 or higher. The fol
 
 The following Windows OS 10 editions, 1809 builds and architecture are supported in Windows Autopatch:
 
-- x64 architecture
 - Windows 10 (1809+)/11 Pro
 - Windows 10 (1809+)/11 Enterprise
 - Windows 10 (1809+)/11 Pro for Workstations
@@ -51,8 +50,9 @@ The following Windows OS 10 editions, 1809 builds and architecture are supported
 Windows Autopatch fully supports co-management. The following co-management requirements apply:
 
 - Use a currently supported [Configuration Manager version](/mem/configmgr/core/servers/manage/updates#supported-versions).
-- Ensure ConfigMgr is connected to the internet and [cloud-attach with Intune](/mem/configmgr/cloud-attach/overview).
+- ConfigMgr must be [cloud-attached with Intune (Co-management)](/mem/configmgr/cloud-attach/overview) and must have the following Co-management workloads enabled:
-- Ensure ConfigMgr is co-managed. For more information, see [Paths to co-management](/mem/configmgr/comanage/quickstart-paths).
 	- Set the [Windows Update workload](/mem/configmgr/comanage/workloads#windows-update-policies) to Pilot Intune or Intune.
 	- Set the [Device configuration workload](/mem/configmgr/comanage/workloads#device-configuration) to Pilot Intune or Intune.
 	- Set the [Office Click-to-Run apps workload](/mem/configmgr/comanage/workloads#office-click-to-run-apps) to Pilot Intune or Intune.
+
+For more information, see [paths to co-management](/mem/configmgr/comanage/quickstart-paths).