Merge branch 'main' into patch-1

.openpublishing.redirection.json

@@ -1,5 +1,50 @@
 {
   "redirections": [
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-uac-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/turn-on-defender-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-secure-boot-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/resolve-access-point-restrictions.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-defender-firewall-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-enable-code-integrity.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/your-device-needs-antimalware-software.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/you-need-to-update-os-build-version-windows.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "memdocs/intune/user-help/your-windows-version-isnt-yet-supported.md",
+      "redirect_url": "/mem/intune/user-help/update-device-settings-windows",
+      "redirect_document_id": false
+    },
     {
       "source_path": "memdocs/intune/enrollment/android-fully-managed-security-settings.md",
       "redirect_url": "/mem/intune/protect/device-restrictions-android-for-work",
@@ -1697,7 +1742,7 @@
     },
     {
       "source_path": "memdocs/autopilot/autopilot-faq.yml",
-      "redirect_url": "/autopilot/autopilot-faq.yml",
+      "redirect_url": "/autopilot/faq.yml",
       "redirect_document_id": false
     },
     {
@@ -1782,7 +1827,7 @@
     },
     {
       "source_path": "memdocs/autopilot/policy-conflicts.md",
-      "redirect_url": "/autopilot/policy-conflicts",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-policy-conflicts-with-windows-autopilot",
       "redirect_document_id": false
     },
     {
@@ -1822,22 +1867,22 @@
     },
     {
       "source_path": "memdocs/autopilot/troubleshoot-aad-join.md",
-      "redirect_url": "/autopilot/troubleshoot-aad-join",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-microsoft-entra-join-issues",
       "redirect_document_id": false
     },
     {
       "source_path": "memdocs/autopilot/troubleshoot-device-enrollment.md",
-      "redirect_url": "/autopilot/troubleshoot-device-enrollment",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-autopilot-device-import-and-enrollment",
       "redirect_document_id": false
     },
     {
       "source_path": "memdocs/autopilot/troubleshooting.md",
-      "redirect_url": "/autopilot/troubleshooting",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-autopilot-overview",
       "redirect_document_id": false
     },
     {
       "source_path": "memdocs/autopilot/troubleshoot-oobe.md",
-      "redirect_url": "/autopilot/troubleshoot-oobe",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-out-of-box-experience--oobe--issues-during-windows-autopilot",
       "redirect_document_id": false
     },
     {
@@ -2601,9 +2646,49 @@
       "redirect_document_id": false
     },
     {
+      "source_path": "windows-365/enterprise/set-up-vmware-horizon.md",
+      "redirect_url": "/windows-365/enterprise/set-up-omnissa-horizon",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows-365/enterprise/requirements-vmware-horizon.md",
+      "redirect_url": "/windows-365/enterprise/requirements-omnissa-horizon",
+      "redirect_document_id": false
+    },
+   {
       "source_path": "memdocs/configmgr/core/clients/manage/monitor-windows-analytics.md",
       "redirect_url": "/mem/configmgr/core/clients/manage/upgrade-readiness#bkmk_remove",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/troubleshooting.md",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-autopilot-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/troubleshoot-device-enrollment.md",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-autopilot-device-import-and-enrollment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/troubleshoot-oobe.md",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-windows-oobe-issues-during-windows-autopilot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/troubleshoot-aad-join.md",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-microsoft-entra-join-issues",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/policy-conflicts.md",
+      "redirect_url": "/autopilot/troubleshooting-faq#troubleshooting-policy-conflicts-with-windows-autopilot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "autopilot/autopilot-faq.yml",
+      "redirect_url": "/autopilot/faq",
+      "redirect_document_id": false
     }
   ]
 }

autopilot/autopilot-motherboard-replacement.md

