Merge branch 'main' into release-mcc-ent

.openpublishing.redirection.windows-deployment.json

@@ -1224,6 +1224,146 @@
       "source_path": "windows/deployment/volume-activation/vamt-step-by-step.md",
       "redirect_url": "/windows/deployment/volume-activation/scenario-online-activation-vamt",
       "redirect_document_id": false
+    },
+    {
+    "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-groups-update-management.md",
+    "redirect_url": "/windows/deployment/windows-autopatch/overview/windows-autopatch-overview",
+    "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-and-feature-update-reports-overview.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-quality-and-feature-update-reports-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-summary-dashboard.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-quality-update-summary-dashboard",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-status-report.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-quality-update-status-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-trending-report.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-quality-update-trending-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-reliability-report.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-reliability-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-feature-update-summary-dashboard.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-feature-update-summary-dashboard",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-feature-update-status-report.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-feature-update-status-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-feature-update-trending-report.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-windows-feature-update-trending-report",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-device-alerts.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-device-alerts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-policy-health-and-remediation.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-policy-health-and-remediation",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-resolve-policy-conflicts.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-resolve-policy-conflicts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-maintain-environment.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/monitor/windows-autopatch-maintain-environment",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-customize-windows-update-settings.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-customize-windows-update-settings",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-edge.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-edge",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-exclude-device.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-exclude-device",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-manage-driver-and-firmware-updates.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-manage-driver-and-firmware-updates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-manage-windows-feature-update-releases.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-manage-windows-feature-update-releases",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-microsoft-365-apps-enterprise",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-support-request.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-support-request",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-teams.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-unenroll-tenant.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-unenroll-tenant",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-feature-update-overview.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-feature-update-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-communications.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-quality-update-communications",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-end-user-exp.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-quality-update-end-user-update-exp",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-overview.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-quality-update-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/operate/windows-autopatch-windows-quality-update-signals.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-windows-quality-update-signals",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/deployment/windows-autopatch/references/windows-autopatch-microsoft-365-policies.md",
+      "redirect_url": "/windows/deployment/windows-autopatch/manage/windows-autopatch-microsoft-365-policies",
+      "redirect_document_id": false
     }
   ]
 }

windows/deployment/windows-autopatch/TOC.yml

@@ -47,79 +47,82 @@
                   href: deploy/windows-autopatch-groups-manage-autopatch-groups.md
             - name: Post-device registration readiness checks
               href: deploy/windows-autopatch-post-reg-readiness-checks.md
-    - name: Operate
+    - name: Manage
       href: 
       items:
-        - name: Software update management
+        - name: Windows updates
-          href: operate/windows-autopatch-groups-update-management.md
+          href: 
           items:
-              - name: Windows updates
+            - name: Customize Windows Update settings
-                href:
+              href: manage/windows-autopatch-customize-windows-update-settings.md
-                items:
+            - name: Windows feature updates
-                  - name: Customize Windows Update settings
+              href: manage/windows-autopatch-windows-feature-update-overview.md
-                    href: operate/windows-autopatch-groups-windows-update.md
-                  - name: Windows quality updates
-                    href: operate/windows-autopatch-groups-windows-quality-update-overview.md
-                    items:
-                      - name: Windows quality update end user experience
-                        href: operate/windows-autopatch-groups-windows-quality-update-end-user-exp.md
-                      - name: Windows quality update signals
-                        href: operate/windows-autopatch-groups-windows-quality-update-signals.md
-                      - name: Windows quality update communications
-                        href: operate/windows-autopatch-groups-windows-quality-update-communications.md
-                  - name: Windows feature updates
-                    href: operate/windows-autopatch-groups-windows-feature-update-overview.md
-                    items:
-                      - name: Manage Windows feature updates
-                        href: operate/windows-autopatch-groups-manage-windows-feature-update-release.md
-              - name: Microsoft 365 Apps for enterprise
-                href: operate/windows-autopatch-microsoft-365-apps-enterprise.md
-              - name: Microsoft Edge
-                href: operate/windows-autopatch-edge.md
-              - name: Microsoft Teams
-                href: operate/windows-autopatch-teams.md
-        - name: Windows quality and feature update reports overview
-          href: operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md
-          items:
-            - name: Windows quality update reports
-              href:
               items:
