From ab02a38d43cea426d1a6bc65d6299433709f683d Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Mon, 7 Aug 2023 12:27:06 +0200
Subject: [PATCH 01/20] [EDU] Landing page

---
 education/docfx.json        |   3 +-
 windows/education/index.yml | 181 ++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 windows/education/index.yml

diff --git a/education/docfx.json b/education/docfx.json
index 29a46f0323..7767861daa 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -76,8 +76,7 @@
         "✅ <a href=\"https://learn.microsoft.com/windows/release-health/supported-versions-windows-client\" target=\"_blank\">Windows 11 SE</a>",
         "✅ <a href=\"https://learn.microsoft.com/windows/release-health/supported-versions-windows-client\" target=\"_blank\">Windows 10</a>"
         ]
-      },
-      "uhfHeaderId": "MSDocsHeader-Windows"
+      }
     },
     "externalReference": [],
     "template": "op.html",
diff --git a/windows/education/index.yml b/windows/education/index.yml
new file mode 100644
index 0000000000..fc06f5531c
--- /dev/null
+++ b/windows/education/index.yml
@@ -0,0 +1,181 @@
+### YamlMime:Hub
+
+title: Windows for Education documentation
+summary: Learn how to deploy, secure, and manage Windows clients in an education environment.
+brand: windows
+
+metadata:
+  ms.topic: hub-page
+  ms.prod: windows-client
+  ms.technology: itpro-edu
+  ms.collection:
+    - education
+    - highpri
+    - tier1
+  author: paolomatarazzo
+  ms.author: paoloma
+  manager: aaroncz
+  ms.date: 07/28/2023
+
+highlightedContent:
+  items:
+  - title: Get started with Windows 11
+    itemType: get-started
+    url: /windows/whats-new/windows-11-overview
+  - title: Windows 11, version 22H2
+    itemType: whats-new
+    url: /windows/whats-new/whats-new-windows-11-version-22H2
+  - title: Windows 11, version 22H2 group policy settings reference 
+    itemType: download
+    url: https://www.microsoft.com/en-us/download/details.aspx?id=104594
+  - title: Windows release health
+    itemType: whats-new
+    url: /windows/release-health
+  - title: Windows commercial licensing
+    itemType: overview
+    url: /windows/whats-new/windows-licensing
+  - title: Windows 365 documentation
+    itemType: overview
+    url: /windows-365
+  - title: Explore all Windows trainings and learning paths for IT pros
+    itemType: learn
+    url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
+  - title: Enroll Windows client devices in Microsoft Intune
+    itemType: how-to-guide
+    url: /mem/intune/fundamentals/deployment-guide-enrollment-windows
+
+productDirectory:
+  title: Get started
+  items:
+
+    - title: Hardware security
+      imageSrc: /media/common/i_usb.svg
+      links:
+        - url: /windows/security/hardware-security/tpm/trusted-platform-module-overview
+          text: Trusted Platform Module
+        - url: /windows/security/hardware-security/pluton/microsoft-pluton-security-processor
+          text: Microsoft Pluton
+        - url: /windows/security/hardware-security/how-hardware-based-root-of-trust-helps-protect-windows
+          text: Windows Defender System Guard
+        - url: /windows-hardware/design/device-experiences/oem-vbs
+          text: Virtualization-based security (VBS)
+        - url: /windows-hardware/design/device-experiences/oem-highly-secure-11
+          text: Secured-core PC
+        - url: /windows/security/hardware-security
+          text: Learn more about hardware security >
+
+    - title: OS security
+      imageSrc: /media/common/i_threat-protection.svg
+      links:
+        - url: /windows/security/operating-system-security
+          text: Trusted boot
+        - url: /windows/security/operating-system-security/system-security/windows-defender-security-center/windows-defender-security-center
+          text: Windows security settings
+        - url: 	/windows/security/operating-system-security/data-protection/bitlocker/
+          text: BitLocker
+        - url: /windows/security/operating-system-security/device-management/windows-security-configuration-framework/windows-security-baselines
+          text: Windows security baselines
+        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/
+          text: MMicrosoft Defender SmartScreen
+        - url: /windows/security/operating-system-security
+          text: Learn more about OS security >
+
+    - title: Identity protection
+      imageSrc: /media/common/i_identity-protection.svg
+      links:
+        - url: /windows/security/identity-protection/hello-for-business
+          text: Windows Hello for Business
+        - url: /windows/security/identity-protection/credential-guard
+          text: Windows Defender Credential Guard
+        - url: /windows-server/identity/laps/laps-overview
+          text: Windows LAPS (Local Administrator Password Solution)
+        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/enhanced-phishing-protection
+          text: Enhanced phishing protection with SmartScreen
+        - url: /education/windows/federated-sign-in
+          text: Federated sign-in (EDU)
+        - url: /windows/security/identity-protection
+          text: Learn more about identity protection >
+
+    - title: Application security
+      imageSrc: /media/common/i_queries.svg
+      links:
+        - url: /windows/security/application-security/application-control/windows-defender-application-control/
+          text: Windows Defender Application Control (WDAC)
+        - url: /windows/security/application-security/application-control/user-account-control
+          text: User Account Control (UAC)
+        - url: /windows/security/application-security/application-control/windows-defender-application-control/design/microsoft-recommended-driver-block-rules
+          text: Microsoft vulnerable driver blocklist
+        - url: /windows/security/application-security/application-isolation/microsoft-defender-application-guard/md-app-guard-overview
+          text: Microsoft Defender Application Guard (MDAG)
+        - url: /windows/security/application-security/application-isolation/windows-sandbox/windows-sandbox-overview
+          text: Windows Sandbox
+        - url: /windows/security/application-security
+          text: Learn more about application security >
+
+    - title: Security foundations
+      imageSrc: /media/common/i_build.svg
+      links:
+        - url: /windows/security/security-foundations/certification/fips-140-validation
+          text: FIPS 140-2 validation
+        - url: /windows/security/security-foundations/certification/windows-platform-common-criteria
+          text: Common Criteria Certifications
+        - url: /windows/security/security-foundations/msft-security-dev-lifecycle
+          text: Microsoft Security Development Lifecycle (SDL)
+        - url: https://www.microsoft.com/msrc/bounty-windows-insider-preview
+          text: Microsoft Windows Insider Preview bounty program
+        - url: https://www.microsoft.com/security/blog/2020/09/15/microsoft-onefuzz-framework-open-source-developer-tool-fix-bugs/
+          text: OneFuzz service
+        - url: /windows/security/security-foundations
+          text: Learn more about security foundations >
+
+    - title: Cloud security
+      imageSrc: /media/common/i_cloud-security.svg
+      links:
+        - url: /mem/intune/protect/security-baselines
+          text: Security baselines with Intune
+        - url: /windows/deployment/windows-autopatch
+          text: Windows Autopatch
+        - url: /windows/deployment/windows-autopilot
+          text: Windows Autopilot
+        - url: /universal-print
+          text: Universal Print
+        - url: /windows/client-management/mdm/remotewipe-csp
+          text: Remote wipe
+        - url: /windows/security/cloud-security
+          text: Learn more about cloud security >
+
+additionalContent:
+  sections:
+    - title: More Windows resources
+      items:
+
+        - title: Windows Server
+          links:
+            - text: Windows Server documentation
+              url: /windows-server
+            - text: What's new in Windows Server 2022?
+              url: /windows-server/get-started/whats-new-in-windows-server-2022
+            - text: Windows Server blog
+              url: https://cloudblogs.microsoft.com/windowsserver/
+
+        - title: Windows product site and blogs
+          links:
+            - text: Find out how Windows enables your business to do more
+              url: https://www.microsoft.com/microsoft-365/windows
+            - text: Windows blogs
+              url: https://blogs.windows.com/
+            - text: Windows IT Pro blog
+              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
+            - text: Microsoft Intune blog
+              url: https://techcommunity.microsoft.com/t5/microsoft-intune-blog/bg-p/MicrosoftEndpointManagerBlog
+            - text: "Windows help & learning: end-user documentation"
+              url: https://support.microsoft.com/windows
+
+        - title: Participate in the community
+          links:
+            - text: Windows community
+              url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows10
+            - text: Microsoft Intune community
+              url: https://techcommunity.microsoft.com/t5/microsoft-intune/bd-p/Microsoft-Intune
+            - text: Microsoft Support community
+              url: https://answers.microsoft.com/windows/forum
\ No newline at end of file

