Merge branch 'main' into WDAC-Docs

windows/deployment/index.yml

@@ -1,104 +1,180 @@
-### YamlMime:Landing
+### YamlMime:Hub
 
-title: Windows client deployment resources and documentation # < 60 chars
+title: Deploy and update Windows # < 60 chars; shows at top of hub page
-summary: Learn about deploying and keeping Windows client devices up to date.  # < 160 chars
+summary: Learn about deploying and updating Windows client devices in your organization. # < 160 chars
 
 metadata:
-  title: Windows client deployment resources and documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
+  title: Windows client deployment documentation # Required; browser tab title displayed in search results. Include the brand. < 60 chars.
-  description: Learn about deploying Windows and keeping it up to date in your organization. # Required; article description that is displayed in search results. < 160 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: landing-page
+  ms.topic: hub-page
-  ms.technology: itpro-deploy
   ms.prod: windows-client
+  ms.technology: itpro-deploy
   ms.collection:
     - highpri
     - tier1
-  author: frankroj
+  author: aczechowski
-  ms.author: frankroj
+  ms.author: aaroncz
   manager: aaroncz
-  ms.date: 10/31/2022
+  ms.date: 12/20/2023
   localization_priority: medium
 
-# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+# common graphics: https://review.learn.microsoft.com/content-production-service/internal/image-gallery?branch=main
 
-landingContent:
+productDirectory:
-# Cards and links should be based on top customer tasks or top subjects
+  title: Get started
-# Start card title with a verb
+  items:
-  # Card (optional)
+    - title: Plan
-  - title: Plan
+      imageSrc: /media/common/i_overview.svg
-    linkLists:
+      links:
-      - linkListType: overview
+        - text: Plan for Windows 11
-        links:
+          url: /windows/whats-new/windows-11-plan?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
-          - text: Create a deployment plan
+        - text: Create a deployment plan
-            url: update/create-deployment-plan.md
+          url: update/create-deployment-plan.md
-          - text: Define readiness criteria
+        - text: Define readiness criteria
-            url: update/plan-define-readiness.md
+          url: update/plan-define-readiness.md
-          - text: Evaluate infrastructure and tools
+        - text: Define your servicing strategy
-            url: update/eval-infra-tools.md
+          url: update/plan-define-strategy.md
-          - text: Define your servicing strategy
+        - text: Determine application readiness
-            url:  update/plan-define-strategy.md
+          url: update/plan-determine-app-readiness.md
+        - text: Plan for volume activation
+          url: volume-activation/plan-for-volume-activation-client.md
 
-  # Card (optional)
+    - title: Prepare
-  - title: Prepare
+      imageSrc: /media/common/i_tasks.svg
-    linkLists:
+      links:
-      - linkListType: how-to-guide
+        - text: Prepare for Windows 11
+          url: /windows/whats-new/windows-11-prepare?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
+        - text: Prepare to deploy Windows updates
+          url: update/prepare-deploy-windows.md
+        - text: Prepare updates using Windows Update for Business
+          url: update/waas-manage-updates-wufb.md
+        - text: Evaluate and update infrastructure
+          url: update/update-policies.md
+        - text: Set up Delivery Optimization for Windows client updates
+          url: do/waas-delivery-optimization-setup.md?toc=/windows/deployment/toc.json&bc=/windows/deployment/breadcrumb/toc.json
+        - text: Prepare for imaging with Configuration Manager
+          url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+
+    - title: Deploy
+      imageSrc: /media/common/i_deploy.svg
+      links:
+        - text: Deploy Windows with Autopilot
+          url: /mem/autopilot/tutorial/autopilot-scenarios
+        - text: Assign devices to servicing channels
+          url: update/waas-servicing-channels-windows-10-updates.md
+        - text: Deploy updates with Intune
+          url: update/deploy-updates-intune.md
+        - text: Deploy Windows updates with Configuration Manager
+          url: update/deploy-updates-configmgr.md
+        - text: Upgrade Windows using Configuration Manager
+          url: deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md
+        - text: Check release health
+          url: update/check-release-health.md
+
+additionalContent:
+  sections:
+    - title: Solutions
+      items:
+
+      - title: Windows Autopilot
         links:
-          - text: Prepare to deploy Windows updates
+          - text: Overview
-            url: update/prepare-deploy-windows.md
+            url: /mem/autopilot/windows-autopilot
-          - text: Prepare updates using Windows Update for Business
+          - text: Scenarios
+            url: /mem/autopilot/tutorial/autopilot-scenarios
+          - text: Device registration
+            url: /mem/autopilot/registration-overview
+          - text: Learn more about Windows Autopilot >
+            url: /mem/autopilot
+
+      - title: Windows Autopatch
+        links:
+          - text: What is Windows Autopatch?
+            url: windows-autopatch/overview/windows-autopatch-overview.md
+          - text: Frequently asked questions (FAQ)
+            url: windows-autopatch/overview/windows-autopatch-faq.yml
+          - text: Prerequisites
+            url: windows-autopatch/prepare/windows-autopatch-prerequisites.md
+          - text: Learn more about Windows Autopatch >
+            url: windows-autopatch/index.yml
+
+      - title: Windows Update for Business
+        links:
+          - text: What is Windows Update for Business?
             url: update/waas-manage-updates-wufb.md
-          - text: Prepare for Zero Touch Installation of Windows 10 with Configuration Manager
+          - text: Windows Update for Business deployment service
-            url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+            url: update/deployment-service-overview.md
-          - text: Set up Delivery Optimization for Windows client updates
+          - text: Manage Windows Update settings
+            url: update/waas-wu-settings.md
+          - text: Windows Update for Business reports overview
+            url: update/wufb-reports-overview.md
+
+      - title: Optimize and cache content
+        links:
+          - text: What is Delivery Optimization?
+            url: do/waas-delivery-optimization.md
+          - text: What is Microsoft Connected Cache?
+            url: do/waas-microsoft-connected-cache.md
+          - text: Frequently asked questions
+            url: do/waas-delivery-optimization-faq.yml
+          - text: Learn more about Delivery Optimization >
             url: do/index.yml
 
-  # Card (optional)
+      - title: In-place upgrade and imaging
-  - title: Deploy
-    linkLists:
-      - linkListType: deploy
         links:
-          - text: Deploy Windows 10 with Autopilot
+          - text: Upgrade Windows using Configuration Manager
-            url: /mem/autopilot
+            url: deploy-windows-cm/upgrade-to-windows-10-with-configuration-manager.md
-          - text: Assign devices to servicing channels
+          - text: Deploy a Windows image using Configuration Manager
-            url: update/waas-servicing-channels-windows-10-updates.md
+            url: deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager.md
+          - text: Convert a disk from MBR to GPT
+            url: mbr-to-gpt.md
+          - text: Resolve Windows upgrade errors
+            url: upgrade/resolve-windows-10-upgrade-errors.md
 
-  # Card
+      - title: Licensing and activation
-  - title: Overview
-    linkLists:
-      - linkListType: overview
         links:
-          - text: What's new in Windows deployment
+          - text: Plan for volume activation
-            url: deploy-whats-new.md
+            url: volume-activation/plan-for-volume-activation-client.md
-          - text: Windows 11 overview
+          - text: Subscription activation
-            url: /windows/whats-new/windows-11
+            url: windows-10-subscription-activation.md
-          - text: Windows client deployment scenarios
+          - text: Volume activation management tool (VAMT)
-            url: windows-10-deployment-scenarios.md
+            url: volume-activation/introduction-vamt.md
-          - text: Basics of Windows updates, channels, and tools
+          - text: Activate using key management service (KMS)
-            url:  update/get-started-updates-channels-tools.md
+            url: volume-activation/activate-using-key-management-service-vamt.md
-          - text: Overview of Windows Autopilot
+          - text: Windows commercial licensing overview
-            url:  /mem/autopilot/windows-autopilot
+            url: /windows/whats-new/windows-licensing
 
-  # Card
+    - title: More resources
-  - title: Support remote work
+      items:
-    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: /microsoft-365/solutions/empower-people-to-work-remotely
-          - text: Top 12 tasks for security teams to support working from home
-            url: /microsoft-365/security/top-security-tasks-for-remote-work
-          - text: Support your remote workforce
-            url: /microsoftteams/faq-support-remote-workforce
 
-  # Card (optional)
+      - title: Release and lifecycle
-  - title: Microsoft Learn training
-    linkLists:
-      - linkListType: learn
         links:
-          - text: Plan to deploy updates for Windows 10 and Microsoft 365 Apps
+          - text: Windows release health dashboard
-            url: /training/modules/windows-plan
+            url: /windows/release-health
-          - text: Prepare to deploy updates for Windows 10 and Microsoft 365 Apps
+          - text: Windows client features lifecycle
-            url: /training/modules/windows-prepare/
+            url: /windows/whats-new/feature-lifecycle
-          - text: Deploy updates for Windows 10 and Microsoft 365 Apps
+          - text: Lifecycle FAQ - Windows
-            url: /training/modules/windows-deploy
+            url: /lifecycle/faq/windows
+
+      - title: 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: 
+#            url: 
+#          - 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: 
+