-                - name: Summary dashboard
+                - name: Manage Windows feature updates
-                  href: operate/windows-autopatch-groups-windows-quality-update-summary-dashboard.md
+                  href: manage/windows-autopatch-manage-windows-feature-update-releases.md
-                - name: Quality update status report
+            - name: Windows quality updates
-                  href: operate/windows-autopatch-groups-windows-quality-update-status-report.md
+              href: manage/windows-autopatch-windows-quality-update-overview.md
-                - name: Quality update trending report
+              items:
-                  href: operate/windows-autopatch-groups-windows-quality-update-trending-report.md
+                - name: Windows quality update end user experience
-                - name: Reliability report
+                  href: manage/windows-autopatch-windows-quality-update-end-user-exp.md
-                  href: operate/windows-autopatch-reliability-report.md
+                - name: Windows quality update signals
+                  href: manage/windows-autopatch-windows-quality-update-signals.md
+                - name: Windows quality update communications
+                  href: manage/windows-autopatch-windows-quality-update-communications.md
+            - name: Manage driver and firmware updates
+              href: manage/windows-autopatch-manage-driver-and-firmware-updates.md
+            - name: Microsoft 365 Apps for enterprise
+              href: manage/windows-autopatch-microsoft-365-apps-enterprise.md
+              items:
+                - name: Microsoft 365 Apps for enterprise update policies
+                  href: manage/windows-autopatch-microsoft-365-policies.md
+            - name: Microsoft Edge
+              href: manage/windows-autopatch-edge.md
+            - name: Microsoft Teams
+              href: manage/windows-autopatch-teams.md
+            - name: Submit a support request
+              href: manage/windows-autopatch-support-request.md
+            - name: Exclude a device
+              href: manage/windows-autopatch-exclude-device.md
+            - name: Unenroll your tenant
+              href: manage/windows-autopatch-unenroll-tenant.md
+    - name: Monitor
+      href:
+      items:
+        - name: Windows feature and quality update reports overview
+          href: monitor/windows-autopatch-windows-quality-and-feature-update-reports-overview.md
+          items:
             - name: Windows feature update reports
               href:
               items:
                 - name: Summary dashboard
-                  href: operate/windows-autopatch-groups-windows-feature-update-summary-dashboard.md
+                  href: monitor/windows-autopatch-windows-feature-update-summary-dashboard.md
                 - name: Feature update status report
-                  href: operate/windows-autopatch-groups-windows-feature-update-status-report.md
+                  href: monitor/windows-autopatch-windows-feature-update-status-report.md
                 - name: Feature update trending report
-                  href: operate/windows-autopatch-groups-windows-feature-update-trending-report.md
+                  href: monitor/windows-autopatch-windows-feature-update-trending-report.md
-            - name: Windows quality and feature update device alerts
+            - name: Windows quality update reports
-              href: operate/windows-autopatch-device-alerts.md
+              href:
+              items:
+                - name: Summary dashboard
+                  href: monitor/windows-autopatch-windows-quality-update-summary-dashboard.md
+                - name: Quality update status report
+                  href: monitor/windows-autopatch-windows-quality-update-status-report.md
+                - name: Quality update trending report
+                  href: monitor/windows-autopatch-windows-quality-update-trending-report.md
+                - name: Reliability report
+                  href: monitor/windows-autopatch-reliability-report.md
+            - name: Windows feature and quality update device alerts
+              href: monitor/windows-autopatch-device-alerts.md
         - name: Policy health
           href:
           items:
             - name: Policy health and remediation
-              href: operate/windows-autopatch-policy-health-and-remediation.md
+              href: monitor/windows-autopatch-policy-health-and-remediation.md
             - name: Resolve policy conflicts
-              href: operate/windows-autopatch-resolve-policy-conflicts.md
+              href: monitor/windows-autopatch-resolve-policy-conflicts.md
         - name: Maintain the Windows Autopatch environment
-          href: operate/windows-autopatch-maintain-environment.md
+          href: monitor/windows-autopatch-maintain-environment.md
-        - name: Manage driver and firmware updates
-          href: operate/windows-autopatch-manage-driver-and-firmware-updates.md
-        - name: Submit a support request
-          href: operate/windows-autopatch-support-request.md
-        - name: Exclude a device
-          href: operate/windows-autopatch-exclude-device.md
-        - name: Unenroll your tenant
-          href: operate/windows-autopatch-unenroll-tenant.md
     - name: References
       href:
       items:
