Merge branch 'main' into release-win11-24h2

.openpublishing.redirection.json

@@ -2477,7 +2477,7 @@
     },
     {
       "source_path": "windows/deploy/windows-10-upgrade-paths.md",
-      "redirect_url": "/windows/deployment/upgrade/windows-10-upgrade-paths",
+      "redirect_url": "/windows/deployment/upgrade/windows-upgrade-paths",
       "redirect_document_id": false
     },
     {

.openpublishing.redirection.windows-deployment.json

@@ -1594,6 +1594,16 @@
       "source_path": "windows/deployment/windows-autopatch/references/windows-autopatch-windows-update-unsupported-policies.md",
       "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-update-policies",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/update/PSFxWhitepaper.md",
+      "redirect_url": "/windows/deployment/update/forward-reverse-differentials",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/upgrade/windows-10-upgrade-paths.md",
+      "redirect_url": "/windows/deployment/upgrade/windows-upgrade-paths",
+      "redirect_document_id": false
     }
   ]
 }

windows/deployment/TOC.yml

@@ -1,10 +1,10 @@
 items:
-- name: Deploy and update Windows client
+- name: Deploy and update Windows
   href: index.yml
   items:
     - name: Get started
       items:
-        - name: Windows client deployment scenarios
+        - name: Windows deployment scenarios
           href: windows-deployment-scenarios.md
         - name: Quick guide to Windows as a service
           href: update/waas-quick-start.md
@@ -16,7 +16,7 @@ items:
           href: update/get-started-updates-channels-tools.md
         - name: Defining Windows update-managed devices
           href: update/update-managed-unmanaged-devices.md
-        - name: Prepare servicing strategy for Windows client updates
+        - name: Prepare servicing strategy for Windows updates
           href: update/waas-servicing-strategy-windows-10-updates.md
 
     - name: Plan
@@ -31,80 +31,62 @@ items:
           href: update/eval-infra-tools.md
         - name: Define your servicing strategy
           href: update/plan-define-strategy.md
-        - name: Delivery Optimization for Windows client updates
+        - name: Windows Update security
+          href: update/windows-update-security.md
+        - name: Windows upgrade and migration considerations
+          href: upgrade/windows-upgrade-and-migration-considerations.md
+        - name: Delivery Optimization for Windows updates
           href: do/waas-delivery-optimization.md?context=/windows/deployment/context/context
-          items:
-            - name: Using a proxy with Delivery Optimization
-              href: do/delivery-optimization-proxy.md?context=/windows/deployment/context/context
-            - name: Delivery Optimization client-service communication
-              href: do/delivery-optimization-workflow.md?context=/windows/deployment/context/context
         - name: Windows 10 deployment considerations
           href: planning/windows-10-deployment-considerations.md
         - name: Windows 10 infrastructure requirements
           href: planning/windows-10-infrastructure-requirements.md
-        - name: Plan for volume activation
-          href: volume-activation/plan-for-volume-activation-client.md
         - name: Windows compatibility cookbook
           href: /windows/compatibility/
-        - name: Features removed or planned for replacement
-          items:
-            - name: Windows client features lifecycle
-              href: /windows/whats-new/feature-lifecycle?context=/windows/deployment/context/context
-            - name: Deprecated features
-              href: /windows/whats-new/deprecated-features?context=/windows/deployment/context/context
-            - name: Resources for deprecated features
-              href: /windows/whats-new/deprecated-features-resources?context=/windows/deployment/context/context
-            - name: Removed features
-              href: /windows/whats-new/removed-features?context=/windows/deployment/context/context
     - name: Prepare
       items:
         - name: Prepare for Windows 11
           href: /windows/whats-new/windows-11-prepare?context=/windows/deployment/context/context
-        - name: Prepare to deploy Windows client updates
+        - name: Prepare to deploy Windows updates
           href: update/prepare-deploy-windows.md
         - name: Evaluate and update infrastructure
           href: update/update-policies.md
-        - name: Update Baseline
+        - name: Update baseline
           href: update/update-baseline.md
-        - name: Set up Delivery Optimization for Windows client updates
+        - name: Set up Delivery Optimization for Windows updates
           href: do/delivery-optimization-configure.md?context=/windows/deployment/context/context
-        - name: Configure BranchCache for Windows client updates
+        - name: Configure BranchCache for Windows updates
           href: update/waas-branchcache.md
         - name: Prepare for deployment with Configuration Manager
           href: /previous-versions/windows/it-pro/windows-10/deployment/deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager
-        - name: Build a successful servicing strategy
-          items:
         - name: Check release health
           href: update/check-release-health.md
-            - name: Prepare updates using Windows Update for Business
-              href: update/waas-manage-updates-wufb.md
-            - name: Prepare updates using WSUS
-              href: update/waas-manage-updates-wsus.md
-
     - name: Deploy
       items:
-        - name: Deploy Windows client
+        - name: Deploy Windows
           items:
-            - name: Deploy Windows client with Autopilot
+            - name: Deploy Windows with Autopilot
               href: /autopilot/
             - name: Windows deployment scenarios and tools
               href: windows-deployment-scenarios-and-tools.md
-        - name: Deploy Windows client updates
+        - name: Deploy Windows updates
           items:
             - name: Assign devices to servicing channels
               href: update/waas-servicing-channels-windows-10-updates.md
             - name: Deploy updates with WSUS
               href: update/waas-manage-updates-wsus.md
-            - name: Deploy updates with Group Policy
+            - name: Update Windows media with dynamic update
-              href: update/waas-wufb-group-policy.md
-            - name: Deploy updates using CSPs and MDM
-              href: update/waas-wufb-csp-mdm.md
-            - name: Update Windows client media with Dynamic Update
               href: update/media-dynamic-update.md
             - name: Migrating and acquiring optional Windows content
               href: update/optional-content.md
+            - name: Deploy feature updates for user-initiated installations
+              href: update/feature-update-user-install.md
+            - name: Safeguard holds
+              items:
                 - name: Safeguard holds
                   href: update/safeguard-holds.md
+                - name: Opt out of safeguard holds
+                  href: update/safeguard-opt-out.md
             - name: Manage the Windows client update experience
               items:
                 - name: Manage device restarts after updates
@@ -123,7 +105,7 @@ items:
               href: update/wufb-compliancedeadlines.md
             - name: Integrate Windows Update for Business with management solutions
               href: update/waas-integrate-wufb.md
-            - name: 'Walkthrough: use Group Policy to configure Windows Update for Business'
+            - name: Use group policy to configure Windows Update for Business
               href: update/waas-wufb-group-policy.md
             - name: Deploy updates using CSPs and MDM
               href: update/waas-wufb-csp-mdm.md
@@ -234,8 +216,6 @@ items:
         - name: VAMT known issues
           href: volume-activation/vamt-known-issues.md
     - name: Monitor
-      items:
-      - name: Windows Update for Business reports
       items:
       - name: Windows Update for Business reports overview
         href: update/wufb-reports-overview.md
@@ -287,7 +267,7 @@ items:
           href: update/wufb-reports-schema-ucupdatealert.md
         - name: Enumerated types
           href: update/wufb-reports-schema-enumerated-types.md
