new lp

windows/deployment/TOC.yml

@@ -245,6 +245,8 @@
         - name: Delivery Optimization reference
           href: update/waas-delivery-optimization-reference.md
         - name: Windows 10 in S mode
+          href: s-mode.md
+        - name: Switch to Windows 10 Pro or Enterprise from S mode
           href: windows-10-pro-in-s-mode.md
         - name: Windows 10 deployment tools
           items:

windows/deployment/index.yml

@@ -72,7 +72,9 @@ landingContent:
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: Prepare to deploy Windows 10
+          - text: Prepare for Zero Touch Installation with Configuration Manager
+            url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+          - text: Prepare to deploy Windows 10 with MDT
             url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
           - text: Evaluate and update infrastructure
             url: update/update-policies.md
@@ -84,12 +86,18 @@ landingContent:
     linkLists:
       - linkListType: deploy
         links:
-          - text: Deploy Windows 10 with Autopilot
+          - text: Windows Autopilot scenarios and capabilities
             url: windows-autopilot/windows-autopilot-scenarios.md
+          - text: Deploy Windows 10 to a new device with Configuration Manager
+            url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md
+          - text: Deploy a Windows 10 image using MDT
+            url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
           - text: Assign devices to servicing channels
             url: update/waas-servicing-channels-windows-10-updates.md
           - text: Deploy Windows 10 updates
-            url: update/index.md
+            url: update/waas-servicing-channels-windows-10-updates.md
+          - text: Resolve Windows 10 upgrade errors
+            url: upgrade/resolve-windows-10-upgrade-errors          
 
   # Card (optional)
   - title: Windows 10 resources

windows/deployment/index3.yml

@@ -1,94 +0,0 @@
-### YamlMime:Landing
-
-title: Windows 10 deployment resources and documentation # < 60 chars
-summary: Learn about deploying and and keeping Windows 10 up to date.  # < 160 chars
-
-metadata:
-  title: Windows 10 deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
-  description: Learn about deploying Windows 10 and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 chars.
-  services: windows-10
-  ms.service: windows-10 #Required; service per approved list. service slug assigned to your service by ACOM.
-  ms.subservice: subservice
-  ms.topic: landing-page # Required
-  ms.collection: windows-10
-  author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
-  ms.author: greglin #Required; microsoft alias of author; optional team alias.
-  ms.date: 05/27/2020 #Required; mm/dd/yyyy format.
-  localization_priority: medium
-    
-# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
-
-landingContent:
-# Cards and links should be based on top customer tasks or top subjects
-# Start card title with a verb
-  # Card (optional)
-  - title: Overview
-    linkLists:
-      - linkListType: overview
-        links:
-          - text: Windows 10 deployment scenarios
-            url: windows-10-deployment-scenarios.md
-          - text: What is Windows as a service?
-            url:  update/waas-overview.md
-          - text: Types of Windows updates
-            url: update/waas-quick-start.md#definitions
-
-  # Card (optional)
-  - title: Get started
-    linkLists:
-      - linkListType: get-started
-        links:
-          - text: Demonstrate Autopilot deployment
-            url: windows-autopilot/demonstrate-deployment-on-vm.md
-          - text: Servicing the Windows 10 operating system
-            url: update/waas-servicing-strategy-windows-10-updates.md
-          - text: Deploy Windows 10 in a test lab
-            url: windows-10-poc.md
-
-  # Card (optional)
-  - title: Deployment planning
-    linkLists:
-      - linkListType: architecture
-        links:
-          - text: Create a deployment plan
-            url: update/create-deployment-plan.md
-          - text: Evaluate infrastructure and tools
-            url: update/eval-infra-tools.md
-          - text: Define your servicing strategy
-            url: update/waas-servicing-strategy-windows-10-updates.md
- 
-   # Card
-  - title: Prepare to deploy Windows 10
-    linkLists:
-      - linkListType: how-to-guide
-        links:
-          - text: Prepare to deploy Windows 10
-            url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
-          - text: Evaluate and update infrastructure
-            url: update/update-policies.md
-          - text: Build a successful servicing strategy
-            url: update/waas-deployment-rings-windows-10-updates.md
-
-  # Card
-  - title: Deploy Windows 10
-    linkLists:
-      - linkListType: deploy
-        links:
-          - text: Deploy Windows 10 with Autopilot
-            url: windows-autopilot/windows-autopilot-scenarios.md
-          - text: Assign devices to servicing channels
-            url: update/waas-servicing-channels-windows-10-updates.md
-          - text: Deploy Windows 10 updates
-            url: update/index.md
-
-  # Card (optional)
-  - title: Also see
-    linkLists:
-      - linkListType: reference
-        links:
-          - text: Windows 10 release information
-            url: https://docs.microsoft.com/en-us/windows/release-information/
-          - text: What's new in Windows 10
-            url: https://docs.microsoft.com/en-us/windows/whats-new/
-          - text: Windows 10 Enterprise Security
-            url: https://docs.microsoft.com/en-us/windows/security/