From 84ac8199e340800e23e679759e8d113fc011b81f Mon Sep 17 00:00:00 2001 From: Sriraman M S <45987684+msbemba@users.noreply.github.com> Date: Tue, 8 Nov 2022 20:02:04 +0530 Subject: [PATCH 01/13] Update windows-10-deployment-scenarios.md windows 10 subscription activation is Dynamic deployment reference - https://learn.microsoft.com/en-us/windows/deployment/windows-10-deployment-scenarios?source=docs#dynamic Per issue#https://github.com/MicrosoftDocs/windows-itpro-docs/issues/10823 --- windows/deployment/windows-10-deployment-scenarios.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/deployment/windows-10-deployment-scenarios.md b/windows/deployment/windows-10-deployment-scenarios.md index 3d06ff84bb..4627e3d824 100644 --- a/windows/deployment/windows-10-deployment-scenarios.md +++ b/windows/deployment/windows-10-deployment-scenarios.md @@ -108,7 +108,7 @@ The goal of dynamic provisioning is to take a new PC out of the box, turn it on, ### Windows 10 Subscription Activation -Windows 10 Subscription Activation is a modern deployment method that enables you to change the SKU from Pro to Enterprise with no keys and no reboots. For more information about Subscription Activation, see [Windows 10 Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation). +Windows 10 Subscription Activation is a dynamic deployment method that enables you to change the SKU from Pro to Enterprise with no keys and no reboots. For more information about Subscription Activation, see [Windows 10 Subscription Activation](/windows/deployment/windows-10-enterprise-subscription-activation). ### Azure Active Directory (Azure AD) join with automatic mobile device management (MDM) enrollment @@ -191,4 +191,4 @@ The deployment process for the replace scenario is as follows: - [Deploy Windows 10 with the Microsoft Deployment Toolkit](./deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md) - [Windows setup technical reference](/windows-hardware/manufacture/desktop/windows-setup-technical-reference) - [Windows Imaging and Configuration Designer](/windows/configuration/provisioning-packages/provisioning-install-icd) -- [UEFI firmware](/windows-hardware/design/device-experiences/oem-uefi) \ No newline at end of file +- [UEFI firmware](/windows-hardware/design/device-experiences/oem-uefi) From f05acc8d16f3fea39ff3a1f3edba7ffb7c699dd9 Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:28:10 -0500 Subject: [PATCH 02/13] Metadata updates --- education/windows/autopilot-reset.md | 7 ++++--- education/windows/change-home-to-edu.md | 3 +-- education/windows/change-to-pro-education.md | 7 ++++--- education/windows/chromebook-migration-guide.md | 2 +- education/windows/configure-windows-for-education.md | 2 +- .../windows/deploy-windows-10-in-a-school-district.md | 2 +- education/windows/deploy-windows-10-in-a-school.md | 2 +- education/windows/deploy-windows-10-overview.md | 2 +- education/windows/edu-deployment-recommendations.md | 2 +- education/windows/edu-stickers.md | 7 ++++--- education/windows/edu-take-a-test-kiosk-mode.md | 4 +--- education/windows/edu-themes.md | 3 +-- .../windows/education-scenarios-store-for-business.md | 4 +--- education/windows/enable-s-mode-on-surface-go-devices.md | 2 +- education/windows/federated-sign-in.md | 4 ++-- education/windows/get-minecraft-for-education.md | 9 ++++----- education/windows/s-mode-switch-to-edu.md | 2 +- education/windows/school-get-minecraft.md | 7 ++++--- education/windows/set-up-school-pcs-azure-ad-join.md | 2 +- .../windows/set-up-school-pcs-provisioning-package.md | 2 +- education/windows/set-up-school-pcs-technical.md | 2 +- education/windows/set-up-school-pcs-whats-new.md | 3 +-- education/windows/set-up-students-pcs-to-join-domain.md | 2 +- education/windows/set-up-students-pcs-with-apps.md | 2 +- education/windows/set-up-windows-10.md | 2 +- education/windows/take-a-test-app-technical.md | 4 +--- education/windows/take-tests-in-windows.md | 4 +--- education/windows/teacher-get-minecraft.md | 9 ++++----- education/windows/test-windows10s-for-edu.md | 7 ++++--- .../tutorial-school-deployment/configure-device-apps.md | 4 +--- .../configure-device-settings.md | 4 +--- .../configure-devices-overview.md | 4 +--- .../windows/tutorial-school-deployment/enroll-aadj.md | 4 +--- .../tutorial-school-deployment/enroll-autopilot.md | 4 +--- .../tutorial-school-deployment/enroll-overview.md | 4 +--- .../windows/tutorial-school-deployment/enroll-package.md | 4 +--- .../tutorial-school-deployment/manage-overview.md | 6 ++---- .../tutorial-school-deployment/manage-surface-devices.md | 4 ++-- .../windows/tutorial-school-deployment/reset-wipe.md | 4 +--- .../tutorial-school-deployment/troubleshoot-overview.md | 4 +--- education/windows/use-set-up-school-pcs-app.md | 2 +- education/windows/windows-11-se-overview.md | 7 ++++--- education/windows/windows-11-se-settings-list.md | 2 +- .../windows/windows-editions-for-education-customers.md | 2 +- 44 files changed, 71 insertions(+), 98 deletions(-) diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md index b261f4a4e9..ef0d5e186c 100644 --- a/education/windows/autopilot-reset.md +++ b/education/windows/autopilot-reset.md @@ -3,10 +3,11 @@ title: Reset devices with Autopilot Reset description: Learn about Autopilot Reset and how to enable and use it. ms.date: 08/10/2022 ms.topic: how-to -appliesto: - - ✅ Windows 10 -ms.collection: +appliesto: + - ✅ Windows 10" +ms.collection: - highpri + - education --- # Reset devices with Autopilot Reset diff --git a/education/windows/change-home-to-edu.md b/education/windows/change-home-to-edu.md index d6aa215ab3..1826ecd768 100644 --- a/education/windows/change-home-to-edu.md +++ b/education/windows/change-home-to-edu.md @@ -8,8 +8,7 @@ ms.author: scbree ms.reviewer: paoloma manager: jeffbu appliesto: -- ✅ Windows 10 -- ✅ Windows 11 + - ✅ Windows 10 and later --- # Upgrade Windows Home to Windows Education on student-owned devices diff --git a/education/windows/change-to-pro-education.md b/education/windows/change-to-pro-education.md index 5deee8e80f..76f00168ee 100644 --- a/education/windows/change-to-pro-education.md +++ b/education/windows/change-to-pro-education.md @@ -3,10 +3,11 @@ title: Change to Windows 10 Education from Windows 10 Pro description: Learn how IT Pros can opt into changing to Windows 10 Pro Education from Windows 10 Pro. ms.topic: how-to ms.date: 08/10/2022 -appliesto: - - ✅ Windows 10 -ms.collection: +appliesto: + - ✅ Windows 10" +ms.collection: - highpri + - education --- # Change to Windows 10 Pro Education from Windows 10 Pro diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index 0c08e17617..05c7db8963 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -4,7 +4,7 @@ description: Learn how to migrate a Google Chromebook-based learning environment ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Chromebook migration guide diff --git a/education/windows/configure-windows-for-education.md b/education/windows/configure-windows-for-education.md index 6ef47f7153..587d279c84 100644 --- a/education/windows/configure-windows-for-education.md +++ b/education/windows/configure-windows-for-education.md @@ -4,7 +4,7 @@ description: Learn how to configure the OS diagnostic data, consumer experiences ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Windows 10 configuration recommendations for education customers diff --git a/education/windows/deploy-windows-10-in-a-school-district.md b/education/windows/deploy-windows-10-in-a-school-district.md index 6d13cc8c9d..4935d37ed7 100644 --- a/education/windows/deploy-windows-10-in-a-school-district.md +++ b/education/windows/deploy-windows-10-in-a-school-district.md @@ -4,7 +4,7 @@ description: Learn how to deploy Windows 10 in a school district. Integrate the ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Deploy Windows 10 in a school district diff --git a/education/windows/deploy-windows-10-in-a-school.md b/education/windows/deploy-windows-10-in-a-school.md index cb598bc6fd..1655458c44 100644 --- a/education/windows/deploy-windows-10-in-a-school.md +++ b/education/windows/deploy-windows-10-in-a-school.md @@ -4,7 +4,7 @@ description: Learn how to integrate your school environment with Microsoft Offic ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Deploy Windows 10 in a school diff --git a/education/windows/deploy-windows-10-overview.md b/education/windows/deploy-windows-10-overview.md index 8b772d160c..96d9d002e0 100644 --- a/education/windows/deploy-windows-10-overview.md +++ b/education/windows/deploy-windows-10-overview.md @@ -4,7 +4,7 @@ description: Learn how to use Windows 10 in schools. ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Windows 10 for Education diff --git a/education/windows/edu-deployment-recommendations.md b/education/windows/edu-deployment-recommendations.md index 983f31ed85..17302ec0a3 100644 --- a/education/windows/edu-deployment-recommendations.md +++ b/education/windows/edu-deployment-recommendations.md @@ -4,7 +4,7 @@ description: Provides guidance on ways to customize the OS privacy settings, and ms.topic: guide ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Deployment recommendations for school IT administrators diff --git a/education/windows/edu-stickers.md b/education/windows/edu-stickers.md index 0c40174ed0..2595b618f0 100644 --- a/education/windows/edu-stickers.md +++ b/education/windows/edu-stickers.md @@ -3,10 +3,11 @@ title: Configure Stickers for Windows 11 SE description: Learn about the Stickers feature and how to configure it via Intune and provisioning package. ms.date: 09/15/2022 ms.topic: how-to -appliesto: - - ✅ Windows 11 SE, version 22H2 -ms.collection: +appliesto: + - ✅ Windows 11 SE" +ms.collection: - highpri + - education --- # Configure Stickers for Windows 11 SE diff --git a/education/windows/edu-take-a-test-kiosk-mode.md b/education/windows/edu-take-a-test-kiosk-mode.md index a3d8944c42..85ce5efe26 100644 --- a/education/windows/edu-take-a-test-kiosk-mode.md +++ b/education/windows/edu-take-a-test-kiosk-mode.md @@ -4,9 +4,7 @@ description: Learn how to configure Windows to execute the Take a Test app in ki ms.date: 09/30/2022 ms.topic: how-to appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Configure Take a Test in kiosk mode diff --git a/education/windows/edu-themes.md b/education/windows/edu-themes.md index a477121ca5..1d00d1e8a9 100644 --- a/education/windows/edu-themes.md +++ b/education/windows/edu-themes.md @@ -4,8 +4,7 @@ description: Learn about education themes for Windows 11 and how to configure th ms.date: 09/15/2022 ms.topic: how-to appliesto: -- ✅ Windows 11, version 22H2 -- ✅ Windows 11 SE, version 22H2 + - ✅ Windows 11 --- # Configure education themes for Windows 11 diff --git a/education/windows/education-scenarios-store-for-business.md b/education/windows/education-scenarios-store-for-business.md index cf50d7cf3e..1a86e4e1c4 100644 --- a/education/windows/education-scenarios-store-for-business.md +++ b/education/windows/education-scenarios-store-for-business.md @@ -4,9 +4,7 @@ description: Learn how IT admins and teachers can use Microsoft Store for Educat ms.topic: article ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Working with Microsoft Store for Education diff --git a/education/windows/enable-s-mode-on-surface-go-devices.md b/education/windows/enable-s-mode-on-surface-go-devices.md index 39f39952b6..6fa45fd3e7 100644 --- a/education/windows/enable-s-mode-on-surface-go-devices.md +++ b/education/windows/enable-s-mode-on-surface-go-devices.md @@ -4,7 +4,7 @@ description: Learn how to enable S mode on Surface Go devices. ms.date: 08/10/2022 ms.topic: how-to appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Surface Go for Education - Enabling S mode diff --git a/education/windows/federated-sign-in.md b/education/windows/federated-sign-in.md index 0f769a31e1..8159e325ab 100644 --- a/education/windows/federated-sign-in.md +++ b/education/windows/federated-sign-in.md @@ -8,11 +8,11 @@ ms.topic: how-to ms.localizationpriority: medium author: paolomatarazzo ms.author: paoloma -ms.reviewer: +ms.reviewer: manager: aaroncz ms.collection: education appliesto: -- ✅ Windows 11 SE, version 22H2 + - ✅ Windows 11 SE --- diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 3bd2273634..7130259b1a 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -3,12 +3,11 @@ title: Get Minecraft Education Edition description: Learn how to get and distribute Minecraft Education Edition. ms.topic: how-to ms.date: 08/10/2022 -appliesto: - - ✅ Windows 10 - - ✅ Windows 11 - - ✅ Windows 11 SE -ms.collection: +appliesto: + - ✅ Windows 10 and later" +ms.collection: - highpri + - education --- # Get Minecraft: Education Edition diff --git a/education/windows/s-mode-switch-to-edu.md b/education/windows/s-mode-switch-to-edu.md index 612de4cf4c..fafc2716c8 100644 --- a/education/windows/s-mode-switch-to-edu.md +++ b/education/windows/s-mode-switch-to-edu.md @@ -4,7 +4,7 @@ description: Learn how to switch out of Windows 10 Pro in S mode to Windows 10 P ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 9ff9ce8dcd..8e26d1acea 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -3,10 +3,11 @@ title: For IT administrators get Minecraft Education Edition description: Learn how IT admins can get and distribute Minecraft in their schools. ms.topic: how-to ms.date: 08/10/2022 -appliesto: - - ✅ Windows 10 -ms.collection: +appliesto: + - ✅ Windows 10" +ms.collection: - highpri + - education --- # For IT administrators - get Minecraft: Education Edition diff --git a/education/windows/set-up-school-pcs-azure-ad-join.md b/education/windows/set-up-school-pcs-azure-ad-join.md index 6eba776f7d..8ba0185e3d 100644 --- a/education/windows/set-up-school-pcs-azure-ad-join.md +++ b/education/windows/set-up-school-pcs-azure-ad-join.md @@ -4,7 +4,7 @@ description: Learn how Azure AD Join is configured in the Set up School PCs app. ms.topic: article ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Azure AD Join for school PCs diff --git a/education/windows/set-up-school-pcs-provisioning-package.md b/education/windows/set-up-school-pcs-provisioning-package.md index ffee7c5880..58b9ae8063 100644 --- a/education/windows/set-up-school-pcs-provisioning-package.md +++ b/education/windows/set-up-school-pcs-provisioning-package.md @@ -4,7 +4,7 @@ description: List of the provisioning package settings that are configured in th ms.date: 08/10/2022 ms.topic: reference appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # What's in my provisioning package? diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 9f2ecc9d8e..28907160cb 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -4,7 +4,7 @@ description: Describes the purpose of the Set up School PCs app for Windows 10 d ms.topic: conceptual ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # What is Set up School PCs? diff --git a/education/windows/set-up-school-pcs-whats-new.md b/education/windows/set-up-school-pcs-whats-new.md index c36b901f8f..2b46d073f5 100644 --- a/education/windows/set-up-school-pcs-whats-new.md +++ b/education/windows/set-up-school-pcs-whats-new.md @@ -4,8 +4,7 @@ description: Find out about app updates and new features in Set up School PCs. ms.topic: whats-new ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 -- ✅ Windows 11 + - ✅ Windows 10 and later --- # What's new in Set up School PCs diff --git a/education/windows/set-up-students-pcs-to-join-domain.md b/education/windows/set-up-students-pcs-to-join-domain.md index 16f670b6fa..91f2ad28d1 100644 --- a/education/windows/set-up-students-pcs-to-join-domain.md +++ b/education/windows/set-up-students-pcs-to-join-domain.md @@ -4,7 +4,7 @@ description: Learn how to use Windows Configuration Designer to provision studen ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Set up student PCs to join domain diff --git a/education/windows/set-up-students-pcs-with-apps.md b/education/windows/set-up-students-pcs-with-apps.md index 679bb7206f..cf16da56b2 100644 --- a/education/windows/set-up-students-pcs-with-apps.md +++ b/education/windows/set-up-students-pcs-with-apps.md @@ -4,7 +4,7 @@ description: Learn how to use Windows Configuration Designer to easily provision ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Provision student PCs with apps diff --git a/education/windows/set-up-windows-10.md b/education/windows/set-up-windows-10.md index c137703898..61f6b28d77 100644 --- a/education/windows/set-up-windows-10.md +++ b/education/windows/set-up-windows-10.md @@ -4,7 +4,7 @@ description: Decide which option for setting up Windows 10 is right for you. ms.topic: article ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Set up Windows devices for education diff --git a/education/windows/take-a-test-app-technical.md b/education/windows/take-a-test-app-technical.md index 9b5498d558..daab02821c 100644 --- a/education/windows/take-a-test-app-technical.md +++ b/education/windows/take-a-test-app-technical.md @@ -4,9 +4,7 @@ description: List of policies and settings applied by the Take a Test app. ms.date: 09/30/2022 ms.topic: reference appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Take a Test app technical reference diff --git a/education/windows/take-tests-in-windows.md b/education/windows/take-tests-in-windows.md index 68472404be..1eea480188 100644 --- a/education/windows/take-tests-in-windows.md +++ b/education/windows/take-tests-in-windows.md @@ -4,9 +4,7 @@ description: Learn about the built-in Take a Test app for Windows and how to use ms.date: 09/30/2022 ms.topic: conceptual appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Take tests and assessments in Windows diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md index ee529257c0..685a738970 100644 --- a/education/windows/teacher-get-minecraft.md +++ b/education/windows/teacher-get-minecraft.md @@ -3,12 +3,11 @@ title: For teachers get Minecraft Education Edition description: Learn how teachers can obtain and distribute Minecraft. ms.topic: how-to ms.date: 08/10/2022 -appliesto: - - ✅ Windows 10 - - ✅ Windows 11 - - ✅ Windows 11 SE -ms.collection: +appliesto: + - ✅ Windows 10 and later" +ms.collection: - highpri + - education --- # For teachers - get Minecraft: Education Edition diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index acc6aeb868..a1a41bcf5e 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -3,10 +3,11 @@ title: Test Windows 10 in S mode on existing Windows 10 education devices description: Provides guidance on downloading and testing Windows 10 in S mode for existing Windows 10 education devices. ms.topic: guide ms.date: 08/10/2022 -appliesto: - - ✅ Windows 10 -ms.collection: +appliesto: + - ✅ Windows 10" +ms.collection: - highpri + - education --- # Test Windows 10 in S mode on existing Windows 10 education devices diff --git a/education/windows/tutorial-school-deployment/configure-device-apps.md b/education/windows/tutorial-school-deployment/configure-device-apps.md index 694a87c643..89eb913446 100644 --- a/education/windows/tutorial-school-deployment/configure-device-apps.md +++ b/education/windows/tutorial-school-deployment/configure-device-apps.md @@ -4,9 +4,7 @@ description: Learn how to configure applications with Microsoft Intune in prepar ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Configure applications with Microsoft Intune diff --git a/education/windows/tutorial-school-deployment/configure-device-settings.md b/education/windows/tutorial-school-deployment/configure-device-settings.md index d2f56961ab..f70081a995 100644 --- a/education/windows/tutorial-school-deployment/configure-device-settings.md +++ b/education/windows/tutorial-school-deployment/configure-device-settings.md @@ -4,9 +4,7 @@ description: Learn how to configure policies with Microsoft Intune in preparatio ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Configure and secure devices with Microsoft Intune diff --git a/education/windows/tutorial-school-deployment/configure-devices-overview.md b/education/windows/tutorial-school-deployment/configure-devices-overview.md index 32b237ce5a..60bc205647 100644 --- a/education/windows/tutorial-school-deployment/configure-devices-overview.md +++ b/education/windows/tutorial-school-deployment/configure-devices-overview.md @@ -4,9 +4,7 @@ description: Learn how to configure policies and applications in preparation for ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Configure settings and applications with Microsoft Intune diff --git a/education/windows/tutorial-school-deployment/enroll-aadj.md b/education/windows/tutorial-school-deployment/enroll-aadj.md index 829124e264..ddcb5d2bb8 100644 --- a/education/windows/tutorial-school-deployment/enroll-aadj.md +++ b/education/windows/tutorial-school-deployment/enroll-aadj.md @@ -4,9 +4,7 @@ description: Learn how to join devices to Azure AD from OOBE and automatically g ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Automatic Intune enrollment via Azure AD join diff --git a/education/windows/tutorial-school-deployment/enroll-autopilot.md b/education/windows/tutorial-school-deployment/enroll-autopilot.md index 85c838b402..01394b420a 100644 --- a/education/windows/tutorial-school-deployment/enroll-autopilot.md +++ b/education/windows/tutorial-school-deployment/enroll-autopilot.md @@ -4,9 +4,7 @@ description: Learn how to join Azure AD and enroll in Intune using Windows Autop ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Windows Autopilot diff --git a/education/windows/tutorial-school-deployment/enroll-overview.md b/education/windows/tutorial-school-deployment/enroll-overview.md index 52fb94bc7a..d816ed1b94 100644 --- a/education/windows/tutorial-school-deployment/enroll-overview.md +++ b/education/windows/tutorial-school-deployment/enroll-overview.md @@ -4,9 +4,7 @@ description: Learn about the different options to enroll Windows devices in Micr ms.date: 08/31/2022 ms.topic: overview appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Device enrollment overview diff --git a/education/windows/tutorial-school-deployment/enroll-package.md b/education/windows/tutorial-school-deployment/enroll-package.md index 2021ec3ff0..9f96234636 100644 --- a/education/windows/tutorial-school-deployment/enroll-package.md +++ b/education/windows/tutorial-school-deployment/enroll-package.md @@ -4,9 +4,7 @@ description: Learn about how to enroll Windows devices with provisioning package ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Enrollment with provisioning packages diff --git a/education/windows/tutorial-school-deployment/manage-overview.md b/education/windows/tutorial-school-deployment/manage-overview.md index db77a8606f..00559d4384 100644 --- a/education/windows/tutorial-school-deployment/manage-overview.md +++ b/education/windows/tutorial-school-deployment/manage-overview.md @@ -1,12 +1,10 @@ --- title: Manage devices with Microsoft Intune -description: Overview of device management capabilities in Intune for Education, including remote actions, remote assistance and inventory/reporting. +description: Overview of device management capabilities in Intune for Education, including remote actions, remote assistance and inventory/reporting. ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Manage devices with Microsoft Intune diff --git a/education/windows/tutorial-school-deployment/manage-surface-devices.md b/education/windows/tutorial-school-deployment/manage-surface-devices.md index 7b888d8adb..42dfe281d0 100644 --- a/education/windows/tutorial-school-deployment/manage-surface-devices.md +++ b/education/windows/tutorial-school-deployment/manage-surface-devices.md @@ -3,8 +3,8 @@ 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: 08/31/2022 ms.topic: tutorial -appliesto: -- ✅ Surface devices +appliesto: + - [✅ Surface devices] --- # Management functionalities for Surface devices diff --git a/education/windows/tutorial-school-deployment/reset-wipe.md b/education/windows/tutorial-school-deployment/reset-wipe.md index 7a404f7ecf..b9a1f80094 100644 --- a/education/windows/tutorial-school-deployment/reset-wipe.md +++ b/education/windows/tutorial-school-deployment/reset-wipe.md @@ -4,9 +4,7 @@ description: Learn about the reset and wipe options for Windows devices using In ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Device reset options diff --git a/education/windows/tutorial-school-deployment/troubleshoot-overview.md b/education/windows/tutorial-school-deployment/troubleshoot-overview.md index 1bf462b5f7..dd9817a5b9 100644 --- a/education/windows/tutorial-school-deployment/troubleshoot-overview.md +++ b/education/windows/tutorial-school-deployment/troubleshoot-overview.md @@ -4,9 +4,7 @@ description: Learn how to troubleshoot Windows devices from Intune and contact M ms.date: 08/31/2022 ms.topic: tutorial appliesto: -- ✅ Windows 10 -- ✅ Windows 11 -- ✅ Windows 11 SE + - ✅ Windows 10 and later --- # Troubleshoot Windows devices diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md index c54a5ce446..05dbf61f4b 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -4,7 +4,7 @@ description: Learn how to use the Set up School PCs app and apply the provisioni ms.topic: how-to ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Use the Set up School PCs app diff --git a/education/windows/windows-11-se-overview.md b/education/windows/windows-11-se-overview.md index 532654b733..2795af6de3 100644 --- a/education/windows/windows-11-se-overview.md +++ b/education/windows/windows-11-se-overview.md @@ -3,10 +3,11 @@ title: Windows 11 SE Overview description: Learn about Windows 11 SE, and the apps that are included with the operating system. ms.topic: article ms.date: 09/12/2022 -appliesto: - - ✅ Windows 11 SE -ms.collection: +appliesto: + - ✅ Windows 11 SE" +ms.collection: - highpri + - education --- # Windows 11 SE Overview diff --git a/education/windows/windows-11-se-settings-list.md b/education/windows/windows-11-se-settings-list.md index 7cd1a683ce..774fca45dd 100644 --- a/education/windows/windows-11-se-settings-list.md +++ b/education/windows/windows-11-se-settings-list.md @@ -4,7 +4,7 @@ description: Windows 11 SE automatically configures settings in the operating sy ms.topic: article ms.date: 09/12/2022 appliesto: -- ✅ Windows 11 SE + - ✅ Windows 11 SE --- # Windows 11 SE for Education settings list diff --git a/education/windows/windows-editions-for-education-customers.md b/education/windows/windows-editions-for-education-customers.md index 90b399237d..f933dc3465 100644 --- a/education/windows/windows-editions-for-education-customers.md +++ b/education/windows/windows-editions-for-education-customers.md @@ -4,7 +4,7 @@ description: Learn about the two Windows 10 editions that are designed for the n ms.topic: article ms.date: 08/10/2022 appliesto: -- ✅ Windows 10 + - ✅ Windows 10 --- # Windows 10 editions for education customers From ad3dd22648591dd60d75abbf47ea59169ebbfc7c Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 10 Nov 2022 10:44:05 -0500 Subject: [PATCH 03/13] updates --- education/windows/autopilot-reset.md | 2 +- education/windows/change-to-pro-education.md | 2 +- education/windows/edu-stickers.md | 2 +- education/windows/get-minecraft-for-education.md | 2 +- education/windows/school-get-minecraft.md | 2 +- education/windows/teacher-get-minecraft.md | 2 +- education/windows/test-windows10s-for-edu.md | 2 +- education/windows/tutorial-school-deployment/index.md | 2 ++ .../tutorial-school-deployment/manage-surface-devices.md | 2 +- education/windows/windows-11-se-overview.md | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/education/windows/autopilot-reset.md b/education/windows/autopilot-reset.md index ef0d5e186c..0901d32b40 100644 --- a/education/windows/autopilot-reset.md +++ b/education/windows/autopilot-reset.md @@ -4,7 +4,7 @@ description: Learn about Autopilot Reset and how to enable and use it. ms.date: 08/10/2022 ms.topic: how-to appliesto: - - ✅ Windows 10" + - ✅ Windows 10 ms.collection: - highpri - education diff --git a/education/windows/change-to-pro-education.md b/education/windows/change-to-pro-education.md index 76f00168ee..f377a4582c 100644 --- a/education/windows/change-to-pro-education.md +++ b/education/windows/change-to-pro-education.md @@ -4,7 +4,7 @@ description: Learn how IT Pros can opt into changing to Windows 10 Pro Education ms.topic: how-to ms.date: 08/10/2022 appliesto: - - ✅ Windows 10" + - ✅ Windows 10 ms.collection: - highpri - education diff --git a/education/windows/edu-stickers.md b/education/windows/edu-stickers.md index 2595b618f0..e7bf34ce22 100644 --- a/education/windows/edu-stickers.md +++ b/education/windows/edu-stickers.md @@ -4,7 +4,7 @@ description: Learn about the Stickers feature and how to configure it via Intune ms.date: 09/15/2022 ms.topic: how-to appliesto: - - ✅ Windows 11 SE" + - ✅ Windows 11 SE ms.collection: - highpri - education diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 7130259b1a..903d8182e3 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -4,7 +4,7 @@ description: Learn how to get and distribute Minecraft Education Edition. ms.topic: how-to ms.date: 08/10/2022 appliesto: - - ✅ Windows 10 and later" + - ✅ Windows 10 and later ms.collection: - highpri - education diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 8e26d1acea..fca31b0f6b 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -4,7 +4,7 @@ description: Learn how IT admins can get and distribute Minecraft in their schoo ms.topic: how-to ms.date: 08/10/2022 appliesto: - - ✅ Windows 10" + - ✅ Windows 10 ms.collection: - highpri - education diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md index 685a738970..df19ac8729 100644 --- a/education/windows/teacher-get-minecraft.md +++ b/education/windows/teacher-get-minecraft.md @@ -4,7 +4,7 @@ description: Learn how teachers can obtain and distribute Minecraft. ms.topic: how-to ms.date: 08/10/2022 appliesto: - - ✅ Windows 10 and later" + - ✅ Windows 10 and later ms.collection: - highpri - education diff --git a/education/windows/test-windows10s-for-edu.md b/education/windows/test-windows10s-for-edu.md index a1a41bcf5e..09f9301130 100644 --- a/education/windows/test-windows10s-for-edu.md +++ b/education/windows/test-windows10s-for-edu.md @@ -4,7 +4,7 @@ description: Provides guidance on downloading and testing Windows 10 in S mode f ms.topic: guide ms.date: 08/10/2022 appliesto: - - ✅ Windows 10" + - ✅ Windows 10 ms.collection: - highpri - education diff --git a/education/windows/tutorial-school-deployment/index.md b/education/windows/tutorial-school-deployment/index.md index 14f76929f4..98574366e1 100644 --- a/education/windows/tutorial-school-deployment/index.md +++ b/education/windows/tutorial-school-deployment/index.md @@ -3,6 +3,8 @@ title: Introduction to the tutorial deploy and manage Windows devices in a schoo description: Introduction to deployment and management of Windows devices in education environments. ms.date: 08/31/2022 ms.topic: conceptual +appliesto: + - ✅ Windows 10 and later --- # Tutorial: deploy and manage Windows devices in a school diff --git a/education/windows/tutorial-school-deployment/manage-surface-devices.md b/education/windows/tutorial-school-deployment/manage-surface-devices.md index 42dfe281d0..e374fd8f7d 100644 --- a/education/windows/tutorial-school-deployment/manage-surface-devices.md +++ b/education/windows/tutorial-school-deployment/manage-surface-devices.md @@ -4,7 +4,7 @@ description: Learn about the management capabilities offered to Surface devices, ms.date: 08/31/2022 ms.topic: tutorial appliesto: - - [✅ Surface devices] + - ✅ Surface devices --- # Management functionalities for Surface devices diff --git a/education/windows/windows-11-se-overview.md b/education/windows/windows-11-se-overview.md index 2795af6de3..4a7f0897d8 100644 --- a/education/windows/windows-11-se-overview.md +++ b/education/windows/windows-11-se-overview.md @@ -4,7 +4,7 @@ description: Learn about Windows 11 SE, and the apps that are included with the ms.topic: article ms.date: 09/12/2022 appliesto: - - ✅ Windows 11 SE" + - ✅ Windows 11 SE ms.collection: - highpri - education From f4948d3be74f582c1868453c8bffe9f60d68077b Mon Sep 17 00:00:00 2001 From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com> Date: Thu, 10 Nov 2022 15:38:47 -0500 Subject: [PATCH 04/13] updates --- education/windows/federated-sign-in.md | 5 +++-- .../includes/intune-custom-settings-1.md | 18 ++++++++++++++++++ .../includes/intune-custom-settings-2.md | 11 +++++++++++ .../intune-custom-settings-alternative.md | 8 ++++++++ .../includes/intune-custom-settings-info.md | 8 ++++++++ .../includes/intune-settings-catalog-1.md | 18 ++++++++++++++++++ .../includes/intune-settings-catalog-2.md | 11 +++++++++++ .../includes/intune-settings-catalog-info.md | 8 ++++++++ .../hello-for-business/hello-how-it-works.md | 7 +++---- .../hello-hybrid-cloud-kerberos-trust.md | 11 ++++++++--- 10 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 education/windows/includes/intune-custom-settings-1.md create mode 100644 education/windows/includes/intune-custom-settings-2.md create mode 100644 education/windows/includes/intune-custom-settings-alternative.md create mode 100644 education/windows/includes/intune-custom-settings-info.md create mode 100644 education/windows/includes/intune-settings-catalog-1.md create mode 100644 education/windows/includes/intune-settings-catalog-2.md create mode 100644 education/windows/includes/intune-settings-catalog-info.md diff --git a/education/windows/federated-sign-in.md b/education/windows/federated-sign-in.md index 8159e325ab..94f34b5942 100644 --- a/education/windows/federated-sign-in.md +++ b/education/windows/federated-sign-in.md @@ -57,7 +57,7 @@ To configure federated sign-in using Microsoft Intune, [create a custom profile] To sign-in with a SAML 2.0 identity provider, your devices must be configured with different policies, which can be configured using Microsoft Intune. -To configure federated sign-in using Microsoft Intune, [create a custom profile][MEM-1] with the following settings: +[!INCLUDE [intune-custom-settings-1](includes/intune-custom-settings-1.md)] | Setting | |--------| @@ -68,7 +68,8 @@ To configure federated sign-in using Microsoft Intune, [create a custom profile] :::image type="content" source="images/federated-sign-in-settings-intune.png" alt-text="Custom policy showing the settings to be configured to enable federated sign-in" lightbox="images/federated-sign-in-settings-intune.png" border="true"::: -Assign the policy to a security group that contains as members the devices that require federated sign-in. +[!INCLUDE [intune-custom-settings-2](includes/intune-custom-settings-2.md)] +[!INCLUDE [intune-custom-settings-info](includes/intune-custom-settings-info.md)]