-    - name: Troubleshooting
+    - name: Troubleshoot
       items:
       - name: Resolve upgrade errors
         items:
@@ -303,28 +283,20 @@ items:
           href: upgrade/windows-error-reporting.md
         - name: Upgrade error codes
           href: /troubleshoot/windows-client/deployment/windows-10-upgrade-error-codes?context=/windows/deployment/context/context
-        - name: Log files
+        - name: Upgrade log files
           href: upgrade/log-files.md
         - name: Resolution procedures
           href: /troubleshoot/windows-client/deployment/windows-10-upgrade-resolution-procedures?context=/windows/deployment/context/context
-        - name: Submit Windows client upgrade errors
+        - name: Submit Windows upgrade errors
           href: upgrade/submit-errors.md
       - name: Troubleshoot Windows Update
         items:
         - name: How to troubleshoot Windows Update
           href: /troubleshoot/windows-client/deployment/windows-update-issues-troubleshooting?context=/windows/deployment/context/context
-        - name: Opt out of safeguard holds
-          href: update/safeguard-opt-out.md
-        - name: Determine the source of Windows Updates
-          href: ./update/how-windows-update-works.md
-        - name: Windows Update security
-          href: ./update/windows-update-security.md
         - name: Common Windows Update errors
           href: /troubleshoot/windows-client/deployment/common-windows-update-errors?context=/windows/deployment/context/context
         - name: Windows Update error code reference
           href: update/windows-update-error-reference.md
-        - name: Troubleshoot the Windows Update for Business deployment service
-          href: update/deployment-service-troubleshoot.md
 
     - name: Reference
       items:
@@ -338,28 +310,33 @@ items:
           href: deploy-m365.md
         - name: Understand the Unified Update Platform
           href: update/windows-update-overview.md
+        - name: Windows Update log files
+          href: update/windows-update-logs.md
         - name: Servicing stack updates
           href: update/servicing-stack-updates.md
         - name: Update CSP policies
           href: /windows/client-management/mdm/policy-csp-update?context=/windows/deployment/context/context
-        - name: Additional Windows Update settings
-          href: update/waas-wu-settings.md
         - name: Update other Microsoft products
           href: update/update-other-microsoft-products.md
         - name: Delivery Optimization reference
           href: do/waas-delivery-optimization-reference.md?context=/windows/deployment/context/context
-        - name: FoD and language packs for WSUS and Configuration Manager
+        - name: Features on Demand and language packs
           href: update/fod-and-lang-packs.md
-        - name: Windows client deployment tools
+        - name: Add fonts in Windows
+          href: windows-missing-fonts.md
+        - name: Windows Updates using forward and reverse differentials
+          href: update/forward-reverse-differentials.md
+
+    - name: Deployment tools
       items:
-            - name: Windows client deployment scenarios and tools
+        - name: Customize Windows PE boot images
-              items:
+          href: customize-boot-image.md
-                - name: Windows Deployment Services (WDS) boot.wim support
-                  href: wds-boot-support.md
         - name: Convert MBR partition to GPT
           href: mbr-to-gpt.md
         - name: Configure a PXE server to load Windows PE
           href: configure-a-pxe-server-to-load-windows-pe.md
+        - name: Windows Deployment Services (WDS) boot.wim support
+          href: wds-boot-support.md
         - name: Windows ADK for Windows 10 scenarios for IT Pros
           href: windows-adk-scenarios-for-it-pros.md
         - name: User State Migration Tool (USMT) technical reference
@@ -370,8 +347,6 @@ items:
                   href: usmt/usmt-overview.md
                 - name: Getting started with the USMT
                   href: usmt/getting-started-with-the-user-state-migration-tool.md
-                        - name: Windows upgrade and migration considerations
-                          href: upgrade/windows-upgrade-and-migration-considerations.md
             - name: USMT How-to articles
               items:
                 - name: Exclude Files and Settings
@@ -390,7 +365,6 @@ items:
                   href: usmt/usmt-reroute-files-and-settings.md
                 - name: Verify the Condition of a Compressed Migration Store
                   href: usmt/verify-the-condition-of-a-compressed-migration-store.md
-
             - name: USMT Reference
               items:
                 - name: USMT Requirements
@@ -457,7 +431,6 @@ items:
                   href: usmt/usmt-xml-elements-library.md
                 - name: Offline Migration Reference
                   href: usmt/offline-migration-reference.md
-
             - name: Troubleshoot USMT
               items:
                 - name: USMT Troubleshooting
@@ -472,8 +445,3 @@ items:
                   href: /troubleshoot/windows-client/deployment/usmt-return-codes
                 - name: USMT Resources
                   href: usmt/usmt-resources.md
-
-        - name: Add fonts in Windows
-          href: windows-missing-fonts.md
-        - name: Customize Windows PE boot images
-          href: customize-boot-image.md

windows/deployment/index.yml

@@ -1,11 +1,11 @@
 ### YamlMime:Landing
 
-title: Deploy and update Windows # < 60 chars; shows at top of hub page
+title: Windows deployment documentation # < 60 chars; shows at top of hub page
-summary: Learn about deploying and updating Windows client devices in your organization. # < 160 chars
+summary: Learn about deploying and updating Windows devices in your organization. # < 160 chars
 
 metadata:
-  title: Windows client deployment documentation # Required; browser tab title displayed in search results. Include the brand. < 60 chars.
+  title: Windows 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.
+  description: Learn about deploying and updating Windows devices in your organization. # Required; article description that is displayed in search results. < 160 chars.
   ms.topic: landing-page
   ms.service: windows-client
   ms.subservice: itpro-deploy
@@ -15,7 +15,7 @@ metadata:
   author: aczechowski
   ms.author: aaroncz
   manager: aaroncz
-  ms.date: 08/22/2024
+  ms.date: 08/27/2024
   ms.localizationpriority: medium
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -30,10 +30,6 @@ landingContent:
       url: /windows/whats-new/windows-11-plan?context=/windows/deployment/context/context
     - text: Create a deployment plan
       url: update/create-deployment-plan.md
-    - text: Define readiness criteria
-      url: update/plan-define-readiness.md
-    - text: Define your servicing strategy
-      url: update/plan-define-strategy.md
     - text: Plan for volume activation
       url: volume-activation/plan-for-volume-activation-client.md
     - text: Windows compatibility cookbook
@@ -47,125 +43,80 @@ landingContent:
       url: /windows/whats-new/windows-11-prepare?context=/windows/deployment/context/context
     - text: Prepare to deploy Windows updates
       url: update/prepare-deploy-windows.md
-    - text: Prepare updates using Windows Update for Business
+    - text: Prepare for 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/delivery-optimization-configure.md?context=/windows/deployment/context/context
-    - text: Prepare for imaging with Configuration Manager
-      url: /previous-versions/windows/it-pro/windows-10/deployment/deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager
 
 - title: Deploy
   linkLists:
   - linkListType: deploy
     links:
