Merge pull request #9744 from aczechowski/cz-8702206-deploy

deploy cleanup

windows/deployment/TOC.yml

@@ -16,13 +16,9 @@
         - name: Prepare servicing strategy for Windows client updates
           href: update/waas-servicing-strategy-windows-10-updates.md
         - name: Deployment proof of concept
-          items:
-            - name: Deploy Windows 10 with MDT and Configuration Manager
           items:
             - name: 'Step by step guide: Configure a test lab to deploy Windows 10'
               href: windows-10-poc.md
-                - name: Deploy Windows 10 in a test lab using MDT
-                  href: windows-10-poc-mdt.md
             - name: Deploy Windows 10 in a test lab using Configuration Manager
               href: windows-10-poc-sc-config-mgr.md
         - name: Deployment process posters
@@ -79,10 +75,6 @@
           href: do/waas-delivery-optimization-setup.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
         - name: Configure BranchCache for Windows client updates
           href: update/waas-branchcache.md
-        - name: Prepare your deployment tools
-          items:
-            - name: Prepare for deployment with MDT
-              href: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
         - name: Prepare for deployment with Configuration Manager
           href: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
         - name: Build a successful servicing strategy
@@ -112,16 +104,6 @@
                   href: deploy-windows-cm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md
                 - name: In-place upgrade
                   href: deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md
-            - name: Deploy Windows client with MDT
-              items:
-                - name: Deploy to a new device
-                  href: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
-                - name: Refresh a device
-                  href: deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md
-                - name: Replace a device
-                  href: deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md
-                - name: In-place upgrade
-                  href: deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md
         - name: Deploy Windows client updates
           items:
             - name: Assign devices to servicing channels

windows/deployment/deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md

@@ -17,7 +17,7 @@ ms.date: 10/27/2022
 
 - Windows 10
 
-This article will show you how to refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager and Microsoft Deployment Toolkit (MDT). A computer refresh isn't the same as an in-place upgrade. A computer refresh involves storing user data and settings from the old installation, wiping the hard drives, installing a new OS, and then restoring the user data at the end of the installation. Also see the MDT refresh procedure: [Refresh a Windows 7 computer with Windows 10](../deploy-windows-mdt/refresh-a-windows-7-computer-with-windows-10.md).
+This article will show you how to refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager and Microsoft Deployment Toolkit (MDT). A computer refresh isn't the same as an in-place upgrade. A computer refresh involves storing user data and settings from the old installation, wiping the hard drives, installing a new OS, and then restoring the user data at the end of the installation.
 
 A computer refresh with Configuration Manager works the same as it does with MDT Lite Touch installation. Configuration Manager also uses the User State Migration Tool (USMT) from the Windows Assessment and Deployment Kit (Windows ADK) 10 in the background. A computer refresh with Configuration Manager has the following steps:
 

windows/deployment/deploy-windows-cm/replace-a-windows-7-client-with-windows-10-using-configuration-manager.md

@@ -19,7 +19,7 @@ ms.date: 10/27/2022
 
 In this article, you'll learn how to replace a Windows 7 SP1 computer using Microsoft Configuration Manager. This process is similar to refreshing a computer, but since you're replacing the device, you have to run the backup job separately from the deployment of Windows 10.
 
-In this article, you'll create a backup-only task sequence that you run on PC0004 (the device you're replacing), deploy the PC0006 computer running Windows 10, and then restore this backup of PC0004 onto PC006. This process is similar to the MDT replace process: [Replace a Windows 7 computer with a Windows 10 computer](../deploy-windows-mdt/replace-a-windows-7-computer-with-a-windows-10-computer.md).
+In this article, you'll create a backup-only task sequence that you run on PC0004 (the device you're replacing), deploy the PC0006 computer running Windows 10, and then restore this backup of PC0004 onto PC006.
 
 ## Infrastructure
 
