Merge pull request #8647 from frankroj/fr-autopilot-diag-ts

Add Autopilot diagnostics troubleshooting 1

Author: v-stsavell

memdocs/autopilot/troubleshooting.md

@@ -9,11 +9,11 @@ ms.localizationpriority: medium
 ms.sitesec: library
 ms.pagetype: deploy
 audience: itpro
-author: aczechowski
-ms.author: aaroncz
+author: frankroj
+ms.author: frankroj
 ms.reviewer: jubaptis
-manager: dougeby
-ms.date: 02/09/2022
+manager: aczechowski
+ms.date: 10/03/2022
 ms.collection: M365-modern-desktop
 ms.topic: troubleshooting
 ---
@@ -33,7 +33,7 @@ Windows Autopilot is designed to simplify all parts of the Windows device lifecy
 - [Key activities](#key-troubleshooting-activities) to perform during troubleshooting
 
 ## Windows Autopilot diagnostics page
-On Windows 11, you can open the Autopilot diagnostic page to view additional detailed troubleshooting information about the Autopilot provisioning process. The diagnostics page can be enabled by going to the ESP profile and selecting **Yes** to **Turn on log collection and diagnostics page for end users**. Once it is enabled you can select the **View Diagnostics button** or the keyboard shortcut Ctrl+Shift+D to access any diagnostic information. The diagnostics page is currently supported for commercial OOBE, and Autopilot user-driven mode.
+On Windows 11, you can open the Autopilot diagnostic page to view additional detailed troubleshooting information about the Autopilot provisioning process. The diagnostics page can be enabled by going to the ESP profile and selecting **Yes** to **Turn on log collection and diagnostics page for end users**. Once it is enabled, you can select the **View Diagnostics button**, or the keyboard shortcut Ctrl+Shift+D to access any diagnostic information. The diagnostics page is currently supported for commercial OOBE, and Autopilot user-driven mode.
 
 ## Windows Autopilot flow
 
@@ -48,21 +48,30 @@ Whether you're performing user-driven or self-deploying device deployments, the
 
 ## Profile download
 
-When an Internet-connected Windows device boots up, it will attempt to connect to the Autopilot service and download an Autopilot profile. Note: It's important that a profile exists at this stage so that a blank profile isn't cached locally on the PC. To remove the currently cached local profile in Windows 10 version 1803 and earlier, it's necessary to re-generalize the OS using **sysprep /generalize /oobe**, reinstall the OS, or re-image the PC. In Windows 10 version 1809 and later, you can retrieve a new profile by rebooting the PC.
+When an Internet-connected Windows device boots up, it will attempt to connect to the Autopilot service and download an Autopilot profile. The Autopilot profile is downloaded as soon as possible, and again after each reboot.
 
-When a profile is downloaded depends upon the version of Windows client that is running on the PC. See the following table.
+> [!NOTE]
+> At this stage, it's important that an Autopilot profile exists in the tenant so that a blank profile isn't cached locally on the device. If necessary, you can retrieve a new Autopilot profile by rebooting the device.
+>
+> If you need to reboot a computer during OOBE to retrieve a new Autopilot profile:
+> 1. Press Shift-F10 on the keyboard to open a command prompt window.
+> 2. In the command prompt window, enter one of the following two options:
+>    1. Enter `shutdown.exe /r /t 0` to **restart** immediately.
+>    2. Enter `shutdown.exe /s /t 0` to **shut down** immediately.
+>
+> For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options).
+
+<!-- To remove the currently cached local profile in Windows 10 version 1803 and earlier, it's necessary to re-generalize the OS using **sysprep /generalize /oobe**, reinstall the OS, or re-image the PC. -->
+ 
+<!-- In Windows 10 version 1809 and later, -->
+
+<!-- When a profile is downloaded depends upon the version of Windows client that is running on the PC. See the following table.
 
 | Windows 10 version | Profile download behavior |
 | --- | --- |
 | 1709 | The profile is downloaded after the OOBE network connection page. This page isn't displayed when using a wired connection. In this case, the profile is downloaded before the EULA screen. |
 | 1803 | The profile is downloaded as soon as possible. If wired, it's downloaded at the start of OOBE. If wireless, it's downloaded after the network connection page. |
-| 1809 | The profile is downloaded as soon as possible (same as 1803), and again after each reboot. |
-
-If you need to reboot a computer during OOBE:
-- Press Shift-F10 to open a command prompt.
-- Enter **shutdown /r /t 0** to restart immediately, or **shutdown /s /t 0** to shut down immediately.
-
-For more information, see [Windows Setup Command-Line Options](/windows-hardware/manufacture/desktop/windows-setup-command-line-options).
+| 1809 | The profile is downloaded as soon as possible (same as 1803), and again after each reboot. | -->
 
 ## Key troubleshooting activities
 
@@ -73,15 +82,17 @@ For troubleshooting, key activities to perform are:
 - Autopilot out-of-box experience (OOBE) behavior: Are the [expected OOBE](troubleshoot-oobe.md) screens displayed? Is the Azure AD credentials page customized with organization-specific details as expected?
 - Azure AD join issues: Is the device able to [join Azure Active Directory](troubleshoot-aad-join.md)?
 - MDM enrollment issues: IS the device able to [enroll in Microsoft Intune](troubleshoot-device-enrollment.md) (or an equivalent MDM service)?
+- Review logs that are automatically collected upon Autopilot failure. For more information, see [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md). <!--1895390-->
 
 ## Next steps
 
-See the following topics for help troubleshooting specific issues:
+See the following topics for help with troubleshooting specific issues:
 
 - [Troubleshoot device enrollment](troubleshoot-device-enrollment.md)
 - [Troubleshoot OOBE issues](troubleshoot-oobe.md)
 - [Troubleshoot AAD join issues](troubleshoot-aad-join.md)
 - [Policy conflicts](policy-conflicts.md)
+- [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md)
 - [Known issues](known-issues.md)
 
 ## Related topics

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

@@ -19,7 +19,7 @@ ms.topic: article
 
 ## Autopilot automatic device diagnostics collection
 <!--1895390-->
-Starting with Intune 2209, Intune will automatically capture diagnostics when devices experience a failure during the Autopilot process on Windows 10 version 1909 or later and with Windows 11. When logs are finished processing on a failed device, they will be automatically captured and uploaded to Intune. Diagnostics and logs may include user identifiable information such as user name or device name. If the logs are not available in Intune, check if the device is powered-on and has access to the internet. Diagnostics are available for 28 days before they are removed.
+Starting with Intune 2209, Intune will automatically capture diagnostics when devices experience a failure during the Autopilot process on Windows 10 version 1909 or later and with Windows 11. When logs are finished processing on a failed device, they will be automatically captured and uploaded to Intune. Diagnostics may include user identifiable information such as user or device name. If the logs are not available in Intune, check if the device is powered-on and has access to the internet. Diagnostics are available for 28 days before they are removed.
 
 For more information, see [Collect diagnostics from a Windows device](../intune/remote-actions/collect-diagnostics.md).