diff --git a/education/windows/tutorial-school-deployment/images/intune-diagnostics.png b/education/windows/tutorial-school-deployment/images/intune-diagnostics.png
new file mode 100644
index 0000000000..20b05ad9d7
Binary files /dev/null and b/education/windows/tutorial-school-deployment/images/intune-diagnostics.png differ
diff --git a/education/windows/tutorial-school-deployment/reset-wipe.md b/education/windows/tutorial-school-deployment/reset-wipe.md
index d00276cd45..df32e0ebad 100644
--- a/education/windows/tutorial-school-deployment/reset-wipe.md
+++ b/education/windows/tutorial-school-deployment/reset-wipe.md
@@ -1,6 +1,6 @@
---
-title: Reset and wipe
-description: reset and wipe
+title: Reset and wipe Windows devices
+description: Reset and wipe options for Windows devices using Intune for Education, including scenarios when to delete devices
ms.date: 08/31/2022
ms.prod: windows
ms.technology: windows
@@ -14,9 +14,10 @@ ms.collection: education
appliesto:
- ✅ Windows 10
- ✅ Windows 11
+- ✅ Windows 11 SE
---
-# Device reset
+# Device reset options
There are different scenarios that require a device to be reset, for example:
@@ -91,7 +92,7 @@ There are scenarios that require a device to be deleted from your tenant, for ex
- The device has been replaced with a new device or has its motherboard replaced
> [!IMPORTANT]
-> The following action should only be performed for devices that are no longer going to be used in your tenant.
+> The following actions should only be performed for devices that are no longer going to be used in your tenant.
To completely remove a device, you need to perform the following actions:
diff --git a/education/windows/tutorial-school-deployment/troubleshoot-overview.md b/education/windows/tutorial-school-deployment/troubleshoot-overview.md
index 17340ef668..5d067b7b92 100644
--- a/education/windows/tutorial-school-deployment/troubleshoot-overview.md
+++ b/education/windows/tutorial-school-deployment/troubleshoot-overview.md
@@ -1,6 +1,6 @@
---
-title: How to contact Microsoft Support
-description: How to contact Microsoft Support for issues related to Intune and other Endpoint Manager services
+title: Troubleshoot Windows devices
+description: How to troubleshoot Windows devices from Intune and contact Microsoft Support for issues related to Intune and other Endpoint Manager services
ms.date: 08/31/2022
ms.prod: windows
ms.technology: windows
@@ -11,10 +11,29 @@ ms.author: paoloma
#ms.reviewer:
manager: aaroncz
ms.collection: education
-#appliesto:
+appliesto:
+- ✅ Windows 10
+- ✅ Windows 11
+- ✅ Windows 11 SE
---
-# How to contact Microsoft Support
+# Troubleshoot Windows devices
+
+Microsoft Endpoint Manager provides many tools that can help you troubleshoot Windows devices.
+Here's a collection of resources to help you troubleshoot Windows devices managed by Intune:
+
+- [Troubleshooting device enrollment in Intune][MEM-2]
+- [Troubleshooting Windows Autopilot][MEM-9]
+- [Troubleshoot Windows Wi-Fi profiles][MEM-6]
+- [Troubleshooting policies and profiles in Microsoft Intune][MEM-5]
+- [Troubleshooting BitLocker with the Intune encryption report][MEM-4]
+- [Troubleshooting CSP custom settings][MEM-8]
+- [Troubleshooting Win32 app installations with Intune][MEM-7]
+- [Troubleshooting device actions in Intune][MEM-3]
+- [**Collect diagnostics**][MEM-10] is a remote action that lets you collect and download Windows device logs without interrupting the user
+ :::image type="content" source="./images/intune-diagnostics.png" alt-text="Intune for Education dashboard" border="true":::
+
+## How to contact Microsoft Support
Microsoft provides global technical, pre-sales, billing, and subscription support for cloud-based device management services. This support includes Microsoft Intune, Configuration Manager, Windows 365, and Microsoft Managed Desktop.
@@ -37,4 +56,13 @@ Follow these steps to obtain support in Microsoft Endpoint Manager:
For more information, see [Microsoft Endpoint Manager support page][MEM-1]
-[MEM-1]: /mem/get-support
\ No newline at end of file
+[MEM-1]: /mem/get-support
+[MEM-2]: /troubleshoot/mem/intune/troubleshoot-device-enrollment-in-intune
+[MEM-3]: /troubleshoot/mem/intune/troubleshoot-device-actions
+[MEM-4]: /troubleshoot/mem/intune/troubleshoot-bitlocker-admin-center
+[MEM-5]: /troubleshoot/mem/intune/troubleshoot-policies-in-microsoft-intune
+[MEM-6]: /troubleshoot/mem/intune/troubleshoot-wi-fi-profiles#troubleshoot-windows-wi-fi-profiles
+[MEM-7]: /troubleshoot/mem/intune/troubleshoot-win32-app-install
+[MEM-8]: /troubleshoot/mem/intune/troubleshoot-csp-custom-settings
+[MEM-9]: /mem/autopilot/troubleshooting
+[MEM-10]: /mem/intune/remote-actions/collect-diagnostics