From e20eb84d372ec9fd06b1b8a15217623e8d0ef61d Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Mon, 7 Aug 2023 12:40:15 +0200
Subject: [PATCH 02/20] updates

---
 education/windows/index.old.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/education/windows/index.old.yml b/education/windows/index.old.yml
index 849e1d3e1d..691901dcf2 100644
--- a/education/windows/index.old.yml
+++ b/education/windows/index.old.yml
@@ -1,3 +1,25 @@
+### YamlMime:Landing
+
+title: Windows for Education documentation
+summary: Evaluate, plan, deploy, and manage Windows devices in an education environment
+
+metadata:
+  title: Windows for Education documentation
+  description: Learn about how to plan, deploy and manage Windows devices in an education environment with Microsoft Intune
+  ms.topic: landing-page
+  ms.prod: windows-client
+  ms.technology: itpro-edu
+  ms.collection:
+  - education
+  - highpri
+  - tier1
+  author: paolomatarazzo
+  ms.author: paoloma
+  ms.date: 03/09/2023
+  manager: aaroncz
+
+landingContent: 
+
   - title: Get started
     linkLists:
       - linkListType: tutorial

From 546db8d9bcdfc6cc68b70e9278df9d211b948055 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Mon, 7 Aug 2023 14:33:53 +0200
Subject: [PATCH 03/20] move EDU under hub

---
 windows/{ => hub}/education/index.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename windows/{ => hub}/education/index.yml (100%)

diff --git a/windows/education/index.yml b/windows/hub/education/index.yml
similarity index 100%
rename from windows/education/index.yml
rename to windows/hub/education/index.yml

From 190e68d4b062be6d0636b39b51f7e6ad69073562 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 07:21:19 +0200
Subject: [PATCH 04/20] updates

---
 education/windows/index.old.yml |  20 ----
 education/windows/index.yml     | 123 ++++------------------
 windows/hub/education/index.yml | 181 --------------------------------
 3 files changed, 22 insertions(+), 302 deletions(-)
 delete mode 100644 windows/hub/education/index.yml

diff --git a/education/windows/index.old.yml b/education/windows/index.old.yml
index 691901dcf2..4a46f98e09 100644
--- a/education/windows/index.old.yml
+++ b/education/windows/index.old.yml
@@ -1,23 +1,3 @@
-### YamlMime:Landing
-
-title: Windows for Education documentation
-summary: Evaluate, plan, deploy, and manage Windows devices in an education environment
-
-metadata:
-  title: Windows for Education documentation
-  description: Learn about how to plan, deploy and manage Windows devices in an education environment with Microsoft Intune
-  ms.topic: landing-page
-  ms.prod: windows-client
-  ms.technology: itpro-edu
-  ms.collection:
-  - education
-  - highpri
-  - tier1
-  author: paolomatarazzo
-  ms.author: paoloma
-  ms.date: 03/09/2023
-  manager: aaroncz
-
 landingContent: 
 
   - title: Get started
diff --git a/education/windows/index.yml b/education/windows/index.yml
index fc06f5531c..1ff5d4989c 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -15,28 +15,16 @@ metadata:
   author: paolomatarazzo
   ms.author: paoloma
   manager: aaroncz
-  ms.date: 07/28/2023
+  ms.date: 08/07/2023
 
 highlightedContent:
   items:
-  - title: Get started with Windows 11
+  - title: Get started with Windows 11 SE
     itemType: get-started
     url: /windows/whats-new/windows-11-overview
   - title: Windows 11, version 22H2
     itemType: whats-new
     url: /windows/whats-new/whats-new-windows-11-version-22H2
-  - title: Windows 11, version 22H2 group policy settings reference 
-    itemType: download
-    url: https://www.microsoft.com/en-us/download/details.aspx?id=104594
-  - title: Windows release health
-    itemType: whats-new
-    url: /windows/release-health
-  - title: Windows commercial licensing
-    itemType: overview
-    url: /windows/whats-new/windows-licensing
-  - title: Windows 365 documentation
-    itemType: overview
-    url: /windows-365
   - title: Explore all Windows trainings and learning paths for IT pros
     itemType: learn
     url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
@@ -47,102 +35,35 @@ highlightedContent:
 productDirectory:
   title: Get started
   items:
-
-    - title: Hardware security
-      imageSrc: /media/common/i_usb.svg
+    - title: Learn how to deploy Windows
+      imageSrc: /media/common/i_deploy.svg
       links:
-        - url: /windows/security/hardware-security/tpm/trusted-platform-module-overview
-          text: Trusted Platform Module
-        - url: /windows/security/hardware-security/pluton/microsoft-pluton-security-processor
-          text: Microsoft Pluton
-        - url: /windows/security/hardware-security/how-hardware-based-root-of-trust-helps-protect-windows
-          text: Windows Defender System Guard
-        - url: /windows-hardware/design/device-experiences/oem-vbs
-          text: Virtualization-based security (VBS)
-        - url: /windows-hardware/design/device-experiences/oem-highly-secure-11
-          text: Secured-core PC
-        - url: /windows/security/hardware-security
-          text: Learn more about hardware security >
+        - url: /windows/deployment
+          text: Learn more about Windows deployment >
 
-    - title: OS security
-      imageSrc: /media/common/i_threat-protection.svg
+    - title: Learn how to secure Windows
+      imageSrc: /media/common/i_security-management.svg
       links:
-        - url: /windows/security/operating-system-security
-          text: Trusted boot
-        - url: /windows/security/operating-system-security/system-security/windows-defender-security-center/windows-defender-security-center
-          text: Windows security settings
-        - url: 	/windows/security/operating-system-security/data-protection/bitlocker/
-          text: BitLocker
-        - url: /windows/security/operating-system-security/device-management/windows-security-configuration-framework/windows-security-baselines
-          text: Windows security baselines
-        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/
-          text: MMicrosoft Defender SmartScreen
-        - url: /windows/security/operating-system-security
-          text: Learn more about OS security >
+        - url: /windows/security
+          text: Learn more about Windows security >
 
-    - title: Identity protection
-      imageSrc: /media/common/i_identity-protection.svg
+    - title: Learn about privacy in Windows
+      imageSrc: /media/common/i_lock.svg
       links:
