toc2

education/windows/TOC.yml

@@ -1,21 +1,11 @@
+items:
 - name: Windows for Education
   href: index.md
-- name: Introduction
-  href: index.md
-- name: Microsoft Education
-  href: microsoft-education.md
-- name: Setup
-  expanded: true
-  items: 
-    - name: Set up your tenant
-      href: set-up-your-tenant.md
-    - name: Set up Microsoft Intune
-      href: set-up-microsoft-intune.md
-- name: Deploy
-  expanded: true
+- name: Tutorials
   items:
   - name: Deploy and manage Windows devices in a school
-      expanded: true
+    href: school-deployment/toc.yml
+  - name: (OLD) Deploy and manage Windows devices in a school
     items: 
       - name: Deploy Windows 10 in a school
         href: deploy-windows-10-in-a-school.md
@@ -24,7 +14,6 @@
       - name: Deployment recommendations for school IT administrators
         href: edu-deployment-recommendations.md
       - name: Set up Windows devices for education
-          expanded: true
         items: 
           - name: Overview
             href: set-up-windows-10.md
@@ -57,47 +46,7 @@
             href: test-windows10s-for-edu.md
           - name: Enable Windows 10 in S mode on Surface Go devices
             href: enable-s-mode-on-surface-go-devices.md
-    - name: Enroll devices in Intune
-      items: 
-        - name: Overview
-          href: enrollment-overview.md
-        - name: Enroll devices with Windows Autopilot
-          href: enrollment-autopilot.md
-        - name: Enroll devices with provisioning packages and SUSPCs
-          href: enrollment-package.md
-        - name: Enroll devices manually
-          href: enrollment-aadj.md
-        - name: Set up School PCs technical reference
-          items: 
-            - name: Technical reference for the Set up School PCs app
-              href: set-up-school-pcs-technical.md
-            - name: Provisioning package settings
-              href: set-up-school-pcs-provisioning-package.md
-            - name: What's new in Set up School PCs
-              href: set-up-school-pcs-whats-new.md
-- name: Manage
-  items: 
-    - name: Overview
-      href: management-overview.md
-    - name: "Minecraft: Education Edition"
-      items: 
-        - name: "Get Minecraft: Education Edition"
-          href: get-minecraft-for-education.md
-        - name: "For IT administrators: get Minecraft Education Edition"
-          href: school-get-minecraft.md
-        - name: "For teachers: get Minecraft Education Edition"
-          href: teacher-get-minecraft.md
-    - name: Take tests and assessments in Windows
-      items: 
-        - name: Overview
-          href: take-tests-in-windows-10.md
-        - name: Configure Take a Test on a single PC
-          href: take-a-test-single-pc.md
-        - name: Configure a Test on multiple PCs
-          href: take-a-test-multiple-pcs.md
-        - name: Take a Test app technical reference
-          href: take-a-test-app-technical.md
-    - name: Change Windows edition
+- name: Change Windows edition
   items: 
     - name: Windows 10 editions for education customers
       href: windows-editions-for-education-customers.md
@@ -107,21 +56,37 @@
       href: change-to-pro-education.md
     - name: Upgrade Windows Home to Windows Education on student-owned devices
       href: change-home-to-edu.md
-    - name: Reset and wipe devices
-      href: reset-wipe.md
-    - name: Microsoft Store for Education
-      items: 
-        - name: Working with Microsoft Store for Education
-          href: education-scenarios-store-for-business.md
-    - name: Device inventory and reporting
-      href: management-inventory-reporting.md
-    - name: Remote actions
-      href: management-remote-actions.md
-- name: Troubleshooting
-  items: 
-    - name: Advanced capabilities
-      href: advanced-capabilities.md
 - name: Migrate from Chromebook to Windows
   items: 
     - name: Chromebook migration guide
       href: chromebook-migration-guide.md
+- name: Set up School PCs technical reference
+  items: 
+    - name: Technical reference for the Set up School PCs app
+      href: set-up-school-pcs-technical.md
+    - name: Provisioning package settings
+      href: set-up-school-pcs-provisioning-package.md
+    - name: What's new in Set up School PCs
+      href: set-up-school-pcs-whats-new.md
+- name: Take tests and assessments in Windows
+  items: 
+    - name: Overview
+      href: take-tests-in-windows-10.md
+    - name: Configure Take a Test on a single PC
+      href: take-a-test-single-pc.md
+    - name: Configure a Test on multiple PCs
+      href: take-a-test-multiple-pcs.md
+    - name: Take a Test app technical reference
+      href: take-a-test-app-technical.md
+- name: Microsoft Store for Education
+  items: 
+    - name: Working with Microsoft Store for Education
+      href: education-scenarios-store-for-business.md
+- name: "Minecraft: Education Edition"
+  items: 
+    - name: "Get Minecraft: Education Edition"
+      href: get-minecraft-for-education.md
+    - name: "For IT administrators: get Minecraft Education Edition"
+      href: school-get-minecraft.md
+    - name: "For teachers: get Minecraft Education Edition"
+      href: teacher-get-minecraft.md

education/windows/school-deployment/toc.yml

@@ -3,13 +3,14 @@ items:
     href: index.md
   - name: Microsoft Education
     href: microsoft-education.md
-  - name: Get started
+  - name: 1 . Prepare your tenant
     items: 
       - name: Set up your tenant
         href: set-up-your-tenant.md
       - name: Set up Microsoft Intune
         href: set-up-microsoft-intune.md
-  - name: Enroll devices in Intune
+  - name: 2. Configure devices with Intune
+  - name: 3. Enroll devices in Intune
     items: 
       - name: Overview
         href: enrollment-overview.md
@@ -19,7 +20,7 @@ items:
         href: enrollment-package.md
       - name: Enroll devices manually
         href: enrollment-aadj.md
-  - name: Manage devices with Intune
+  - name: 4. Manage devices with Intune
     items: 
       - name: Overview
         href: management-overview.md
@@ -27,7 +28,7 @@ items:
         href: management-remote-actions.md
       - name: Device inventory and reporting
         href: management-inventory-reporting.md
-  - name: Reset and wipe devices
-    href: reset-wipe.md
       - name: Advanced capabilities
         href: advanced-capabilities.md
+  - name: 5. Reset and wipe devices
+    href: reset-wipe.md