@@ -128,8 +131,6 @@
           items:
             - name: Windows update policies
               href: references/windows-autopatch-windows-update-unsupported-policies.md
-            - name: Microsoft 365 Apps for enterprise update policies
-              href: references/windows-autopatch-microsoft-365-policies.md
             - name: Conflicting configurations
               href: references/windows-autopatch-conflicting-configurations.md
         - name: Changes made at tenant enrollment

windows/deployment/windows-autopatch/manage/windows-autopatch-microsoft-365-apps-enterprise.md

@@ -128,9 +128,7 @@ For organizations seeking greater control, you can allow or block Microsoft 365
 
 [Servicing profiles](/deployoffice/admincenter/servicing-profile) is a feature in the [Microsoft 365 Apps admin center](https://config.office.com/) that provides controlled update management of monthly Office updates, including controls for user and device targeting, scheduling, rollback, and reporting.
 
-A [service profile](/deployoffice/admincenter/servicing-profile#compatibility-with-other-management-tools) takes precedence over other policies, such as a Microsoft Intune policy or the Office Deployment Tool. The servicing profile affects all devices that meet the [device eligibility requirements](#device-eligibility) regardless of existing management tools in your environment. So, if you're targeting a managed device with a servicing profile it's ineligible for Microsoft 365 App update management.
+A [service profile](/deployoffice/admincenter/servicing-profile#compatibility-with-other-management-tools) takes precedence over other policies, such as a Microsoft Intune policy or the Office Deployment Tool. The servicing profile affects all devices that meet the [device eligibility requirements](#device-eligibility) regardless of existing management tools in your environment. So, if you're targeting a managed device with a servicing profile it's ineligible for Microsoft 365 App update management.However, the device may still be eligible for other managed updates.
-
-However, the device may still be eligible for other managed updates. For more information about a device's eligibility for a given [software update workload](windows-autopatch-update-management.md#software-update-workloads), see the Device eligibility section of each respective software update workload.
 
 ## Incidents and outages
 

windows/deployment/windows-autopatch/manage/windows-autopatch-windows-quality-update-overview.md

@@ -120,7 +120,7 @@ In the Release management blade, you can:
 
 ### Release schedule
 
-For each [deployment ring](windows-autopatch-update-management.md#windows-autopatch-deployment-rings), the **Release schedule** tab contains:
+For each deployment ring, the **Release schedule** tab contains:
 
 - The status of the update. Releases appear as **Active**. The update schedule is based on the values of the [Windows 10 Update Ring policies](/mem/intune/protect/windows-update-for-business-configure), which are configured on your behalf.
 - The date the update is available.

windows/deployment/windows-autopatch/operate/windows-autopatch-groups-update-management.md

@@ -1,61 +0,0 @@
----
-title: Software update management for Autopatch groups
-description: This article provides an overview of how updates are handled with Autopatch groups
-ms.date: 07/08/2024
-ms.service: windows-client
-ms.subservice: itpro-updates
-ms.topic: concept-article
-ms.localizationpriority: medium
-author: tiaraquan
-ms.author: tiaraquan
-manager: aaroncz
-ms.reviewer: andredm7
-ms.collection:
-  - highpri
-  - tier1
----
-
-# Software update management
-
-Keeping your devices up to date is a balance of speed and stability. Windows Autopatch connects all devices to a modern cloud-based infrastructure to manage updates on your behalf.
-
-## Software update workloads
-
-| Software update workload | Description |
-| ----- | ----- |
-| Windows quality update | Windows Autopatch uses four deployment rings to manage [Windows quality updates](../operate/windows-autopatch-groups-windows-quality-update-overview.md) |
-| Windows feature update | Windows Autopatch uses four deployment rings to manage [Windows feature updates](windows-autopatch-groups-windows-feature-update-overview.md) |
-| Anti-virus definition | Updated with each scan. |
-| Microsoft 365 Apps for enterprise | For more information, see [Microsoft 365 Apps for enterprise](windows-autopatch-microsoft-365-apps-enterprise.md). |
-| Microsoft Edge | For more information, see [Microsoft Edge](../operate/windows-autopatch-edge.md). |
-| Microsoft Teams | For more information, see [Microsoft Teams](../operate/windows-autopatch-teams.md). |
-
-## Autopatch groups
-
-Autopatch groups help Microsoft Cloud-Managed services meet all organizations where they are at in their update management journey.
-
-Autopatch groups is a logical container that groups several [Microsoft Entra groups](/azure/active-directory/fundamentals/active-directory-groups-view-azure-portal), and software update policies, such as Windows Update rings and feature update policies, together.
-
-For more information on key benefits and how to use Autopatch groups, see [Autopatch groups overview](../deploy/windows-autopatch-groups-overview.md).
-
-## Windows quality updates
-
-Windows Autopatch deploys the [Monthly security update releases](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/windows-quality-updates-primer/ba-p/2569385) that are released on the second Tuesday of each month.
-
-To release updates to devices in a gradual manner, Windows Autopatch deploys a set of mobile device management (MDM) policies to each update deployment ring to control the rollout. For more information, see [Windows quality updates overview](../operate/windows-autopatch-groups-windows-quality-update-overview.md).
-
-## Windows feature updates
-
-You're in control of telling Windows Autopatch when your organization is ready to move to the next Windows OS version.
-
-The Window feature update release management experience makes it easier and less expensive for you to keep your Windows devices up to date. You can focus on running your core businesses while Windows Autopatch runs update management on your behalf.
-
-For more information, see [Windows feature updates overview](../operate/windows-autopatch-groups-windows-feature-update-overview.md).
-
-## Reports
-
-Using [Windows quality and feature update reports](../operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md), you can monitor and remediate Windows Autopatch managed devices that are Not up to Date and resolve any device alerts to bring Windows Autopatch managed devices back into compliance.
-
-## Policy health and remediation
-
-Windows Autopatch deploys Intune policies for Windows quality and feature update management. Windows Update policies must remain healthy for devices to receive Windows updates and stay up to date. We continuously monitor the health of the policies and raise alerts and provide remediation actions. For more information, see [Policy health and remediation](../operate/windows-autopatch-policy-health-and-remediation.md) and [Changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md).

windows/whats-new/deprecated-features.md

@@ -103,7 +103,7 @@ The features in this article are no longer being actively developed, and might b
 |IIS Digest Authentication | We recommend that users use alternative authentication methods.| 1709 |
 |RSA/AES Encryption for IIS   | We recommend that users use CNG encryption provider. | 1709 |
 |Screen saver functionality in Themes   | Disabled in Themes. Screen saver functionality in Group Policies, Control Panel, and Sysprep continues to be functional. Lock screen features and policies are preferred. | 1709 |
-|Sync your settings (updated: August 17, 2017) | Back-end changes: In future releases, the back-end storage for the current sync process will change. A single cloud storage system will be used for Enterprise State Roaming and all other users. The **Sync your settings** options and the Enterprise State Roaming feature will continue to work provided your clients are running an up-to-date version of: </br> - Windows 11 </br> - Windows 10, version 21H2, or later | 1709 |
+|Sync your settings (updated: August 17, 2017) | Back-end changes: In future releases, the back-end storage for the current sync process will change. A single cloud storage system will be used for Enterprise State Roaming and all other users. As part of this change, we will stop supporting the Device Syncing Settings and App Data report.  All other  **Sync your settings** options and the Enterprise State Roaming feature will continue to work provided your clients are running an up-to-date version of: </br> - Windows 11 </br> - Windows 10, version 21H2, or later | 1709 |
 |System Image Backup (SIB) Solution|This feature is also known as the **Backup and Restore (Windows 7)** legacy control panel. For full-disk backup solutions, look for a third-party product from another software publisher. You can also use [OneDrive](/onedrive/) to sync data files with Microsoft 365.| 1709 |
 |TLS RC4 Ciphers  |To be disabled by default. For more information, see [TLS (Schannel SSP) changes in Windows 10 and Windows Server 2016](/windows-server/security/tls/tls-schannel-ssp-changes-in-windows-10-and-windows-server)| 1709 |
 |Trusted Platform Module (TPM) Owner Password Management |This functionality within TPM.msc will be migrated to a new user interface.| 1709 |