-        - url: /windows/security/identity-protection/hello-for-business
-          text: Windows Hello for Business
-        - url: /windows/security/identity-protection/credential-guard
-          text: Windows Defender Credential Guard
-        - url: /windows-server/identity/laps/laps-overview
-          text: Windows LAPS (Local Administrator Password Solution)
-        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/enhanced-phishing-protection
-          text: Enhanced phishing protection with SmartScreen
-        - url: /education/windows/federated-sign-in
-          text: Federated sign-in (EDU)
-        - url: /windows/security/identity-protection
-          text: Learn more about identity protection >
+        - url: /windows/privacy
+          text: Learn more about privacy in Windows >
 
-    - title: Application security
-      imageSrc: /media/common/i_queries.svg
+    - title: Learn how to manage Windows
+      imageSrc: /media/common/i_management.svg
       links:
-        - url: /windows/security/application-security/application-control/windows-defender-application-control/
-          text: Windows Defender Application Control (WDAC)
-        - url: /windows/security/application-security/application-control/user-account-control
-          text: User Account Control (UAC)
-        - url: /windows/security/application-security/application-control/windows-defender-application-control/design/microsoft-recommended-driver-block-rules
-          text: Microsoft vulnerable driver blocklist
-        - url: /windows/security/application-security/application-isolation/microsoft-defender-application-guard/md-app-guard-overview
-          text: Microsoft Defender Application Guard (MDAG)
-        - url: /windows/security/application-security/application-isolation/windows-sandbox/windows-sandbox-overview
-          text: Windows Sandbox
-        - url: /windows/security/application-security
-          text: Learn more about application security >
+        - url: /windows/client-management
+          text: Learn more about Windows management >
 
-    - title: Security foundations
-      imageSrc: /media/common/i_build.svg
+    - title: Learn how to configure Windows
+      imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: /windows/security/security-foundations/certification/fips-140-validation
-          text: FIPS 140-2 validation
-        - url: /windows/security/security-foundations/certification/windows-platform-common-criteria
-          text: Common Criteria Certifications
-        - url: /windows/security/security-foundations/msft-security-dev-lifecycle
-          text: Microsoft Security Development Lifecycle (SDL)
-        - url: https://www.microsoft.com/msrc/bounty-windows-insider-preview
-          text: Microsoft Windows Insider Preview bounty program
-        - url: https://www.microsoft.com/security/blog/2020/09/15/microsoft-onefuzz-framework-open-source-developer-tool-fix-bugs/
-          text: OneFuzz service
-        - url: /windows/security/security-foundations
-          text: Learn more about security foundations >
-
-    - title: Cloud security
-      imageSrc: /media/common/i_cloud-security.svg
-      links:
-        - url: /mem/intune/protect/security-baselines
-          text: Security baselines with Intune
-        - url: /windows/deployment/windows-autopatch
-          text: Windows Autopatch
-        - url: /windows/deployment/windows-autopilot
-          text: Windows Autopilot
-        - url: /universal-print
-          text: Universal Print
-        - url: /windows/client-management/mdm/remotewipe-csp
-          text: Remote wipe
-        - url: /windows/security/cloud-security
-          text: Learn more about cloud security >
+        - url: /windows/configuration
+          text: Learn more about Windows configuration >
 
 additionalContent:
   sections:
diff --git a/windows/hub/education/index.yml b/windows/hub/education/index.yml
deleted file mode 100644
index fc06f5531c..0000000000
--- a/windows/hub/education/index.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-### YamlMime:Hub
-
-title: Windows for Education documentation
-summary: Learn how to deploy, secure, and manage Windows clients in an education environment.
-brand: windows
-
-metadata:
-  ms.topic: hub-page
-  ms.prod: windows-client
-  ms.technology: itpro-edu
-  ms.collection:
-    - education
-    - highpri
-    - tier1
-  author: paolomatarazzo
-  ms.author: paoloma
-  manager: aaroncz
-  ms.date: 07/28/2023
-
-highlightedContent:
-  items:
-  - title: Get started with Windows 11
-    itemType: get-started
-    url: /windows/whats-new/windows-11-overview
-  - title: Windows 11, version 22H2
-    itemType: whats-new
-    url: /windows/whats-new/whats-new-windows-11-version-22H2
-  - title: Windows 11, version 22H2 group policy settings reference 
-    itemType: download
-    url: https://www.microsoft.com/en-us/download/details.aspx?id=104594
-  - title: Windows release health
-    itemType: whats-new
-    url: /windows/release-health
-  - title: Windows commercial licensing
-    itemType: overview
-    url: /windows/whats-new/windows-licensing
-  - title: Windows 365 documentation
-    itemType: overview
-    url: /windows-365
-  - title: Explore all Windows trainings and learning paths for IT pros
-    itemType: learn
-    url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
-  - title: Enroll Windows client devices in Microsoft Intune
-    itemType: how-to-guide
-    url: /mem/intune/fundamentals/deployment-guide-enrollment-windows
-
-productDirectory:
-  title: Get started
-  items:
-
-    - title: Hardware security
-      imageSrc: /media/common/i_usb.svg
-      links:
-        - url: /windows/security/hardware-security/tpm/trusted-platform-module-overview
-          text: Trusted Platform Module
-        - url: /windows/security/hardware-security/pluton/microsoft-pluton-security-processor
-          text: Microsoft Pluton
-        - url: /windows/security/hardware-security/how-hardware-based-root-of-trust-helps-protect-windows
-          text: Windows Defender System Guard
-        - url: /windows-hardware/design/device-experiences/oem-vbs
-          text: Virtualization-based security (VBS)
-        - url: /windows-hardware/design/device-experiences/oem-highly-secure-11
-          text: Secured-core PC
-        - url: /windows/security/hardware-security
-          text: Learn more about hardware security >
-
-    - title: OS security
-      imageSrc: /media/common/i_threat-protection.svg
-      links:
-        - url: /windows/security/operating-system-security
-          text: Trusted boot
-        - url: /windows/security/operating-system-security/system-security/windows-defender-security-center/windows-defender-security-center
-          text: Windows security settings
-        - url: 	/windows/security/operating-system-security/data-protection/bitlocker/
-          text: BitLocker
-        - url: /windows/security/operating-system-security/device-management/windows-security-configuration-framework/windows-security-baselines
-          text: Windows security baselines
-        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/
-          text: MMicrosoft Defender SmartScreen
-        - url: /windows/security/operating-system-security
-          text: Learn more about OS security >
-
-    - title: Identity protection
-      imageSrc: /media/common/i_identity-protection.svg
-      links:
-        - url: /windows/security/identity-protection/hello-for-business
-          text: Windows Hello for Business
-        - url: /windows/security/identity-protection/credential-guard
-          text: Windows Defender Credential Guard
-        - url: /windows-server/identity/laps/laps-overview
-          text: Windows LAPS (Local Administrator Password Solution)
-        - url: /windows/security/operating-system-security/virus-and-threat-protection/microsoft-defender-smartscreen/enhanced-phishing-protection
-          text: Enhanced phishing protection with SmartScreen
-        - url: /education/windows/federated-sign-in
-          text: Federated sign-in (EDU)
-        - url: /windows/security/identity-protection
-          text: Learn more about identity protection >
-
-    - title: Application security
-      imageSrc: /media/common/i_queries.svg
-      links:
-        - url: /windows/security/application-security/application-control/windows-defender-application-control/
-          text: Windows Defender Application Control (WDAC)
-        - url: /windows/security/application-security/application-control/user-account-control
-          text: User Account Control (UAC)
-        - url: /windows/security/application-security/application-control/windows-defender-application-control/design/microsoft-recommended-driver-block-rules
-          text: Microsoft vulnerable driver blocklist
-        - url: /windows/security/application-security/application-isolation/microsoft-defender-application-guard/md-app-guard-overview
-          text: Microsoft Defender Application Guard (MDAG)
-        - url: /windows/security/application-security/application-isolation/windows-sandbox/windows-sandbox-overview
-          text: Windows Sandbox
-        - url: /windows/security/application-security
-          text: Learn more about application security >
-
-    - title: Security foundations
-      imageSrc: /media/common/i_build.svg
-      links:
-        - url: /windows/security/security-foundations/certification/fips-140-validation
-          text: FIPS 140-2 validation
-        - url: /windows/security/security-foundations/certification/windows-platform-common-criteria
-          text: Common Criteria Certifications
-        - url: /windows/security/security-foundations/msft-security-dev-lifecycle
-          text: Microsoft Security Development Lifecycle (SDL)
-        - url: https://www.microsoft.com/msrc/bounty-windows-insider-preview
-          text: Microsoft Windows Insider Preview bounty program
-        - url: https://www.microsoft.com/security/blog/2020/09/15/microsoft-onefuzz-framework-open-source-developer-tool-fix-bugs/
-          text: OneFuzz service
-        - url: /windows/security/security-foundations
-          text: Learn more about security foundations >
-
-    - title: Cloud security
-      imageSrc: /media/common/i_cloud-security.svg
-      links:
-        - url: /mem/intune/protect/security-baselines
-          text: Security baselines with Intune
-        - url: /windows/deployment/windows-autopatch
-          text: Windows Autopatch
-        - url: /windows/deployment/windows-autopilot
-          text: Windows Autopilot
-        - url: /universal-print
-          text: Universal Print
-        - url: /windows/client-management/mdm/remotewipe-csp
-          text: Remote wipe
-        - url: /windows/security/cloud-security
-          text: Learn more about cloud security >
-
-additionalContent:
-  sections:
-    - title: More Windows resources
-      items:
-
-        - title: Windows Server
-          links:
-            - text: Windows Server documentation
-              url: /windows-server
-            - text: What's new in Windows Server 2022?
-              url: /windows-server/get-started/whats-new-in-windows-server-2022
-            - text: Windows Server blog
-              url: https://cloudblogs.microsoft.com/windowsserver/
-
-        - title: Windows product site and blogs
-          links:
-            - text: Find out how Windows enables your business to do more
-              url: https://www.microsoft.com/microsoft-365/windows
-            - text: Windows blogs
-              url: https://blogs.windows.com/
-            - text: Windows IT Pro blog
-              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
-            - text: Microsoft Intune blog
-              url: https://techcommunity.microsoft.com/t5/microsoft-intune-blog/bg-p/MicrosoftEndpointManagerBlog
-            - text: "Windows help & learning: end-user documentation"
-              url: https://support.microsoft.com/windows
-
-        - title: Participate in the community
-          links:
-            - text: Windows community
-              url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows10
-            - text: Microsoft Intune community
-              url: https://techcommunity.microsoft.com/t5/microsoft-intune/bd-p/Microsoft-Intune
-            - text: Microsoft Support community
-              url: https://answers.microsoft.com/windows/forum
\ No newline at end of file

