update

education/windows/index.yml

@@ -1,6 +1,6 @@
 ### YamlMime:Landing
 
-title: Windows security # < 60 chars
+title: Windows for Education # < 60 chars
 summary: Built with Zero Trust principles... BLURB TO UPDATE  # < 160 chars
 
 metadata:
@@ -30,7 +30,7 @@ landingContent:
 # Cards and links should be based on top customer tasks or top subjects
 # Start card title with a verb
   # Card (optional)
-  - title: School Deployment2
+  - title: Set up School PCs
     linkLists:
       - linkListType: overview
         links:
@@ -45,13 +45,13 @@ landingContent:
 # Cards and links should be based on top customer tasks or top subjects
 # Start card title with a verb
   # Card (optional)
-  - title: School Deployment3
+  - title: Configure devices
     linkLists:
-      - linkListType: overview
+      - linkListType: Take a test
         links:
         - text: Overview
           url: overview.md
-      - linkListType: concept
+      - linkListType: Change Windows editions
         links:
         - text: System security
           url: overview.md

education/windows/school-deployment/enroll-autopilot.md

@@ -113,6 +113,17 @@ Once the dynamic device group is created, it can be used for assigning Windows A
 
 For more information, see [Configure Autopilot profiles](/mem/autopilot/profiles).
 
+### 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.
+
+To deploy the ESP to devices, you need to create an ESP profile in Microsoft Endpoint Manager.
+
+For more information, see [Set up the Enrollment Status Page][MEM-3].
+
+> [!CAUTION]
+> When targeting an ESP to **Windows 11 SE devices**, only approved apps should be included as part of the ESP configuration.
+
 ### Enrollment Status Page reference here
 ## branding reference here
 ### Autopilot end-user experience
@@ -134,4 +145,11 @@ ________________________________________________________
 
 > [!div class="nextstepaction"]
 > [< Enroll devices](enroll-overview.md)
-> [Manage devices >](manage-overview.md)
+> [Manage devices >](manage-overview.md)
+
+
+
+<!-- Reference links in article -->
+
+
+[MEM-3]: /mem/intune/enrollment/windows-enrollment-status

education/windows/school-deployment/enroll-package.md

@@ -22,7 +22,7 @@ appliesto:
 Enrolling devices with provisioning packages is an efficient way to enroll large number of Windows devices in an education environment. Some of the benefits of provisioning packages are:
 
 - There are no particular hardware dependencies on the devices to complete the enrollment process
-- They work with different hardware configurations, across different makes and models
+- Devices do not 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.
@@ -45,7 +45,6 @@ The devices will be joined to Azure Active Directory and automatically enrolled
 For more information on prerequisites, configuration, and recommendations, see [Use the Set Up School PCs app][1].
 
 
-
 ### 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 Azure AD and enroll automatically in Intune.

education/windows/school-deployment/microsoft-education.md

@@ -1,6 +1,6 @@
 ---
 title: Microsoft Education
-description: Microsoft Education
+description: overview of Microsoft Education
 ms.date: 08/31/2022
 ms.prod: windows
 ms.technology: windows
@@ -24,12 +24,12 @@ Historically, school IT administrators and educators have struggled to find an e
 Microsoft 365 Education provides tools and services that enable simplified management of all devices through Microsoft Endpoint Manager (MEM). With MEM, IT administrators have the flexibility to support diverse scenarios, including both school-owned devices and bring-your-own devices.
 Microsoft Endpoint Manager services include:
 
-- [Microsoft Intune](/mem/intune/fundamentals/what-is-intune)
+- [Microsoft Intune][MEM-1]
-- [Microsoft Intune for Education](/intune-education/what-is-intune-for-education)
+- [Microsoft Intune for Education][INT-1]
-- Configuration Manager
+- [Configuration Manager][MEM-2]
-- Desktop Analytics
+- [Desktop Analytics][MEM-3]
-- Windows Autopilot
+- [Windows Autopilot][MEM-4]
-- [Surface Management Portal](/surface/surface-management-portal)
+- [Surface Management Portal][MEM-5]
 
 These services are part of the Microsoft 365 stack to help secure access, protect data, and manage risk.
 