@@ -221,11 +221,11 @@ Next, see [Perform an in-place upgrade to Windows 10 using Configuration Manager
 
 ## Related articles
 
-[Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)<br>
+- [Prepare for Zero Touch Installation of Windows 10 with Configuration Manager](prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md)
-[Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)<br>
+- [Create a custom Windows PE boot image with Configuration Manager](create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-[Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)<br>
+- [Add a Windows 10 operating system image using Configuration Manager](add-a-windows-10-operating-system-image-using-configuration-manager.md)
-[Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)<br>
+- [Create an application to deploy with Windows 10 using Configuration Manager](create-an-application-to-deploy-with-windows-10-using-configuration-manager.md)
-[Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)<br>
+- [Add drivers to a Windows 10 deployment with Windows PE using Configuration Manager](add-drivers-to-a-windows-10-deployment-with-windows-pe-using-configuration-manager.md)
-[Create a task sequence with Configuration Manager and MDT](./create-a-task-sequence-with-configuration-manager-and-mdt.md)<br>
+- [Create a task sequence with Configuration Manager and MDT](./create-a-task-sequence-with-configuration-manager-and-mdt.md)
-[Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)<br>
+- [Deploy Windows 10 using PXE and Configuration Manager](deploy-windows-10-using-pxe-and-configuration-manager.md)
-[Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)<br>
+- [Refresh a Windows 7 SP1 client with Windows 10 using Configuration Manager](refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md)

windows/deployment/index.yml

@@ -1,4 +1,4 @@
-### YamlMime:Hub
+### YamlMime:Landing
 
 title: Deploy and update Windows # < 60 chars; shows at top of hub page
 summary: Learn about deploying and updating Windows client devices in your organization. # < 160 chars
@@ -6,7 +6,7 @@ summary: Learn about deploying and updating Windows client devices in your organ
 metadata:
   title: Windows client deployment documentation # Required; browser tab title displayed in search results. Include the brand. < 60 chars.
   description: Learn about deploying and updating Windows client devices in your organization. # Required; article description that is displayed in search results. < 160 chars.
-  ms.topic: hub-page
+  ms.topic: landing-page
   ms.service: windows-client
   ms.subservice: itpro-deploy
   ms.collection:
@@ -15,16 +15,16 @@ metadata:
   author: aczechowski
   ms.author: aaroncz
   manager: aaroncz
-  ms.date: 01/18/2024
+  ms.date: 04/01/2024
   localization_priority: medium
 
-# common graphics: https://review.learn.microsoft.com/content-production-service/internal/image-gallery?branch=main
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+
+landingContent:
 
-productDirectory:
-  title: Get started
-  items:
 - title: Plan
-      imageSrc: /media/common/i_overview.svg
+  linkLists:
+  - linkListType: concept
     links:
     - text: Plan for Windows 11
       url: /windows/whats-new/windows-11-plan?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
@@ -40,7 +40,8 @@ productDirectory:
       url: volume-activation/plan-for-volume-activation-client.md
 
 - title: Prepare
-      imageSrc: /media/common/i_tasks.svg
+  linkLists:
+  - linkListType: get-started
     links:
     - text: Prepare for Windows 11
       url: /windows/whats-new/windows-11-prepare?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
@@ -56,7 +57,8 @@ productDirectory:
       url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
 
 - title: Deploy
-      imageSrc: /media/common/i_deploy.svg
+  linkLists:
+  - linkListType: deploy
     links:
     - text: Deploy Windows with Autopilot
       url: /mem/autopilot/tutorial/autopilot-scenarios
@@ -71,12 +73,9 @@ productDirectory:
     - text: Check release health
       url: update/check-release-health.md
 
-additionalContent:
-  sections:
-    - title: Solutions
-      items:
-
 - title: Windows Autopilot
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: Overview
         url: /mem/autopilot/windows-autopilot
@@ -88,6 +87,8 @@ additionalContent:
         url: /mem/autopilot
 
 - title: Windows Autopatch
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: What is Windows Autopatch?
         url: windows-autopatch/overview/windows-autopatch-overview.md
@@ -99,6 +100,8 @@ additionalContent:
         url: windows-autopatch/index.yml
 
 - title: Windows Update for Business
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: What is Windows Update for Business?
         url: update/waas-manage-updates-wufb.md
@@ -110,6 +113,8 @@ additionalContent:
         url: update/wufb-reports-overview.md
 
 - title: Optimize and cache content
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: What is Delivery Optimization?
         url: do/waas-delivery-optimization.md
@@ -121,6 +126,8 @@ additionalContent:
         url: do/index.yml
 
 - title: In-place upgrade and imaging
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: Upgrade Windows using Configuration Manager
         url: deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md
@@ -132,6 +139,8 @@ additionalContent:
         url: upgrade/resolve-windows-upgrade-errors.md
 
 - title: Licensing and activation
+  linkLists:
+  - linkListType: how-to-guide
     links:
       - text: Plan for volume activation
         url: volume-activation/plan-for-volume-activation-client.md
@@ -144,10 +153,12 @@ additionalContent:
       - text: Windows commercial licensing overview
         url: /windows/whats-new/windows-licensing
 
-    - title: More resources
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
-      items:
 
-      - title: Release and lifecycle
+- title: More resources
+  linkLists:
+  - linkListType: reference
+    # Release and lifecycle
     links:
       - text: Windows release health dashboard
         url: /windows/release-health
@@ -155,26 +166,17 @@ additionalContent:
         url: /windows/whats-new/feature-lifecycle
       - text: Lifecycle FAQ - Windows
         url: /lifecycle/faq/windows
-
+  - linkListType: download
-      - title: Windows hardware
+    # Windows hardware
     links:
       - text: Download and install the Windows ADK
         url: /windows-hardware/get-started/adk-install
       - text: Deployment tools
         url: /windows-hardware/manufacture/desktop/boot-and-install-windows
-#          - text: 
+  - linkListType: whats-new
-#            url: 
+    # Community
-#          - text: 
-#            url: 
-
-      - title: Community
     links:
       - text: Windows IT pro blog
         url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
       - text: Windows office hours
         url: https://aka.ms/windows/officehours
-#          - text: 
-#            url: 
-#          - text: 
-#            url: 
-

windows/deployment/planning/windows-10-enterprise-faq-itpro.yml

@@ -82,7 +82,7 @@ sections:
       - question: |
           Can I upgrade computers from Windows 7 or Windows 8.1 without deploying a new image?
         answer: |
-          Computers running Windows 7 or Windows 8.1 can be upgraded directly to Windows 10 through the in-place upgrade process without a need to reimage the device using MDT and/or Configuration Manager. For more information, see [Upgrade to Windows 10 with Microsoft Configuration Manager](../deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md) or [Upgrade to Windows 10 with the Microsoft Deployment Toolkit](../deploy-windows-mdt/upgrade-to-windows-10-with-the-microsoft-deployment-toolkit.md).
+          Computers running Windows 7 or Windows 8.1 can be upgraded directly to Windows 10 through the in-place upgrade process without a need to reimage the device. For more information, see [Upgrade to Windows 10 with Microsoft Configuration Manager](../deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md).
 
       - question: |
           Can I upgrade from Windows 7 Enterprise or Windows 8.1 Enterprise to Windows 10 Enterprise for free?

windows/deployment/wds-boot-support.md

@@ -61,6 +61,5 @@ If you currently use WDS with **boot.wim** from installation media for end-to-en
 
 ## Also see
 
-[Features removed or no longer developed starting with Windows Server 2022](/windows-server/get-started/removed-deprecated-features-windows-server-2022#features-were-no-longer-developing)<br>
+- [Features removed or no longer developed starting with Windows Server 2022](/windows-server/get-started/removed-deprecated-features-windows-server-2022#features-were-no-longer-developing)
-[Create a custom Windows PE boot image with Configuration Manager](deploy-windows-cm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)<br>
+- [Create a custom Windows PE boot image with Configuration Manager](deploy-windows-cm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
-[Prepare for deployment with MDT](deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md)<br>

windows/deployment/windows-10-poc.md

@@ -22,10 +22,7 @@ This guide contains instructions to configure a proof of concept (PoC) environme
 > [!NOTE]
 > Microsoft also offers a pre-configured lab using an evaluation version of Configuration Manager. For more information, see [Windows and Office deployment and management lab kit](/microsoft-365/enterprise/modern-desktop-deployment-and-management-lab).
 
-This lab guide makes extensive use of Windows PowerShell and Hyper-V. Subsequent companion guides contain steps to deploy Windows 10 using the PoC environment. After completing this guide, see the following Windows 10 PoC deployment guides:
+This lab guide makes extensive use of Windows PowerShell and Hyper-V. Subsequent companion guides contain steps to deploy Windows 10 using the PoC environment. After completing this guide, see [Step by step: Deploy Windows 10 in a test lab using Microsoft Configuration Manager](windows-10-poc-sc-config-mgr.md).
-
-- [Step by step: Deploy Windows 10 in a test lab using Microsoft Configuration Manager](windows-10-poc-sc-config-mgr.md)
-- [Step by step: Deploy Windows 10 in a test lab using MDT](windows-10-poc-mdt.md)
 
 The proof of concept (PoC) deployment guides are intended to provide a demonstration of Windows 10 deployment tools and processes for IT professionals that aren't familiar with these tools, and you want to set up a PoC environment. Don't use the instructions in this guide in a production setting. They aren't meant to replace the instructions found in production deployment guidance.
 
@@ -1044,4 +1041,5 @@ Use the following procedures to verify that the PoC environment is configured pr
 
 ## Next steps
 
-- [Windows 10 deployment scenarios](windows-deployment-scenarios.md).
+- [Windows 10 deployment scenarios](windows-deployment-scenarios.md)
+- [Step by step: Deploy Windows 10 in a test lab using Microsoft Configuration Manager](windows-10-poc-sc-config-mgr.md)