diff --git a/.openpublishing.redirection.education.json b/.openpublishing.redirection.education.json
index e27a545a00..77b49e134c 100644
--- a/.openpublishing.redirection.education.json
+++ b/.openpublishing.redirection.education.json
@@ -234,6 +234,78 @@
"source_path": "education/windows/configure-windows-for-education.md",
"redirect_url": "/education/windows",
"redirect_document_id": false
+ },
+
+
+ {
+ "source_path": "education/windows/tutorial-school-deployment/configure-device-apps.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/configure-device-apps",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/configure-device-settings.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/configure-device-settings",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/configure-devices-overview.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/configure-devices-overview",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/enroll-autopilot.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/enroll-autopilot",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/enroll-entra-join.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/enroll-entra-join",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/enroll-overview.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/enroll-overview",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/enroll-package.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/enroll-package",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/index.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/introduction",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/manage-overview.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/manage-overview",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/manage-surface-devices.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/manage-surface-devices",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/reset-wipe.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/reset-wipe",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/set-up-microsoft-entra-id.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/set-up-microsoft-entra-id",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/set-up-microsoft-intune.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/set-up-microsoft-intune",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "education/windows/tutorial-school-deployment/troubleshoot-overview.md",
+ "redirect_url": "/mem/intune/industry/education/tutorial-school-deployment/troubleshoot-overview",
+ "redirect_document_id": false
}
]
}
\ No newline at end of file
diff --git a/.openpublishing.redirection.windows-configuration.json b/.openpublishing.redirection.windows-configuration.json
index d92acf14b2..f89a157d6b 100644
--- a/.openpublishing.redirection.windows-configuration.json
+++ b/.openpublishing.redirection.windows-configuration.json
@@ -462,7 +462,12 @@
},
{
"source_path": "windows/configuration/windows-spotlight.md",
- "redirect_url": "/windows/configuration/lock-screen/windows-spotlight",
+ "redirect_url": "/windows/configuration/windows-spotlight/index",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/configuration/lock-screen/windows-spotlight.md",
+ "redirect_url": "/windows/configuration/windows-spotlight",
"redirect_document_id": false
},
{
diff --git a/.openpublishing.redirection.windows-security.json b/.openpublishing.redirection.windows-security.json
index 9a07d9ac68..471c829ed5 100644
--- a/.openpublishing.redirection.windows-security.json
+++ b/.openpublishing.redirection.windows-security.json
@@ -9169,6 +9169,16 @@
"source_path": "windows/security/threat-protection/security-policy-settings/user-rights-assignment.md",
"redirect_url": "/previous-versions/windows/it-pro/windows-10/security/threat-protection/security-policy-settings/user-rights-assignment",
"redirect_document_id": false
+ },
+ {
+ "source_path": "windows/security/cloud-security/index.md",
+ "redirect_url": "/windows/security/cloud-services",
+ "redirect_document_id": false
+ },
+ {
+ "source_path": "windows/security/identity-protection/hello-for-business/hello-feature-dual-enrollment.md",
+ "redirect_url": "/windows/security/identity-protection/hello-for-business/dual-enrollment",
+ "redirect_document_id": false
}
]
}
diff --git a/education/windows/change-home-to-edu.md b/education/windows/change-home-to-edu.md
index 88685f15ae..042df87a74 100644
--- a/education/windows/change-home-to-edu.md
+++ b/education/windows/change-home-to-edu.md
@@ -215,14 +215,6 @@ A multiple activation key activates either individual computers or a group of co
| Scenario | Ownership | MAK | KMS | AD based activation | Subscription Activation |
|-|-|:-:|:-:|:-:|:-:|
-| **Workplace join (add work or school account)** | Personal (or student-owned) | X | | | |
-| **Microsoft Entra join** | Organization | X | X | | X |
-| **Microsoft Entra hybrid join** | Organization | X | X | X | X |
-
-## Related links
-
-- [Windows 10 edition upgrade (Windows 10)](/windows/deployment/upgrade/windows-10-edition-upgrades)
-- [Windows 10/11 Subscription Activation](/windows/deployment/windows-10-subscription-activation)
-- [Equip Your Students with Windows 11 Education - Kivuto](https://kivuto.com/windows-11-student-use-benefit/)
-- [Upgrade Windows Home to Windows Pro (microsoft.com)](https://support.microsoft.com/windows/upgrade-windows-home-to-windows-pro-ef34d520-e73f-3198-c525-d1a218cc2818)
-- [Partner Center: Upgrade Education customers from Windows 10 Home to Windows 10 Education](/partner-center/upgrade-windows-to-education)
+| **Workplace join (add work or school account)** | Personal (or student-owned) | ✅ | | | |
+| **Microsoft Entra join** | Organization | ✅ | ✅ | | ✅ |
+| **Microsoft Entra hybrid join** | Organization | ✅ | ✅ | ✅ | ✅ |
diff --git a/education/windows/index.yml b/education/windows/index.yml
index d14d00dd63..942a90b16b 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -63,10 +63,8 @@ productDirectory:
- title: Learn how to manage Windows devices
imageSrc: /media/common/i_management.svg
links:
- - url: tutorial-school-deployment/manage-overview.md
+ - url: /mem/intune/industry/education/tutorial-school-deployment/manage-overview
text: Manage devices with Microsoft Intune
- - url: tutorial-school-deployment/manage-surface-devices.md
- text: Management functionalities for Surface devices
- url: /education/windows/get-minecraft-for-education
text: Get and deploy Minecraft Education
- url: /windows/client-management
diff --git a/education/windows/toc.yml b/education/windows/toc.yml
index 667c2ddc07..62e4c0d85c 100644
--- a/education/windows/toc.yml
+++ b/education/windows/toc.yml
@@ -4,8 +4,6 @@ items:
- name: Tutorials
expanded: true
items:
- - name: Deploy and manage Windows devices in a school
- href: tutorial-school-deployment/toc.yml
- name: Deploy applications to Windows 11 SE
href: tutorial-deploy-apps-winse/toc.yml
- name: Concepts
diff --git a/education/windows/tutorial-school-deployment/configure-device-apps.md b/education/windows/tutorial-school-deployment/configure-device-apps.md
deleted file mode 100644
index 25171ff770..0000000000
--- a/education/windows/tutorial-school-deployment/configure-device-apps.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: Configure applications with Microsoft Intune
-description: Learn how to configure applications with Microsoft Intune in preparation for device deployment.
-ms.date: 01/16/2024
-ms.topic: tutorial
----
-
-# Configure applications with Microsoft Intune
-
-With Intune for Education, school IT administrators have access to diverse applications to help students unlock their learning potential. This section discusses tools and resources for adding apps to Intune for Education.
-
-Applications can be assigned to groups:
-
-- If you target apps to a **group of users**, the apps will be installed on any managed devices that the users sign into
-- If you target apps to a **group of devices**, the apps will be installed on those devices and available to any user who signs in
-
-> [!div class="checklist"]
->In this section you will:
->
-> - Add apps to Intune for Education
-> - Assign apps to groups
-> - Review some considerations for Windows 11 SE devices
-
-## Add apps to Intune for Education
-
-Intune for Education supports the deployment of two types of Windows applications: **web apps** and **desktop apps**.
-
-:::image type="content" source="./images/intune-education-apps.png" alt-text="Intune for Education - Apps" lightbox="./images/intune-education-apps.png" border="true":::
-
-### Desktop apps
-
-The addition of desktop applications to Intune should be carried out by repackaging the apps, and defining the commands to silently install them. The process is described in the article [Add, assign, and monitor a Win32 app in Microsoft Intune][MEM-1].
-
-### Web apps
-
-To create web applications in Intune for Education:
-
-1. Sign in to the Intune for Education portal
-1. Select **Apps**
-1. Select **New app** > **New web app**
-1. Provide a URL for the web app, a name and, optionally, an icon and description
-1. Select **Save**
-
-For more information, see [Add web apps][INT-2].
-
-## Assign apps to groups
-
-To assign applications to a group of users or devices:
-
-1. Sign in to the Intune for Education portal
-1. Select **Groups** > Pick a group to manage
-1. Select **Apps**
-1. Select either **Web apps** or **Windows apps**
-1. Select the apps you want to assign to the group > Save
-
-## Considerations for Windows 11 SE
-
-Windows 11 SE prevents the installation and execution of third party applications with a technology called **Windows Defender Application Control** (WDAC).
-WDAC applies an *allowlist* policy, which ensures that unwanted apps don't run or get installed. However, it also prevents IT admins from deploying apps to Windows 11 SE devices, unless they're included in the E Mode policy.
-
-To learn more about which apps are supported in Windows 11 SE, and how to deploy them, see the tutorial [Deploy applications to Windows 11 SE with Intune][EDU-1].
-
-## Next steps
-
-With the applications configured, you can now deploy students' and teachers' devices.
-
-> [!div class="nextstepaction"]
-> [Next: Deploy devices >](enroll-overview.md)
-
-
-
-[EDU-1]: ../tutorial-deploy-apps-winse/index.md
-
-[MEM-1]: /mem/intune/apps/apps-win32-add
-
-[INT-1]: /intune-education/express-configuration-intune-edu
-[INT-2]: /intune-education/add-web-apps-edu
\ No newline at end of file
diff --git a/education/windows/tutorial-school-deployment/configure-device-settings.md b/education/windows/tutorial-school-deployment/configure-device-settings.md
deleted file mode 100644
index 5733d483e9..0000000000
--- a/education/windows/tutorial-school-deployment/configure-device-settings.md
+++ /dev/null
@@ -1,133 +0,0 @@
----
-title: Configure and secure devices with Microsoft Intune
-description: Learn how to configure policies with Microsoft Intune in preparation for device deployment.
-ms.date: 01/16/2024
-ms.topic: tutorial
-ms.collection: essentials-manage
----
-
-# Configure and secure devices with Microsoft Intune
-
-With Intune for Education, you can configure settings for devices in the school, to ensure that they comply with specific policies.
-For example, you may need to secure your devices, ensuring that they are kept up to date. Or you may need to configure all the devices with the same look and feel.
-
-Settings can be assigned to groups:
-
-- If you target settings to a **group of users**, those settings will apply, regardless of what managed devices the targeted users sign in to
-- If you target settings to a **group of devices**, those settings will apply regardless of who is using the devices
-
-There are two ways to manage settings in Intune for Education:
-
-- **Express Configuration.** This option is used to configure a selection of settings that are commonly used in school environments
-- **Group settings.** This option is used to configure all settings that are offered by Intune for Education
-
-> [!NOTE]
-> Express Configuration is ideal when you are getting started. Settings are pre-configured to Microsoft-recommended values, but can be changed to fit your school's needs. It is recommended to use Express Configuration to initially set up your Windows devices.
-
-
-> [!div class="checklist"]
->In this section you will:
->
-> - Configure settings with Express Configuration
-> - Configure group settings
-> - Create Windows Update policies
-> - Configure security policies
-
-## Configure settings with Express Configuration
-
-With Express Configuration, you can get Intune for Education up and running in just a few steps. You can select a group of devices or users, select applications to distribute, and choose settings from the most commonly used in schools.
-
-> [!TIP]
-> To learn more, and practice step-by-step Express Configuration in Intune for Education, try this interactive demo.
-
-## Configure group settings
-
-Groups are used to manage users and devices with similar management needs, allowing you to apply changes to many devices or users at once. To review the available group settings:
-
-1. Sign in to the Intune for Education portal
-1. Select **Groups** > Pick a group to manage
-1. Select **Windows device settings**
-1. Expand the different categories and review information about individual settings
-
-Settings that are commonly configured for student devices include:
-
-- Wallpaper and lock screen background. See: [Lock screen and desktop][INT-7]
-- Wi-Fi connections. See: [Add Wi-Fi profiles][INT-8]
-- Enablement of the integrated testing and assessment solution *Take a Test*. See: [Add Take a Test profile][INT-9]
-
-For more information, see [Windows device settings in Intune for Education][INT-3].
-
-## Create Windows Update policies
-
-It is important to keep Windows devices up to date with the latest security updates. You can create Windows Update policies using Intune for Education.
-
-To create a Windows Update policy:
-
-1. Select **Groups** > Pick a group to manage
-1. Select **Windows device settings**
-1. Expand the category **Update and upgrade**
-1. Configure the required settings as needed
-
-For more information, see [Updates and upgrade][INT-6].
-
-> [!NOTE]
-> If you require a more complex Windows Update policy, you can create it in Microsoft Intune. For more information:
-> - [What is Windows Update for Business?][WIN-1]
-> - [Manage Windows software updates in Intune][MEM-1]
-
-## Configure security policies
-
-It is critical to ensure that the devices you manage are secured using the different security technologies available in Windows.
-Intune for Education provides different settings to secure devices.
-
-To create a security policy:
-
-1. Select **Groups** > Pick a group to manage
-1. Select **Windows device settings**
-1. Expand the category **Security**
-1. Configure the required settings as needed, including
- - Windows Defender
- - Windows Encryption
- - Windows SmartScreen
-
-For more information, see [Security][INT-4].
-
-> [!NOTE]
-> If you require more sophisticated security policies, you can create them in Microsoft Intune. For more information:
-> - [Antivirus][MEM-2]
-> - [Disk encryption][MEM-3]
-> - [Firewall][MEM-4]
-> - [Endpoint detection and response][MEM-5]
-> - [Attack surface reduction][MEM-6]
-> - [Account protection][MEM-7]
-
----
-
-## Next steps
-
-With the Intune service configured, you can configure policies and applications to deploy to your students' and teachers' devices.
-
-> [!div class="nextstepaction"]
-> [Next: Configure applications >](configure-device-apps.md)
-
-
-
-[EDU-1]: /education/windows/windows-11-se-overview
-
-[INT-2]: /intune-education/express-configuration-intune-edu
-[INT-3]: /intune-education/all-edu-settings-windows
-[INT-4]: /intune-education/all-edu-settings-windows#security
-[INT-6]: /intune-education/all-edu-settings-windows#updates-and-upgrade
-[INT-7]: /intune-education/all-edu-settings-windows#lock-screen-and-desktop
-[INT-8]: /intune-education/add-wi-fi-profile
-[INT-9]: /intune-education/take-a-test-profiles
-
-[WIN-1]: /windows/deployment/update/waas-manage-updates-wufb
-
-[MEM-1]: /mem/intune/protect/windows-update-for-business-configure
-[MEM-2]: /mem/intune/protect/endpoint-security-antivirus-policy
-[MEM-3]: /mem/intune/protect/encrypt-devices
-[MEM-4]: /mem/intune/protect/endpoint-security-firewall-policy
-[MEM-5]: /mem/intune/protect/endpoint-security-edr-policy
-[MEM-6]: /mem/intune/protect/endpoint-security-asr-policy
-[MEM-7]: /mem/intune/protect/endpoint-security-account-protection-policy
\ No newline at end of file
diff --git a/education/windows/tutorial-school-deployment/configure-devices-overview.md b/education/windows/tutorial-school-deployment/configure-devices-overview.md
deleted file mode 100644
index 27ad5f3a8d..0000000000
--- a/education/windows/tutorial-school-deployment/configure-devices-overview.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-title: Configure devices with Microsoft Intune
-description: Learn how to configure policies and applications in preparation for device deployment.
-ms.date: 11/09/2023
-ms.topic: tutorial
-ms.collection: essentials-manage
----
-
-# Configure settings and applications with Microsoft Intune
-
-Before distributing devices to your users, you must ensure that the devices will be configured with the required policies, settings, and applications as they get enrolled in Intune.
-Microsoft Intune uses Microsoft Entra groups to assign policies and applications to devices.
-With Microsoft Intune for Education, you can conveniently create groups and assign policies and applications to them.
-
-
-> [!div class="checklist"]
->In this section you will:
->
-> - Create groups
-> - Create and assign policies to groups
-> - Create and assign applications to groups
-
-## Create groups
-
-By organizing devices, students, classrooms, or learning curricula into groups, you can provide students with the resources and configurations they need.
-
-By default, Intune for Education creates two default groups: *All devices* and *All users*.
-Two additional groups are pre-created if you use **Microsoft School Data Sync (SDS)**: *All teachers* and *All students*. SDS can also be configured to automatically create and maintain groups of students and teachers for each school.
-
-:::image type="content" source="./images/intune-education-groups.png" alt-text="Intune for Education - Groups blade" border="true":::
-
-Beyond the defaults, groups can be customized to suit various needs. For example, if you have both *Windows 10* and *Windows 11 SE* devices in your school, you can create groups, such as *Windows 10 devices* and *Windows 11 SE devices*, to assign different policies and applications to.
-
-Two group types can be created:
-
-- **Assigned groups** are used when you want to manually add users or devices to a group
-- **Dynamic groups** reference rules that you create to assign students or devices to groups, which automate the membership's maintenance of those groups
-
-> [!TIP]
-> If you target applications and policies to a *device dynamic group*, they will be applied to the devices as soon as they are enrolled in Intune, before users signs in. This can be useful in bulk enrollment scenarios, where devices are enrolled without requiring users to sign in. Devices can be configured and prepared in advance, before distribution.
-
-For more information, see:
-
-- [Create groups in Intune for Education][EDU-1]
-- [Manually add or remove users and devices to an existing assigned group][EDU-2]
-- [Edit dynamic group rules to accommodate for new devices, locations, or school years][EDU-3]
-
-________________________________________________________
-
-## Next steps
-
-With the groups created, you can configure policies and applications to deploy to your groups.
-
-> [!div class="nextstepaction"]
-> [Next: Configure policies >](configure-device-settings.md)
-
-
-
-[EDU-1]: /intune-education/create-groups
-[EDU-2]: /intune-education/edit-groups-intune-for-edu
-[EDU-3]: /intune-education/edit-groups-intune-for-edu#edit-dynamic-group-rules
diff --git a/education/windows/tutorial-school-deployment/enroll-autopilot.md b/education/windows/tutorial-school-deployment/enroll-autopilot.md
deleted file mode 100644
index 23985289cf..0000000000
--- a/education/windows/tutorial-school-deployment/enroll-autopilot.md
+++ /dev/null
@@ -1,148 +0,0 @@
----
-title: Enrollment in Intune with Windows Autopilot
-description: Learn how to join Microsoft Entra ID and enroll in Intune using Windows Autopilot.
-ms.date: 01/16/2024
-ms.topic: tutorial
----
-
-# Windows Autopilot
-
-Windows Autopilot is designed to simplify all parts of Windows devices lifecycle, from initial deployment through end of life. Using cloud-based services, Windows Autopilot can reduce the overall costs for deploying, managing, and retiring devices.
-
-Traditionally, IT pros spend a significant amount of time building and customizing images that will later be deployed to devices. Windows Autopilot introduces a new, simplified approach. Devices don't need to be reimaged, rather they can be deployed with the OEM image, and customized using cloud-based services.
-
-From the user's perspective, it only takes a few simple operations to make their device ready to use. The only interaction required from the end user is to set their language and regional settings, connect to a network, and verify their credentials. Everything beyond that is automated.
-
-## Prerequisites
-
-Before setting up Windows Autopilot, consider these prerequisites:
-
-- **Software requirements.** Ensure your school and devices meet the [software, networking, licensing, and configuration requirements][WIN-1] for Windows Autopilot
-- **Devices ordered and registered.** Ensure your school IT administrator or Microsoft partner has ordered the devices from an original equipment manufacturer (OEM) and registered them for the Autopilot deployment service. To connect with a partner, you can use the [Microsoft Partner Center][MSFT-1] and work with them to register your devices
-- **Networking requirements.** Ensure students know to connect to the school network during OOBE setup. For more information on managing devices behind firewalls and proxy servers, see [Network endpoints for Microsoft Intune][MEM-1]
-
-> [!NOTE]
-> Where not explicitly specified, both HTTPS (443) and HTTP (80) must be accessible. If you are auto-enrolling your devices into Microsoft Intune or deploying Microsoft Office, follow the networking guidelines for [Microsoft Intune][INT-1] and [Microsoft 365][M365-1].
-
-## Register devices to Windows Autopilot
-
-Before deployment, devices must be registered in the Windows Autopilot service. Each device's unique hardware identity (known as a *hardware hash*) must be uploaded to the Autopilot service. In this way, the Autopilot service can recognize which tenant devices belong to, and which OOBE experience it should present. There are three main ways to register devices to Autopilot:
-
-- **OEM registration process.** When you purchase devices from an OEM or Reseller, that company can automatically register devices to Windows Autopilot and associate them to your tenant. Before this registration can happen, a *Global Administrator* must grant the OEM/Reseller permissions to register devices. For more information, see [OEM registration][MEM-2]
- > [!NOTE]
- > For **Microsoft Surface registration**, collect the details shown in this [documentation table][SURF-1] and follow the instruction to submit the request form to Microsoft Support.
-- **Cloud Solution Provider (CSP) registration process.** As with OEMs, CSP partners must be granted permission to register devices for a school. For more information, see [Partner registration][MEM-5]
- > [!TIP]
- > Try the Microsoft Partner Center clickable demo, which provides detailed steps to establish a partner relationship and register devices.
-- **Manual registration.** To manually register a device, you must first capture its hardware hash. Once this process has been completed, the hardware hash can be uploaded to the Windows Autopilot service using [Microsoft Intune][MEM-6]
- > [!IMPORTANT]
- > **Windows 11 SE** devices do not support the use of Windows PowerShell or Microsoft Configuration Manager to capture hardware hashes. Hardware hashes can only be captured manually. We recommend working with an OEM, partner, or device reseller to register devices.
-
-## Create groups for Autopilot devices
-
-**Windows Autopilot deployment profiles** determine the Autopilot *deployment mode* and define the out-of-box experience of your devices. A device group is required to assign a Windows Autopilot deployment profile to the devices.
-For this task, it's recommended to create dynamic device groups using Autopilot attributes.
-
-Here are the steps for creating a dynamic group for the devices that have an assigned Autopilot group tag:
-
-1. Sign in to the Intune for Education portal
-1. Select **Groups** > **Create group**
-1. Specify a **Group name** and select **Dynamic**
-1. Under **Rules**, select **I want to manage: Devices** and use the clause **Where: Device group tag starts with**, specifying the required tag value
-1. Select **Create group**
- :::image type="content" source="./images/intune-education-autopilot-group.png" alt-text="Intune for Education - creation of a dynamic group for Autopilot devices" border="true":::
-
-More advanced dynamic membership rules can be created from Microsoft Intune admin center. For more information, see [Create an Autopilot device group using Intune][MEM-3].
-
-> [!TIP]
-> You can use these dynamic groups not only to assign Autopilot profiles, but also to target applications and settings.
-
-## Create Autopilot deployment profiles
-
-For Autopilot devices to offer a customized OOBE experience, you must create **Windows Autopilot deployment profiles** and assign them to a group containing the devices.
-A deployment profile is a collection of settings that determine the behavior of the device during OOBE. Among other settings, a deployment profile specifies a **deployment mode**, which can either be:
-
-1. **User-driven:** devices with this profile are associated with the user enrolling the device. User credentials are required to complete the Microsoft Entra join process during OOBE
-1. **Self-deploying:** devices with this profile aren't associated with the user enrolling the device. User credentials aren't required to complete the Microsoft Entra join process. Rather, the device is joined automatically and, for this reason, specific hardware requirements must be met to use this mode
-
-To create an Autopilot deployment profile:
-
-1. Sign in to the Intune for Education portal
-1. Select **Groups** > Select a group from the list
-1. Select **Windows device settings**
-1. Expand the **Enrolment** category
-1. From **Configure Autopilot deployment profile for device** select **User-driven**
-1. Ensure that **User account type** is configured as **Standard**
-1. Select **Save**
-
-While Intune for Education offers simple options for Autopilot configurations, more advanced deployment profiles can be created from Microsoft Intune admin center. For more information, see [Windows Autopilot deployment profiles][MEM-4].
-
-### Configure an Enrollment Status Page
-
-An Enrollment Status Page (ESP) is a greeting page displayed to users while enrolling or signing in for the first time to Windows devices. The ESP displays provisioning progress, showing applications and profiles installation status.
-
-:::image type="content" source="./images/win11-oobe-esp.gif" alt-text="Windows OOBE - enrollment status page animation." border="false":::
-
-> [!NOTE]
-> Some Windows Autopilot deployment profiles **require** the ESP to be configured.
-
-To deploy the ESP to devices, you need to create an ESP profile in Microsoft Intune.
-
-> [!TIP]
-> While testing the deployment process, you can configure the ESP to:
-> - allow the reset of the devices in case the installation fails
-> - allow the use of the device if installation error occurs
->
-> This enables you to troubleshoot the installation process in case any issues arise and to easily reset the OS. You can turn these settings off once you are done testing.
-
-For more information, see [Set up the Enrollment Status Page][MEM-3].
-
-> [!CAUTION]
-> The Enrollment Status Page (ESP) is compatible with Windows 11 SE. However, due to the E Mode policy, devices may not complete the enrollment. For more information, see [Enrollment Status Page][EDU-3].
-
-### Autopilot end-user experience
-
-Once configuration is complete and devices are distributed, students and teachers are able to complete the out-of-box experience with Autopilot. They can set up their devices at home, at school, or wherever there's a reliable Internet connection.
-When a Windows device is turned on for the first time, the end-user experience with Windows Autopilot is as follows:
-
-1. Identify the language and region
-1. Select the keyboard layout and decide on the option for a second keyboard layout
-1. Connect to the internet: if connecting through Wi-Fi, the user will be prompted to connect to a wireless network. If the device is connected through an ethernet cable, Windows will skip this step
-1. Apply updates: the device will look for and apply required updates
-1. Windows will detect if the device has an Autopilot profile assigned to it. If so, it will proceed with the customized OOBE experience. If the Autopilot profile specifies a naming convention for the device, the device will be renamed, and a reboot will occur
-1. The user authenticates to Microsoft Entra ID, using the school account
-1. The device joins Microsoft Entra ID, enrolls in Intune and all the settings and applications are configured
-
-> [!NOTE]
-> Some of these steps may be skipped, depending on the Autopilot profile configuration and if the device is using a wired connection.
-
-:::image type="content" source="./images/win11-login-screen.png" alt-text="Windows 11 login screen" border="false":::
-
-________________________________________________________
-## Next steps
-
-With the devices joined to Microsoft Entra tenant and managed by Intune, you can use Intune to maintain them and report on their status.
-
-> [!div class="nextstepaction"]
-> [Next: Manage devices >](manage-overview.md)
-
-
-
-[MEM-1]: /mem/intune/fundamentals/intune-endpoints
-[MEM-2]: /mem/autopilot/oem-registration
-[MEM-3]: /mem/autopilot/enrollment-autopilot#create-an-autopilot-device-group-using-intune
-[MEM-4]: /mem/autopilot/profiles
-[MEM-5]: /mem/autopilot/partner-registration
-[MEM-6]: /mem/autopilot/add-devices
-
-[WIN-1]: /windows/deployment/windows-autopilot/windows-autopilot-requirements
-
-[MSFT-1]: https://partner.microsoft.com/
-
-[INT-1]: /intune/network-bandwidth-use
-
-[M365-1]: https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2
-
-[EDU-3]: ../tutorial-deploy-apps-winse/considerations.md#enrollment-status-page
-
-[SURF-1]: /surface/surface-autopilot-registration-support
diff --git a/education/windows/tutorial-school-deployment/enroll-entra-join.md b/education/windows/tutorial-school-deployment/enroll-entra-join.md
deleted file mode 100644
index e599fca7ac..0000000000
--- a/education/windows/tutorial-school-deployment/enroll-entra-join.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: Enrollment in Intune with standard out-of-box experience (OOBE)
-description: Learn how to join devices to Microsoft Entra ID from OOBE and automatically get them enrolled in Intune.
-ms.date: 11/09/2023
-ms.topic: tutorial
----
-
-# Automatic Intune enrollment via Microsoft Entra join
-
-If you're setting up a Windows device individually, you can use the out-of-box experience to join it to your school's Microsoft Entra tenant, and automatically enroll it in Intune.
-With this process, no advance preparation is needed:
-
-1. Follow the on-screen prompts for region selection, keyboard selection, and network connection
-1. Wait for updates. If any updates are available, they'll be installed at this time
- :::image type="content" source="./images/win11-oobe-updates.png" alt-text="Windows 11 OOBE - updates page" border="true":::
-1. When prompted, select **Set up for work or school** and authenticate using your school's Microsoft Entra account
- :::image type="content" source="./images/win11-oobe-auth.png" alt-text="Windows 11 OOBE - authentication page" border="true":::
-1. The device will join Microsoft Entra ID and automatically enroll in Intune. All settings defined in Intune will be applied to the device
-
-> [!IMPORTANT]
-> If you configured enrollment restrictions in Intune blocking personal Windows devices, this process will not complete. You will need to use a different enrollment method, or ensure that the devices are registered in Autopilot.
-
-:::image type="content" source="./images/win11-login-screen.png" alt-text="Windows 11 login screen" border="false":::
-
----
-
-## Next steps
-
-With the devices joined to Microsoft Entra tenant and managed by Intune, you can use Intune to maintain them and report on their status.
-
-> [!div class="nextstepaction"]
-> [Next: Manage devices >](manage-overview.md)
diff --git a/education/windows/tutorial-school-deployment/enroll-overview.md b/education/windows/tutorial-school-deployment/enroll-overview.md
deleted file mode 100644
index 8410be0db9..0000000000
--- a/education/windows/tutorial-school-deployment/enroll-overview.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Device enrollment overview
-description: Learn about the different options to enroll Windows devices in Microsoft Intune
-ms.date: 11/09/2023
-ms.topic: overview
----
-
-# Device enrollment overview
-
-There are three main methods for joining Windows devices to Microsoft Entra ID and getting them enrolled and managed by Intune:
-
-- **Automatic Intune enrollment via Microsoft Entra join** happens when a user first turns on a device that is in out-of-box experience (OOBE), and selects the option to join Microsoft Entra ID. In this scenario, the user can customize certain Windows functionalities before reaching the desktop, and becomes a local administrator of the device. This option isn't an ideal enrollment method for education devices
-- **Bulk enrollment with provisioning packages.** Provisioning packages are files that can be used to set up Windows devices, and can include information to connect to Wi-Fi networks and to join a Microsoft Entra tenant. Provisioning packages can be created using either **Set Up School PCs** or **Windows Configuration Designer** applications. These files can be applied during or after the out-of-box experience
-- **Enrollment via Windows Autopilot.** Windows Autopilot is a collection of cloud services to configure the out-of-box experience, enabling light-touch or zero-touch deployment scenarios. Windows Autopilot simplifies the Windows device lifecycle, from initial deployment to end of life, for OEMs, resellers, IT administrators and end users
-
-## Choose the enrollment method
-
-**Windows Autopilot** and the **Set up School PCs** app are usually the most efficient options for school environments.
-This [table][INT-1] describes the ideal scenarios for using either option. It's recommended to review the table when planning your enrollment and deployment strategies.
-
-:::image type="content" source="./images/enroll.png" alt-text="The device lifecycle for Intune-managed devices - enrollment" border="false":::
-
-Select one of the following options to learn the next steps about the enrollment method you chose:
-> [!div class="op_single_selector"]
-> - [Automatic Intune enrollment via Microsoft Entra join](enroll-entra-join.md)
-> - [Bulk enrollment with provisioning packages](enroll-package.md)
-> - [Enroll devices with Windows Autopilot](enroll-autopilot.md)
-
-
-
-[INT-1]: /intune-education/add-devices-windows#when-to-use-set-up-school-pcs-vs-windows-autopilot
diff --git a/education/windows/tutorial-school-deployment/enroll-package.md b/education/windows/tutorial-school-deployment/enroll-package.md
deleted file mode 100644
index 22f7c70443..0000000000
--- a/education/windows/tutorial-school-deployment/enroll-package.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: Enrollment of Windows devices with provisioning packages
-description: Learn about how to enroll Windows devices with provisioning packages using SUSPCs and Windows Configuration Designer.
-ms.date: 11/09/2023
-ms.topic: tutorial
----
-
-# Enrollment with provisioning packages
-
-Enrolling devices with provisioning packages is an efficient way to deploy a large number of Windows devices. Some of the benefits of provisioning packages are:
-
-- There are no particular hardware dependencies on the devices to complete the enrollment process
-- Devices don't need to be registered in advance
-- Enrollment is a simple task: just open a provisioning package and the process is automated
-
-You can create provisioning packages using either **Set Up School PCs** or **Windows Configuration Designer** applications, which are described in the following sections.
-
-## Set up School PCs
-
-With Set up School PCs, you can create a package containing the most common device configurations that students need, and enroll devices in Intune. The package is saved on a USB stick, which can then be plugged into devices during OOBE. Applications and settings will be automatically applied to the devices, including the Microsoft Entra join and Intune enrollment process.
-
-### Create a provisioning package
-
-The Set Up School PCs app guides you through configuration choices for school-owned devices.
-
-:::image type="content" source="./images/supcs-win11se.png" alt-text="Configure device settings in Set Up School PCs app" border="false":::
-
-> [!CAUTION]
-> If you are creating a provisioning package for **Windows 11 SE** devices, ensure to select the correct *OS version* in the *Configure device settings* page.
-
-Set Up School PCs will configure many settings, allowing you to optimize devices for shared use and other scenarios.
-
-For more information on prerequisites, configuration, and recommendations, see [Use the Set Up School PCs app][EDU-1].
-
-> [!TIP]
-> To learn more and practice with Set up School PCs, try the Set Up School PCs demo, which provides detailed steps to create a provisioning package and deploy a device.
-## Windows Configuration Designer
-
-Windows Configuration Designer is especially useful in scenarios where a school needs to provision packages for both bring-you-own devices and school-owned devices. Differently from Set Up School PCs, Windows Configuration Designer doesn't offer a guided experience, and allows granular customizations, including the possibility to embed scripts in the package.
-
-:::image type="content" source="./images/wcd.png" alt-text="Set up device page in Windows Configuration Designer" border="false":::
-
-For more information, see [Install Windows Configuration Designer][WIN-1], which provides details about the app, its provisioning process, and considerations for its use.
-
-## Enroll devices with the provisioning package
-
-To provision Windows devices with provisioning packages, insert the USB stick containing the package during the out-of-box experience. The devices will read the content of the package, join Microsoft Entra ID and automatically enroll in Intune.
-All settings defined in the package and in Intune will be applied to the device, and the device will be ready to use.
-
-:::image type="content" source="./images/win11-oobe-ppkg.gif" alt-text="Windows 11 OOBE - enrollment with provisioning package animation." border="false":::
-
----
-
-## Next steps
-
-With the devices joined to Microsoft Entra tenant and managed by Intune, you can use Intune to maintain them and report on their status.
-
-> [!div class="nextstepaction"]
-> [Next: Manage devices >](manage-overview.md)
-
-
-
-[EDU-1]: /education/windows/use-set-up-school-pcs-app
-
-[WIN-1]: /windows/configuration/provisioning-packages/provisioning-install-icd
diff --git a/education/windows/tutorial-school-deployment/images/advanced-support.png b/education/windows/tutorial-school-deployment/images/advanced-support.png
deleted file mode 100644
index d7655d1616..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/advanced-support.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/device-lifecycle.png b/education/windows/tutorial-school-deployment/images/device-lifecycle.png
deleted file mode 100644
index ab14cdb9f0..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/device-lifecycle.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/dfci-profile-expanded.png b/education/windows/tutorial-school-deployment/images/dfci-profile-expanded.png
deleted file mode 100644
index 3386f7673a..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/dfci-profile-expanded.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/dfci-profile.png b/education/windows/tutorial-school-deployment/images/dfci-profile.png
deleted file mode 100644
index d77dc06f3d..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/dfci-profile.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/enroll.png b/education/windows/tutorial-school-deployment/images/enroll.png
deleted file mode 100644
index 352cda9509..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/enroll.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/enrollment-restrictions.png b/education/windows/tutorial-school-deployment/images/enrollment-restrictions.png
deleted file mode 100644
index 69b22745a6..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/enrollment-restrictions.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/entra-assign-licenses.png b/education/windows/tutorial-school-deployment/images/entra-assign-licenses.png
deleted file mode 100644
index 3f031053d5..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/entra-assign-licenses.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/entra-branding.png b/education/windows/tutorial-school-deployment/images/entra-branding.png
deleted file mode 100644
index 7201c7386d..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/entra-branding.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/entra-device-settings.png b/education/windows/tutorial-school-deployment/images/entra-device-settings.png
deleted file mode 100644
index ef18b7391f..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/entra-device-settings.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/entra-tenant-name.png b/education/windows/tutorial-school-deployment/images/entra-tenant-name.png
deleted file mode 100644
index 4cf21148d1..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/entra-tenant-name.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/intune-diagnostics.png b/education/windows/tutorial-school-deployment/images/intune-diagnostics.png
deleted file mode 100644
index 20b05ad9d7..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/intune-diagnostics.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/intune-education-apps.png b/education/windows/tutorial-school-deployment/images/intune-education-apps.png
deleted file mode 100644
index ca344cf5cf..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/intune-education-apps.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/intune-education-autopilot-group.png b/education/windows/tutorial-school-deployment/images/intune-education-autopilot-group.png
deleted file mode 100644
index 75543684ca..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/intune-education-autopilot-group.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/intune-education-groups.png b/education/windows/tutorial-school-deployment/images/intune-education-groups.png
deleted file mode 100644
index 87f4546e88..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/intune-education-groups.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/intune-education-portal.png b/education/windows/tutorial-school-deployment/images/intune-education-portal.png
deleted file mode 100644
index 6bcc9f9375..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/intune-education-portal.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/inventory-reporting.png b/education/windows/tutorial-school-deployment/images/inventory-reporting.png
deleted file mode 100644
index 39c904e205..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/inventory-reporting.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/m365-admin-center.png b/education/windows/tutorial-school-deployment/images/m365-admin-center.png
deleted file mode 100644
index d471b441dd..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/m365-admin-center.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/protect-manage.png b/education/windows/tutorial-school-deployment/images/protect-manage.png
deleted file mode 100644
index 7ee7040a46..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/protect-manage.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/remote-actions.png b/education/windows/tutorial-school-deployment/images/remote-actions.png
deleted file mode 100644
index cfbd12f2da..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/remote-actions.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/retire.png b/education/windows/tutorial-school-deployment/images/retire.png
deleted file mode 100644
index c079cfeaac..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/retire.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/supcs-win11se.png b/education/windows/tutorial-school-deployment/images/supcs-win11se.png
deleted file mode 100644
index 700ff6d87f..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/supcs-win11se.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/surface-management-portal-expanded.png b/education/windows/tutorial-school-deployment/images/surface-management-portal-expanded.png
deleted file mode 100644
index 339bd90904..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/surface-management-portal-expanded.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/surface-management-portal.png b/education/windows/tutorial-school-deployment/images/surface-management-portal.png
deleted file mode 100644
index a1b7dd37ab..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/surface-management-portal.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/wcd.png b/education/windows/tutorial-school-deployment/images/wcd.png
deleted file mode 100644
index fba5be741f..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/wcd.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/whfb-disable.png b/education/windows/tutorial-school-deployment/images/whfb-disable.png
deleted file mode 100644
index 97177965e3..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/whfb-disable.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-autopilot-reset.png b/education/windows/tutorial-school-deployment/images/win11-autopilot-reset.png
deleted file mode 100644
index 0ec380619e..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-autopilot-reset.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-login-screen.png b/education/windows/tutorial-school-deployment/images/win11-login-screen.png
deleted file mode 100644
index 438dda11bc..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-login-screen.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-oobe-auth.png b/education/windows/tutorial-school-deployment/images/win11-oobe-auth.png
deleted file mode 100644
index 5ebb6a9f14..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-oobe-auth.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-oobe-esp.gif b/education/windows/tutorial-school-deployment/images/win11-oobe-esp.gif
deleted file mode 100644
index fa2e4c3aeb..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-oobe-esp.gif and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-oobe-ppkg.gif b/education/windows/tutorial-school-deployment/images/win11-oobe-ppkg.gif
deleted file mode 100644
index 2defd5c1ce..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-oobe-ppkg.gif and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-oobe-updates.png b/education/windows/tutorial-school-deployment/images/win11-oobe-updates.png
deleted file mode 100644
index 51bbc39c9f..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-oobe-updates.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/images/win11-wipe.png b/education/windows/tutorial-school-deployment/images/win11-wipe.png
deleted file mode 100644
index 027afae172..0000000000
Binary files a/education/windows/tutorial-school-deployment/images/win11-wipe.png and /dev/null differ
diff --git a/education/windows/tutorial-school-deployment/index.md b/education/windows/tutorial-school-deployment/index.md
deleted file mode 100644
index c72273b7aa..0000000000
--- a/education/windows/tutorial-school-deployment/index.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: Introduction to the tutorial deploy and manage Windows devices in a school
-description: Introduction to deployment and management of Windows devices in education environments.
-ms.date: 11/09/2023
-ms.topic: tutorial
-ms.collection: essentials-get-started
----
-
-# Tutorial: deploy and manage Windows devices in a school
-
-This guide introduces the tools and services available from Microsoft to deploy, configure and manage Windows devices in an education environment.
-
-## Audience and user requirements
-
-This tutorial is intended for education professionals responsible for deploying and managing Windows devices, including:
-
-- School leaders
-- IT administrators
-- Teachers
-- Microsoft partners
-
-This content provides a comprehensive path for schools to deploy and manage new Windows devices with Microsoft Intune. It includes step-by-step information how to manage devices throughout their lifecycle, and specific guidance for **Windows 11 SE** and **Surface devices**.
-
-> [!NOTE]
-> Depending on your school setup scenario, you may not need to implement all steps.
-
-## Device lifecycle management
-
-Historically, school IT administrators and educators have struggled to find an easy-to-use, flexible, and secure way to manage the lifecycle of the devices in their schools. In response, Microsoft has developed integrated suites of products for streamlined, cost-effective device lifecycle management.
-
-Microsoft 365 Education provides tools and services that enable simplified management of all devices through Microsoft Intune services. With Microsoft's solutions, IT administrators have the flexibility to support diverse scenarios, including school-owned devices and bring-your-own devices.
-Microsoft Intune services include:
-
-- [Microsoft Intune][MEM-1]
-- [Microsoft Intune for Education][INT-1]
-- [Configuration Manager][MEM-2]
-- [Desktop Analytics][MEM-3]
-- [Windows Autopilot][MEM-4]
-- [Surface Management Portal][MEM-5]
-
-These services are part of the Microsoft 365 stack to help secure access, protect data, and manage risk.
-
-## Why Intune for Education?
-
-Windows devices can be managed with Intune for Education, enabling simplified management of multiple devices from a single point.
-From enrollment, through configuration and protection, to resetting, Intune for Education helps school IT administrators manage and optimize the devices throughout their lifecycle:
-
-:::image type="content" source="./images/device-lifecycle.png" alt-text="The device lifecycle for Intune-managed devices" border="false":::
-
-- **Enroll:** to enable remote device management, devices must be enrolled in Intune with an account in your Microsoft Entra tenant. Some enrollment methods require an IT administrator to initiate enrollment, while others require students to complete the initial device setup process. This document discusses the facets of various device enrollment methodologies
-- **Configure:** once the devices are enrolled in Intune, applications and settings will be applied, as defined by the IT administrator
-- **Protect and manage:** in addition to its configuration capabilities, Intune for Education helps protect devices from unauthorized access or malicious attacks. For example, adding an extra layer of authentication with Windows Hello can make devices more secure. Policies are available that let you control settings for Windows Firewall, Endpoint Protection, and software updates
-- **Retire:** when it's time to repurpose a device, Intune for Education offers several options, including resetting the device, removing it from management, or wiping school data. In this document, we cover different device return and exchange scenarios
-
-## Four pillars of modern device management
-
-In the remainder of this document, we'll discuss the key concepts and benefits of modern device management with Microsoft 365 solutions for education. The guidance is organized around the four main pillars of modern device management:
-
-- **Identity management:** setting up and configuring the identity system, with Microsoft 365 Education and Microsoft Entra ID, as the foundation for user identity and authentication
-- **Initial setup:** setting up the Intune for Education environment for managing devices, including configuring settings, deploying applications, and defining updates cadence
-- **Device enrollment:** Setting up Windows devices for deployment and enrolling them in Intune for Education
-- **Device reset:** Resetting managed devices with Intune for Education
-
----
-
-## Next steps
-
-Let's begin with the creation and configuration of your Microsoft Entra tenant and Intune environment.
-
-> [!div class="nextstepaction"]
-> [Next: Set up Microsoft Entra ID >](set-up-microsoft-entra-id.md)
-
-
-
-[MEM-1]: /mem/intune/fundamentals/what-is-intune
-[MEM-2]: /mem/configmgr/core/understand/introduction
-[MEM-3]: /mem/configmgr/desktop-analytics/overview
-[MEM-4]: /mem/autopilot/windows-autopilot
-[MEM-5]: /mem/autopilot/dfci-management
-
-[INT-1]: /intune-education/what-is-intune-for-education
diff --git a/education/windows/tutorial-school-deployment/manage-overview.md b/education/windows/tutorial-school-deployment/manage-overview.md
deleted file mode 100644
index 0a51b174b9..0000000000
--- a/education/windows/tutorial-school-deployment/manage-overview.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: Manage devices with Microsoft Intune
-description: Overview of device management capabilities in Intune for Education, including remote actions, remote assistance and inventory/reporting.
-ms.date: 11/09/2023
-ms.topic: tutorial
----
-
-# Manage devices with Microsoft Intune
-
-Microsoft Intune offers a streamlined remote device management experience throughout the school year. IT administrators can optimize device settings, deploy new applications, updates, ensuring that security and privacy are maintained.
-
-:::image type="content" source="./images/protect-manage.png" alt-text="The device lifecycle for Intune-managed devices - protect and manage devices" border="false":::
-
-## Remote device management
-
-With Intune for Education, there are several ways to manage students' devices. Groups can be created to organize devices and students, to facilitate remote management. You can determine which applications students have access to, and fine tune device settings and restrictions. You can also monitor which devices students sign in to, and troubleshoot devices remotely.
-
-### Remote actions
-
-Intune fo Education allows you to perform actions on devices without having to sign in to the devices. For example, you can send a command to a device to restart or to turn off, or you can locate a device.
-
-:::image type="content" source="./images/remote-actions.png" alt-text="Remote actions available in Intune for Education when selecting a Windows device" lightbox="./images/remote-actions.png" border="true":::
-
-With bulk actions, remote actions can be performed on multiple devices at once.
-
-To learn more about remote actions in Intune for Education, see [Remote actions][EDU-1].
-
-## Remote assistance
-
-With devices managed by Intune for Education, you can remotely assist students and teachers that are having issues with their devices.
-
-For more information, see [Remote assistance for managed devices - Intune for Education][EDU-2].
-
-## Device inventory and reporting
-
-With Intune for Education, it's possible view and report on current devices, applications, settings, and overall health. You can also download reports to review or share offline.
-
-Here are the steps for generating reports in Intune for Education:
-
-1. Sign in to the Intune for Education portal
-1. Select **Reports**
-1. Select between one of the report types:
- - Device inventory
- - Device actions
- - Application inventory
- - Settings errors
- - Windows Defender
- - Autopilot deployment
-1. If needed, use the search box to find specific devices, applications, and settings
-1. To download a report, select **Download**. The report will download as a comma-separated value (CSV) file, which you can view and modify in a spreadsheet app like Microsoft Excel.
- :::image type="content" source="./images/inventory-reporting.png" alt-text="Reporting options available in Intune for Education when selecting the reports blade" border="true":::
-
-To learn more about reports in Intune for Education, see [Reports in Intune for Education][EDU-3].
-
-
-
-[EDU-1]: /intune-education/edu-device-remote-actions
-[EDU-2]: /intune-education/remote-assist-mobile-devices
-[EDU-3]: /intune-education/what-are-reports
diff --git a/education/windows/tutorial-school-deployment/manage-surface-devices.md b/education/windows/tutorial-school-deployment/manage-surface-devices.md
deleted file mode 100644
index 028dc739c7..0000000000
--- a/education/windows/tutorial-school-deployment/manage-surface-devices.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: Management functionalities for Surface devices
-description: Learn about the management capabilities offered to Surface devices, including firmware management and the Surface Management Portal.
-ms.date: 11/09/2023
-ms.topic: tutorial
-appliesto:
- - ✅ Surface devices
----
-
-# Management functionalities for Surface devices
-
-Microsoft Surface devices offer advanced management functionalities, including the possibility to manage firmware settings and a web portal designed for them.
-
-## Manage device firmware for Surface devices
-
-Surface devices use a Unified Extensible Firmware Interface (UEFI) setting that allows you to enable or disable built-in hardware components, protect UEFI settings from being changed, and adjust device boot configuration. With [Device Firmware Configuration Interface profiles built into Intune][INT-1], Surface UEFI management extends the modern management capabilities to the hardware level. Windows can pass management commands from Intune to UEFI for Autopilot-deployed devices.
-
-DFCI supports zero-touch provisioning, eliminates BIOS passwords, and provides control of security settings for boot options, cameras and microphones, built-in peripherals, and more. For more information, see [Manage DFCI on Surface devices][SURF-1] and [Manage DFCI with Windows Autopilot][MEM-1], which includes a list of requirements to use DFCI.
-
-:::image type="content" source="./images/dfci-profile.png" alt-text="Creation of a DFCI profile from Microsoft Intune" lightbox="./images/dfci-profile-expanded.png" border="true":::
-
-## Microsoft Surface Management Portal
-
-Located in the Microsoft Intune admin center, the Microsoft Surface Management Portal enables you to self-serve, manage, and monitor your school's Intune-managed Surface devices at scale. Get insights into device compliance, support activity, warranty coverage, and more.
-
-When Surface devices are enrolled in cloud management and users sign in for the first time, information automatically flows into the Surface Management Portal, giving you a single pane of glass for Surface-specific administration activities.
-
-To access and use the Surface Management Portal:
-
-1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
-1. Select **All services** > **Surface Management Portal**
- :::image type="content" source="./images/surface-management-portal.png" alt-text="Surface Management Portal within Microsoft Intune" lightbox="./images/surface-management-portal-expanded.png" border="true":::
-1. To obtain insights for all your Surface devices, select **Monitor**
- - Devices that are out of compliance or not registered, have critically low storage, require updates, or are currently inactive, are listed here
-1. To obtain details on each insights category, select **View report**
- - This dashboard displays diagnostic information that you can customize and export
-1. To obtain the device's warranty information, select **Device warranty and coverage**
-1. To review a list of support requests and their status, select **Support requests**
-
-
-
-[INT-1]: /intune/configuration/device-firmware-configuration-interface-windows
-[MEM-1]: /mem/autopilot/dfci-management
-[SURF-1]: /surface/surface-manage-dfci-guide
diff --git a/education/windows/tutorial-school-deployment/reset-wipe.md b/education/windows/tutorial-school-deployment/reset-wipe.md
deleted file mode 100644
index 9646537bac..0000000000
--- a/education/windows/tutorial-school-deployment/reset-wipe.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-title: Reset and wipe Windows devices
-description: Learn about the reset and wipe options for Windows devices using Intune for Education, including scenarios when to delete devices.
-ms.date: 11/09/2023
-ms.topic: tutorial
----
-
-# Device reset options
-
-There are different scenarios that require a device to be reset, for example:
-
-- The device isn't responding to commands
-- The device is lost or stolen
-- It's the end of the life of the device
-- It's the end of the school year and you want to prepare the device for a new school year
-- The device has hardware problems and you want to send it to the service center
-
-:::image type="content" source="./images/retire.png" alt-text="The device lifecycle for Intune-managed devices - retirement" border="false":::
-
-Intune for Education provides two device reset functionalities that enable IT administrators to remotely execute them:
-
-- **Factory reset** (also known as **wipe**) is used to wipe all data and settings from the device, returning it to the default factory settings
-- **Autopilot reset** is used to return the device to a fully configured or known IT-approved state
-
-## Factory reset (wipe)
-
-A factory reset, or a wipe, reverts a device to the original settings when it was purchased. All settings, applications and data installed on the device after purchase are removed. The device is also removed from Intune management.
-
-Once the wipe is completed, the device will be in out-of-box experience.
-
-Here are the steps to perform a factory reset from Intune for Education:
-
-1. Sign in to the Intune for Education portal
-1. Select **Devices**
-1. Select the device you want to reset > **Factory reset**
-1. Select **Factory reset** to confirm the action
-
-:::image type="content" source="./images/win11-wipe.png" alt-text="Three screenshots showing the device being wiped, ending up in OOBE" lightbox="./images/win11-wipe.png" border="false":::
-
-Consider using factory reset in the following example scenarios:
-
-- The device isn't working properly, and you want to reset it without reimaging it
-- It's the end of school year and you want to prepare the device for a new school year
-- You need to reassign the device to a different student, and you want to reset the device to its original settings
-- You're returning a device to the service center, and you want to remove all data and settings from the device
-
-> [!TIP]
-> Consider that once the device is wiped, the new user will go through OOBE. This option may be ideal if the device is also registered in Autopilot to make the OOBE experience seamless, or if you plan to use a provisioning package to re-enroll the device.
-
-## Autopilot Reset
-
-Autopilot Reset is ideal when all data on a device needs to be wiped, but the device remains enrolled in your tenant.
-
-Once the Autopilot reset action is completed, the device will ask to chose region and keyboard layout, then it will display the sign-in screen.
-
-Here are the steps to perform an Autopilot reset from Intune for Education:
-
-1. Sign in to the Intune for Education portal
-1. Select **Devices**
-1. Select the device you want to reset > **Autopilot reset**
-1. Select **Autopilot reset** to confirm the action
-
-:::image type="content" source="./images/win11-autopilot-reset.png" alt-text="Three screenshots showing the device being wiped, ending up in the login screen" border="false":::
-
-Consider using Autopilot reset in the following example scenarios:
-
-- The device isn't working properly, and you want to reset it without reimaging it
-- It's the end of school year and you want to prepare the device for a new school year
-- You need to reassign the device to a different student, and you want to reset the device to without requiring the student to go through OOBE
-
-> [!TIP]
-> Consider that the end user will **not** go through OOBE, and the association of the user to the device in Intune doesn't change. For this reason, this option may be ideal for devices that have been enrolled in Intune as *shared devices* (for example, a device that was enrolled with a provisioning package or using Autopilot self-deploying mode).
-
-## Wiping and deleting a device
-
-There are scenarios that require a device to be deleted from your tenant, for example:
-
-- The device is lost or stolen
-- It's the end of the life of the device
-- The device has been replaced with a new device or has its motherboard replaced
-
-> [!IMPORTANT]
-> 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:
-
-1. If possible, perform a **factory reset (wipe)** of the device. If the device can't be wiped, delete the device from Intune using [these steps][MEM-1]
-1. If the device is registered in Autopilot, delete the Autopilot object using [these steps][MEM-2]
-1. Delete the device from Microsoft Entra ID using [these steps][MEM-3]
-
-## Autopilot considerations for a motherboard replacement scenario
-
-Repairing Autopilot-enrolled devices can be complex, as OEM requirements must be balanced with Autopilot requirements. If a motherboard replacement is needed on an Autopilot device, it's suggested the following process:
-
-1. Deregister the device from Autopilot
-1. Replace the motherboard
-1. Capture a new device ID (4K HH)
-1. Re-register the device with Autopilot
- > [!IMPORTANT]
- > For DFCI management, the device must be re-registered by a partner or OEM. Self-registration of devices is not supported with DFCI management.
-1. Reset the device
-1. Return the device
-
-For more information, see [Autopilot motherboard replacement scenario guidance][MEM-4].
-
-
-
-[MEM-1]: /mem/intune/remote-actions/devices-wipe#delete-devices-from-the-intune-portal
-[MEM-2]: /mem/intune/remote-actions/devices-wipe#delete-devices-from-the-intune-portal
-[MEM-3]: /mem/intune/remote-actions/devices-wipe#delete-devices-from-the-azure-active-directory-portal
-[MEM-4]: /mem/autopilot/autopilot-mbr
diff --git a/education/windows/tutorial-school-deployment/set-up-microsoft-entra-id.md b/education/windows/tutorial-school-deployment/set-up-microsoft-entra-id.md
deleted file mode 100644
index 845d66a892..0000000000
--- a/education/windows/tutorial-school-deployment/set-up-microsoft-entra-id.md
+++ /dev/null
@@ -1,173 +0,0 @@
----
-title: Set up Microsoft Entra ID
-description: Learn how to create and prepare your Microsoft Entra tenant for an education environment.
-ms.date: 01/16/2024
-ms.topic: tutorial
-appliesto:
----
-
-# Set up Microsoft Entra ID
-
-The Microsoft platform for education simplifies the management of Windows devices with Intune for Education and Microsoft 365 Education. The first, fundamental step, is to configure the identity infrastructure to manage user access and permissions for your school.
-
-Microsoft Entra ID, which is included with the Microsoft 365 Education subscription, provides authentication and authorization to any Microsoft cloud services. Identity objects are defined in Microsoft Entra ID for human identities, like students and teachers, as well as non-human identities, like devices, services, and applications. Once users get Microsoft 365 licenses assigned, they'll be able to consume services and access resources within the tenant. With Microsoft 365 Education, you can manage identities for your teachers and students, assign licenses to devices and users, and create groups for the classrooms.
-
-> [!div class="checklist"]
->In this section you will:
->
-> - Set up a Microsoft 365 Education tenant
-> - Add users, create groups, and assign licenses
-> - Configure school branding
-> - Enable bulk enrollment
-
-## Create a Microsoft 365 tenant
-
-If you don't already have a Microsoft 365 tenant, you'll need to create one.
-
-For more information, see [Create your Office 365 tenant account][M365-1]
-
-> [!TIP]
-> To learn more, and practice how to configure the Microsoft 365 tenant for your school, try this interactive demo.
-### Explore the Microsoft 365 admin center
-
-The **Microsoft 365 admin center** is the hub for all administrative consoles for the Microsoft 365 cloud. To access the Microsoft Entra admin center, sign in with the same global administrator account when you [created the Microsoft 365 tenant](#create-a-microsoft-365-tenant).
-
-From the Microsoft 365 admin center, you can access different administrative dashboards: Microsoft Entra ID, Microsoft Intune, Intune for Education, and others:
-
-:::image type="content" source="./images/m365-admin-center.png" alt-text="*All admin centers* page in *Microsoft 365 admin center*" lightbox="./images/m365-admin-center.png" border="true":::
-
-For more information, see [Overview of the Microsoft 365 admin center][M365-2].
-
-> [!NOTE]
-> Setting up your school's basic cloud infrastructure does not require you to complete the rest of the Microsoft 365 setup. For this reason, we will skip directly to adding students and teachers as users in the Microsoft 365 tenant.
-
-## Add users, create groups, and assign licenses
-
-With the Microsoft 365 tenant in place, it's time to add users, create groups, and assign licenses. All students and teachers need a user account before they can sign in and access the different Microsoft 365 services. There are multiple ways to do this, including using School Data Sync (SDS), synchronizing an on-premises Active Directory, manually, or a combination of the above.
-
-> [!NOTE]
-> Synchronizing your Student Information System (SIS) with School Data Sync is the preferred way to create students and teachers as users in a Microsoft 365 Education tenant. However, if you want to integrate an on-premises directory and synchronize accounts to the cloud, skip to [Microsoft Entra Connect Sync](#microsoft-entra-connect-sync) below.
-
-### School Data Sync
-
-School Data Sync (SDS) imports and synchronizes SIS data to create classes in Microsoft 365, such as Microsoft 365 groups and class teams in Microsoft Teams. SDS can be used to create new, cloud-only, identities or to evolve existing identities. Users evolve into *students* or *teachers* and are associated with a *grade*, *school*, and other education-specific attributes.
-
-For more information, see [Overview of School Data Sync][SDS-1].
-
-> [!TIP]
-> To learn more and practice with School Data Sync, follow the Microsoft School Data Sync demo, which provides detailed steps to access, configure, and deploy School Data Sync in your Microsoft 365 Education tenant.
-
-> [!NOTE]
-> You can perform a test deployment by cloning or downloading sample SDS CSV school data from the [O365-EDU-Tools GitHub site](https://github.com/OfficeDev/O365-EDU-Tools).
->
-> Remember that you should typically deploy test SDS data (users, groups, and so on) in a separate test tenant, not your school production environment.
-
-### Microsoft Entra Connect Sync
-
-To integrate an on-premises directory with Microsoft Entra ID, you can use **Microsoft Entra Connect** to synchronize users, groups, and other objects. Microsoft Entra Connect lets you configure the authentication method appropriate for your school, including:
-
-- [Password hash synchronization][AAD-1]
-- [Pass-through authentication][AAD-2]
-- [Federated authentication][AAD-3]
-
-For more information, see [Set up directory synchronization for Microsoft 365][O365-1].
-
-### Create users manually
-
-In addition to the above methods, you can manually add users and groups, and assign licenses through the Microsoft 365 admin center.
-
-There are two options for adding users manually, either individually or in bulk:
-
-1. To add students and teachers as users in Microsoft 365 Education *individually*:
- - Sign in to the Microsoft Entra admin center
- - Select **Microsoft Entra ID** > **Users** > **All users** > **New user** > **Create new user**
- For more information, see [Add users and assign licenses at the same time][M365-3].
-1. To add *multiple* users to Microsoft 365 Education:
- - Sign in to the Microsoft Entra admin center
- - Select **Microsoft Entra ID** > **Users** > **All users** > **Bulk operations** > **Bulk create**
-
-For more information, see [Add multiple users in the Microsoft 365 admin center][M365-4].
-
-### Create groups
-
-Creating groups is important to simplify multiple tasks, like assigning licenses, delegating administration, deploy settings, applications or to distribute assignments to students. To create groups:
-
-1. Sign in to the Microsoft Entra admin center
-1. Select **Microsoft Entra ID** > **Groups** > **All groups** > **New group**
-1. On the **New group** page, select **Group type** > **Security**
-1. Provide a group name and add members, as needed
-1. Select **Next**
-
-For more information, see [Create a group in the Microsoft 365 admin center][M365-5].
-
-### Assign licenses
-
-The recommended way to assign licenses is through group-based licensing. With this method, Microsoft Entra ID ensures that licenses are assigned to all members of the group. Any new members who join the group are assigned the appropriate licenses, and when members leave, their licenses are removed.
-
-To assign a license to a group:
-
-1. Sign in to the Microsoft Entra admin center
-1. Select **Microsoft Entra ID** > **Show More** > **Billing** > **Licenses**
-1. Select the required products that you want to assign licenses for > **Assign**
-1. Add the groups to which the licenses should be assigned
-
- :::image type="content" source="images/entra-assign-licenses.png" alt-text="Assign licenses from Microsoft Entra admin center." lightbox="images/entra-assign-licenses.png":::
-
-For more information, see [Group-based licensing using Microsoft Entra admin center][AAD-4].
-
-## Configure school branding
-
-Configuring your school branding enables a more familiar Autopilot experience to students and teachers. With a custom school branding, you can define a custom logo and a welcome message, which will appear during the Windows out-of-box experience.
-
-To configure your school's branding:
-
-1. Sign in to the Microsoft Entra admin center
-1. Select **Microsoft Entra ID** > **Show More** > **User experiences** > **Company branding**
-1. You can specify brand settings like background image, logo, username hint and a sign-in page text
- :::image type="content" source="images/entra-branding.png" alt-text="Configure Microsoft Entra ID branding from Microsoft Entra admin center." lightbox="images/entra-branding.png":::
-1. To adjust the school tenant's name displayed during OOBE, select **Microsoft Entra ID** > **Overview** > **Properties**
-1. In the **Name** field, enter the school district or organization's name > **Save**
- :::image type="content" alt-text="Configure Microsoft Entra tenant name from Microsoft Entra admin center." source="images/entra-tenant-name.png" lightbox="images/entra-tenant-name.png":::
-
-For more information, see [Add branding to your directory][AAD-5].
-
-## Enable bulk enrollment
-
-If you decide to enroll Windows devices using provisioning packages instead of Windows Autopilot, you must ensure that the provisioning packages can join Windows devices to the Microsoft Entra tenant.
-
-To allow provisioning packages to complete the Microsoft Entra join process:
-
-1. Sign in to the Microsoft Entra admin center
-1. Select **Microsoft Entra ID** > **Devices** > **Device Settings**
-1. Under **Users may join devices to Microsoft Entra ID**, select **All**
- > [!NOTE]
- > If it is required that only specific users can join devices to Microsoft Entra ID, select **Selected**. Ensure that the user account that will create provisioning packages is included in the list of users.
-1. Select Save
- :::image type="content" source="images/entra-device-settings.png" alt-text="Configure device settings from Microsoft Entra admin center." lightbox="images/entra-device-settings.png":::
-
----
-
-## Next steps
-
-With users and groups created, and licensed for Microsoft 365 Education, you can now configure Microsoft Intune.
-
-> [!div class="nextstepaction"]
-> [Next: Set up Microsoft Intune >](set-up-microsoft-intune.md)
-
-
-
-[AAD-1]: /azure/active-directory/hybrid/whatis-phs
-[AAD-2]: /azure/active-directory/hybrid/how-to-connect-pta
-[AAD-3]: /azure/active-directory/hybrid/how-to-connect-fed-whatis
-[AAD-4]: /azure/active-directory/enterprise-users/licensing-groups-assign
-[AAD-5]: /azure/active-directory/fundamentals/customize-branding
-
-[M365-1]: /microsoft-365/education/deploy/create-your-office-365-tenant
-[M365-2]: /microsoft-365/admin/admin-overview/admin-center-overview
-[M365-3]: /microsoft-365/admin/add-users/add-users
-[M365-4]: /microsoft-365/enterprise/add-several-users-at-the-same-time
-[M365-5]: /microsoft-365/admin/create-groups/create-groups
-
-[O365-1]: /office365/enterprise/set-up-directory-synchronization
-
-[SDS-1]: /schooldatasync/overview-of-school-data-sync
diff --git a/education/windows/tutorial-school-deployment/set-up-microsoft-intune.md b/education/windows/tutorial-school-deployment/set-up-microsoft-intune.md
deleted file mode 100644
index 1ee9608b0c..0000000000
--- a/education/windows/tutorial-school-deployment/set-up-microsoft-intune.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-title: Set up device management
-description: Learn how to configure the Intune service and set up the environment for education.
-ms.date: 01/16/2024
-ms.topic: tutorial
-appliesto:
----
-
-# Set up Microsoft Intune
-
-Without the proper tools and resources, managing hundreds or thousands of devices in a school environment can be a complex and time-consuming task. Microsoft Intune is a collection of services that simplifies the management of devices at scale.
-
-The Microsoft Intune service can be managed in different ways, and one of them is **Intune for Education**, a web portal designed for education environments.
-
-:::image type="content" source="./images/intune-education-portal.png" alt-text="Intune for Education dashboard" lightbox="./images/intune-education-portal.png" border="true":::
-
-**Intune for Education** supports the entire device lifecycle, from the enrollment phase through retirement. IT administrators can start managing classroom devices with bulk enrollment options and a streamlined deployment. At the end of the school year, IT admins can reset devices, ensuring they're ready for the next year.
-
-For more information, see [Intune for Education documentation][INT-1].
-
-> [!div class="checklist"]
->In this section you will:
->
-> - Review Intune's licensing prerequisites
-> - Configure the Intune service for education devices
-
-## Prerequisites
-
-Before configuring settings with Intune for Education, consider the following prerequisites:
-
-- **Intune subscription.** Microsoft Intune is licensed in three ways:
- - As a standalone service
- - As part of [Enterprise Mobility + Security][MSFT-1]
- - As part of a [Microsoft 365 Education subscription][MSFT-2]
-- **Device platform.** Intune for Education can manage devices running a supported version of Windows 10, Windows 11, Windows 11 SE, iOS, and iPad OS
-
-For more information, see [Intune licensing][MEM-1] and [this comparison sheet][MSFT-3], which includes a table detailing the *Microsoft Modern Work Plan for Education*.
-
-## Configure the Intune service for education devices
-
-The Intune service can be configured in different ways, depending on the needs of your school. In this section, you'll configure the Intune service using settings commonly implemented by K-12 school districts.
-
-### Configure enrollment restrictions
-
-With enrollment restrictions, you can prevent certain types of devices from being enrolled and therefore managed by Intune. For example, you can prevent the enrollment of devices that are not owned by the school.
-
-To block personally owned Windows devices from enrolling:
-
-1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
-1. Select **Devices** > **Enroll devices** > **Enrollment device platform restrictions**
-1. Select the **Windows restrictions** tab
-1. Select **Create restriction**
-1. On the **Basics** page, provide a name for the restriction and, optionally, a description > **Next**
-1. On the **Platform settings** page, in the **Personally owned devices** field, select **Block** > **Next**
- :::image type="content" source="./images/enrollment-restrictions.png" alt-text="This screenshot is of the device enrollment restriction page in Microsoft Intune admin center." lightbox="./images/enrollment-restrictions.png":::
-1. Optionally, on the **Scope tags** page, add scope tags > **Next**
-1. On the **Assignments** page, select **Add groups**, and then use the search box to find and choose groups to which you want to apply the restriction > **Next**
-1. On the **Review + create** page, select **Create** to save the restriction
-
-For more information, see [Create a device platform restriction][MEM-2].
-
-### Disable Windows Hello for Business
-
-Windows Hello for Business is a biometric authentication feature that allows users to sign in to their devices using a PIN, password, or fingerprint. Windows Hello for Business is enabled by default on Windows devices, and to set it up, users must perform for multi-factor authentication (MFA). As a result, this feature may not be ideal for students, who may not have MFA enabled.
-It's suggested to disable Windows Hello for Business on Windows devices at the tenant level, and enabling it only for devices that need it, for example for teachers and staff devices.
-To disable Windows Hello for Business at the tenant level:
-
-1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
-1. Select **Devices** > **Windows** > **Windows Enrollment**
-1. Select **Windows Hello for Business**
-1. Ensure that **Configure Windows Hello for Business** is set to **disabled**
-1. Select **Save**
-
-:::image type="content" source="./images/whfb-disable.png" alt-text="Disablement of Windows Hello for Business from Microsoft Intune admin center." lightbox="./images/whfb-disable.png":::
-
-For more information how to enable Windows Hello for Business on specific devices, see [Create a Windows Hello for Business policy][MEM-4].
-
----
-
-## Next steps
-
-With the Intune service configured, you can configure policies and applications in preparation to the deployment of students' and teachers' devices.
-
-> [!div class="nextstepaction"]
-> [Next: Configure devices >](configure-devices-overview.md)
-
-
-
-[MEM-1]: /mem/intune/fundamentals/licenses
-[MEM-2]: /mem/intune/enrollment/enrollment-restrictions-set
-[MEM-4]: /mem/intune/protect/windows-hello#create-a-windows-hello-for-business-policy
-
-[INT-1]: /intune-education/what-is-intune-for-education
-
-[MSFT-1]: https://www.microsoft.com/microsoft-365/enterprise-mobility-security
-[MSFT-2]: https://www.microsoft.com/licensing/product-licensing/microsoft-365-education
-[MSFT-3]: https://edudownloads.azureedge.net/msdownloads/Microsoft-Modern-Work-Plan-Comparison-Education_11-2021.pdf
\ No newline at end of file
diff --git a/education/windows/tutorial-school-deployment/toc.yml b/education/windows/tutorial-school-deployment/toc.yml
deleted file mode 100644
index 8abc013f68..0000000000
--- a/education/windows/tutorial-school-deployment/toc.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-items:
- - name: Introduction
- href: index.md
- - name: 1. Prepare your tenant
- items:
- - name: Set up Microsoft Entra ID
- href: set-up-microsoft-entra-id.md
- - name: Set up Microsoft Intune
- href: set-up-microsoft-intune.md
- - name: 2. Configure settings and applications
- items:
- - name: Overview
- href: configure-devices-overview.md
- - name: Configure policies
- href: configure-device-settings.md
- - name: Configure applications
- href: configure-device-apps.md
- - name: 3. Deploy devices
- items:
- - name: Overview
- href: enroll-overview.md
- - name: Enroll devices via Microsoft Entra join
- href: enroll-entra-join.md
- - name: Enroll devices with provisioning packages
- href: enroll-package.md
- - name: Enroll devices with Windows Autopilot
- href: enroll-autopilot.md
- - name: 4. Manage devices
- items:
- - name: Overview
- href: manage-overview.md
- - name: Management functionalities for Surface devices
- href: manage-surface-devices.md
- - name: Reset and wipe devices
- href: reset-wipe.md
- - name: 5. Troubleshoot and get help
- href: troubleshoot-overview.md
-
diff --git a/education/windows/tutorial-school-deployment/troubleshoot-overview.md b/education/windows/tutorial-school-deployment/troubleshoot-overview.md
deleted file mode 100644
index 0d59f1af56..0000000000
--- a/education/windows/tutorial-school-deployment/troubleshoot-overview.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: Troubleshoot Windows devices
-description: Learn how to troubleshoot Windows devices from Intune and contact Microsoft Support for issues related to Intune and other services.
-ms.date: 11/09/2023
-ms.topic: tutorial
----
-
-# Troubleshoot Windows devices
-
-Microsoft Intune 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" lightbox="./images/intune-diagnostics.png" 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.
-
-Follow these steps to obtain support in Microsoft Intune provides many tools that can help you troubleshoot Windows devices:
-
-- Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
-- Select **Troubleshooting + support** > **Help and support**
- :::image type="content" source="images/advanced-support.png" alt-text="Screenshot that shows how to obtain support from Microsoft Intune." lightbox="images/advanced-support.png":::
-- Select the required support scenario: Configuration Manager, Intune, Co-management, or Windows 365
-- Above **How can we help?**, select one of three icons to open different panes: *Find solutions*, *Contact support*, or *Service requests*
-- In the **Find solutions** pane, use the text box to specify a few details about your issue. The console may offer suggestions based on what you've entered. Depending on the presence of specific keywords, the console provides help like:
- - Run diagnostics: start automated tests and investigations of your tenant from the console to reveal known issues. When you run a diagnostic, you may receive mitigation steps to help with resolution
- - View insights: find links to documentation that provides context and background specific to the product area or actions you've described
- - Recommended articles: browse suggested troubleshooting topics and other content related to your issue
-- If needed, use the *Contact support* pane to file an online support ticket
- > [!IMPORTANT]
- > When opening a case, be sure to include as many details as possible in the *Description* field. Such information includes: timestamp and date, device ID, device model, serial number, OS version, and any other details relevant to the issue.
-- To review your case history, select the **Service requests** pane. Active cases are at the top of the list, with closed issues also available for review
-
-For more information, see [Microsoft Intune support page][MEM-1]
-
-
-[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
diff --git a/education/windows/windows-11-se-settings-list.md b/education/windows/windows-11-se-settings-list.md
index bea07c4d0b..1c973e2035 100644
--- a/education/windows/windows-11-se-settings-list.md
+++ b/education/windows/windows-11-se-settings-list.md
@@ -2,7 +2,7 @@
title: Windows 11 SE settings list
description: Windows 11 SE automatically configures settings in the operating system. Learn more about the settings you can control and manage, and the settings you can't change.
ms.topic: reference
-ms.date: 08/18/2023
+ms.date: 05/06/2024
appliesto:
- ✅ Windows 11 SE
ms.collection:
diff --git a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
index cb1db35d6e..aeb7575b4c 100644
--- a/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
+++ b/windows/application-management/app-v/appv-planning-for-high-availability-with-appv.md
@@ -32,7 +32,7 @@ You can use Internet Information Services' (IIS) network load balancing (NLB) to
Review the following articles to learn more about configuring IIS and NLB for computers running Windows Server operating systems:
-* [Achieving High Availability and Scalability - ARR and NLB](https://www.iis.net/learn/extensions/configuring-application-request-routing-arr/achieving-high-availability-and-scalability-arr-and-nlb) describes how to configure IIS 7.0.
+* [Achieving High Availability and Scalability - ARR and NLB](/iis/extensions/configuring-application-request-routing-arr/achieving-high-availability-and-scalability-arr-and-nlb) describes how to configure IIS 7.0.
* [Network load balancing overview](/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831698(v=ws.11)) will tell you more about how to configure Microsoft Windows Server.
@@ -88,13 +88,13 @@ Use the following steps to modify the connection string to include ```failover p
3. Modify the **MANAGEMENT\_SQL\_CONNECTION\_STRING** value with the ```failover partner = ``` value.
4. Restart management service using the IIS console.
> [!NOTE]
- >Database Mirroring is on the list of [deprecated database engine features in SQL Server 2012]() due to the **AlwaysOn** feature available starting with Microsoft SQL Server 2012.
+ >Database Mirroring is on the list of [deprecated database engine features in SQL Server 2012](/previous-versions/sql/sql-server-2012/ms143729(v=sql.110)) due to the **AlwaysOn** feature available starting with Microsoft SQL Server 2012.
-Click any of the following links for more information:
+For more information, see the following articles:
* [Prepare a mirror database for mirroring (SQL Server)](/sql/database-engine/database-mirroring/prepare-a-mirror-database-for-mirroring-sql-server).
* [Establish a database mirroring session using Windows Authentication (SQL Server Management Studio)](/sql/database-engine/database-mirroring/establish-database-mirroring-session-windows-authentication).
-* [Deprecated database engine features in SQL Server 2012]().
+* [Deprecated database engine features in SQL Server 2012](/previous-versions/sql/sql-server-2012/ms143729(v=sql.110)).
## Support for Microsoft SQL Server Always On configuration
diff --git a/windows/client-management/manage-windows-copilot.md b/windows/client-management/manage-windows-copilot.md
index 24110d05f3..918fe88905 100644
--- a/windows/client-management/manage-windows-copilot.md
+++ b/windows/client-management/manage-windows-copilot.md
@@ -6,7 +6,9 @@ ms.subservice: windows-copilot
ms.date: 03/21/2024
ms.author: mstewart
author: mestew
-ms.collection: windows-copilot
+ms.collection:
+ - windows-copilot
+ - magic-ai-copilot
appliesto:
- ✅ Windows 11, version 22H2 or later
---
diff --git a/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
index 49d00a03bf..6542f4aa17 100644
--- a/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
+++ b/windows/client-management/mdm/policies-in-policy-csp-supported-by-group-policy.md
@@ -1,7 +1,7 @@
---
title: Policies in Policy CSP supported by Group Policy
description: Learn about the policies in Policy CSP supported by Group Policy.
-ms.date: 04/10/2024
+ms.date: 04/23/2024
---
@@ -871,7 +871,6 @@ This article lists the policies in Policy CSP that have a group policy mapping.
## WindowsAI
- [TurnOffWindowsCopilot](policy-csp-windowsai.md)
-- [DisableAIDataAnalysis](policy-csp-windowsai.md)
## WindowsDefenderSecurityCenter
diff --git a/windows/client-management/mdm/policy-csp-windowsai.md b/windows/client-management/mdm/policy-csp-windowsai.md
index aa027def07..7f0e55df51 100644
--- a/windows/client-management/mdm/policy-csp-windowsai.md
+++ b/windows/client-management/mdm/policy-csp-windowsai.md
@@ -1,7 +1,7 @@
---
title: WindowsAI Policy CSP
description: Learn more about the WindowsAI Area in Policy CSP.
-ms.date: 01/31/2024
+ms.date: 04/23/2024
---
@@ -9,74 +9,10 @@ ms.date: 01/31/2024
# Policy CSP - WindowsAI
-[!INCLUDE [Windows Insider tip](includes/mdm-insider-csp-note.md)]
-
-
-## DisableAIDataAnalysis
-
-
-| Scope | Editions | Applicable OS |
-|:--|:--|:--|
-| ❌ Device ✅ User | ✅ Pro ✅ Enterprise ✅ Education ✅ Windows SE ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows Insider Preview [99.9.9999] |
-
-
-
-```User
-./User/Vendor/MSFT/Policy/Config/WindowsAI/DisableAIDataAnalysis
-```
-
-
-
-
-This policy setting allows you to prevent Windows AI from using and analyzing user patterns and data.
-
-- If you enable this policy setting, Windows AI won't be able to take advantage of historical user patterns.
-
-- If you disable or don't configure this policy setting, Windows AI will be able to assist users by considering their historical behaviors and data.
-
-
-
-
-
-
-
-**Description framework properties**:
-
-| Property name | Property value |
-|:--|:--|
-| Format | `int` |
-| Access Type | Add, Delete, Get, Replace |
-| Default Value | 0 |
-
-
-
-**Allowed values**:
-
-| Value | Description |
-|:--|:--|
-| 0 (Default) | Enable Data Analysis for Windows AI. |
-| 1 | Disable Data Analysis for Windows AI. |
-
-
-
-**Group policy mapping**:
-
-| Name | Value |
-|:--|:--|
-| Name | DisableAIDataAnalysis |
-| Path | WindowsAI > AT > WindowsComponents > WindowsAI |
-
-
-
-
-
-
-
-
## TurnOffWindowsCopilot
diff --git a/windows/client-management/mdm/surfacehub-csp.md b/windows/client-management/mdm/surfacehub-csp.md
index 553037a410..78f6dd37b7 100644
--- a/windows/client-management/mdm/surfacehub-csp.md
+++ b/windows/client-management/mdm/surfacehub-csp.md
@@ -1,7 +1,7 @@
---
title: SurfaceHub CSP
description: Learn more about the SurfaceHub CSP.
-ms.date: 01/18/2024
+ms.date: 04/22/2024
---
@@ -65,6 +65,10 @@ The following list shows the SurfaceHub configuration service provider nodes:
- [MOMAgent](#momagent)
- [WorkspaceID](#momagentworkspaceid)
- [WorkspaceKey](#momagentworkspacekey)
+ - [MOMAgentGovtCloud](#momagentgovtcloud)
+ - [AzureCloudIndexGovtCloud](#momagentgovtcloudazurecloudindexgovtcloud)
+ - [WorkspaceIDGovtCloud](#momagentgovtcloudworkspaceidgovtcloud)
+ - [WorkspaceKeyGovtCloud](#momagentgovtcloudworkspacekeygovtcloud)
- [Properties](#properties)
- [AllowAutoProxyAuth](#propertiesallowautoproxyauth)
- [AllowSessionResume](#propertiesallowsessionresume)
@@ -2011,6 +2015,162 @@ Primary key for authenticating with workspace. Will always return an empty strin
+
+## MOMAgentGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device ❌ User | ✅ Pro ✅ Enterprise ✅ Education ✅ Windows SE ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud
+```
+
+
+
+
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `node` |
+| Access Type | Get |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/AzureCloudIndexGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device ❌ User | ✅ Pro ✅ Enterprise ✅ Education ✅ Windows SE ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/AzureCloudIndexGovtCloud
+```
+
+
+
+
+Enum value for Azure Clouds supported for OMS tracking in SurfaceHub.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `int` |
+| Access Type | Get, Replace |
+| Default Value | 0 |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/WorkspaceIDGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device ❌ User | ✅ Pro ✅ Enterprise ✅ Education ✅ Windows SE ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/WorkspaceIDGovtCloud
+```
+
+
+
+
+GUID identifying the Microsoft Operations Management Suite workspace ID to collect the data for Govt Clouds. Set this to an empty string to disable the MOM agent.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `chr` (string) |
+| Access Type | Get, Replace |
+
+
+
+
+
+
+
+
+
+### MOMAgentGovtCloud/WorkspaceKeyGovtCloud
+
+
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| ✅ Device ❌ User | ✅ Pro ✅ Enterprise ✅ Education ✅ Windows SE ✅ IoT Enterprise / IoT Enterprise LTSC | ✅ Windows 10, version 22H2 [10.0.19045.4355] and later |
+
+
+
+```Device
+./Vendor/MSFT/SurfaceHub/MOMAgentGovtCloud/WorkspaceKeyGovtCloud
+```
+
+
+
+
+Primary key for authenticating with workspace for Govt Clouds. Will always return an empty string.
+
+
+
+
+
+
+
+**Description framework properties**:
+
+| Property name | Property value |
+|:--|:--|
+| Format | `chr` (string) |
+| Access Type | Get, Replace |
+
+
+
+
+
+
+
+
## Properties
diff --git a/windows/client-management/mdm/surfacehub-ddf-file.md b/windows/client-management/mdm/surfacehub-ddf-file.md
index 4bfee13fce..3222bade2d 100644
--- a/windows/client-management/mdm/surfacehub-ddf-file.md
+++ b/windows/client-management/mdm/surfacehub-ddf-file.md
@@ -1,7 +1,7 @@
---
title: SurfaceHub DDF file
description: View the XML file containing the device description framework (DDF) for the SurfaceHub configuration service provider.
-ms.date: 01/18/2024
+ms.date: 04/22/2024
---
@@ -12,11 +12,10 @@ The following XML file contains the device description framework (DDF) for the S
```xml
-]>
+
1.2
-
-
+ SurfaceHub./Vendor/MSFT
@@ -86,8 +85,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -110,8 +108,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -134,8 +131,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -158,8 +154,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -203,8 +198,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -227,8 +221,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -251,8 +244,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -534,8 +526,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.150631.0
-
-
+
@@ -611,8 +602,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -753,8 +743,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -982,8 +971,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1028,8 +1016,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1522,8 +1509,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.15063, 10.0.14393.9691.0
-
-
+
@@ -1584,8 +1570,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1633,8 +1618,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1657,8 +1641,99 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
+
+
+
+
+ MOMAgentGovtCloud
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 10.0.19045.4355
+ 1.0
+ 0x4;0x1B;0x30;0x31;0x48;0x54;0x62;0x63;0x64;0x65;0x77;0x79;0x7A;0x7D;0x7E;0x81;0x82;0x8A;0x8B;0xA1;0xA2;0xA4;0xA5;0xAB;0xAC;0xAF;0xB4;0xBC;0xBF;0xCA;0xCB;0xCD;
+
+
+
+ WorkspaceIDGovtCloud
+
+
+
+
+
+ GUID identifying the Microsoft Operations Management Suite workspace ID to collect the data for Govt Clouds. Set this to an empty string to disable the MOM agent.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ WorkspaceKeyGovtCloud
+
+
+
+
+
+ Primary key for authenticating with workspace for Govt Clouds.. Will always return an empty string.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
+
+
+
+ AzureCloudIndexGovtCloud
+
+
+
+
+
+ 0
+ Enum value for Azure Clouds supported for OMS tracking in SurfaceHub.
+
+
+
+
+
+
+
+
+
+
+ text/plain
+
@@ -1702,8 +1777,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1726,8 +1800,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1754,8 +1827,7 @@ The following XML file contains the device description framework (DDF) for the S
10.0.17134, 10.0.16299.641.0
-
-
+ LanProfile
@@ -1777,8 +1849,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
@@ -1801,8 +1872,7 @@ The following XML file contains the device description framework (DDF) for the S
-
-
+
diff --git a/windows/configuration/assigned-access/xsd.md b/windows/configuration/assigned-access/xsd.md
index 89519a3862..209c3fb81d 100644
--- a/windows/configuration/assigned-access/xsd.md
+++ b/windows/configuration/assigned-access/xsd.md
@@ -2,7 +2,7 @@
title: Assigned Access XML Schema Definition (XSD)
description: Assigned Access XSD reference article.
ms.topic: reference
-ms.date: 02/15/2024
+ms.date: 04/08/2024
---
# Assigned Access XML Schema Definition (XSD)
@@ -232,7 +232,7 @@ Here's the Assigned Access XSD for the features added in Windows 11:
## Windows 11, version 21H2 additions
-Here's the Assigned Access XSD for the features added in Windows 10, version 21H2:
+Here's the Assigned Access XSD for the features added in Windows 11, version 21H2:
```xml
[!NOTE]
->You can use the [Personalization CSP](/windows/client-management/mdm/personalization-csp) settings to set lock screen and desktop background images.
-
-## What does Windows Spotlight include?
-
-- **Background image**
- The Windows Spotlight displays a new image on the lock screen each day. The initial background image is included during installation. More images are downloaded on ongoing basis.
- 
-- **Feature suggestions, fun facts, tips**
- The lock screen background will occasionally make recommendations on how to enhance your productivity and enjoyment of Microsoft products including suggesting other relevant Microsoft products and services.
- 
-
-## How do you turn off Windows Spotlight locally?
-
-To turn off Windows Spotlight locally, go to **Settings** > **Personalization** > **Lock screen** > **Background** > **Windows spotlight** > select a different lock screen background
-
-
-
-## How do you disable Windows Spotlight for managed devices?
-
-Windows Spotlight is enabled by default. Windows 10 provides Group Policy and mobile device management (MDM) settings to help you manage Windows Spotlight on enterprise computers.
-
->[!NOTE]
->These policies are in the **User Configuration \Policies\Administrative Templates\Windows Components\Cloud Content** path in the Group Policy Management Console, and in the **User Configuration \Administrative Templates\Windows Components\Cloud Content** path in the Local Group Policy Editor.
-
-| Group Policy | MDM | Description | Applies to |
-|--|--|--|--|
-| **Do not suggest third-party content in Windows spotlight** | **Experience/Allow ThirdParty Suggestions In Windows Spotlight** | Enables enterprises to restrict suggestions to Microsoft apps and services | Windows 10 Pro, Enterprise, and Education, version 1607 and later |
-| **Turn off all Windows Spotlight features** | **Experience/Allow Windows Spotlight** | Enables enterprises to completely disable all Windows Spotlight features in a single setting | Windows 10 Enterprise and Education, version 1607 and later |
-| **Configure Spotlight on lock screen** | **Experience/Configure Windows Spotlight On Lock Screen** | Specifically controls the use of the dynamic Windows Spotlight image on the lock screen, and can be enabled or disabled | Windows 10 Enterprise and Education, version 1607 and later |
-| **Turn off the Windows Spotlight on Action Center** | **Experience/Allow Windows Spotlight On Action Center** | Turn off Suggestions from Microsoft that show after each clean install, upgrade, or on an on-going basis to introduce users to what is new or changed | Windows 10 Enterprise and Education, version 1703 |
-| **Do not use diagnostic data for tailored experiences** | **Experience/Allow Tailored Experiences With Diagnostic Data** | Prevent Windows from using diagnostic data to provide tailored experiences to the user | Windows 10 Pro, Enterprise, and Education, version 1703 |
-| **Turn off the Windows Welcome Experience** | **Experience/Allow Windows Spotlight Windows Welcome Experience** | Turn off the Windows Spotlight Windows Welcome experience that helps introduce users to Windows, such as launching Microsoft Edge with a web page highlighting new features | Windows 10 Enterprise and Education, version 1703 |
-| **Turn off the Windows Spotlight on Settings** | **Experience/Allow Windows Spotlight on Settings** | Turn off the Windows Spotlight in the Settings app. | Windows 10 Enterprise and Education, version 1803 |
-
- In addition to the specific policy settings for Windows Spotlight, administrators can replace Windows Spotlight with a selected image using the Group Policy setting **Computer Configuration** > **Administrative Templates** > **Control Panel** > **Personalization** > **Force a specific default lock screen image** (Windows 10 Enterprise and Education).
-
- >[!TIP]
- >If you want to use a custom lock screen image that contains text, see [Resolution for custom lock screen image](#resolution-for-custom-lock-screen-image).
-
-
-
-Pay attention to the checkbox in **Options**. In addition to providing the path to the lock screen image, administrators can choose to allow or **Turn off fun facts, tips, tricks, and more on lock screen**. If the checkbox isn't selected, users will see the lock screen image that is defined in the policy setting, and will also see occasional messages.
-
-## Resolution for custom lock screen image
-
-A concern with custom lock screen images is how they'll appear on different screen sizes and resolutions.
-
-A custom lock screen image created in 16:9 aspect ratio (1600x900) will scale properly on devices using a 16:9 resolution, such as 1280x720 or 1920x1080. On devices using other aspect ratios, such as 4:3 (1024x768) or 16:10 (1280x800), height scales correctly and width is cropped to a size equal to the aspect ratio. The image will remain centered on the screen
-
-Lock screen images created at other aspect ratios may scale and center unpredictably on your device when changing aspect ratios.
-
-The recommendation for custom lock screen images that include text (such as a legal statement) is to create the lock screen image in 16:9 resolution with text contained in the 4:3 region, allowing the text to remain visible at any aspect ratio.
diff --git a/windows/configuration/taskbar/images/pin-add-11.png b/windows/configuration/taskbar/images/pin-add-11.png
index de84d0154c..867f27af43 100644
Binary files a/windows/configuration/taskbar/images/pin-add-11.png and b/windows/configuration/taskbar/images/pin-add-11.png differ
diff --git a/windows/configuration/taskbar/images/pin-layout-11.png b/windows/configuration/taskbar/images/pin-layout-11.png
index 717f210776..5df7a8bfda 100644
Binary files a/windows/configuration/taskbar/images/pin-layout-11.png and b/windows/configuration/taskbar/images/pin-layout-11.png differ
diff --git a/windows/configuration/taskbar/images/pin-remove-11.png b/windows/configuration/taskbar/images/pin-remove-11.png
index d815923516..736d4b2d11 100644
Binary files a/windows/configuration/taskbar/images/pin-remove-11.png and b/windows/configuration/taskbar/images/pin-remove-11.png differ
diff --git a/windows/configuration/taskbar/images/pin-replace-11.png b/windows/configuration/taskbar/images/pin-replace-11.png
index ce90eebcad..f758d145be 100644
Binary files a/windows/configuration/taskbar/images/pin-replace-11.png and b/windows/configuration/taskbar/images/pin-replace-11.png differ
diff --git a/windows/configuration/taskbar/images/taskbar-11.png b/windows/configuration/taskbar/images/taskbar-11.png
index accd2c6f8f..0e24fb2679 100644
Binary files a/windows/configuration/taskbar/images/taskbar-11.png and b/windows/configuration/taskbar/images/taskbar-11.png differ
diff --git a/windows/configuration/taskbar/images/taskbar-sections-11.png b/windows/configuration/taskbar/images/taskbar-sections-11.png
index 3e14e85b9d..68e6ce31c5 100644
Binary files a/windows/configuration/taskbar/images/taskbar-sections-11.png and b/windows/configuration/taskbar/images/taskbar-sections-11.png differ
diff --git a/windows/configuration/taskbar/includes/turn-off-windows-copilot.md b/windows/configuration/taskbar/includes/turn-off-windows-copilot.md
deleted file mode 100644
index 69b9f7fd71..0000000000
--- a/windows/configuration/taskbar/includes/turn-off-windows-copilot.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-author: paolomatarazzo
-ms.author: paoloma
-ms.date: 04/11/2024
-ms.topic: include
----
-
-### Turn off Windows Copilot
-
-This policy setting allows you to turn off Windows Copilot.
-
-- If you enable this policy setting, users can't use Copilot. The Copilot icon doesn't appear on the taskbar either
-- If you disable or don't configure this policy setting, users can use Copilot, if available
-
-| | Path |
-|--|--|
-| **CSP** | `./User/Vendor/MSFT/Policy/Config/WindowsAI/`[TurnOffWindowsCopilot](/windows/client-management/mdm/policy-csp-windowsai#turnoffwindowscopilot) |
-| **GPO** | **User Configuration** > **Administrative Templates** > **Windows Components** > **Windows Copilot** |
diff --git a/windows/configuration/taskbar/index.md b/windows/configuration/taskbar/index.md
index 04b5c9de37..68edd41929 100644
--- a/windows/configuration/taskbar/index.md
+++ b/windows/configuration/taskbar/index.md
@@ -1,6 +1,6 @@
---
title: Configure the Windows taskbar
-description: Administrators can pin more apps to the taskbar and remove default pinned apps from the taskbar by adding a section to a layout modification XML file.
+description: Learn how to configure the Windows taskbar to provide quick access to the tools and applications that users need most.
ms.topic: how-to
ms.date: 04/17/2024
appliesto:
@@ -47,10 +47,9 @@ Let's review the components of the Windows taskbar by dividing it into three are
1. Pinned and running apps
1. The *right area* contains:
1. The system tray, which displays icons like the pen menu, touch keyboard, virtual touchpad, and any application icons that are running in the background like OneDrive, Teams, or antivirus software
- 1. Quick Actions
+ 1. Quick actions
1. Calendar
- 1. Action Center
- 1. Copilot
+ 1. Notifications
:::image type="content" source="images/taskbar-sections-11.png" alt-text="Screenshot of the Windows 11 taskbar with the three areas highlighted." border="false" lightbox="./images/taskbar-sections-11.png":::
@@ -72,8 +71,7 @@ Let's review the components of the Windows taskbar by dividing it into two areas
- News and interests
- The system tray, which displays icons like the pen menu, touch keyboard, virtual touchpad, power, network, volume, and any application icons that are running in the background like OneDrive, Teams, or antivirus software
- Calendar
- - Action center
- - Copilot
+ - Notifications and actions
:::image type="content" source="images/taskbar-sections-10.png" alt-text="Screenshot of the Windows 11 taskbar with the two areas highlighted." border="false" lightbox="./images/taskbar-sections-10.png":::
diff --git a/windows/configuration/taskbar/policy-settings.md b/windows/configuration/taskbar/policy-settings.md
index cf9fa4a5ea..72ca73538b 100644
--- a/windows/configuration/taskbar/policy-settings.md
+++ b/windows/configuration/taskbar/policy-settings.md
@@ -37,7 +37,6 @@ Select one of the tabs to see the list of available settings:
|[Show additional calendar](#show-additional-calendar)|❌|✅|
|[Simplify Quick Settings Layout](#simplify-quick-settings-layout)|✅|✅|
|[Turn off automatic promotion of notification icons to the taskbar](#turn-off-automatic-promotion-of-notification-icons-to-the-taskbar)|❌|✅|
-|[Turn off Windows Copilot](#turn-off-windows-copilot)|✅|✅|
::: zone-end
@@ -62,7 +61,6 @@ Select one of the tabs to see the list of available settings:
|[Show additional calendar](#show-additional-calendar)|❌|✅|
|[Turn off automatic promotion of notification icons to the taskbar](#turn-off-automatic-promotion-of-notification-icons-to-the-taskbar)|❌|✅|
|[Turn off notification area cleanup](#turn-off-notification-area-cleanup)|❌|✅|
-|[Turn off Windows Copilot](#turn-off-windows-copilot)|✅|✅|
::: zone-end
@@ -109,8 +107,6 @@ Select one of the tabs to see the list of available settings:
[!INCLUDE [turn-off-notification-area-cleanup](includes/turn-off-notification-area-cleanup.md)]
::: zone-end
-[!INCLUDE [turn-off-windows-copilot](includes/turn-off-windows-copilot.md)]
-
#### [:::image type="icon" source="../images/icons/touch.svg"::: **Taskbar behaviors**](#tab/actions)
::: zone pivot="windows-11"
diff --git a/windows/configuration/toc.yml b/windows/configuration/toc.yml
index 6feefd28bf..27cec371e7 100644
--- a/windows/configuration/toc.yml
+++ b/windows/configuration/toc.yml
@@ -7,8 +7,8 @@ items:
href: start/toc.yml
- name: Taskbar
href: taskbar/toc.yml
-- name: Spotlight
- href: lock-screen/windows-spotlight.md
+- name: Windows spotlight
+ href: windows-spotlight/index.md
- name: Microsoft Store
href: store/toc.yml
- name: Cellular settings
diff --git a/windows/configuration/windows-spotlight/images/contoso-lockscreen-10.png b/windows/configuration/windows-spotlight/images/contoso-lockscreen-10.png
new file mode 100644
index 0000000000..7b3015dd39
Binary files /dev/null and b/windows/configuration/windows-spotlight/images/contoso-lockscreen-10.png differ
diff --git a/windows/configuration/windows-spotlight/images/contoso-lockscreen-11.png b/windows/configuration/windows-spotlight/images/contoso-lockscreen-11.png
new file mode 100644
index 0000000000..a4bc816c78
Binary files /dev/null and b/windows/configuration/windows-spotlight/images/contoso-lockscreen-11.png differ
diff --git a/windows/configuration/windows-spotlight/images/lockscreen-10.png b/windows/configuration/windows-spotlight/images/lockscreen-10.png
new file mode 100644
index 0000000000..243ca18f67
Binary files /dev/null and b/windows/configuration/windows-spotlight/images/lockscreen-10.png differ
diff --git a/windows/configuration/windows-spotlight/images/lockscreen-11.png b/windows/configuration/windows-spotlight/images/lockscreen-11.png
new file mode 100644
index 0000000000..bf153070c1
Binary files /dev/null and b/windows/configuration/windows-spotlight/images/lockscreen-11.png differ
diff --git a/windows/configuration/windows-spotlight/index.md b/windows/configuration/windows-spotlight/index.md
new file mode 100644
index 0000000000..53b5c10121
--- /dev/null
+++ b/windows/configuration/windows-spotlight/index.md
@@ -0,0 +1,129 @@
+---
+title: Configure Windows spotlight
+description: Learn how to configure Windows spotlight using Group Policy and mobile device management (MDM) settings.
+ms.topic: how-to
+ms.date: 04/23/2024
+ms.author: paoloma
+author: paolomatarazzo
+appliesto:
+zone_pivot_groups: windows-versions-11-10
+---
+
+# Configure Windows spotlight
+
+Windows spotlight is a feature that displays different wallpapers and offers suggestions, fun facts, tips, or organizational messages:
+
+::: zone pivot="windows-11"
+
+- **Wallpapers**: Windows spotlight displays a new image on the lock screen and in the background every day
+- **Suggestions, fun facts, tips**: recommendations on how to enhance the user's productivity of Microsoft products. They're displayed in different locations, such as the lock screen, the background, the taskbar, or the Get Started app
+- **Organizational messages**: messages from your organization, which can be displayed in the taskbar, the notification area, or the Get Started app
+
+:::image type="content" source="images/lockscreen-11.png" alt-text="Screenshot of the Windows 11 lock screen with Windows Spotlight enabled." border="false":::
+
+::: zone-end
+
+::: zone pivot="windows-10"
+
+- **Wallpapers**: Windows spotlight displays a new image on the lock screen every day
+- **Suggestions, fun facts, tips**: recommendations on how to enhance the user's productivity of Microsoft products. They're displayed in different locations, such as the lock screen, the background, the taskbar, or the Get Started app
+- **Organizational messages**: messages from your organization, which can be displayed in the taskbar, the notification area, or the Get Started app
+
+:::image type="content" source="images/lockscreen-10.png" alt-text="Screenshot of the Windows 10 lock screen with Windows Spotlight enabled." border="false":::
+
+::: zone-end
+
+## Windows edition and licensing requirements
+
+Windows spotlight is available on Windows Enterprise and Education editions only.
+
+## Configuration options
+
+Windows spotlight is enabled by default, but you can customize it to meet your organization's needs. There are several options to configure Windows spotlight.
+
+If you need to configure a device for a single user, go to:
+
+::: zone pivot="windows-11"
+
+- **Settings** > **Personalization** > **[Background](ms-settings:personalization-background)**. To change the background image to Windows spotlight, select **Windows spotlight** from the **Personalize your background** drop-down menu
+
+::: zone-end
+
+- **Settings** > **Personalization** > **[Lock screen](ms-settings:personalization-lockscreen)**. To change the lock screen image to Windows spotlight, select **Windows spotlight** from the **Personalize your lock screen** drop-down menu
+
+For advanced customizations and when you need to configure multiple devices, you can use one of the following options:
+
+- Configuration Service Provider (CSP): commonly used for devices managed by a Mobile Device Management (MDM) solution, like Microsoft Intune. CSPs can also be configured with [provisioning packages](../provisioning-packages/how-it-pros-can-use-configuration-service-providers.md#csps-in-windows-configuration-designer), which are used at deployment time or for unmanaged devices. To configure Windows spotlight, use the [Experience Policy CSP][CSP-1]
+- Group policy (GPO): used for devices that are Active Directory joined or Microsoft Entra hybrid joined, and not managed by a device management solution. Group policy can also be used for devices that aren't joined to an Active Directory domain, using the local group policy editor
+
+## Policy settings
+
+Here's a sorted list of the policy settings to configure Windows spotlight:
+
+::: zone pivot="windows-11"
+|Policy name| CSP | GPO |
+|-|-|-|
+|[AllowSpotlightCollection](/windows/client-management/mdm/policy-csp-experience#allowspotlightcollection)|✅|❌|
+|[AllowThirdPartySuggestionsInWindowsSpotlight](/windows/client-management/mdm/policy-csp-experience#allowthirdpartysuggestionsinwindowsspotlight)|✅|✅|
+|[AllowWindowsSpotlight](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlight)|✅|✅|
+|[AllowWindowsSpotlightOnActionCenter](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightonactioncenter)|✅|✅|
+|[AllowWindowsSpotlightOnSettings](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightonsettings)|✅|✅|
+|[AllowWindowsSpotlightWindowsWelcomeExperience](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightwindowswelcomeexperience)|✅|✅|
+|[ConfigureWindowsSpotlightOnLockScreen](/windows/client-management/mdm/policy-csp-experience#configurewindowsspotlightonlockscreen)|✅|✅|
+
+::: zone-end
+
+::: zone pivot="windows-10"
+
+|Policy name| CSP | GPO |
+|-|-|-|
+|[AllowThirdPartySuggestionsInWindowsSpotlight](/windows/client-management/mdm/policy-csp-experience#allowthirdpartysuggestionsinwindowsspotlight)|✅|✅|
+|[AllowWindowsSpotlight](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlight)|✅|✅|
+|[AllowWindowsSpotlightOnActionCenter](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightonactioncenter)|✅|✅|
+|[AllowWindowsSpotlightOnSettings](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightonsettings)|✅|✅|
+|[AllowWindowsSpotlightWindowsWelcomeExperience](/windows/client-management/mdm/policy-csp-experience#allowwindowsspotlightwindowswelcomeexperience)|✅|✅|
+|[ConfigureWindowsSpotlightOnLockScreen](/windows/client-management/mdm/policy-csp-experience#configurewindowsspotlightonlockscreen)|✅|✅|
+
+::: zone-end
+
+## Custom lock screen and background images
+
+You can replace the Windows spotlight lock screen and background images with a custom image. When you do so, users can still see suggestions, fun facts, tips, or organizational messages on the lock screen, but the background image is replaced with the custom image.
+
+To configure the lock screen and background images, use the [Personalization CSP][CSP-2].
+
+|Policy name| CSP | GPO |
+|-|-|-|
+|[DesktopImageUrl](/windows/client-management/mdm/personalization-csp#desktopimageurl)|✅|✅|
+|[LockScreenImageUrl](/windows/client-management/mdm/personalization-csp#lockscreenimageurl)|✅|✅|
+
+>[!NOTE]
+> A concern with custom images is how they'll appear on different screen sizes and resolutions. A custom image created in `16:9` aspect ratio (for example, `1600x900`) scales properly on devices using a `16:9` resolution, such as `1280x720` or `1920x1080`. On devices using other aspect ratios, such as `4:3` (`1024x768`) or `16:10` (`1280x800`), height scales correctly and width is cropped to a size equal to the aspect ratio. The image remains centered on the screen.
+>
+> Lock screen images created at other aspect ratios might scale and center unpredictably on your device when changing aspect ratios. The recommendation for custom images that include text (such as a legal statement), is to create the lock screen image in `16:9` resolution with text contained in the `4:3` region, allowing the text to remain visible at any aspect ratio.
+
+## User experience
+
+When Windows spotlight is enabled, devices apply a new image on the lock screen and in the background every day. The image is displayed in the background when the user signs in, and on the lock screen when the user locks the device. Users can still receive suggestions, fun facts, tips, or organizational messages. If you deploy a custom lock screen or background image, devices apply the custom image instead of the Windows spotlight image:
+
+::: zone pivot="windows-11"
+
+:::image type="content" source="images/contoso-lockscreen-11.png" alt-text="Screenshot of the Windows 11 lock screen with Windows spotlight enabled over an organization wallpaper." border="false":::
+
+::: zone-end
+
+::: zone pivot="windows-10"
+
+:::image type="content" source="images/contoso-lockscreen-10.png" alt-text="Screenshot of the Windows 10 lock screen with Windows spotlight enabled over an organization wallpaper." border="false":::
+
+::: zone-end
+
+## Next steps
+
+To learn more about organizational messages, see [Organizational messages in Microsoft Intune][INT-1].
+
+
+
+[CSP-1]: /windows/client-management/mdm/policy-csp-experience
+[CSP-2]: /windows/client-management/mdm/personalization-csp
+[INT-1]: /mem/intune/remote-actions/organizational-messages-overview
diff --git a/windows/deployment/update/waas-wu-settings.md b/windows/deployment/update/waas-wu-settings.md
index 84c4092f53..c94c1fb34b 100644
--- a/windows/deployment/update/waas-wu-settings.md
+++ b/windows/deployment/update/waas-wu-settings.md
@@ -3,7 +3,7 @@ title: Manage additional Windows Update settings
description: In this article, learn about additional settings to control the behavior of Windows Update in your organization.
ms.service: windows-client
ms.subservice: itpro-updates
-ms.topic: conceptual
+ms.topic: reference
author: mestew
ms.author: mstewart
manager: aaroncz
@@ -14,7 +14,7 @@ ms.localizationpriority: medium
appliesto:
- ✅ Windows 11
- ✅ Windows 10
-ms.date: 04/25/2023
+ms.date: 04/29/2024
---
# Manage additional Windows Update settings
@@ -42,32 +42,35 @@ You can use Group Policy settings or mobile device management (MDM) to configure
>[!IMPORTANT]
>Additional information about settings to manage device restarts and restart notifications for updates is available on **[Manage device restarts after updates](waas-restart.md)**.
>
->Additional settings that configure when Feature and Quality updates are received are detailed on **[Configure Windows Update for Business](waas-configure-wufb.md)**.
+>Additional settings that configure when feature and quality updates are received are detailed on **[Configure Windows Update for Business](waas-configure-wufb.md)**.
## Scanning for updates
-Admins have a lot of flexibility in configuring how their devices scan and receive updates.
+Admins have flexibility in configuring how their devices scan and receive updates.
[Specify Intranet Microsoft update service location](#specify-intranet-microsoft-update-service-location) allows admins to point devices to an internal Microsoft update service location, while [Do not connect to any Windows Update Internet locations](#do-not-connect-to-any-windows-update-internet-locations) gives them the option to restrict devices to just that internal update service. [Automatic Updates Detection Frequency](#automatic-updates-detection-frequency) controls how frequently devices scan for updates.
-You can make custom device groups that will work with your internal Microsoft update service by using [Enable client-side targeting](#enable-client-side-targeting). You can also make sure your devices receive updates that weren't signed by Microsoft from your internal Microsoft update service, through [Allow signed updates from an intranet Microsoft update service location](#allow-signed-updates-from-an-intranet-microsoft-update-service-location).
+You can make custom device groups that work with your internal Microsoft update service by using [Enable client-side targeting](#enable-client-side-targeting). You can also make sure your devices receive updates that weren't signed by Microsoft from your internal Microsoft update service, through [Allow signed updates from an intranet Microsoft update service location](#allow-signed-updates-from-an-intranet-microsoft-update-service-location).
-Finally, to make sure the updating experience is fully controlled by the admins, you can [Remove access to use all Windows Update features](#remove-access-to-use-all-windows-update-features) for users.
+Finally, to make sure the updating experience is fully admin controlled, you can [Remove access to use all Windows Update features](#remove-access-to-use-all-windows-update-features) for users.
-For additional settings that configure when Feature and Quality updates are received, see [Configure Windows Update for Business](waas-configure-wufb.md).
+For additional settings that configure when feature and quality updates are received, see [Configure Windows Update for Business](waas-configure-wufb.md).
### Specify intranet Microsoft update service location
Specifies an intranet server to host updates from Microsoft Update. You can then use this update service to automatically update computers on your network.
-This setting lets you specify a server on your network to function as an internal update service. The Automatic Updates client will search this service for updates that apply to the computers on your network.
+This setting lets you specify a server on your network to function as an internal update service. The Automatic Updates client searches this service for updates that apply to the computers on your network.
-To use this setting in Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update\Specify Intranet Microsoft update service location**. You must set two server name values: the server from which the Automatic Updates client detects and downloads updates, and the server to which updated workstations upload statistics. You can set both values to be the same server. An optional server name value can be specified to configure Windows Update Agent to download updates from an alternate download server instead of the intranet update service.
+To use this setting in Group Policy, go to **Computer Configuration\Administrative Templates\Windows Components\Windows Update\Specify Intranet Microsoft update service location**. You must set two server name values:
+- The server from which the Automatic Updates client detects and downloads updates
+- The server to which updated workstations upload statistics
+You can set both values to be the same server. An optional server name value can be specified to configure Windows Update Agent to download updates from an alternate download server instead of the intranet update service.
If the setting is set to **Enabled**, the Automatic Updates client connects to the specified intranet Microsoft update service (or alternate download server), instead of Windows Update, to search for and download updates. Enabling this setting means that end users in your organization don't have to go through a firewall to get updates, and it gives you the opportunity to test updates after deploying them.
If the setting is set to **Disabled** or **Not Configured**, and if Automatic Updates isn't disabled by policy or user preference, the Automatic Updates client connects directly to the Windows Update site on the Internet.
The alternate download server configures the Windows Update Agent to download files from an alternative download server instead of the intranet update service.
-The option to download files with missing Urls allows content to be downloaded from the Alternate Download Server when there are no download Urls for files in the update metadata. This option should only be used when the intranet update service doesn't provide download Urls in the update metadata for files that are present on the alternate download server.
+The option to download files with missing URLs allows content to be downloaded from the Alternate Download Server when there are no download URLs for files in the update metadata. This option should only be used when the intranet update service doesn't provide download URLs in the update metadata for files that are present on the alternate download server.
>[!NOTE]
>If the "Configure Automatic Updates" policy is disabled, then this policy has no effect.
@@ -84,8 +87,8 @@ Specifies the hours that Windows will use to determine how long to wait before c
To set this setting with Group Policy, navigate to **Computer Configuration\Administrative Templates\Windows Components\Windows Update\Automatic Updates detection frequency**.
-If the setting is set to **Enabled**, Windows will check for available updates at the specified interval.
-If the setting is set to **Disabled** or **Not Configured**, Windows will check for available updates at the default interval of 22 hours.
+If the setting is set to **Enabled**, Windows checks for available updates at the specified interval.
+If the setting is set to **Disabled** or **Not Configured**, Windows checks for available updates at the default interval of 22 hours.
>[!NOTE]
>The "Specify intranet Microsoft update service location" setting must be enabled for this policy to have effect.
@@ -96,7 +99,7 @@ To configure this policy with MDM, use [DetectionFrequency](/windows/client-mana
### Remove access to use all Windows Update features
-By enabling the Group Policy setting under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Remove access to use all Windows update features**, administrators can disable the "Check for updates" option for users. Any background update scans, downloads and installations will continue to work as configured.
+By enabling the Group Policy setting under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Remove access to use all Windows update features**, administrators can disable the "Check for updates" option for users. Any background update scans, downloads, and installations will continue to work as configured.
### Do not connect to any Windows Update Internet locations
@@ -109,11 +112,11 @@ Use **Computer Configuration\Administrative Templates\Windows Components\Windows
### Enable client-side targeting
-Specifies the target group name or names that should be used to receive updates from an intranet Microsoft update service. This allows admins to configure device groups that will receive different updates from sources like WSUS or Configuration Manager.
+Specifies the target group name or names that should be used to receive updates from an intranet Microsoft update service. This allows admins to configure device groups that receive different updates from sources like WSUS or Configuration Manager.
This Group Policy setting can be found under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Enable client-side targeting**.
If the setting is set to **Enabled**, the specified target group information is sent to the intranet Microsoft update service, which uses it to determine which updates should be deployed to this computer.
-If the setting is set to **Disabled** or **Not Configured**, no target group information will be sent to the intranet Microsoft update service.
+If the setting is set to **Disabled** or **Not Configured**, no target group information is sent to the intranet Microsoft update service.
If the intranet Microsoft update service supports multiple target groups, this policy can specify multiple group names separated by semicolons. Otherwise, a single group must be specified.
@@ -147,7 +150,7 @@ Allows admins to exclude Windows Update drivers during updates.
To configure this setting in Group Policy, use **Computer Configuration\Administrative Templates\Windows Components\Windows update\Do not include drivers with Windows Updates**.
Enable this policy to not include drivers with Windows quality updates.
-If you disable or don't configure this policy, Windows Update will include updates that have a Driver classification.
+If you disable or don't configure this policy, Windows Update includes updates that have a Driver classification.
### Configure Automatic Updates
@@ -157,15 +160,15 @@ Enables the IT admin to manage automatic update behavior to scan, download, and
Under **Computer Configuration\Administrative Templates\Windows Components\Windows update\Configure Automatic Updates**, you must select one of the following options:
-**2 - Notify for download and auto install** - When Windows finds updates that apply to this device, users will be notified that updates are ready to be downloaded. After going to **Settings > Update & security > Windows Update**, users can download and install any available updates.
+**2 - Notify for download and auto install** - When Windows finds updates that apply to this device, users are notified that updates are ready to be downloaded. After going to **Settings > Update & security > Windows Update**, users can download and install any available updates.
**3 - Auto download and notify for Install** - Windows finds updates that apply to the device and downloads them in the background (the user isn't notified or interrupted during this process). When the downloads are complete, users will be notified that they're ready to install. After going to **Settings > Update & security > Windows Update**, users can install them.
**4 - Auto download and schedule the install** - Specify the schedule using the options in the Group Policy Setting. For more information about this setting, see [Schedule update installation](waas-restart.md#schedule-update-installation).
-**5 - Allow local admin to choose setting** - With this option, local administrators will be allowed to use the settings app to select a configuration option of their choice. Local administrators won't be allowed to disable the configuration for Automatic Updates. This option isn't available in any Windows 10 or later versions.
+**5 - Allow local admin to choose setting** - With this option, local administrators are allowed to use the settings app to select a configuration option of their choice. Local administrators won't be allowed to disable the configuration for Automatic Updates. This option isn't available in any Windows 10 or later versions.
-**7 - Notify for install and notify for restart** (Windows Server 2016 and later only) - With this option, when Windows finds updates that apply to this device, they'll be downloaded, then users will be notified that updates are ready to be installed. Once updates are installed, a notification will be displayed to users to restart the device.
+**7 - Notify for install and notify for restart** (Windows Server 2016 and later only) - With this option, when Windows finds updates that apply to this device, they are downloaded, then users are notified that updates are ready to be installed. Once updates are installed, a notification is displayed to users to restart the device.
If this setting is set to **Disabled**, any updates that are available on Windows Update must be downloaded and installed manually. To do this, users must go to **Settings > Update & security > Windows Update**.
@@ -257,14 +260,14 @@ HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\
## Display organization name in Windows Update notifications
-When Windows 11 clients are associated with a Microsoft Entra tenant, the organization name appears in the Windows Update notifications. For instance, when you have a compliance deadline configured for Windows Update for Business, the user notification will display a message similar to **Contoso requires important updates to be installed**. The organization name will also display on the **Windows Update** page in the **Settings** for Windows 11.
+When Windows 11 clients are associated with a Microsoft Entra tenant, the organization name appears in the Windows Update notifications. For instance, when you have a compliance deadline configured for Windows Update for Business, the user notification displays a message similar to **Contoso requires important updates to be installed**. The organization name will also display on the **Windows Update** page in the **Settings** for Windows 11.
The organization name appears automatically for Windows 11 clients that are associated with Microsoft Entra ID in any of the following ways:
- [Microsoft Entra joined](/azure/active-directory/devices/concept-azure-ad-join)
- [Microsoft Entra registered](/azure/active-directory/devices/concept-azure-ad-register)
- [Microsoft Entra hybrid joined](/azure/active-directory/devices/concept-azure-ad-join-hybrid)
-To disable displaying the organization name in Windows Update notifications, add or modify the following in the registry:
+To disable displaying the organization name in Windows Update notifications, add or modify the following values in the registry:
- **Registry key**: `HKEY_LOCAL_MACHINE\Software\Microsoft\WindowsUpdate\Orchestrator\Configurations`
- **DWORD value name**: UsoDisableAADJAttribution
diff --git a/windows/deployment/usmt/usmt-loadstate-syntax.md b/windows/deployment/usmt/usmt-loadstate-syntax.md
index 520ba1010a..c13a48e0c7 100644
--- a/windows/deployment/usmt/usmt-loadstate-syntax.md
+++ b/windows/deployment/usmt/usmt-loadstate-syntax.md
@@ -6,7 +6,7 @@ manager: aaroncz
ms.author: frankroj
ms.service: windows-client
author: frankroj
-ms.date: 01/09/2024
+ms.date: 04/30/2024
ms.topic: article
ms.subservice: itpro-deploy
appliesto:
@@ -127,33 +127,33 @@ The `/uel`, `/ue` and `/ui` options can be used together to migrate only the use
## Incompatible command-line options
-The following table indicates which command-line options aren't compatible with the `LoadState.exe` command. If the table entry for a particular combination has a ✔️, the options are compatible, and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
+The following table indicates which command-line options aren't compatible with the `LoadState.exe` command. If the table entry for a particular combination has a ✅, the options are compatible, and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
| Command-Line Option | /keyfile | /nocompress | /genconfig | /all |
|--- |--- |--- |--- |--- |
-| **/i** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/v** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/nocompress** | ✔️ | N/A | ❌ | ✔️ |
-| **/key** | ❌ | ✔️ | ❌ | ✔️ |
-| **/decrypt** | Required* | ❌ | ❌ | ✔️ |
-| **/keyfile** | N/A | ✔️ | ❌ | ✔️ |
-| **/l** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/progress** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/r** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/w** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/c** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/p** | ✔️ | ✔️ | ❌ | N/A |
-| **/all** | ✔️ | ✔️ | ❌ | ✔️ |
-| **/ui** | ✔️ | ✔️ | ❌ | ❌ |
-| **/ue** | ✔️ | ✔️ | ❌ | ❌ |
-| **/uel** | ✔️ | ✔️ | ❌ | ❌ |
-| **/genconfig** | ✔️ | ✔️ | N/A | ✔️ |
-| **/config** | ✔️ | ✔️ | ❌ | ✔️ |
-| *StorePath* | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/md** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/mu** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/lae** | ✔️ | ✔️ | ✔️ | ✔️ |
-| **/lac** | ✔️ | ✔️ | ✔️ | ✔️ |
+| **/i** | ✅ | ✅ | ✅ | ✅ |
+| **/v** | ✅ | ✅ | ✅ | ✅ |
+| **/nocompress** | ✅ | N/A | ❌ | ✅ |
+| **/key** | ❌ | ✅ | ❌ | ✅ |
+| **/decrypt** | Required* | ❌ | ❌ | ✅ |
+| **/keyfile** | N/A | ✅ | ❌ | ✅ |
+| **/l** | ✅ | ✅ | ✅ | ✅ |
+| **/progress** | ✅ | ✅ | ❌ | ✅ |
+| **/r** | ✅ | ✅ | ❌ | ✅ |
+| **/w** | ✅ | ✅ | ❌ | ✅ |
+| **/c** | ✅ | ✅ | ❌ | ✅ |
+| **/p** | ✅ | ✅ | ❌ | N/A |
+| **/all** | ✅ | ✅ | ❌ | ✅ |
+| **/ui** | ✅ | ✅ | ❌ | ❌ |
+| **/ue** | ✅ | ✅ | ❌ | ❌ |
+| **/uel** | ✅ | ✅ | ❌ | ❌ |
+| **/genconfig** | ✅ | ✅ | N/A | ✅ |
+| **/config** | ✅ | ✅ | ❌ | ✅ |
+| *StorePath* | ✅ | ✅ | ✅ | ✅ |
+| **/md** | ✅ | ✅ | ✅ | ✅ |
+| **/mu** | ✅ | ✅ | ✅ | ✅ |
+| **/lae** | ✅ | ✅ | ✅ | ✅ |
+| **/lac** | ✅ | ✅ | ✅ | ✅ |
> [!NOTE]
>
diff --git a/windows/deployment/usmt/usmt-requirements.md b/windows/deployment/usmt/usmt-requirements.md
index 1ed79eb022..cdb3d41096 100644
--- a/windows/deployment/usmt/usmt-requirements.md
+++ b/windows/deployment/usmt/usmt-requirements.md
@@ -6,7 +6,7 @@ manager: aaroncz
ms.author: frankroj
ms.service: windows-client
author: frankroj
-ms.date: 01/18/2024
+ms.date: 04/30/2024
ms.topic: article
ms.subservice: itpro-deploy
appliesto:
@@ -24,10 +24,10 @@ The following table lists the operating systems supported in USMT.
| Operating Systems | ScanState (Source Device)| LoadState (Destination Device)|
|--- |--- |--- |
-|Windows 7|✔️|❌|
-|Windows 8|✔️|❌|
-|Windows 10|✔️|✔️|
-|Windows 11|✔️|✔️|
+|Windows 7|✅|❌|
+|Windows 8|✅|❌|
+|Windows 10|✅|✅|
+|Windows 11|✅|✅|
> [!NOTE]
>
@@ -79,7 +79,7 @@ To open an elevated command prompt:
### Specify the `/c` option and \ settings in the `Config.xml` file
-USMT fails if it can't migrate a file or setting, unless the `/c` option is specified. When the `/c` option is specified, USMT logs an error each time it encounters a file that is in use that didn't migrate, but the migration isn't be interrupted. In USMT, which types of errors should allow the migration to continue and which should cause the migration to fail can be specified in the `Config.xml` file. For more information about error reporting, and the **\** element, see [Config.xml file](usmt-configxml-file.md#errorcontrol), [Log files](usmt-log-files.md), and [XML elements library](usmt-xml-elements-library.md).
+USMT fails if it can't migrate a file or setting, unless the `/c` option is specified. When the `/c` option is specified, USMT logs an error each time it encounters a file that is in use that didn't migrate, but the migration isn't to be interrupted. In USMT, which types of errors should allow the migration to continue and which should cause the migration to fail can be specified in the `Config.xml` file. For more information about error reporting, and the **\** element, see [Config.xml file](usmt-configxml-file.md#errorcontrol), [Log files](usmt-log-files.md), and [XML elements library](usmt-xml-elements-library.md).
## LoadState
diff --git a/windows/deployment/usmt/usmt-scanstate-syntax.md b/windows/deployment/usmt/usmt-scanstate-syntax.md
index 5b74859a02..82d4e9ada4 100644
--- a/windows/deployment/usmt/usmt-scanstate-syntax.md
+++ b/windows/deployment/usmt/usmt-scanstate-syntax.md
@@ -6,7 +6,7 @@ manager: aaroncz
ms.author: frankroj
ms.service: windows-client
author: frankroj
-ms.date: 01/09/2024
+ms.date: 04/30/2024
ms.topic: article
ms.subservice: itpro-deploy
appliesto:
@@ -85,7 +85,7 @@ There are several benefits to running the `ScanState.exe` command on an offline
- **Improved success of migration.**
The migration success rate is increased because:
-
+
- Files aren't locked for editing while offline.
- WinPE provides administrator access to files in the offline Windows file system, eliminating the need for administrator-level access to the online system.
@@ -197,33 +197,33 @@ For more information, see [Migrate EFS Files and Certificates](usmt-migrate-efs-
## Incompatible command-line options
-The following table indicates which command-line options aren't compatible with the `ScanState.exe` command. If the table entry for a particular combination has a ✔️, the options are compatible and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
+The following table indicates which command-line options aren't compatible with the `ScanState.exe` command. If the table entry for a particular combination has a ✅, the options are compatible and they can be used together. The ❌ symbol means that the options aren't compatible. For example, the `/nocompress` option can't be used with the `/encrypt` option.
|Command-Line Option|/keyfile|/nocompress|/genconfig|/all|
|--- |--- |--- |--- |--- |
-|**/i**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/o**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/v**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/nocompress**| ✔️ | ✔️ | ✔️ |N/A|
-|**/localonly**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/key**| ❌ | ✔️ | ❌ | ✔️ |
-|**/encrypt**|Required*| ❌ | ❌ | ✔️ |
-|**/keyfile**|N/A| ✔️ | ❌ | ✔️ |
-|**/l**| ✔️ | ✔️ | ✔️ | ✔️ |
-|**/listfiles**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/progress**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/r**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/w**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/c**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/p**| ✔️ | ✔️ | ❌ |N/A|
-|**/all**| ✔️ | ✔️ | ❌ | ✔️ |
-|**/ui**| ✔️ | ✔️ | ❌ | ❌ |
-|**/ue**| ✔️ | ✔️ | ❌ | ❌ |
-|**/uel**| ✔️ | ✔️ | ❌ | ❌ |
-|**/efs**:*\