@@ -54,3 +54,13 @@ In the remainder of this document, we'll discuss the key concepts and benefits o
 - **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
+
+<!-- Reference links in article -->
+
+[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

education/windows/school-deployment/set-up-azure-ad.md

@@ -1,6 +1,6 @@
 ---
-title: Set up your tenant
+title: Set up Azure Active Directory
-description: How to create and prepare your tenant for an education environment 
+description: How to create and prepare your Azure AD tenant for an education environment 
 ms.date: 08/31/2022
 ms.prod: windows
 ms.technology: windows
@@ -14,16 +14,20 @@ ms.collection: education
 #appliesto:
 ---
 
-# Set up your tenant
+# Set up Azure Active Directory
 
 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.
 
-Azure Active Directory (Azure AD), which is included with the Microsoft 365 Education subscription, provides authentication and authorization to any Microsoft cloud services. Identity objects are defined in Azure AD 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 will 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.
+Azure Active Directory (Azure AD), which is included with the Microsoft 365 Education subscription, provides authentication and authorization to any Microsoft cloud services. Identity objects are defined in Azure AD 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.
 
-## Set up a Microsoft 365 Education tenant
+In this section you will:
+> [!div class="checklist"]
+> * Set up a Microsoft 365 Education tenant
+> * Add users, create groups, and assign licenses
+> * Configure school branding
+> * Enable bulk enrollment
 
-In this section, you'll create and configure a Microsoft 365 tenant and explore the Microsoft 365 admin center.
+## Create a Microsoft 365 tenant
-### Create a Microsoft 365 tenant
 
 If you don't already have a Microsoft 365 tenant, you'll need to create one.
 
@@ -158,9 +162,10 @@ ________________________________________________________
 > * Configure school branding
 > * Enable bulk enrollment
 
-With users and groups created, and licensed for Microsoft 365 Education, you're ready to set up and manage students' and teachers' devices. To set up devices, you need to first configure Microsoft Intune.
+With users and groups created, and licensed for Microsoft 365 Education, you can now configure Microsoft Intune.
+
 > [!div class="nextstepaction"]
-> [Set up Microsoft Intune >](set-up-microsoft-intune.md)
+> [Next section: Set up Microsoft Intune >](set-up-microsoft-intune.md)
 
 <!-- Reference links in article -->
 

education/windows/school-deployment/set-up-microsoft-intune.md

@@ -25,9 +25,9 @@ Microsoft Intune is one of the services provided by Microsoft Endpoint Manager.
 
 :::image type="content" source="./images/intune-education-portal.png" alt-text="Intune for Education dashboard" 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 or wipe devices, ensuring they're ready for the next year.
+**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](/intune-education/what-is-intune-for-education).
+For more information, see [Intune for Education documentation][INT-1].
 
 In this section, you'll configure the Intune service to enroll and configure devices in your school.
 
@@ -37,11 +37,11 @@ Before configuring settings with Intune for Education, consider the following pr
 
 - **Intune subscription.** Microsoft Intune is licensed in three ways:
   - As a standalone service