-    - text: Deploy Windows with Autopilot
+    - text: Compare Windows Autopilot solutions
-      url: /mem/autopilot/tutorial/autopilot-scenarios
+      url: /autopilot/device-preparation/compare
-    - 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
+    - text: Optimize and cache content
-      url: /mem/configmgr/osd/deploy-use/upgrade-windows-to-the-latest-version
+      url: do/index.yml
-    - text: Check release health
-      url: update/check-release-health.md
 
-- title: Windows Autopilot
+- title: Use Windows Autopilot
   linkLists:
-  - linkListType: how-to-guide
+  - linkListType: overview
     links:
-      - text: Overview
+      - text: Windows Autopilot device preparation overview
-        url: /mem/autopilot/windows-autopilot
+        url: /autopilot/device-preparation/overview
-      - text: Scenarios
+      - text: Windows Autopilot overview
-        url: /mem/autopilot/tutorial/autopilot-scenarios
+        url: /autopilot/overview
-      - text: Device registration
+  - linkListType: tutorial
-        url: /mem/autopilot/registration-overview
+    links:
-      - text: Learn more about Windows Autopilot >
+      - text: Windows Autopilot scenarios
-        url: /mem/autopilot
+        url: /autopilot/tutorial/autopilot-scenarios
+      - text: Windows Autopilot device preparation scenarios
+        url: /autopilot/device-preparation/tutorial/scenarios
 
-- title: Windows Autopatch
+- title: Use Windows Autopatch
   linkLists:
-  - linkListType: how-to-guide
+  - linkListType: overview
     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 >
+      - text: Deployment guide
+        url: windows-autopatch/overview/windows-autopatch-deployment-guide.md
+      - text: See more >
         url: windows-autopatch/index.yml
 
-- title: Windows Update for Business
+- title: Use Windows Update for Business
   linkLists:
   - linkListType: how-to-guide
     links:
       - text: What is Windows Update for Business?
         url: update/waas-manage-updates-wufb.md
-      - text: Windows Update for Business deployment service
+      - text: Configure Windows Update for Business
-        url: update/deployment-service-overview.md
+        url: update/waas-configure-wufb.md
-      - 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
+- title: Use tools for upgrade and imaging
   linkLists:
-  - linkListType: how-to-guide
+  - linkListType: reference
     links:
-      - text: What is Delivery Optimization?
+      - text: Customize Windows PE boot images
-        url: do/waas-delivery-optimization.md
+        url: customize-boot-image.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
-
-- title: In-place upgrade and imaging
-  linkLists:
-  - linkListType: how-to-guide
-    links:
-      - text: Upgrade Windows using Configuration Manager
-        url: /mem/configmgr/osd/deploy-use/upgrade-windows-to-the-latest-version
-      - text: Deploy a Windows 10 image using Configuration Manager
-        url: /previous-versions/windows/it-pro/windows-10/deployment/deploy-windows-cm/refresh-a-windows-7-client-with-windows-10-using-configuration-manager
       - text: Convert a disk from MBR to GPT
         url: mbr-to-gpt.md
+      - text: Configure a PXE server to load Windows PE
+        url: configure-a-pxe-server-to-load-windows-pe.md
       - text: Resolve Windows upgrade errors
         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
-      - text: Subscription activation
-        url: windows-10-subscription-activation.md
-      - text: Volume activation management tool (VAMT)
-        url: volume-activation/introduction-vamt.md
-      - text: Activate using key management service (KMS)
-        url: volume-activation/activate-using-key-management-service-vamt.md
-      - text: Windows commercial licensing overview
-        url: /windows/whats-new/windows-licensing
-
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
 - title: More resources
   linkLists:
-  - linkListType: reference
-    # Release and lifecycle
-    links:
-      - text: Windows release health dashboard
-        url: /windows/release-health
-      - text: Windows client features lifecycle
-        url: /windows/whats-new/feature-lifecycle
-      - text: Lifecycle FAQ - Windows
-        url: /lifecycle/faq/windows
   - linkListType: download
     # Windows hardware
     links:
@@ -177,6 +128,6 @@ landingContent:
     # Community
     links:
       - text: Windows IT pro blog
-        url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
+        url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows-ITPro-blog
       - text: Windows office hours
         url: https://aka.ms/windows/officehours

windows/deployment/update/feature-update-user-install.md

@@ -1,9 +1,9 @@
 ---
-title: Best practices - user-initiated feature update installation
+title: Deploy feature updates for user-initiated installations
-description: Learn recommendations and best practices for manually deploying a feature update for a user-initiated installation.
+description: Learn recommendations and best practices for manually deploying a feature update for a user-initiated installation during a fixed service window.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: best-practice
+ms.topic: how-to
 author: mestew
 ms.author: mstewart
 manager: aaroncz
@@ -14,14 +14,15 @@ appliesto:
 ms.date: 07/10/2018
 ---
 
-# Deploy feature updates for user-initiated installations (during a fixed service window)
+# Deploy feature updates for user-initiated installations
 
 Use the following steps to deploy a feature update for a user-initiated installation.
 
 ## Get ready to deploy feature updates
 