From b58813ce7af77856287e3485b109979d74edb75c Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:08:41 +0200
Subject: [PATCH 05/20] updates

---
 education/windows/index.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/education/windows/index.yml b/education/windows/index.yml
index 1ff5d4989c..af7a9de69e 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -21,7 +21,7 @@ highlightedContent:
   items:
   - title: Get started with Windows 11 SE
     itemType: get-started
-    url: /windows/whats-new/windows-11-overview
+    url: windows-11-se-overview.md
   - title: Windows 11, version 22H2
     itemType: whats-new
     url: /windows/whats-new/whats-new-windows-11-version-22H2

From f6c37f69158e90c1d80177b1d7ca23c0bf2514ea Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:20:33 +0200
Subject: [PATCH 06/20] update

---
 education/windows/{index.old.yml => index.old.txt} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename education/windows/{index.old.yml => index.old.txt} (100%)

diff --git a/education/windows/index.old.yml b/education/windows/index.old.txt
similarity index 100%
rename from education/windows/index.old.yml
rename to education/windows/index.old.txt

From bd46cecf8cc08c50ff6b09b0158dde0139c10246 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 13:56:48 +0200
Subject: [PATCH 07/20] updates

---
 education/docfx.json            |  2 +-
 education/windows/index.old.txt | 16 ----------------
 education/windows/index.yml     | 26 +++++++++++++++-----------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/education/docfx.json b/education/docfx.json
index 7767861daa..a9579639a6 100644
--- a/education/docfx.json
+++ b/education/docfx.json
@@ -41,7 +41,7 @@
       "manager": "aaroncz",
       "ms.localizationpriority": "medium",
       "breadcrumb_path": "/education/breadcrumb/toc.json",
-      "uhfHeaderId": "MSDocsHeader-M365-IT",
+      "uhfHeaderId": "MSDocsHeader-Windows",
       "feedback_system": "GitHub",
       "feedback_github_repo": "MicrosoftDocs/windows-itpro-docs",
       "feedback_product_url": "https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332",
diff --git a/education/windows/index.old.txt b/education/windows/index.old.txt
index 4a46f98e09..3713530ec3 100644
--- a/education/windows/index.old.txt
+++ b/education/windows/index.old.txt
@@ -1,19 +1,3 @@
-landingContent: 
-
-  - title: Get started
-    linkLists:
-      - linkListType: tutorial
-        links:
-        - text: Deploy and manage Windows devices in a school
-          url: tutorial-school-deployment/index.md
-        - text: Prepare your tenant
-          url: tutorial-school-deployment/set-up-azure-ad.md
-        - text: Configure settings and applications with Microsoft Intune
-          url: tutorial-school-deployment/configure-devices-overview.md
-        - text: Manage devices with Microsoft Intune
-          url: tutorial-school-deployment/manage-overview.md
-        - text: Management functionalities for Surface devices
-          url: tutorial-school-deployment/manage-surface-devices.md     
 
   - title: Learn about Windows 11 SE
     linkLists:
diff --git a/education/windows/index.yml b/education/windows/index.yml
index af7a9de69e..782e82d9ce 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -28,9 +28,9 @@ highlightedContent:
   - title: Explore all Windows trainings and learning paths for IT pros
     itemType: learn
     url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
-  - title: Enroll Windows client devices in Microsoft Intune
+  - title: Deploy applications to Windows 11 SE with Intune
     itemType: how-to-guide
-    url: /mem/intune/fundamentals/deployment-guide-enrollment-windows
+    url: /education/windows/tutorial-deploy-apps-winse
 
 productDirectory:
   title: Get started
@@ -38,6 +38,8 @@ productDirectory:
     - title: Learn how to deploy Windows
       imageSrc: /media/common/i_deploy.svg
       links:
+        - url: /education/windows/tutorial-school-deployment/
+          text: "Tutorial: deploy and manage Windows devices in a school"
         - url: /windows/deployment
           text: Learn more about Windows deployment >
 
@@ -47,23 +49,25 @@ productDirectory:
         - url: /windows/security
           text: Learn more about Windows security >
 