@@ -244,7 +244,7 @@ If the profiles status of a device shows **Fix pending**, Autopilot is in the pr
 1. Manually deregister the device using the steps in the [Deregister a device](#deregister-a-device) section.
 1. Reregister the device.
 
-For more information, see [Troubleshoot Autopilot device import and enrollment: Autopilot profile not applied after reimaging to an older OS version](troubleshoot-device-enrollment.md#autopilot-profile-not-applied-after-reimaging-to-an-older-os-version).
+For more information, see [Why is the Windows Autopilot profile not applied after a hardware change occurred on a device?](troubleshooting-faq.yml#why-is-the-windows-autopilot-profile-not-applied-after-a-hardware-change-occurred-on-a-device-).
 
 ## Specific repair scenarios
 

autopilot/autopilot-support.md

@@ -6,7 +6,7 @@ ms.subservice: itpro-deploy
 ms.localizationpriority: medium
 author: frankroj
 ms.author: frankroj
-ms.date: 06/11/2024
+ms.date: 08/02/2024
 ms.reviewer: jubaptis
 manager: aaroncz
 ms.collection:
@@ -22,15 +22,15 @@ appliesto:
 
 The following table displays support information for the Windows Autopilot program.
 
-Before contacting the following resources listed for Windows Autopilot-related issues, check the [Windows Autopilot FAQ](autopilot-faq.yml).
+Before contacting the following resources listed for Windows Autopilot-related issues, check the [Windows Autopilot FAQ](faq.yml) and [Windows Autopilot troubleshooting FAQ](troubleshooting-faq.yml).
 
 | **Audience**   |   **Support contact**     |
 |------------|---------------------------------------|
-| **OEM or Channel Partner registering devices as a Cloud Solution Partner (CSP) via Microsoft Partner Center**| Use the help resources available in the Microsoft Partner Center. CSPs registering Autopilot devices through Microsoft Partner Center, either manually or through the Microsoft Partner Center API, the first option for support should be the Microsoft Partner Center Help resources (https://partner.microsoft.com/support) within Microsoft Partner Center. This support policy is true for both named partners and channel partners (distributor, reseller, SI, etc.)  |
+| **OEM or Channel Partner registering devices as a Cloud Solution Partner (CSP) via Microsoft Partner Center**| Use the help resources available in the Microsoft Partner Center. CSPs registering Autopilot devices through Microsoft Partner Center, either manually or through the Microsoft Partner Center API, the first option for support should be the Microsoft Partner Center Help resources <https://partner.microsoft.com> within Microsoft Partner Center. This support policy is true for both named partners and channel partners (distributor, reseller, SI, etc.)  |
 | **OEM registering/deregistration devices using OEM Direct API**| Contact the **msoemops** support alias. Response time depends on priority: <br>Low - 120 hours <br>Normal - 72 hours <br>High - 24 hours <br>Immediate - 4 hours <br> The **msoemops** support alias is only accessible and available for OEMs who are using OEM Direct API for Windows Autopilot service.|
 | **Enterprise customers (Company IT Administrator)** | Contact the Technical Account Manager (TAM), Account Technology Strategist (ATS), or Customer Service Support (CSS) representative. |
 | **End-user** | Contact the IT administrator or the Channel Partner/OEM. |
 | **Microsoft Partner Center users** | Use the [help resources](https://partner.microsoft.com/support) available in Microsoft Partner Center. |
 | **Intune users (IT Admin)**| From the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431), select [Help and support](https://intune.microsoft.com/#blade/Microsoft_Intune_DeviceSettings/TenantAdminMenu/helpSupport). |
-| **Microsoft 365 Business Premium** | Support is accessible directly through the Microsoft 365 Business Premium portal when logged in:  https://support.microsoft.com/. |
-| **Queries relating to MDA testing** | Contact [email protected]. |
+| **Microsoft 365 Business Premium** | Support is accessible directly through the Microsoft 365 Business Premium portal when logged in:  <https://support.microsoft.com/>. |
+| **Queries relating to MDA testing** | Contact <[email protected]>. |

autopilot/device-preparation/faq.yml

@@ -9,7 +9,7 @@ metadata:
   ms.author: frankroj
   ms.reviewer: jubaptis
   manager: aaroncz
-  ms.date: 06/03/2024
+  ms.date: 07/29/2024
   ms.collection:
     - M365-modern-desktop
     - highpri
@@ -19,7 +19,7 @@ title: Windows Autopilot device preparation FAQ
 summary: |
   **Applies to:**
 
-  - Windows 11
+  - [Windows 11](/windows/release-health/supported-versions-windows-client#windows-11-supported-versions).
 
   This article provides OEMs, partners, administrators, and users with answers to some frequently asked questions about deploying Windows with Windows Autopilot device preparation.
 

autopilot/device-preparation/troubleshooting-faq.yml

@@ -9,7 +9,7 @@ metadata:
   ms.author: frankroj
   ms.reviewer: jubaptis
   manager: aaroncz
-  ms.date: 06/21/2024
+  ms.date: 07/29/2024
   ms.collection:
     - M365-modern-desktop
     - highpri
@@ -19,7 +19,7 @@ title: Windows Autopilot device preparation troubleshooting FAQ
 summary: |
   **Applies to:**
 
-  - Windows 11
+  - [Windows 11](/windows/release-health/supported-versions-windows-client#windows-11-supported-versions).
 
   This article provides troubleshooting for common Windows Autopilot device preparation issues.
 

autopilot/autopilot-faq.yml → autopilot/faq.yml

@@ -9,7 +9,7 @@ metadata:
   ms.author: frankroj
   ms.reviewer: jubaptis
   manager: aaroncz
-  ms.date: 06/11/2024
+  ms.date: 08/02/2024
   ms.collection:
     - M365-modern-desktop
     - highpri
@@ -19,8 +19,8 @@ title: Windows Autopilot FAQ
 summary: |
   **Applies to:**
 
-  - Windows 11
-  - Windows 10
+  - [Windows 11](/windows/release-health/supported-versions-windows-client#windows-11-supported-versions).
+  - [Windows 10](/windows/release-health/supported-versions-windows-client#windows-10-supported-versions).
 
   This article provides OEMs, partners, administrators, and end users with answers to some frequently asked questions about deploying Windows with Autopilot.
 
@@ -62,7 +62,7 @@ sections:
       - question: |
           Is it required to become a CSP to participate in Windows Autopilot?
         answer: |
-          This requirement doesn't apply to top volume OEMs because they can use the OEM Direct API. All others who choose to use the Microsoft Partnet Center (MPC) to register devices must become CSPs to access MPC.
+          This requirement doesn't apply to top volume OEMs because they can use the OEM Direct API. All others who choose to use the Microsoft Partner Center (MPC) to register devices must become CSPs to access MPC.
 
       - question: |
           Do the different CSP levels have all the same capabilities when it comes to Windows Autopilot?

autopilot/includes/registered-vs-joined.md

@@ -25,4 +25,4 @@ Headings are driven by article context. -->
 >
 > These options are intended for users to join personally owned devices to their organization's network. Windows Autopilot registered devices are registered as corporate owned devices.
 >
-> If a device is already one of these two types of devices, to register is as a Windows Autopilot device, first remove it from Microsoft Intune and Microsoft Entra ID. For more information, see [Device appears as Microsoft Entra registered instead of Microsoft Entra joined](../troubleshoot-device-enrollment.md#device-appears-as-microsoft-entra-registered-instead-of-microsoft-entra-joined) and [Deregister a device](../registration-overview.md#deregister-a-device).
+> If a device is already one of these two types of devices, to register is as a Windows Autopilot device, first remove it from Microsoft Intune and Microsoft Entra ID. For more information, see [Why is the join type for a device showing as "Microsoft Entra registered" instead of "Microsoft Entra joined"?](../troubleshooting-faq.yml#why-is-the-join-type-for-a-device-showing-as--microsoft-entra-registered--instead-of--microsoft-entra-joined--) and [Deregister a device](../registration-overview.md#deregister-a-device).

autopilot/known-issues.md

@@ -225,7 +225,7 @@ To resolve this error, use one of the following work around methods:
 - Delete the device record in Intune, and then redeploy the device so that it reruns the Autopilot deployment. For more information, see [Deregister a device](registration-overview.md#deregister-a-device).
 - Remove the device enrollment restriction for **Windows (MDM)** personally owned devices. For more information, see [Set enrollment restrictions in Microsoft Intune](/mem/intune/enrollment/enrollment-restrictions-set).<!-- MEMDocs #2748 -->
 
-For more information on this issue, see [Troubleshoot Autopilot device import and enrollment](troubleshoot-device-enrollment.md).
+For more information on this issue, see [Troubleshooting Windows Autopilot device import and enrollment](troubleshooting-faq.yml#troubleshooting-windows-autopilot-device-import-and-enrollment).
 
 ### A non-assigned user can sign in when using user-driven mode with Active Directory Federation Services (ADFS)
 
@@ -249,7 +249,11 @@ The services responsible for determining the list of apps that should be blockin
 
 ### That username looks like it belongs to another organization. Try signing in again or start over with a different account
 
-Confirm that all of the information is correct at `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Provisioning\Diagnostics\Autopilot`. For more information, see [Troubleshoot OOBE issues](troubleshoot-oobe.md#registry).
+Confirm that all of the information is correct in the registry key:
+
+`HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Provisioning\Diagnostics\Autopilot`
+
+For more information, see [Where are the Windows Autopilot profile settings received from the Windows Autopilot deployment service stored?](troubleshooting-faq.yml#where-are-the-windows-autopilot-profile-settings-received-from-the-windows-autopilot-deployment-service-stored-).
 
 ### Windows Autopilot user-driven hybrid Microsoft Entra deployments don't grant users Administrator rights even when specified in the Windows Autopilot profile
 
@@ -325,4 +329,4 @@ Using PPKGs in combination with Windows Autopilot isn't recommended.
 ## Related content
 
 - [Collect MDM logs](/windows/client-management/mdm-collect-logs).
-- [Troubleshooting Windows Autopilot](troubleshooting.md).
+- [Troubleshooting Windows Autopilot overview](troubleshooting-faq.yml#troubleshooting-windows-autopilot-overview).