-### Step 1: Enable Peer Cache
+### Step 1: Enable peer cache
-Use **Peer Cache** to help manage deployment of content to clients in remote locations. Peer Cache is a built-in Configuration Manager solution that enables clients to share content with other clients directly from their local cache.
+
+Use **peer cache** to help manage deployment of content to clients in remote locations. Peer cache is a built-in Configuration Manager solution that enables clients to share content with other clients directly from their local cache.
 
 [Enable Configuration Manager client in full OS to share content](/mem/configmgr/core/clients/deploy/about-client-settings#enable-configuration-manager-client-in-full-os-to-share-content) if you have clients in remote locations that would benefit from downloading feature update content from a peer instead of downloading it from a distribution point (or Microsoft Update).
 
@@ -31,14 +32,14 @@ If you're deploying **Feature update to Windows 10, version 1709** or later, by
 
 %systemdrive%\Users\Default\AppData\Local\Microsoft\Windows\WSUS\SetupConfig.ini
 
-```
+```ini
 [SetupConfig]
 Priority=Normal
 ```
 
 You can use the new [Run Scripts](/mem/configmgr/apps/deploy-use/create-deploy-scripts) feature to run a PowerShell script like the sample below to create the SetupConfig.ini on target devices.
 
-```
+```powershell
 #Parameters
 Param(
   [string] $PriorityValue = "Normal"
@@ -80,7 +81,7 @@ or documentation, even if Microsoft has been advised of the possibility of such
 #>
 ```
 
->[!NOTE]
+> [!NOTE]
 > If you elect not to override the default setup priority, you will need to increase the [maximum run time](/mem/configmgr/sum/get-started/manage-settings-for-software-updates#BKMK_SetMaxRunTime) value for Feature Update to Windows 10, version 1709 or higher from the default of 60 minutes. A value of 240 minutes may be required. Remember to ensure that your maintenance window duration is larger than your defined maximum run time value.
 
 ## Manually deploy feature updates in a user-initiated installation
@@ -88,6 +89,7 @@ or documentation, even if Microsoft has been advised of the possibility of such
 The following sections provide the steps to manually deploy a feature update.
 
 ### Step 1: Specify search criteria for feature updates
+
 There are potentially a thousand or more feature updates displayed in the Configuration Manager console. The first step in the workflow for manually deploying a feature update is to identify the feature updates that you want to deploy.
 
 1. In the Configuration Manager console, select **Software Library**.
@@ -98,7 +100,8 @@ There are potentially a thousand or more feature updates displayed in the Config
 
 4. Save the search for future use.
 
-### Step 2: Download the content for the feature update(s)
+### Step 2: Download the content for the feature update
+
 Before you deploy the feature updates, you can download the content as a separate step. Do this download so you can verify that the content is available on the distribution points before you deploy the feature updates. Downloading first helps you avoid any unexpected issues with the content delivery. Use the following procedure to download the content for feature updates before creating the deployment.
 
 1. In the Configuration Manager console, navigate to **Software Library > Windows 10 Servicing**.
@@ -119,7 +122,7 @@ Before you deploy the feature updates, you can download the content as a separat
    Select **Next**.
 4. On the **Distribution Points** page, specify the distribution points or distribution point groups that will host the feature update files, and then select **Next**. For more information about distribution points, see [Distribution point configurations](/mem/configmgr/core/servers/deploy/configure/install-and-configure-distribution-points#bkmk_configs).
 
-   >[!NOTE]
+   > [!NOTE]
    > The Distribution Points page is available only when you create a new software update deployment package.
 5. On the **Distribution Settings** page, specify the following settings:
 
@@ -137,7 +140,7 @@ Before you deploy the feature updates, you can download the content as a separat
    - **Download software updates from the Internet**: Select this setting to download the software updates from the location on the Internet. This is the default setting.
    - **Download software updates from a location on the local network**: Select this setting to download software updates from a local folder or shared network folder. Use this setting when the computer running the wizard doesn't have Internet access.
 
-     >[!NOTE]
+     > [!NOTE]
      > When you use this setting, download the software updates from any computer with Internet access, and then copy the software updates to a location on the local network that is accessible from the computer running the wizard.
 
    Select **Next**.
@@ -146,12 +149,14 @@ Before you deploy the feature updates, you can download the content as a separat
 9. On the **Completion** page, verify that the software updates were successfully downloaded, and then select **Close**.
 
 #### To monitor content status
+
 1. To monitor the content status for the feature updates, select **Monitoring** in the Configuration Manager console.
 2. In the Monitoring workspace, expand **Distribution Status**, and then select **Content Status**.
 3. Select the feature update package that you previously identified to download the feature updates.
 4. On the **Home** tab, in the Content group, select **View Status**.
 
-### Step 3: Deploy the feature update(s) 
+### Step 3: Deploy the feature update
+
 After you determine which feature updates you intend to deploy, you can manually deploy the feature update(s). Use the following procedure to manually deploy the feature update(s).
 
 1. In the Configuration Manager console, select **Software Library**.
@@ -169,16 +174,16 @@ After you determine which feature updates you intend to deploy, you can manually
 
    - **Type of deployment**: Specify the deployment type for the software update deployment. Select **Required** to create a mandatory software update deployment in which the feature updates are automatically installed on clients before a configured installation deadline.
 
-     >[!IMPORTANT]
+     > [!IMPORTANT]
      > After you create the software update deployment, you cannot later change the type of deployment.
 
-     >[!NOTE]
+     > [!NOTE]
-     >A software update group deployed as **Required** will be downloaded in background and honor BITS settings, if configured.
+     > A software update group deployed as **Required** will be downloaded in background and honor BITS settings, if configured.
 
    - **Use Wake-on-LAN to wake up clients for required deployments**: Specify whether to enable Wake On LAN at the deadline to send wake-up packets to computers that require one or more software updates in the deployment. Any computers that are in sleep mode at the installation deadline time will be awakened so the software update installation can initiate. Clients that are in sleep mode that don't require any software updates in the deployment aren't started. By default, this setting isn't enabled and is available only when **Type of deployment** is set to **Required**.
 
-     >[!WARNING]
+     > [!WARNING]
-     >Before you can use this option, computers and networks must be configured for Wake On LAN. 
+     > Before you can use this option, computers and networks must be configured for Wake On LAN.
 
    - **Detail level**: Specify the level of detail for the state messages that are reported by client computers.
 6. On the Scheduling page, configure the following settings:
@@ -190,8 +195,8 @@ After you determine which feature updates you intend to deploy, you can manually
 
    - **Installation deadline**: Select **Specific time** to specify the installation deadline for the software updates in the deployment.
 
-     >[!NOTE]
+     > [!NOTE]
-     >You can configure the installation deadline setting only when **Type of deployment** is set to **Required** on the Deployment Settings page. 
+     > You can configure the installation deadline setting only when **Type of deployment** is set to **Required** on the Deployment Settings page.
 
      - **Specific time**: Select this setting to automatically install the software updates in the deployment at a specific date and time. However, for the purposes of the fixed servicing window, set the installation deadline date and time to a future value, well beyond the fixed servicing window.
 
@@ -200,21 +205,26 @@ After you determine which feature updates you intend to deploy, you can manually
 7. On the User Experience page, configure the following settings:
    - **User notifications**: Specify **Display in Software Center and show all notifications**.
    - **Deadline behavior**: Available only when **Type of deployment** is set to **Required** on the Deployment Settings page. Specify the behavior that is to occur when the deadline is reached for the software update deployment. Specify whether to install the software updates in the deployment. Also specify whether to perform a system restart after software update installation regardless of a configured maintenance window.
-     >[!NOTE]
+
-     >Remember that the installation deadline date and time will be well into the future to allow plenty of time for the user-initiated install during a fixed servicing window.
+     > [!NOTE]
+     > Remember that the installation deadline date and time will be well into the future to allow plenty of time for the user-initiated install during a fixed servicing window.
+
    - **Device restart behavior**: Available only when **Type of deployment** is set to **Required** on the Deployment Settings page. Specify whether to suppress a system restart on servers and workstations after software updates are installed and a system restart is required to complete the installation.
 
-     >[!IMPORTANT]
+     > [!IMPORTANT]
-     >Suppressing system restarts can be useful in server environments or for cases in which you do not want the computers that are installing the software updates to restart by default. However, doing so can leave computers in an insecure state, whereas allowing a forced restart helps to ensure immediate completion of the software update installation.
+     > Suppressing system restarts can be useful in server environments or for cases in which you do not want the computers that are installing the software updates to restart by default. However, doing so can leave computers in an insecure state, whereas allowing a forced restart helps to ensure immediate completion of the software update installation.
+
    - **Write filter handling for Windows Embedded devices**: When you deploy software updates to Windows Embedded devices that are write filter enabled, you can specify to install the software update on the temporary overlay and either commit changes later or commit the changes at the installation deadline or during a maintenance window. When you commit changes at the installation deadline or during a maintenance window, a restart is required and the changes persist on the device.
 
-     >[!NOTE]
+     > [!NOTE]
-     >When you deploy a software update to a Windows Embedded device, make sure that the device is a member of a collection that has a configured maintenance window. 
+     > When you deploy a software update to a Windows Embedded device, make sure that the device is a member of a collection that has a configured maintenance window.
+
    - **Software updates deployment re-evaluation behavior upon restart**: Starting in Configuration Manager version 1606, select this setting to configure software updates deployments to have clients run a software updates compliance scan immediately after a client installs software updates and restarts. This enables the client to check for additional software updates that become applicable after the client restarts, and to then install them (and become compliant) during the same maintenance window.
 8. On the Alerts page, configure how Configuration Manager and System Center Operations Manager generate alerts for this deployment. You can configure alerts only when **Type of deployment** is set to **Required** on the Deployment Settings page.
 
-   >[!NOTE]
+   > [!NOTE]
-   >You can review recent software updates alerts from the **Software Updates** node in the **Software Library** workspace. 
+   > You can review recent software updates alerts from the **Software Updates** node in the **Software Library** workspace.
+
 9. On the Download Settings page, configure the following settings:
    - Specify whether the client will download and install the software updates when a client is connected to a slow network or is using a fallback content location.
    - Specify whether to have the client download and install the software updates from a fallback distribution point when the content for the software updates isn't available on a preferred distribution point.
@@ -222,12 +232,14 @@ After you determine which feature updates you intend to deploy, you can manually
    - **If software updates are not available on distribution point in current, neighbor or site groups, download content from Microsoft Updates**: Select this setting to have clients that are connected to the intranet download software updates from Microsoft Update if software updates aren't available on distribution points. Internet-based clients can always go to Microsoft Update for software updates content.
    - Specify whether to allow clients to download after an installation deadline when they use metered Internet connections. Internet providers sometimes charge by the amount of data that you send and receive when you are on a metered Internet connection.
 
-     >[!NOTE]
+     > [!NOTE]
-     >Clients request the content location from a management point for the software updates in a deployment. The download behavior depends upon how you have configured the distribution point, the deployment package, and the settings on this page. For more information, see [Content source location scenarios](/mem/configmgr/core/plan-design/hierarchy/content-source-location-scenarios). 
+     > Clients request the content location from a management point for the software updates in a deployment. The download behavior depends upon how you have configured the distribution point, the deployment package, and the settings on this page. For more information, see [Content source location scenarios](/mem/configmgr/core/plan-design/hierarchy/content-source-location-scenarios).
+
 10. On the Summary page, review the settings. To save the settings to a deployment template, select **Save As Template**, enter a name and select the settings that you want to include in the template, and then select **Save**. To change a configured setting, select the associated wizard page and change the setting.
 11. Select **Next** to deploy the feature update(s).
 
 ### Step 4: Monitor the deployment status
+
 After you deploy the feature update(s), you can monitor the deployment status. Use the following procedure to monitor the deployment status:
 
 1. In the Configuration Manager console, navigate to **Monitoring > Overview > Deployments**.

windows/deployment/update/forward-reverse-differentials.md

@@ -1,6 +1,6 @@
 ---
 title: Windows Updates using forward and reverse differentials
-description: A technique to produce compact software updates optimized for any origin and destination revision pair
+description: A technique to produce compact software updates optimized for any origin and destination revision pair.
 ms.service: windows-client
 ms.subservice: itpro-updates
 ms.topic: reference
@@ -29,7 +29,7 @@ technique to build compact software update packages that are applicable to any
 revision of the base version, and then describe how Windows quality updates
 use this technique.
 
-## General Terms
+## General terms
 
 The following general terms apply throughout this document:
 
@@ -76,7 +76,7 @@ The flip side of express download is that the size of PSF files can be large dep
 
 In the following sections, we describe how quality updates use this technique based on forward and reverse differentials for newer releases of Windows  and Windows Server to overcome the challenges with express downloads.
 
-## High-level Design
+## High-level design
 
 ### Update packaging
 
@@ -98,7 +98,7 @@ Below is a high-level sequence of activities that the component servicing infras
 - Resolve any dependencies and install components.
 - Clean up older state (V<sub>N-1</sub>); the previous state V<sub>N</sub> is retained for uninstallation and restoration or repair.
 
-### **Resilient Hydration**
+### Resilient hydration
 
 To ensure resiliency against component store corruption or missing files that could occur due to susceptibility of certain types of hardware to file system corruption, a corruption repair service has been traditionally used to recover the component store automatically (automatic corruption repair) or on demand (manual corruption repair) using an online or local repair source. This service will continue to offer the ability to repair and recover content for hydration and successfully install an update, if needed.
 

windows/deployment/update/waas-quick-start.md

@@ -32,7 +32,7 @@ Some new terms have been introduced as part of Windows as a service, so you shou
 
 For more information, see [Overview of Windows as a service](waas-overview.md).
 
-For some interesting in-depth information about how cumulative updates work, see [Windows Updates using forward and reverse differentials](PSFxWhitepaper.md).
+For some interesting in-depth information about how cumulative updates work, see [Windows Updates using forward and reverse differentials](forward-reverse-differentials.md).
 
 ## Key concepts
 

windows/deployment/update/windows-update-logs.md

@@ -3,7 +3,7 @@ title: Windows Update log files
 description: Learn about the Windows Update log files and how to merge and convert Windows Update trace files (.etl files) into a single readable WindowsUpdate.log file.
 ms.service: windows-client
 ms.subservice: itpro-updates
-ms.topic: troubleshooting
+ms.topic: reference
 author: mestew
 ms.author: mstewart
 manager: aaroncz
@@ -18,10 +18,8 @@ ms.date: 12/08/2023
 
 # Windows Update log files
 
-
 The following table describes the log files created by Windows Update.
 
-
 |Log file|Location|Description|When to use |
 |-|-|-|-|
 |windowsupdate.log|C:\Windows\Logs\WindowsUpdate|Starting in Windows 8.1 and continuing in Windows 10, Windows Update client uses Event Tracing for Windows (ETW) to generate diagnostic logs.|If you receive an error message when you run Windows Update, you can use the information included in the Windowsupdate.log log file to troubleshoot the issue.|
@@ -33,8 +31,8 @@ The following table describes the log files created by Windows Update.
 
 To merge and convert Windows Update trace files (.etl files) into a single readable WindowsUpdate.log file, see [Get-WindowsUpdateLog](/powershell/module/windowsupdate/get-windowsupdatelog?preserve-view=tru&view=win10-ps).
 
->[!NOTE]
+> [!NOTE]
->When you run the **Get-WindowsUpdateLog** cmdlet, an copy of WindowsUpdate.log file is created as a static log file. It does not update as the old WindowsUpdate.log unless you run **Get-WindowsUpdateLog** again. 
+> When you run the **Get-WindowsUpdateLog** cmdlet, an copy of WindowsUpdate.log file is created as a static log file. It does not update as the old WindowsUpdate.log unless you run **Get-WindowsUpdateLog** again.
 
 ## Windows Update log components
 
@@ -67,17 +65,18 @@ The Windows Update engine has different component names. The following are some
 - DataStore - Caching update data locally
 - IdleTimer - Tracking active calls, stopping a service
 
->[!NOTE]
+> [!NOTE]
->Many component log messages are invaluable if you are looking for problems in that specific area. However, they can be useless if you don't filter to exclude irrelevant components so that you can focus on what's important. 
+> Many component log messages are invaluable if you are looking for problems in that specific area. However, they can be useless if you don't filter to exclude irrelevant components so that you can focus on what's important.
 
 ## Windows Update log structure
+
 The Windows update log structure is separated into four main identities:
 
-- Time Stamps 
+- Time stamps
-- Process ID and Thread ID 
+- Process ID and thread ID
-- Component Name 
+- Component name
-- Update Identifiers    
+- Update identifiers
-   - Update ID and Revision Number 
+  - Update ID and revision number
   - Revision ID
   - Local ID
   - Inconsistent terminology
@@ -85,22 +84,25 @@ The Windows update log structure is separated into four main identities:
 The WindowsUpdate.log structure is discussed in the following sections.
 
 ### Time stamps
+
 The time stamp indicates the time at which the logging occurs.
+
 - Messages are usually in chronological order, but there may be exceptions.
 - A pause during a sync can indicate a network problem, even if the scan succeeds.
 - A long pause near the end of a scan can indicate a supersedence chain issue.
    ![Windows Update time stamps.](images/update-time-log.png)
 
-
 ### Process ID and thread ID
+
 The Process IDs and Thread IDs are random, and they can vary from log to log and even from service session to service session within the same log.
+
 - The first four digits, in hex, are the process ID.
 - The next four digits, in hex, are the thread ID.
 - Each component, such as the USO, Windows Update engine, COM API callers, and Windows Update installer handlers, has its own process ID.
    ![Windows Update process and thread IDs.](images/update-process-id.png)
 
-
 ### Component name
+
 Search for and identify the components that are associated with the IDs. Different parts of the Windows Update engine have different component names. Some of them are as follows:
 
 - ProtocolTalker - Client-server sync
@@ -112,7 +114,6 @@ Search for and identify the components that are associated with the IDs. Differe
 
 ![Windows Update component name.](images/update-component-name.png)
 
-
 ### Update identifiers
 
 The following items are update identifiers:
@@ -120,13 +121,13 @@ The following items are update identifiers:
 #### Update ID and revision number
 
 There are different identifiers for the same update in different contexts. It's important to know the identifier schemes.
+
 - Update ID: A GUID (indicated in the previous screenshot) assigned to a given update at publication time
 - Revision number: A number incremented every time that a given update (that has a given update ID) is modified and republished on a service
 - Revision numbers are reused from one update to another (not a unique identifier).
 - The update ID and revision number are often shown together as "{GUID}.revision."
    ![Windows Update update identifiers.](images/update-update-id.png)
 
-
 #### Revision ID
 
 - A Revision ID (don't confuse this value with "revision number") is a serial number issued when an update is initially published or revised on a given service.
@@ -143,6 +144,7 @@ There are different identifiers for the same update in different contexts. It's
 - You can find the local IDs that a client is using by getting the client's %WINDIR%\SoftwareDistribution\Datastore\Datastore.edb file
 
 #### Inconsistent terminology
+
 - Sometimes the logs use terms inconsistently. For example, the InstalledNonLeafUpdateIDs list actually contains revision IDs, not update IDs.
 - Recognize IDs by form and context:
 
@@ -153,4 +155,5 @@ There are different identifiers for the same update in different contexts. It's
       ![Windows Update inconsisten terminology.](images/update-inconsistent.png)
 
 ## Windows Setup log files analysis using SetupDiag tool
-SetupDiag is a diagnostic tool that can be used for analysis of logs related to installation of Windows Updates. For detailed information, see [SetupDiag](../upgrade/setupdiag.md).
+
+SetupDiag is a diagnostic tool that can be used for analysis of logs related to installation of Windows Updates. For more information, see [SetupDiag](../upgrade/setupdiag.md).

windows/deployment/upgrade/windows-10-upgrade-paths.md

@@ -1,104 +0,0 @@
----
-title: Windows 10 upgrade paths
-description: You can upgrade to Windows 10 from a previous version of Windows if the upgrade path is supported.
-ms.service: windows-client
-ms.localizationpriority: medium
-author: frankroj
-manager: aaroncz
-ms.author: frankroj
-ms.topic: conceptual
-ms.collection:
-  - highpri
-  - tier2
-ms.subservice: itpro-deploy
-ms.date: 02/13/2024
-appliesto:
-  - ✅ <a href="https://learn.microsoft.com/windows/release-health/supported-versions-windows-client" target="_blank">Windows 10</a>
----
-
-# Windows 10 upgrade paths
-
-> [!IMPORTANT]
->
-> This article deals with upgrading from Windows versions that are out of support. For a current version of this article, please see [Windows upgrade paths](windows-upgrade-paths.md) that deals with currently supported versions of Windows.
->
-> For more information, see:
->
-> - [Windows 8.1 support ended on January 10, 2023](https://support.microsoft.com/windows/windows-8-1-support-ended-on-january-10-2023-3cfd4cde-f611-496a-8057-923fba401e93).
-> - [Windows 7 support ended on January 14, 2020](https://support.microsoft.com/windows/windows-7-support-ended-on-january-14-2020-b75d4580-2cc7-895a-2c9c-1466d9a53962).
-> - [FAQ about Windows 7 ESU](/troubleshoot/windows-client/windows-7-eos-faq/windows-7-extended-security-updates-faq).
-
-## Upgrade paths
-
-This article provides a summary of available upgrade paths to Windows 10. You can upgrade to Windows 10 from Windows 7 or a later operating system. Paths include upgrading from one release of Windows 10 to later release of Windows 10. Migrating from one edition of Windows 10 to a different edition of the same release is also supported.
-
-If you're also migrating to a different edition of Windows, see [Windows edition upgrade](windows-edition-upgrades.md). Methods and supported paths are described on this page to change the edition of Windows. These methods require that you input a license or product key for the new Windows edition prior to starting the upgrade process. Edition downgrade is also supported for some paths. However, applications and settings aren't maintained when the Windows edition is downgraded.
-
-- **Windows 10 version upgrade**: You can directly upgrade any General Availability Channel version of Windows 10 to a newer, supported General Availability Channel version of Windows 10, even if it involves skipping versions. Work with your account representative if your current version of Windows is out of support. See the [Windows lifecycle fact sheet](/lifecycle/faq/windows) for availability and service information.
-
-- **In-place upgrade from Windows 7, Windows 8.1, or [Windows 10 General Availability Channel](/windows/release-health/release-information)** to Windows 10 LTSC isn't supported. Windows 10 LTSC 2015 didn't block this in-place upgrade path. This issue was corrected in the Windows 10 LTSC 2016 release, which only allows data-only and clean install options.
-
-  You can upgrade from Windows 10 LTSC to Windows 10 General Availability Channel if you upgrade to the same or a newer build version. For example, Windows 10 Enterprise 2016 LTSB can be upgraded to Windows 10 Enterprise version 1607 or later. Upgrade is supported using the in-place upgrade process using Windows setup. The Product Key switch needs to be used if you want to keep your apps. If you don't use the switch, the option **Keep personal files and apps** option is grayed out. The command line would be `setup.exe /pkey xxxxx-xxxxx-xxxxx-xxxxx-xxxxx`, using your relevant Windows 10 GA Channel product key. For example, if using a KMS, the command line would be `setup.exe /pkey NPPR9-FWDCX-D2C8J-H872K-2YT43`.
-
-- **Windows N/KN**: Windows "N" and "KN" SKUs (editions without media-related functionality) follow the same upgrade paths shown in the following tables. If the pre-upgrade and post-upgrade editions aren't the same type (for example, Windows 8.1 Pro N to Windows 10 Pro), personal data is kept but applications and settings are removed during the upgrade process.
-
-- **Windows 8.0**: You can't upgrade directly from Windows 8.0 to Windows 10. To upgrade from Windows 8.0, you must first install the [Windows 8.1 update](https://support.microsoft.com/help/15356/windows-8-install-update-kb-2919355).
-
-## Windows 10
-
-✔ = Full upgrade is supported including personal data, settings, and applications.
-
-D = Edition downgrade; personal data is maintained, applications and settings are removed.
-
----
-| | Windows 10 Home | Windows 10 Pro | Windows 10 Pro Education | Windows 10 Education | Windows 10 Enterprise |
-|---|---|---|---|---|---|
-| **Home**  | | ✔  | ✔  | ✔  | |
-| **Pro**   | D | | ✔   | ✔  | ✔  |
-| **Education**  | | | | | D  |
-| **Enterprise**  | | | | ✔ | |
-
----
-
-## Windows 8.1
-
-✔ = Full upgrade is supported including personal data, settings, and applications.
-
-D = Edition downgrade; personal data is maintained, applications and settings are removed.
-
----
-|  | Windows 10 Home | Windows 10 Pro | Windows 10 Pro Education | Windows 10 Education | Windows 10 Enterprise |
-|---|---|---|---|---|---|
-| **(Core)**  | ✔  | ✔  | ✔  | ✔  | |
-| **Connected**   | ✔  | ✔  | ✔  | ✔  | |
-| **Pro**  | D   | ✔  | ✔   | ✔  | ✔  |
-| **Pro Student**  | D | ✔  | ✔  | ✔  | ✔  |
-| **Pro WMC**  | D  | ✔  | ✔  | ✔  | ✔  |
-| **Enterprise**  | | | | ✔  | ✔  |
-| **Embedded Industry** | | | | | ✔  |
-
----
-
-## Windows 7
-
-✔ = Full upgrade is supported including personal data, settings, and applications.
-
-D = Edition downgrade; personal data is maintained, applications and settings are removed.
-
----
-|  | Windows 10 Home | Windows 10 Pro | Windows 10 Pro Education | Windows 10 Education | Windows 10 Enterprise |
-|---|---|---|---|---|---|
-| **Starter**   | ✔  | ✔  | ✔  | ✔  | |
-| **Home Basic**  | ✔  | ✔  | ✔  | ✔  | |
-| **Home Premium**  | ✔  | ✔  | ✔  | ✔  | |
-| **Professional**  | D  | ✔  | ✔ | ✔  | ✔  |
-| **Ultimate**  | D  | ✔   | ✔   | ✔  | ✔  |
-| **Enterprise**  |  |  |  | ✔  | ✔  |
-
----
-
-## Related articles
-
-- [Windows 10 deployment scenarios](../windows-deployment-scenarios.md).
-- [Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md).
-- [Windows 10 edition upgrade](windows-edition-upgrades.md).

windows/hub/index.yml

@@ -1,148 +1,135 @@
 ### YamlMime:Hub
 
-title: Windows client documentation for IT Pros
+title: Windows client documentation
-summary: Learn how to deploy, secure, and manage Windows clients for your organization.
+summary: Documentation for IT pros on how to deploy, secure, and manage Windows clients for your organization.
 brand: windows
 
 metadata:
-  title: Windows client documentation for IT Pros
+  title: Windows client documentation
-  description: Learn how to deploy, secure, and manage Windows clients for your organization.
+  description: Documentation for IT pros on how to deploy, secure, and manage Windows clients for your organization.
   ms.topic: hub-page
   ms.service: windows-client
   ms.collection:
     - tier1
     - essentials-navigation
-  author: paolomatarazzo
+  author: aczechowski
-  ms.author: paoloma
+  ms.author: aaroncz
   manager: aaroncz
-  ms.date: 07/11/2024
+  ms.date: 08/27/2024
 
 highlightedContent:
+# itemType: architecture | concept | deploy | download | get-started | how-to-guide | training | overview | quickstart | reference | sample | tutorial | video | whats-new
   items:
+
   - title: Get started with Windows 11
     itemType: get-started
     url: /windows/whats-new/windows-11-overview
+
   - title: Windows 11, version 23H2
     itemType: whats-new
     url: /windows/whats-new/whats-new-windows-11-version-23h2
+
   - title: Windows 11, version 23H2 group policy settings reference
     itemType: download
     url: https://www.microsoft.com/download/details.aspx?id=105668
-  - title: Windows release health
-    itemType: whats-new
-    url: /windows/release-health
-  - title: Windows commercial licensing
-    itemType: overview
-    url: /windows/whats-new/windows-licensing
-  - title: Windows 365 documentation
-    itemType: overview
-    url: /windows-365
-  - title: Explore all Windows trainings and learning paths for IT pros
-    itemType: learn
-    url: https://learn.microsoft.com/en-us/training/browse/?products=windows&roles=administrator
-  - title: Enroll Windows client devices in Microsoft Intune
-    itemType: how-to-guide
-    url: /mem/intune/fundamentals/deployment-guide-enrollment-windows
 
-productDirectory:
+  - title: Windows administrative tools
-  title: Get started
+    itemType: concept
+    url: /windows/client-management/client-tools/administrative-tools-in-windows
+
+
+conceptualContent:
+# itemType: architecture | concept | deploy | download | get-started | how-to-guide | training | overview | quickstart | reference | sample | tutorial | video | whats-new
   items:
-
+    - title: Deploy Windows
-    - title: Learn how to deploy Windows
-      imageSrc: /media/common/i_deploy.svg
       links:
       - url: /autopilot/
+        itemType: deploy
         text: Windows Autopilot
-        - url: /autopilot/device-preparation/compare
-          text: Compare Windows Autopilot solutions
-        - url: /windows/deployment/do/
-          text: Delivery optimization
-        - url: /windows/deployment/update/deployment-service-overview
-          text: Windows Update for Business deployment service
       - url: /windows/deployment/windows-autopatch
-          text: Windows Autopatch overview
+        itemType: overview
-        - url: /windows/deployment
+        text: Windows Autopatch
-          text: Learn more about Windows deployment >
+      - url: /windows/deployment/do/
+        itemType: concept
+        text: Delivery optimization
+      footerLink:
+        url: /windows/deployment
+        text: See more
 
-    - title: Learn how to secure Windows
+    - title: Secure Windows
-      imageSrc: /media/common/i_security-management.svg
       links:
-        - url: /windows/security/threat-protection/windows-security-configuration-framework/windows-security-baselines
+      - url: /windows/security/introduction
-          text: Windows security baselines
+        itemType: overview
+        text: Introduction to Windows security
+      - url: /windows/security/operating-system-security/data-protection/bitlocker/
+        itemType: concept
+        text: BitLocker
       - url: /windows/security/identity-protection/hello-for-business
+        itemType: concept
         text: Windows Hello for Business
-        - url: /windows/security/identity-protection/web-sign-in
+      footerLink:
-          text: Web sign-in for Windows
+        url: /windows/security
-        - url: /windows/security/threat-protection/windows-defender-application-control
+        text: See more
-          text: Windows Defender Application Control (WDAC)
-        - url: /windows/security/threat-protection/microsoft-defender-application-guard/md-app-guard-overview
-          text: Microsoft Defender Application Guard
-        - url: /windows/security
-          text: Learn more about Windows security >
 
-    - title: Learn about privacy in Windows
+    - title: Privacy in Windows
-      imageSrc: /media/common/i_lock.svg
       links:
       - url: /windows/privacy/required-diagnostic-events-fields-windows-11-22h2
+        itemType: reference
         text: Windows 11 required diagnostic data
       - url: /windows/privacy/configure-windows-diagnostic-data-in-your-organization
+        itemType: how-to-guide
         text: Configure Windows diagnostic data in your organization
-        - url: /windows/privacy/diagnostic-data-viewer-overview
-          text: Diagnostic Data Viewer
       - url: /windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services
+        itemType: reference
         text: Manage connections to Microsoft services
-        - url: /windows/privacy/windows-privacy-compliance-guide
+      footerLink:
-          text: Windows privacy compliance guide
+        url: /windows/privacy
-        - url: /windows/privacy
+        text: See more
-          text: Learn more about privacy in Windows >
 
-    - title: Learn how to manage Windows
+    - title: Manage Windows
-      imageSrc: /media/common/i_management.svg
       links:
-        - url: /windows/client-management/administrative-tools-in-windows-10
+      - url: /windows/client-management/client-tools/administrative-tools-in-windows
+        itemType: concept
         text: Windows administrative tools
       - url: /windows/client-management/client-tools/windows-version-search
+        itemType: how-to-guide
         text: What version of Windows am I running?
-        - url: /windows/client-management/mobile-device-enrollment
-          text: MDM enrollment
       - url: /windows/client-management/mdm/
-          text: Configuration Service Provider (CSP) reference
+        itemType: reference
-        - url: /windows/application-management/index
+        text: Configuration Service Provider (CSP) policies
-          text: Learn more about application management >
+      footerLink:
-        - url: /windows/client-management
+        url: /windows/client-management
-          text: Learn more about Windows management >
+        text: See more
 
-    - title: Learn how to configure Windows
+    - title: Configure Windows
-      imageSrc: /media/common/i_config-tools.svg
       links:
-        - url: /windows/configuration/windows-accessibility-for-itpros
+      - url: /windows/configuration/accessibility/
+        itemType: overview
         text: Accessibility information
-        - url: /windows/configuration/provisioning-packages/provisioning-packages
+      - url: /windows/configuration/start/layout
-          text: Use Provisioning packages to configure new devices
+        itemType: how-to-guide
-        - url: /windows/configuration/customize-start-menu-layout-windows-11
+        text: Customize the Start layout
-          text: Customize the Start menu layout
-        - url: /windows/configuration/set-up-shared-or-guest-pc
-          text: Set up a shared or guest PC
       - url: /windows/configuration/assigned-access
-          text: Configure kiosks and restricted user experiences
+        itemType: concept
-        - url: /windows/configuration
+        text: Kiosks and restricted user experiences
-          text: Learn more about Windows configuration >
+      footerLink:
+        url: /windows/configuration
+        text: See more
 
-    - title: Learn about Windows for Education
+    - title: Windows for Education
-      imageSrc: /media/common/i_advanced.svg
       links:
-        - url: /education/windows/tutorial-school-deployment/
-          text: "Tutorial: deploy and manage Windows devices in a school"
-        - url: /education/windows/windows-11-se-overview
-          text: Windows 11 SE Overview
       - url: /education/windows/federated-sign-in
+        itemType: how-to-guide
         text: Configure federated sign-in for Windows devices
       - url: /education/windows/get-minecraft-for-education
+        itemType: concept
         text: Get and deploy Minecraft Education
-        - url: /education/windows/take-tests-in-windows
+      - url: /education/windows/windows-11-se-overview
-          text: Take tests and assessments in Windows
+        itemType: overview
-        - url: /education/Windows
+        text: Windows 11 SE
-          text: Learn more about Windows for Education >
+      footerLink:
+        url: /education/windows
+        text: See more
 
 additionalContent:
   sections:
@@ -151,46 +138,36 @@ additionalContent:
 
         - title: Windows hardware
           links:
-            - text: Windows hardware developer documentation
+            - text: Download and install the Windows ADK
-              url: /windows-hardware/drivers/
+              url: /windows-hardware/get-started/adk-install
-            - text: Get started with building Windows devices
-              url: /windows-hardware/get-started
             - text: Download the Windows Driver Kit
               url: /windows-hardware/drivers/download-the-wdk
             - text: Device and driver installation
               url: /windows-hardware/drivers/install/overview-of-device-and-driver-installation
-            - text: Windows Driver Frameworks
-              url: /windows-hardware/drivers/wdf/
-            - text: Kernel-mode driver architecture design guide
-              url: /windows-hardware/drivers/kernel/
 
         - title: Windows Server
           links:
             - text: Windows Server documentation
               url: /windows-server
-            - text: What's new in Windows Server 2022?
+            - text: What's new in Windows Server 2025
-              url: /windows-server/get-started/whats-new-in-windows-server-2022
+              url: /windows-server/get-started/whats-new-windows-server-2025
             - text: Windows Server blog
-              url: https://cloudblogs.microsoft.com/windowsserver/
+              url: https://www.microsoft.com/windows-server/blog/
 
         - title: Windows product site and blogs
           links:
-            - text: Find out how Windows enables your business to do more
+            - text: Windows user documentation
-              url: https://www.microsoft.com/microsoft-365/windows
+              url: https://support.microsoft.com/windows
             - text: Windows blogs
               url: https://blogs.windows.com/
             - text: Windows IT Pro blog
-              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows10Blog
+              url: https://techcommunity.microsoft.com/t5/windows-it-pro-blog/bg-p/Windows-ITPro-blog
-            - text: Microsoft Intune blog
-              url: https://techcommunity.microsoft.com/t5/microsoft-intune-blog/bg-p/MicrosoftEndpointManagerBlog
-            - text: "Windows help & learning: end-user documentation"
-              url: https://support.microsoft.com/windows
 
         - title: Participate in the community
           links:
             - text: Windows community
-              url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows10
+              url: https://techcommunity.microsoft.com/t5/windows/ct-p/Windows
-            - text: Microsoft Intune community
+            - text: Windows office hours
-              url: https://techcommunity.microsoft.com/t5/microsoft-intune/bd-p/Microsoft-Intune
+              url: https://aka.ms/Windows/OfficeHours
-            - text: Microsoft Support community
+            - text: Microsoft support community
-              url: https://answers.microsoft.com/
+              url: https://answers.microsoft.com/windowsclient/forum