Add Autopilot diagnostics

Author: frankroj

memdocs/autopilot/windows-autopilot-whats-new.md

@@ -12,7 +12,7 @@ ms.date: 09/22/2022
 ms.collection:
   - M365-modern-desktop
   - highpri
-ms.topic: article
+ms.topic: article 
 ---
 
 # Windows Autopilot: What's new

memdocs/intune/remote-actions/collect-diagnostics.md

@@ -33,6 +33,8 @@ ms.collection: M365-identity-device-management
 
 The **Collect diagnostics** remote action lets you collect and download Windows device logs without interrupting the user. Only non-user locations and file types can be accessed, so no personal information is collected.
 
+Autopilot diagnostics can also be captured automatically when devices experience a failure during the Autopilot process. When logs are finished processing on a failed device, they will be automatically captured and uploaded to Intune. Autopilot diagnostics and logs may include user identifiable information such as user name or device name.
+
 The diagnostic collection is stored for 28 days and then deleted. Each device can have up to 10 collections stored at one time.
 
 *Collect diagnostics* is also available as a [Bulk device action](../remote-actions/bulk-device-actions.md) that collects diagnostic logs from up to 25 Windows devices at a time.
@@ -59,6 +61,9 @@ To use the *Collect diagnostics* action:
 4. After the  action completes, select **Download** in the row for the action > **Yes**.
 5. The data zip file is added to your download tray and you can save it to your computer.
 
+> [!NOTE]
+> For Autopilot diagnostics collection, no additional action is required. Autopilot diagnostics will be automatically captured when devices experience a failure as long as the Autopilot automatic capture diagnostic feature is enabled.
+
 ## Data collected
 
 No personal information is collected. If you've installed [KB5011543](https://support.microsoft.com/topic/march-22-2022-kb5011543-os-builds-19042-1620-19043-1620-and-19044-1620-preview-4fe2d1c0-720f-47fe-9523-75339bc107a1) on Windows 10 or [KB5011563](https://support.microsoft.com/topic/march-28-2022-kb5011563-os-build-22000-593-preview-40df54c9-b5a9-42e5-ae1c-9a33ff91ca91) on Windows 11, the format of the zip file will be simpler, including a flattened structure where the logs collected are named to match the data collected, and when multiple files are collected a folder is created.  
@@ -142,10 +147,19 @@ Files:
 You can disable the **Collect diagnostics** remote action for all devices by following these steps:
 
 1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431) > **Tenant administration** > **Device diagnostics**.
-2. Change the control to **Disabled**.
+2. Change the control under **Device diagnostics are available for corporate-managed devices running Windows 10, version 1909 and later, or Windows 11.** to **Disabled**.
 
      :::image type="content" source="./media/collect-diagnostics/disable-device-diagnostics.png" alt-text="Screenshot that shows the Device diagnostics pane with the highlighted control set to Disabled.":::
 
+## Disable Autopilot diagnostics
+
+You can disable Autopilot automatic diagnostic capture by following these steps:
+
+1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431) > **Tenant administration** > **Device diagnostics**.
+2. Change the control under **Automatically capture diagnostics when devices experience a failure during the Autopilot process on Windows 10 version 1909 or later and Windows 11. Diagnostics may include user identifiable information such as user or device name (preview).** to **Disabled**.
+
+     :::image type="content" source="./media/collect-diagnostics/disable-autopilot-diagnostics.png" alt-text="Screenshot that shows the Device diagnostics pane with the highlighted control set to Disabled.":::
+
 ## Known issues with device diagnostics
 
 Currently there are the two main issues that may cause device diagnostics to fail: