Merge branch 'main' into 9580729d-41c2-4963-b81f-3cfbbeb80704_51

windows/client-management/azure-active-directory-integration-with-mdm.md

@@ -1,7 +1,7 @@
 ---
 title: Microsoft Entra integration with MDM
 description: Microsoft Entra ID is the world's largest enterprise cloud identity management service.
-ms.topic: conceptual
+ms.topic: integration
 ms.collection:
 - highpri
 - tier2

windows/deployment/upgrade/resolve-windows-upgrade-errors.md

@@ -5,7 +5,7 @@ ms.author: frankroj
 description: Resolve Windows upgrade errors for ITPros. Technical information for IT professionals to help diagnose Windows setup errors.
 author: frankroj
 ms.localizationpriority: medium
-ms.topic: conceptual
+ms.topic: troubleshooting-general
 ms.service: windows-client
 ms.subservice: itpro-deploy
 ms.date: 01/29/2025

windows/deployment/upgrade/submit-errors.md

@@ -6,7 +6,7 @@ description: Download the Feedback Hub app, and then submit Windows upgrade erro
 ms.service: windows-client
 author: frankroj
 ms.localizationpriority: medium
-ms.topic: conceptual
+ms.topic: troubleshooting-general
 ms.subservice: itpro-deploy
 ms.date: 01/29/2025
 appliesto:

windows/deployment/usmt/usmt-troubleshooting.md

@@ -7,7 +7,7 @@ ms.author: frankroj
 ms.service: windows-client
 author: frankroj
 ms.date: 01/29/2025
-ms.topic: conceptual
+ms.topic: troubleshooting-general
 ms.subservice: itpro-deploy
 appliesto:
   - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 11</a>