-    - title: Learn about privacy in Windows
-      imageSrc: /media/common/i_lock.svg
-      links:
-        - url: /windows/privacy
-          text: Learn more about privacy in Windows >
-
-    - title: Learn how to manage Windows
+    - title: Learn how to manage Windows devices
       imageSrc: /media/common/i_management.svg
       links:
+        - url: tutorial-school-deployment/manage-overview.md
+          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: 
+          text: Configure settings and applications with Microsoft Intune
         - url: /windows/client-management
           text: Learn more about Windows management >
 
     - title: Learn how to configure Windows
       imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: /windows/configuration
-          text: Learn more about Windows configuration >
+        - url: /windows/configuration/education/windows/federated-sign-in
+          text: Configure federated sign-in for Windows devices
 
 additionalContent:
   sections:

From ce9cc02335822c608fd045030bc1243704b21529 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 14:14:49 +0200
Subject: [PATCH 08/20] updates

---
 education/windows/index.old.txt | 19 -------------------
 education/windows/index.yml     |  8 +++++++-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/education/windows/index.old.txt b/education/windows/index.old.txt
index 3713530ec3..b2d43e8fe6 100644
--- a/education/windows/index.old.txt
+++ b/education/windows/index.old.txt
@@ -20,25 +20,6 @@
         - text: Deploy Windows 11 SE using Set up School PCs
           url: https://www.youtube.com/watch?v=Ql2fbiOop7c
 
-  - title: Deploy devices with Set up School PCs
-    linkLists:
-      - linkListType: concept
-        links:
-        - text: What is Set up School PCs?
-          url: set-up-school-pcs-technical.md
-      - linkListType: how-to-guide
-        links:
-        - text: Use the Set up School PCs app
-          url: use-set-up-school-pcs-app.md
-      - linkListType: reference
-        links:
-        - text: Provisioning package settings
-          url: set-up-school-pcs-provisioning-package.md
-      - linkListType: video
-        links:
-        - text: Use the Set up School PCs App
-          url: https://www.youtube.com/watch?v=2ZLup_-PhkA
-
   - title: Configure devices
     linkLists:
       - linkListType: concept
diff --git a/education/windows/index.yml b/education/windows/index.yml
index 782e82d9ce..8249653b52 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -40,6 +40,8 @@ productDirectory:
       links:
         - url: /education/windows/tutorial-school-deployment/
           text: "Tutorial: deploy and manage Windows devices in a school"
+        - url: use-set-up-school-pcs-app.md
+          text: Deploy devices with Set up School PCs
         - url: /windows/deployment
           text: Learn more about Windows deployment >
 
@@ -58,7 +60,7 @@ productDirectory:
           text: Management functionalities for Surface devices
         - url: /education/windows/get-minecraft-for-education
           text: Get and deploy Minecraft Education
-        - url: 
+        - url: get-minecraft-for-education.md
           text: Configure settings and applications with Microsoft Intune
         - url: /windows/client-management
           text: Learn more about Windows management >
@@ -68,6 +70,10 @@ productDirectory:
       links:
         - url: /windows/configuration/education/windows/federated-sign-in
           text: Configure federated sign-in for Windows devices
+        - url: set-up-school-pcs-provisioning-package.md
+          text: Provisioning package settings
+        - url: https://www.youtube.com/watch?v=2ZLup_-PhkA
+          text: "Video: Use the Set up School PCs App"
 
 additionalContent:
   sections:

From f5fb8b7ae4ffd3b592098e22754dca47ac7e26eb Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 15:59:11 +0200
Subject: [PATCH 09/20] updates

---
 education/windows/index.yml | 41 +++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/education/windows/index.yml b/education/windows/index.yml
index 8249653b52..542b61300f 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -68,7 +68,7 @@ productDirectory:
     - title: Learn how to configure Windows
       imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: /windows/configuration/education/windows/federated-sign-in
+        - url: federated-sign-in.md
           text: Configure federated sign-in for Windows devices
         - url: set-up-school-pcs-provisioning-package.md
           text: Provisioning package settings
@@ -77,17 +77,36 @@ productDirectory:
 
 additionalContent:
   sections:
-    - title: More Windows resources
-      items:
+    - title: For developers # < 60 chars (optional)
+      summary: Are you an app developer looking for information about developing solutions on Microsoft Education products? Start here. # < 160 chars (optional)
+    - items:
+        # Card
+        - title: UWP apps for education
+          summary: Learn how to write universal apps for education.
+          url: /windows/uwp/apps-for-education/
+        # Card
+        - title: Take a test API
+          summary: Learn how web applications can use the API to provide a locked down experience for taking tests.
+          url: /windows/uwp/apps-for-education/take-a-test-api
 
-        - title: Windows Server
-          links:
-            - text: Windows Server documentation
-              url: /windows-server
-            - text: What's new in Windows Server 2022?
-              url: /windows-server/get-started/whats-new-in-windows-server-2022
-            - text: Windows Server blog
-              url: https://cloudblogs.microsoft.com/windowsserver/
+        - title: Office dev center
+          summary: Integrate with Office 365 across devices and services to extend Microsoft enterprise-scale compliance and security to students, teachers, and staff in your education app.
+          url: https://developer.microsoft.com/office/
+
+        - title: Data Streamer
+          summary: Bring new STEM experiences into the classroom with real-time data in Excel using Data Streamer. Data Streamer can send data to Excel from a sensor or application.
+          url: /microsoft-365/education/data-streamer
+    - title: For partners # < 60 chars (optional)
+      summary: Looking for resources available to Microsoft Education partners? Start here. # < 160 chars (optional)
+    - items:
+
+        - title: Microsoft Partner Network
+          summary: Discover the latest news and resources for Microsoft Education products, solutions, licensing and readiness.
+          url: https://partner.microsoft.com/explore/education
+
+        - title: Education Partner community Yammer group
+          summary: Sign in with your Microsoft Partner account and join the Education Partner community private group on Yammer.
+          url: https://www.yammer.com/mepn/
 
         - title: Windows product site and blogs
           links:

From d379ad71ae2e745e2960264d9ac97d93e5fed1a6 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:11:07 +0200
Subject: [PATCH 10/20] removed SFB article

---
 store-for-business/sfb-change-history.md | 86 ------------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 store-for-business/sfb-change-history.md