-  - As part of [Enterprise Mobility + Security](https://www.microsoft.com/microsoft-365/enterprise-mobility-security)
+  - As part of [Enterprise Mobility + Security][MSFT-1]
-  - As part of a [Microsoft 365 Education subscription](https://www.microsoft.com/licensing/product-licensing/microsoft-365-education)
+  - As part of a [Microsoft 365 Education subscription][MSFT-2]
-- **Device platform.** Devices running a supported version of Windows 10, Windows 11, Windows 11 SE, iOS, and iPad OS
+- **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/intune/fundamentals/licenses) and [this comparison sheet](https://edudownloads.azureedge.net/msdownloads/Microsoft-Modern-Work-Plan-Comparison-Education_11-2021.pdf), which includes a table detailing the Microsoft Modern Work Plan for Education.
+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
 
@@ -64,18 +64,7 @@ To block personally owned Windows devices from enrolling:
 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/intune/enrollment/enrollment-restrictions-set).
+For more information, see [Create a device platform restriction][MEM-2].
-
-### 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.
-
-To deploy the ESP to devices, you need to create an ESP profile in Microsoft Endpoint Manager.
-
-For more information, see [Set up the Enrollment Status Page](/mem/intune/enrollment/windows-enrollment-status).
-
-> [!CAUTION]
-> When targeting an ESP to **Windows 11 SE devices**, only approved apps should be included as part of the ESP configuration.
 
 ### Disable Windows Hello for Business
 
@@ -91,67 +80,7 @@ To disable Windows Hello for Business at the tenant level:
 
 :::image type="content" source="./images/whfb-disable.png" alt-text="Disablement of Windows Hello for Business from Microsoft Endpoint Manager admin center" border="true":::
 
-For more information how to enable Windows Hello for Business on specific devices, see [Create a Windows Hello for Business policy](/mem/intune/protect/windows-hello#create-a-windows-hello-for-business-policy).
+For more information how to enable Windows Hello for Business on specific devices, see [Create a Windows Hello for Business policy][MEM-4].
-
-## Configure device settings
-
-With Intune for Education, you can configure settings for users and devices in the school. 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.** Configure a selection of settings that are most used in school environments
-- **Group settings.** Configure all settings for any group of devices or users
-
-> [!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.
-
-### 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.
-
-For more information, see [Express Configuration in Intune for Education](/intune-education/express-configuration-intune-edu).
-
-> [!TIP]
-> To learn more, and practice step-by-step Express Configuration in Intune for Education, try <a href="https://www.microsoft.com/en-us/education/interactive-demos/deploy-apps-and-policies" target="_blank"><b>this interactive demo</b></a>.
-
-### 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 <a href="https://intuneeducation.portal.azure.com/" target="_blank"><b>Intune for Education portal</b></a>
-1. Select **Groups** > Pick a group to manage
-1. Select **Windows device settings**
-1. Expand the different categories and review information about individual settings
-
-For more information, see [Set up Intune for Education](/microsoft-365/education/deploy/use-intune-for-education).
-
-## Configure applications
-
-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" border="true":::
-
-Applications can be deployed 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
-
-For more information:
-
-- [Install apps for all users](/microsoft-365/education/deploy/use-intune-for-education)
-- [Add desktop apps](/intune-education/add-desktop-apps-edu) 
-- [Add web apps](/intune-education/add-web-apps-edu)
-
-### Considerations for Windows 11 SE
-
-Windows 11 SE supports all web applications and a set of native applications.
-You can prepare and add an app to Microsoft Intune as a Win32 app from the [approved app list](/education/windows/windows-11-se-overview).
-
-> [!NOTE]
-> If the applications you need aren't included in the list, anyone in your school district can submit an application request at <a href="https://edusupport.microsoft.com/support?product_id=win11se" target="_blank"><b>Microsoft Education Support</b></a>.
 
 ________________________________________________________
 ## Section review and next steps
@@ -163,6 +92,25 @@ ________________________________________________________
 > * Configure applications
 
 With the Intune service configured, you can start enrolling and managing students' and teachers' devices.
+
 > [!div class="nextstepaction"]
-> [< Set up your tenant](set-up-your-tenant.md)
+> [< Previous section: Set up Azure AD](set-up-Azure-AD.md)
-> [Enroll devices >](enroll-overview.md)
+> [Next section: Enroll devices >](enroll-overview.md)
+
+<!-- Reference links in article -->
+
+[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
+[INT-2]: /intune-education/express-configuration-intune-edu
+[INT-3]: /microsoft-365/education/deploy/use-intune-for-education
+[INT-4]: /intune-education/add-desktop-apps-edu
+[INT-5]: /intune-education/add-web-apps-edu
+
+[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
+
+[EDU-1]: /education/windows/windows-11-se-overview

education/windows/school-deployment/toc.yml

@@ -6,8 +6,8 @@ items:
   - name: 1 . Prepare your tenant
     items:
       - name: Overview
-        href: set-up-your-tenant.md
+        href: set-up-azure-ad.md
-      - name: Set up your tenant
+      - name: Set up Azure Active Directory
         href: set-up-your-tenant.md
       - name: Set up Microsoft Intune
         href: set-up-microsoft-intune.md