Merge branch 'master' into symantec-mdatp

windows/configuration/windows-10-start-layout-options-and-policies.md

@@ -20,7 +20,7 @@ ms.date: 06/19/2018
 
 **Applies to**
 
--   Windows 10
+-   Windows 10, Windows Server 2016 with Desktop Experience, Windows Server 2019 with Desktop Experience
 
 > **Looking for consumer information?** [See what's on the Start menu](https://support.microsoft.com/help/17195/windows-10-see-whats-on-the-menu)
 
@@ -132,7 +132,7 @@ If your Start layout customization is not applied as expected, open **Event View
 - [Start layout XML for desktop editions of Windows 10 (reference)](start-layout-xml-desktop.md)
 - [Customize Windows 10 Start and taskbar with Group Policy](customize-windows-10-start-screens-by-using-group-policy.md)
 - [Customize Windows 10 Start and taskbar with provisioning packages](customize-windows-10-start-screens-by-using-provisioning-packages-and-icd.md)
-- [Customize Windows 10 Start and tasbkar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
+- [Customize Windows 10 Start and taskbar with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)
 - [Changes to Start policies in Windows 10](changes-to-start-policies-in-windows-10.md)
 
 

windows/deployment/index.yml

@@ -22,39 +22,9 @@ landingContent:
 # Cards and links should be based on top customer tasks or top subjects
 # Start card title with a verb
   # Card (optional)
-  - title: Deploy Windows 10
+  - title: Plan
     linkLists:
       - linkListType: overview
-        links:
-          - text: Windows 10 deployment scenarios
-            url: windows-10-deployment-scenarios.md
-
-      - linkListType: get-started
-        links:
-          - text: Demonstrate Autopilot deployment
-            url: windows-autopilot/demonstrate-deployment-on-vm.md
-          - text: Deploy Windows 10 in a test lab
-            url: windows-10-poc.md
-
-  # Card (optional)
-  - title: Update Windows 10
-    linkLists:
-      - linkListType: overview
-        links:
-          - text: What is Windows as a service?
-            url:  update/waas-overview.md
-          - text: Types of Windows updates
-            url: update/waas-quick-start.md#definitions
-      - linkListType: get-started
-        links:
-          - text: Servicing the Windows 10 operating system
-            url: update/waas-servicing-strategy-windows-10-updates.md
-
-
-  # Card (optional)
-  - title: Deployment planning
-    linkLists:
-      - linkListType: architecture
         links:
           - text: Create a deployment plan
             url: update/create-deployment-plan.md
@@ -62,56 +32,68 @@ landingContent:
             url: update/plan-define-readiness.md
           - text: Evaluate infrastructure and tools
             url: update/eval-infra-tools.md
-          - text: Determine application readiness
-            url: update/plan-determine-app-readiness.md
           - text: Define your servicing strategy
-            url: update/waas-servicing-strategy-windows-10-updates.md
+            url:  update/plan-define-strategy.md
 
-   # Card
+  # Card (optional)
-  - title: Prepare to deploy Windows 10
+  - title: Prepare
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: Prepare for Zero Touch Installation with Configuration Manager
+          - text: Prepare to deploy Windows 10 updates
+            url: update/prepare-deploy-windows.md
+          - text: Prepare updates using Windows Update for Business
+            url: update/waas-manage-updates-wufb.md
+          - text: Prepare for Zero Touch Installation of Windows 10 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
-          - text: Build a successful servicing strategy
-            url: update/waas-deployment-rings-windows-10-updates.md
 
-  # Card
+  # Card (optional)
-  - title: Deploy and update Windows 10
+  - title: Deploy
     linkLists:
       - linkListType: deploy
         links:
-          - text: Windows Autopilot scenarios and capabilities
+          - text: Deploy Windows 10 with Autopilot
             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
+          - text: Deploy Windows updates with Configuration Manager
-            url: update/waas-servicing-channels-windows-10-updates.md
+            url: update/deploy-updates-configmgr.md
-          - text: Resolve Windows 10 upgrade errors
+ 
-            url: upgrade/resolve-windows-10-upgrade-errors.md          
+  # Card
+  - title: Overview
+    linkLists:
+      - linkListType: overview
+        links:
+          - text: What's new in Windows deployment
+            url: windows-10-deployment-scenarios.md
+          - text: Windows 10 deployment scenarios
+            url: windows-10-deployment-scenarios.md
+          - text: Basics of Windows updates, channels, and tools
+            url:  update/get-started-updates-channels-tools.md
+          - text: Overview of Windows Autopilot
+            url:  windows-autopilot/windows-autopilot.md
+
+
+  # Card
+  - title: Support remote work
+    linkLists:
+      - linkListType: concept
+        links:
+          - text: Deploy Windows 10 for a remote world
+            url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/deploying-a-new-version-of-windows-10-in-a-remote-world/ba-p/1419846
+          - text: Empower remote workers with Microsoft 365
+            url: https://docs.microsoft.com/microsoft-365/solutions/empower-people-to-work-remotely
+          - text: Top 12 tasks for security teams to support working from home
+            url: https://docs.microsoft.com/microsoft-365/security/top-security-tasks-for-remote-work
 
   # Card (optional)
-  - title: Windows 10 resources
+  - title: Microsoft Learn
     linkLists:
-      - linkListType: reference
+      - linkListType: learn
         links:
-          - text: Windows 10 release information
+          - text: Plan to deploy updates for Windows 10 and Microsoft 365 Apps
-            url: https://docs.microsoft.com/windows/release-information/
+            url: https://docs.microsoft.com/learn/modules/windows-plan
-          - text: What's new in Windows 10
+          - text: Prepare to deploy updates for Windows 10 and Microsoft 365 Apps
-            url: https://docs.microsoft.com/windows/whats-new/
+            url: https://docs.microsoft.com/learn/modules/windows-prepare/
-          - text: Windows 10 Enterprise Security
+          - text: Deploy updates for Windows 10 and Microsoft 365 Apps
-            url: https://docs.microsoft.com/windows/security/
+            url: https://docs.microsoft.com/learn/modules/windows-deploy
-          - text: Desktop Deployment Center
-            url: https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home
-          - text: Microsoft 365 solution and architecture center
-            url: https://docs.microsoft.com/microsoft-365/solutions/?view=o365-worldwide
-