diff --git a/store-for-business/sfb-change-history.md b/store-for-business/sfb-change-history.md
deleted file mode 100644
index 0bd887f0d4..0000000000
--- a/store-for-business/sfb-change-history.md
+++ /dev/null
@@ -1,86 +0,0 @@
----
-title: Change history for Microsoft Store for Business and Education
-description: Summary of topic changes for Microsoft Store for Business and Microsoft Store for Education. 
-ms.mktglfcycl: manage
-ms.sitesec: library
-ms.pagetype: store
-author: TrudyHa
-ms.author: TrudyHa
-ms.topic: conceptual
-ms.date: 3/2/2019
-ms.reviewer: 
-manager: dansimp
-ms.localizationpriority: medium
----
-
-# Change history for Microsoft Store for Business and Microsoft Store for Education  
-
-## March 2019
-
-| New or changed topic | Description |
-| --- | --- |
-| [Understand your Microsoft Customer Agreement invoice](billing-understand-your-invoice-msfb.md) | New topic |
-| [Understand billing profiles](billing-profile.md) | New topic |
-| [Payment methods](payment-methods.md) | New topic |
-| [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Update with information on billing accounts. |
-| [Roles and permissions in Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md) | Add info for purchasing roles and permissions. |
-
-## April 2018
-
-| New or changed topic | Description |
-| --- | --- |
-| [Configure access to Microsoft Store](/windows/configuration/stop-employees-from-using-microsoft-store#a-href-idblock-store-group-policyablock-microsoft-store-using-group-policy) | Update on app updates when Microsoft Store is blocked. |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
-
-## March 2018
-
-| New or changed topic | Description |
-| --- | --- |
-| [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md) | New |
-| [Manage private store settings](manage-private-store-settings.md) | Update for adding private store performance improvements. |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
-| [Roles and permissions in Microsoft Store for Business](roles-and-permissions-microsoft-store-for-business.md) | Update |
-
-## February 2018
-
-| New or changed topic | Description |
-| --- | --- |
-| [Manage private store settings](manage-private-store-settings.md) | Update for adding private store collections. |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
-
-## November 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
-
-## October 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | Update. Add profile settings with supported build info.  |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
-
-## September 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | New |
-| [Acquire apps](acquire-apps-microsoft-store-for-business.md#acquire-apps) | New |
-| [Settings reference: Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md) </br> and </br> [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Updates for UI changes in **Settings**. |
-
-## July 2017
-
-| New or changed topic | Description |
-| --- | --- |
-| [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md) | New |
-| [Microsoft Store for Business and Education overview - supported markets](./microsoft-store-for-business-overview.md#supported-markets) | Updates for added market support. |
-| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | New. Information about Windows Autopilot Deployment Program and how it is used in Microsoft Store for Business and Education.  |
-
-## June 2017
-
-| New or changed topic | Description |
-| -------------------- | ----------- |
-| [Notifications in Microsoft Store for Business and Education](notifications-microsoft-store-business.md) | New. Information about notification model in Microsoft Store for Business and Education. |
-| [Get Minecraft: Education Edition with Windows 10 device promotion](/education/windows/get-minecraft-device-promotion) | New. Information about redeeming Minecraft: Education Edition licenses with qualifying purchases of Windows 10 devices.  |
-| [Microsoft Store for Business and Education overview - supported markets](./microsoft-store-for-business-overview.md#supported-markets) | Updates for added market support. |

From 5b4aadde70a8e69a4abd138b3c21136e786f0fc1 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 09:59:55 -0400
Subject: [PATCH 11/20] AAD rebranding fix

---
 .../identity-protection/hello-for-business/hello-faq.yml        | 2 +-
 .../hello-for-business/hello-how-it-works-authentication.md     | 2 +-
 .../hello-for-business/hello-hybrid-key-trust.md                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/windows/security/identity-protection/hello-for-business/hello-faq.yml b/windows/security/identity-protection/hello-for-business/hello-faq.yml
index e289afe305..661971662b 100644
--- a/windows/security/identity-protection/hello-for-business/hello-faq.yml
+++ b/windows/security/identity-protection/hello-for-business/hello-faq.yml
@@ -190,7 +190,7 @@ sections:
           Windows Hello for Business is two-factor authentication based on the observed authentication factors of: *something you have*, *something you know*, and *something that's part of you*. Windows Hello for Business incorporates two of these factors: something you have (the user's private key protected by the device's security module) and something you know (your PIN). With the proper hardware, you can enhance the user experience by introducing biometrics. By using biometrics, you can replace the "something you know" authentication factor with the "something that is part of you" factor, with the assurances that users can fall back to the "something you know factor".
 
           > [!NOTE]
-          > The Windows Hello for Business key meets Azure AD multifactor authentication (MFA) requirements and reduces the number of MFA prompts users will see when accessing resources. For more information, see [What is a Primary Refresh Token](/azure/active-directory/devices/concept-primary-refresh-token#when-does-a-prt-get-an-mfa-claim).
+          > The Windows Hello for Business key meets Microsoft Entra multifactor authentication (MFA) requirements and reduces the number of MFA prompts users will see when accessing resources. For more information, see [What is a Primary Refresh Token](/azure/active-directory/devices/concept-primary-refresh-token#when-does-a-prt-get-an-mfa-claim).
       - question: Which is a better or more secure for of authentication, key or certificate?
         answer: |
           Both types of authentication provide the same security; one is not more secure than the other.
diff --git a/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md b/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
index 36755630f0..af0ff0de5a 100644
--- a/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
+++ b/windows/security/identity-protection/hello-for-business/hello-how-it-works-authentication.md
@@ -31,7 +31,7 @@ Microsoft Entra joined devices authenticate to Microsoft Entra ID during sign-in
 
 ## Microsoft Entra join authentication to Active Directory using cloud Kerberos trust
 
-![Microsoft Entra join authentication to Azure AD.](images/howitworks/auth-aadj-cloudtrust-kerb.png)
+![Microsoft Entra join authentication to Active Directory.](images/howitworks/auth-aadj-cloudtrust-kerb.png)
 
 | Phase  | Description  |
 | :----: | :----------- |
diff --git a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust.md b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust.md
index d9716ad230..a0a36f2cc0 100644
--- a/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust.md
+++ b/windows/security/identity-protection/hello-for-business/hello-hybrid-key-trust.md
@@ -42,7 +42,7 @@ Hybrid Windows Hello for Business needs two directories:
 - An on-premises Active Directory
 - A Microsoft Entra tenant
 
-The two directories must be synchronized with [Microsoft Entra Connect Sync][AZ-1], which synchronizes user accounts from the on-premises Active Directory to Azure AD.\
+The two directories must be synchronized with [Microsoft Entra Connect Sync][AZ-1], which synchronizes user accounts from the on-premises Active Directory to Microsoft Entra ID.\
 During the Window Hello for Business provisioning process, users register the public portion of their Windows Hello for Business credential with Microsoft Entra ID. *Microsoft Entra Connect Sync* synchronizes the Windows Hello for Business public key to Active Directory.
 
 > [!NOTE]

From e036b4101eaa3f81c8edd1ce4e025d4e479479d6 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:28:34 -0400
Subject: [PATCH 12/20] Entra join link

---
 windows/security/identity-protection/web-sign-in/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/security/identity-protection/web-sign-in/index.md b/windows/security/identity-protection/web-sign-in/index.md
index edd4b03647..f13acff6dd 100644
--- a/windows/security/identity-protection/web-sign-in/index.md
+++ b/windows/security/identity-protection/web-sign-in/index.md
@@ -25,7 +25,7 @@ This article describes how to configure Web sign-in and the supported key scenar
 To use web sign-in, the clients must meet the following prerequisites:
 
 - Windows 11, version 22H2 with [5030310][KB-1], or later
-- Must be Microsoft Entra joined
+- Must be [Microsoft Entra joined](/entra/identity/devices/concept-directory-join)
 - Must have Internet connectivity, as the authentication is done over the Internet
 
 [!INCLUDE [federated-sign-in](../../../../includes/licensing/web-sign-in.md)]

From dbfde3376f31688ba59ba461c50e5d8c21eb2d59 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:42:43 -0400
Subject: [PATCH 13/20] EDU landing page

---
 education/windows/index.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/education/windows/index.yml b/education/windows/index.yml
index 542b61300f..ebb7366333 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -40,14 +40,17 @@ productDirectory:
       links:
         - url: /education/windows/tutorial-school-deployment/
           text: "Tutorial: deploy and manage Windows devices in a school"
+        - url: /education/windows/tutorial-school-deployment/enroll-autopilot
+          text: Enrollment in Intune with Windows Autopilot
         - url: use-set-up-school-pcs-app.md
           text: Deploy devices with Set up School PCs
         - url: /windows/deployment
           text: Learn more about Windows deployment >
-
     - title: Learn how to secure Windows
       imageSrc: /media/common/i_security-management.svg
       links:
+        - url: federated-sign-in.md
+          text: Configure federated sign-in for Windows devices
         - url: /windows/security
           text: Learn more about Windows security >
 
@@ -60,16 +63,18 @@ productDirectory:
           text: Management functionalities for Surface devices
         - url: /education/windows/get-minecraft-for-education
           text: Get and deploy Minecraft Education
-        - url: get-minecraft-for-education.md
-          text: Configure settings and applications with Microsoft Intune
         - url: /windows/client-management
           text: Learn more about Windows management >
 
     - title: Learn how to configure Windows
       imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: federated-sign-in.md
-          text: Configure federated sign-in for Windows devices
+        - url: /education/windows/tutorial-school-deployment/configure-devices-overview
+          text: Configure settings and applications with Microsoft Intune
+        - url: /windows/configuration/set-up-shared-or-guest-pc
+          text: Set up a shared or guest Windows device
+        - url: /education/windows/take-tests-in-windows
+          text: Take tests and assessments in Windows
         - url: set-up-school-pcs-provisioning-package.md
           text: Provisioning package settings
         - url: https://www.youtube.com/watch?v=2ZLup_-PhkA

From f366be74bf524272a99b57a8e49998709b9385cd Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:56:09 -0400
Subject: [PATCH 14/20] EDU landing page

---
 education/windows/index.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/education/windows/index.yml b/education/windows/index.yml
index ebb7366333..a78beaa537 100644
--- a/education/windows/index.yml
+++ b/education/windows/index.yml
@@ -51,6 +51,14 @@ productDirectory:
       links:
         - url: federated-sign-in.md
           text: Configure federated sign-in for Windows devices
+        - url: /windows/security/application-security/application-control/user-account-control
+          text: User Account Control (UAC)
+        - url: /mem/intune/protect/security-baselines
+          text: Security baselines with Intune
+        - url: /windows/deployment/windows-autopatch
+          text: Windows Autopatch
+        - url: /universal-print
+          text: Universal Print
         - url: /windows/security
           text: Learn more about Windows security >
 

From 00bfd66f96a5c2a560fa56722da5e3ec8a416c03 Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:06:45 -0400
Subject: [PATCH 15/20] EDU landing page

---
 store-for-business/sfb-change-history.md | 86 ++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 store-for-business/sfb-change-history.md

diff --git a/store-for-business/sfb-change-history.md b/store-for-business/sfb-change-history.md
new file mode 100644
index 0000000000..0bd887f0d4
--- /dev/null
+++ b/store-for-business/sfb-change-history.md
@@ -0,0 +1,86 @@
+---
+title: Change history for Microsoft Store for Business and Education
+description: Summary of topic changes for Microsoft Store for Business and Microsoft Store for Education. 
+ms.mktglfcycl: manage
+ms.sitesec: library
+ms.pagetype: store
+author: TrudyHa
+ms.author: TrudyHa
+ms.topic: conceptual
+ms.date: 3/2/2019
+ms.reviewer: 
+manager: dansimp
+ms.localizationpriority: medium
+---
+
+# Change history for Microsoft Store for Business and Microsoft Store for Education  
+
+## March 2019
+
+| New or changed topic | Description |
+| --- | --- |
+| [Understand your Microsoft Customer Agreement invoice](billing-understand-your-invoice-msfb.md) | New topic |
+| [Understand billing profiles](billing-profile.md) | New topic |
+| [Payment methods](payment-methods.md) | New topic |
+| [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Update with information on billing accounts. |
+| [Roles and permissions in Microsoft Store for Business and Education](roles-and-permissions-microsoft-store-for-business.md) | Add info for purchasing roles and permissions. |
+
+## April 2018
+
+| New or changed topic | Description |
+| --- | --- |
+| [Configure access to Microsoft Store](/windows/configuration/stop-employees-from-using-microsoft-store#a-href-idblock-store-group-policyablock-microsoft-store-using-group-policy) | Update on app updates when Microsoft Store is blocked. |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
+
+## March 2018
+
+| New or changed topic | Description |
+| --- | --- |
+| [Manage software purchased with Microsoft Products and Services agreement in Microsoft Store for Business](manage-mpsa-software-microsoft-store-for-business.md) | New |
+| [Manage private store settings](manage-private-store-settings.md) | Update for adding private store performance improvements. |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
+| [Roles and permissions in Microsoft Store for Business](roles-and-permissions-microsoft-store-for-business.md) | Update |
+
+## February 2018
+
+| New or changed topic | Description |
+| --- | --- |
+| [Manage private store settings](manage-private-store-settings.md) | Update for adding private store collections. |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
+
+## November 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
+
+## October 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | Update. Add profile settings with supported build info.  |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | Update |
+
+## September 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [What's New in Microsoft Store for Business and Education](whats-new-microsoft-store-business-education.md) | New |
+| [Acquire apps](acquire-apps-microsoft-store-for-business.md#acquire-apps) | New |
+| [Settings reference: Microsoft Store for Business and Education](manage-settings-microsoft-store-for-business.md) </br> and </br> [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-microsoft-store-for-business-account-settings.md) | Updates for UI changes in **Settings**. |
+
+## July 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [Microsoft Store for Business and Education PowerShell module - preview](microsoft-store-for-business-education-powershell-module.md) | New |
+| [Microsoft Store for Business and Education overview - supported markets](./microsoft-store-for-business-overview.md#supported-markets) | Updates for added market support. |
+| [Manage Windows device deployment with Windows Autopilot Deployment](add-profile-to-devices.md) | New. Information about Windows Autopilot Deployment Program and how it is used in Microsoft Store for Business and Education.  |
+
+## June 2017
+
+| New or changed topic | Description |
+| -------------------- | ----------- |
+| [Notifications in Microsoft Store for Business and Education](notifications-microsoft-store-business.md) | New. Information about notification model in Microsoft Store for Business and Education. |
+| [Get Minecraft: Education Edition with Windows 10 device promotion](/education/windows/get-minecraft-device-promotion) | New. Information about redeeming Minecraft: Education Edition licenses with qualifying purchases of Windows 10 devices.  |
+| [Microsoft Store for Business and Education overview - supported markets](./microsoft-store-for-business-overview.md#supported-markets) | Updates for added market support. |

From 5f4ceaef03c324c651661feb10665b849583aa6a Mon Sep 17 00:00:00 2001
From: Paolo Matarazzo <74918781+paolomatarazzo@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:09:29 -0400
Subject: [PATCH 16/20] EDU landing page

---
 education/windows/index.old.txt | 40 ---------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 education/windows/index.old.txt

diff --git a/education/windows/index.old.txt b/education/windows/index.old.txt
deleted file mode 100644
index b2d43e8fe6..0000000000
--- a/education/windows/index.old.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
-  - title: Learn about Windows 11 SE
-    linkLists:
-      - linkListType: concept
-        links:
-        - text: What is Windows 11 SE?
-          url: windows-11-se-overview.md
-        - text: Windows 11 SE settings
-          url: windows-11-se-settings-list.md
-      - linkListType: whats-new
-        links:
-        - text: Configure federated sign-in
-          url: federated-sign-in.md
-        - text: Configure education themes
-          url: edu-themes.md
-        - text: Configure Stickers
-          url: edu-stickers.md
-      - linkListType: video
-        links:
-        - text: Deploy Windows 11 SE using Set up School PCs
-          url: https://www.youtube.com/watch?v=Ql2fbiOop7c
-
-  - title: Configure devices
-    linkLists:
-      - linkListType: concept
-        links:
-        - text: Take tests and assessments in Windows
-          url: take-tests-in-windows.md
-        - text: Considerations for shared and guest devices
-          url: /windows/configuration/shared-devices-concepts?context=/education/context/context
-        - text: Change Windows editions
-          url: change-home-to-edu.md
-      - linkListType: how-to-guide
-        links:
-        - text: Configure Take a Test in kiosk mode
-          url: edu-take-a-test-kiosk-mode.md
-        - text: Configure Shared PC
-          url: /windows/configuration/set-up-shared-or-guest-pc?context=/education/context/context
-        - text: Get and deploy Minecraft Education
-          url: get-minecraft-for-education.md
\ No newline at end of file

From ce4d41f30f72a62c9a8b1803695fd56fc5d3bd91 Mon Sep 17 00:00:00 2001
From: tiaraquan <tiaraquan@microsoft.com>
Date: Fri, 27 Oct 2023 10:05:10 -0700
Subject: [PATCH 17/20] Added information about MEC when set to Allow

---
 ...indows-autopatch-microsoft-365-apps-enterprise.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
index 06e2e12c09..251e6080a3 100644
--- a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
+++ b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
@@ -1,7 +1,7 @@
 ---
 title: Microsoft 365 Apps for enterprise
 description: This article explains how Windows Autopatch manages Microsoft 365 Apps for enterprise updates
-ms.date: 06/23/2023 
+ms.date: 10/27/2023 
 ms.prod: windows-client
 ms.technology: itpro-updates
 ms.topic: how-to
@@ -81,7 +81,15 @@ Windows Autopatch doesn't allow you to pause or roll back an update in the Micro
 
 ## Allow or block Microsoft 365 App updates
 
-For organizations seeking greater control, you can allow or block Microsoft 365 App updates for Windows Autopatch-enrolled devices. When the Microsoft 365 App update setting is set to **Block**, Windows Autopatch doesn't provide Microsoft 365 App updates on your behalf, and your organizations have full control over these updates. For example, you can continue to receive updates from [channels](/deployoffice/overview-update-channels) other than the default [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview).
+> [!IMPORTANT]
+> You must be an Intune Administrator to make changes to the setting.
+
+For organizations seeking greater control, you can allow or block Microsoft 365 App updates for Windows Autopatch-enrolled devices.
+
+| Microsoft 365 App setting | Description |
+| ----- | ----- |
+| **Block** | When set to **Block**, Windows Autopatch doesn't provide Microsoft 365 App updates on your behalf, and your organizations have full control over these updates. You can continue to receive updates from [channels](/deployoffice/overview-update-channels) other than the default [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview). |
+| **Allow** | When set to **Allow**, Windows Autopatch moves all Autopatch managed devices to the [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview) and manages updates automatically. To manage updates manually, the Microsoft 365 App update setting is set to **Block**. |
 
 **To allow or block Microsoft 365 App updates:**
 

From 5d189c95a738da19d4f28af74eea46f508cc42fc Mon Sep 17 00:00:00 2001
From: tiaraquan <tiaraquan@microsoft.com>
Date: Fri, 27 Oct 2023 10:11:12 -0700
Subject: [PATCH 18/20] Updated Whats new with M365 update

---
 .../whats-new/windows-autopatch-whats-new-2023.md         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md b/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md
index e800c3533c..24650e3a33 100644
--- a/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md
+++ b/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md
@@ -1,7 +1,7 @@
 ---
 title: What's new 2023
 description: This article lists the 2023 feature releases and any corresponding Message center post numbers.
-ms.date: 10/19/2023 
+ms.date: 10/27/2023 
 ms.prod: windows-client
 ms.technology: itpro-updates
 ms.topic: whats-new
@@ -23,6 +23,12 @@ Minor corrections such as typos, style, or formatting issues aren't listed.
 
 ## October 2023
 
+### October feature releases or updates
+
+| Article | Description |
+| ----- | ----- |
+| [Microsoft 365 Apps for enterprise](../operate/windows-autopatch-microsoft-365-apps-enterprise.md#microsoft-365-apps-for-enterprise-update-controls) | Added more information about the Allow setting in the [Microsoft 365 Apps for enterprise update controls](../operate/windows-autopatch-microsoft-365-apps-enterprise.md#microsoft-365-apps-for-enterprise-update-controls) section |
+
 ## October service release
 
 | Message center post number | Description |

From d12c2437bc60d41a2ebc25a48abeec47e0853ec5 Mon Sep 17 00:00:00 2001
From: tiaraquan <tiaraquan@microsoft.com>
Date: Fri, 27 Oct 2023 10:14:09 -0700
Subject: [PATCH 19/20] Tweak

---
 .../operate/windows-autopatch-microsoft-365-apps-enterprise.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
index 251e6080a3..c425246290 100644
--- a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
+++ b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
@@ -89,7 +89,7 @@ For organizations seeking greater control, you can allow or block Microsoft 365
 | Microsoft 365 App setting | Description |
 | ----- | ----- |
 | **Block** | When set to **Block**, Windows Autopatch doesn't provide Microsoft 365 App updates on your behalf, and your organizations have full control over these updates. You can continue to receive updates from [channels](/deployoffice/overview-update-channels) other than the default [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview). |
-| **Allow** | When set to **Allow**, Windows Autopatch moves all Autopatch managed devices to the [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview) and manages updates automatically. To manage updates manually, the Microsoft 365 App update setting is set to **Block**. |
+| **Allow** | When set to **Allow**, Windows Autopatch moves all Autopatch managed devices to the [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview) and manages updates automatically. To manage updates manually, set the Microsoft 365 App update setting to **Block**. |
 
 **To allow or block Microsoft 365 App updates:**
 

From fe4a90447a3976c20a278d3efd3490de9d245083 Mon Sep 17 00:00:00 2001
From: tiaraquan <tiaraquan@microsoft.com>
Date: Fri, 27 Oct 2023 10:21:36 -0700
Subject: [PATCH 20/20] Nitpick

---
 .../operate/windows-autopatch-microsoft-365-apps-enterprise.md  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
index c425246290..3120c809f3 100644
--- a/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
+++ b/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md
@@ -88,8 +88,8 @@ For organizations seeking greater control, you can allow or block Microsoft 365
 
 | Microsoft 365 App setting | Description |
 | ----- | ----- |
-| **Block** | When set to **Block**, Windows Autopatch doesn't provide Microsoft 365 App updates on your behalf, and your organizations have full control over these updates. You can continue to receive updates from [channels](/deployoffice/overview-update-channels) other than the default [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview). |
 | **Allow** | When set to **Allow**, Windows Autopatch moves all Autopatch managed devices to the [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview) and manages updates automatically. To manage updates manually, set the Microsoft 365 App update setting to **Block**. |
+| **Block** | When set to **Block**, Windows Autopatch doesn't provide Microsoft 365 App updates on your behalf, and your organizations have full control over these updates. You can continue to receive updates from [channels](/deployoffice/overview-update-channels) other than the default [Monthly Enterprise Channel](/deployoffice/overview-update-channels#monthly-enterprise-channel-overview). |
 
 **To allow or block Microsoft 365 App updates:**