Merge branch 'main' of https://github.com/MicrosoftDocs/windows-docs-pr into test-suffix

2025-06-19 20:33:42 +00:00 · 2023-08-28 11:45:56 -07:00
parent 0f9111e56d 7bc692d71a
commit 6e292521bf
25 changed files with 597 additions and 775 deletions
--- a/.openpublishing.redirection.windows-deployment.json
+++ b/.openpublishing.redirection.windows-deployment.json
@ -750,6 +750,11 @@
      "redirect_url": "/windows/deployment/windows-10-subscription-activation",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/deployment/do/mcc-enterprise-portal-deploy.md",
      "redirect_url": "/windows/deployment/do/mcc-enterprise-deploy",
      "redirect_document_id": false
    },    
    {
      "source_path": "windows/deployment/windows-autopatch/deploy/index.md",
      "redirect_url": "/windows/deployment/windows-autopatch/deploy/windows-autopatch-admin-contacts",
--- a/.openpublishing.redirection.windows-security.json
+++ b/.openpublishing.redirection.windows-security.json
@ -7334,6 +7334,51 @@
      "source_path": "windows/security/zero-trust-windows-device-health.md",
      "redirect_url": "/windows/security/security-foundations/zero-trust-windows-device-health",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/configure-pde-in-intune.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-arso.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-hibernation.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-memory-dumps.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-password-connected-standby.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-wer.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/intune-enable-pde.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/configure",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/includes/pde-description.md",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption",
      "redirect_document_id": false
    },
    {
      "source_path": "windows/security/operating-system-security/data-protection/personal-data-encryption/faq-pde.yml",
      "redirect_url": "/windows/security/operating-system-security/data-protection/personal-data-encryption/faq",
      "redirect_document_id": false
    }
  ]
 }
--- a/windows/deployment/do/TOC.yml
+++ b/windows/deployment/do/TOC.yml
@ -38,13 +38,11 @@
      - name: Requirements
        href: mcc-enterprise-prerequisites.md
      - name: Deploy Microsoft Connected Cache
-        href: mcc-enterprise-portal-deploy.md
+        href: mcc-enterprise-deploy.md
      - name: Update or uninstall MCC
        href: mcc-enterprise-update-uninstall.md
      - name: Appendix
        href: mcc-enterprise-appendix.md
      - name: MCC for Enterprise and Education (early preview)
        href: mcc-enterprise-deploy.md      
    - name: MCC for ISPs
      items:
      - name: MCC for ISPs Overview
--- a/windows/deployment/do/mcc-enterprise-deploy.md
+++ b/windows/deployment/do/mcc-enterprise-deploy.md
@ -1,5 +1,5 @@
 ---
-title: MCC for Enterprise and Education (early preview)
+title: Deploying your cache node
 manager: aaroncz
 description: How to deploy a Microsoft Connected Cache (MCC) for Enterprise and Education cache node
 ms.prod: windows-client
@ -12,7 +12,7 @@ ms.technology: itpro-updates
 ms.collection: tier3
 ---
-# Deploying your enterprise cache node
+# Deploying your cache node
 **Applies to**
@ -130,7 +130,7 @@ Installing MCC on your Windows device is a simple process. A PowerShell script p
 - Downloads, installs, and deploys EFLOW
 - Enables Microsoft Update so EFLOW can stay up to date
 - Creates a virtual machine
- Enables the firewall and opens ports 80 for inbound and outbound traffic. Port 80 is used by MCC.
+- Enables the firewall and opens ports 80 and 22 for inbound and outbound traffic. Port 80 is used by MCC, and port 22 is used for SSH communications.
 - Configures Connected Cache tuning settings.
 - Creates the necessary *FREE* Azure resource - IoT Hub/IoT Edge.
 - Deploys the MCC container to server.
--- a/windows/deployment/do/mcc-enterprise-portal-deploy.md
+++ b/windows/deployment/do/mcc-enterprise-portal-deploy.md
@ -1,145 +0,0 @@
 ---
 title: Deploying your cache node
 manager: aaroncz
 description: How to deploy Microsoft Connected Cache (MCC) for Enterprise and Education cache node
 ms.prod: windows-client
 ms.author: carmenf
 author: cmknox
 ms.reviewer: mstewart
 ms.topic: article
 ms.date: 12/31/2017
 ms.technology: itpro-updates
 ms.collection: tier3
 ---
 # Deploying your cache node
 **Applies to**
 - Windows 10
 - Windows 11
 ## Create the Microsoft Connected Cache resource
 1. Navigate to Azure portal by using the [following link](https://aka.ms/mcc-enterprise-preview): 
    > [!IMPORTANT]
    > You must access Azure portal using this link (https://aka.ms/mcc-enterprise-preview) in order to find the correct Microsoft Connected Cache resource.
    ![Screenshot of Azure portal "Create a resource" page, where you search for the Microsoft Connected Cache resource](images/ent-mcc-portal-create.png)
 1. In the search bar by **Get Started**, search for `Microsoft Connected Cache for Enterprise`.
    ![Screenshot of Azure portal after searching for the Microsoft Connected Cache resource](images/ent-mcc-portal-resource.png)
 1. Select **Create** to create your Microsoft Connected Cache resource. When prompted, choose the subscription, resource group, and location of your cache node. Also, enter a name for your cache node.
 1. The creation of the cache node may take a few minutes. After a successful creation, you'll see a “Deployment complete” page as below. Select **Go to resource**.
 ![Screenshot of Azure portal after the deployment is complete](images/ent-mcc-deployment-complete.png)
 ## Create, provision, and deploy the cache node in Azure portal
 To create, provision, and deploy the cache node in Azure portal, follow these steps:
 1.	Open Azure portal and navigate to the Microsoft Connected Cache for Enterprise (preview) resource.
 1.	Navigate to **Settings** > **Cache nodes** and select **Create Cache Node**.
 1.	Provide a name for your cache node and select **Create** to create your cache node. 
 1.	You may need to refresh to see the cache node. Select the cache node to configure it. 
 1.	Fill out the Basics and Storage fields. Enter the cache drive size in GB - this has a minimum size of 50 GB.
    ![Screenshot of Azure portal on the Provisioning page, where the user can configure their cache node.](images/ent-mcc-provisioning.png)
 Once complete, select **Save** at the top of the page and select **Provision server**.
 1.	To deploy your cache node, download the installer by selecting **Download provisioning package**.
 1.	Run the provided provisioning script - note that this is unique to each cache node. 
 ## Verify proper functioning MCC server
 #### Verify client side
 Connect to the EFLOW VM and check if MCC is properly running:
 1. Open PowerShell as an Administrator.
 2. Enter the following commands:
   ```powershell
   Connect-EflowVm
   sudo -s
   iotedge list
   ```
   :::image type="content" source="./images/ent-mcc-connect-eflowvm.png" alt-text="Screenshot of running connect-EflowVm, sudo -s, and iotedge list from PowerShell." lightbox="./images/ent-mcc-connect-eflowvm.png":::
 You should see MCC, edgeAgent, and edgeHub running. If you see edgeAgent or edgeHub but not MCC, try this command in a few minutes. The MCC container can take a few minutes to deploy.
 #### Verify server side
 For a validation of properly functioning MCC, execute the following command in the EFLOW VM or any device in the network. Replace <CacheServerIP\> with the IP address of the cache server.
 ```powershell
 wget [http://<CacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com]
 ```
 A successful test result will display a status code of 200 along with additional information.
 :::image type="content" source="./images/ent-mcc-verify-server-ssh.png" alt-text="Screenshot of a successful wget with an SSH client." lightbox="./images/ent-mcc-verify-server-ssh.png":::
 :::image type="content" source="./images/ent-mcc-verify-server-powershell.png" alt-text="Screenshot of a successful wget using PowerShell." lightbox="./images/ent-mcc-verify-server-powershell.png":::
 Similarly, enter the following URL from a browser in the network:
 `http://<YourCacheServerIP>/mscomtest/wuidt.gif?cacheHostOrigin=au.download.windowsupdate.com`
 If the test fails, see the [common issues](#common-issues) section for more information.
 ### Monitoring your metrics
 To view the metrics associated with your cache nodes, navigate to the **Overview** > **Monitoring** tab within the Azure portal.
 :::image type="content" source="./images/mcc-isp-metrics.png" alt-text="Screenshot of the Azure portal displaying the metrics view in the Overview tab.":::
 You can choose to monitor the health and performance of all cache nodes or one at a time by using the dropdown menu. The **Egress bits per second** graph shows your inbound and outbound traffic of your cache nodes over time. You can change the time range (1 hour, 12 hours, 1 day, 7 days, 14 days, and 30 days) by selecting the time range of choice on the top bar.
 If you're unable to view metrics for your cache node, it may be that your cache node is unhealthy, inactive, or hasn't been fully configured.
 ### Intune (or other management software) configuration for MCC
 For an [Intune](/mem/intune/) deployment, create a **Configuration Profile** and include the Cache Host eFlow IP Address or FQDN:
 :::image type="content" source="./images/ent-mcc-intune-do.png" alt-text="Screenshot of Intune showing the Delivery Optimization cache server host names.":::
 ## Common Issues
 #### PowerShell issues
 If you're seeing errors similar to this error: `The term Get-<Something> isn't recognized as the name of a cmdlet, function, script file, or operable program.`
 1. Ensure you're running Windows PowerShell version 5.x.
 1. Run \$PSVersionTable and ensure you're running version 5.x and *not version 6 or 7*.
 1. Ensure you have Hyper-V enabled:
    **Windows 10:** [Enable Hyper-V on Windows 10](/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)
    **Windows Server:** [Install the Hyper-V role on Windows Server](/windows-server/virtualization/hyper-v/get-started/install-the-hyper-v-role-on-windows-server)
 #### Verify Running MCC Container
 Connect to the Connected Cache server and check the list of running IoT Edge modules using the following commands:
 ```bash
 Connect-EflowVm
 sudo iotedge list
 ```
 :::image type="content" source="./images/ent-mcc-iotedge-list.png" alt-text="Screenshot of the iotedge list command." lightbox="./images/ent-mcc-iotedge-list.png":::
 If edgeAgent and edgeHub containers are listed, but not "MCC", you may view the status of the IoT Edge security manager by using the command:
 ```bash
 sudo journalctl -u iotedge -f
 ```
 This command will provide the current status of the starting, stopping of a container, or the container pull and start.  
 :::image type="content" source="./images/ent-mcc-journalctl.png" alt-text="Screenshot of the output from journalctl -u iotedge -f." lightbox="./images/ent-mcc-journalctl.png":::
 > [!NOTE]
 > You should consult the IoT Edge troubleshooting guide ([Common issues and resolutions for Azure IoT Edge](/azure/iot-edge/troubleshoot)) for any issues you may encounter configuring IoT Edge, but we've listed a few issues that we encountered during our internal validation.
--- a/windows/deployment/do/waas-delivery-optimization-reference.md
+++ b/windows/deployment/do/waas-delivery-optimization-reference.md
@ -276,9 +276,7 @@ Starting in Windows 10, version 1803, allows you to delay the use of an HTTP sou
 MDM Setting: **DelayCacheServerFallbackForeground**
-Starting in Windows 10, version 1903, allows you to delay the fallback from cache server to the HTTP source for foreground content download by X seconds. If the 'Delay foreground download from HTTP' policy is set, it will apply first (to allow downloads from peers) and then this policy will be applied. **By default, this policy isn't set.**
+Starting in Windows 10, version 1903, allows you to delay the fallback from cache server to the HTTP source for foreground content download by X seconds. If the 'Delay foreground download from HTTP policy is set, it will apply first (to allow downloads from peers) and then this policy will be applied. **By default, this policy isn't set.**
 By default this policy isn't set. So,
 ### Delay Background Download Cache Server Fallback (in secs)
--- a/windows/deployment/windows-autopatch/TOC.yml
+++ b/windows/deployment/windows-autopatch/TOC.yml
@ -10,6 +10,8 @@
          href: overview/windows-autopatch-roles-responsibilities.md
        - name: Privacy
          href: overview/windows-autopatch-privacy.md
        - name: Deployment guide
          href: overview/windows-autopatch-deployment-guide.md
        - name: FAQ
          href: overview/windows-autopatch-faq.yml
    - name: Prepare
--- a/windows/deployment/windows-autopatch/media/windows-autopatch-deployment-journey.png
+++ b/windows/deployment/windows-autopatch/media/windows-autopatch-deployment-journey.png
--- a/windows/deployment/windows-autopatch/overview/windows-autopatch-deployment-guide.md
+++ b/windows/deployment/windows-autopatch/overview/windows-autopatch-deployment-guide.md
@ -0,0 +1,337 @@
 ---
 title: Windows Autopatch deployment guide
 description: This guide explains how to successfully deploy Windows Autopatch in your environment
 ms.date: 08/24/2023
 ms.prod: windows-client
 ms.technology: itpro-updates
 ms.topic: how-to
 ms.localizationpriority: medium
 author: tiaraquan
 ms.author: tiaraquan
 manager: dougeby
 ms.reviewer: hathind
 ms.collection:
  - tier2
 ---
 # Windows Autopatch deployment guide
 As organizations move to support hybrid and remote workforces, and continue to adopt cloud-based endpoint management with services such as Intune, managing updates is critical.
 Windows Autopatch is a cloud service that automates Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams updates to improve security and productivity across your organization.
 A successful Windows Autopatch deployment starts with planning and determining your objectives. Use this deployment guide to plan your move or migration to Windows Autopatch.
 This guide:
 - Helps you plan your deployment and adopt Windows Autopatch
 - Lists and describes some common objectives
 - Provides a recommended deployment plan
 - Provides migration considerations for Windows Update for Business (WUfB) and Microsoft Configuration Manager
 - Lists some common general considerations when deploying Windows Autopatch
 - Provides suggested business case benefits and communication guidance
 - Gives additional guidance and how to join the Autopatch community
 ## Determine your objectives
 This section details some common objectives when using Windows Autopatch.  
 Once an organization is onboarded, Windows Autopatch automatically creates multiple progressive deployment rings and applies the latest updates according to Windows Autopatch recommended practices and your organization's custom configuration. While there are options to adjust configurations such as quality update cadence, the service provides you with a baseline to begin establishing your update objectives.
 Use Windows Autopatch to solve the following challenges:
 - Difficulty developing and defending update cadence and general best practices
 - Increase visibility and improve issue reporting
 - Achieving a consistent update success rate
 - Standardize and optimize the configuration for devices, policies, tools and versions across their environment
 - Transition to modern update management by configuring Intune and Windows Update for Business
 - Make update processes more efficient and less reliant on IT admin resources  
 - Address vulnerabilities and Windows quality updates as soon as possible to improve security
 - Assist with compliance to align with industry standards
 - Invest more time on value-add IT projects rather than monthly updates
 - Planning and managing Windows feature updates
 - Transition to Windows 11
 ## Recommended deployment steps
 The following deployment steps can be used as a guide to help you to create your organization's specific deployment plan to adopt and deploy Windows Autopatch.
 :::image type="content" source="../media/windows-autopatch-deployment-journey.png" alt-text="Windows Autopatch deployment journey" lightbox="../media/windows-autopatch-deployment-journey.png":::
 ### Step one: Prepare
 [Review the prerequisites](../prepare/windows-autopatch-prerequisites.md) and [enroll your tenant](../prepare/windows-autopatch-enroll-tenant.md) into the Windows Autopatch service. At this stage, your devices aren't affected.  You can enroll your tenant and review the service options before registering your devices.
 | Step | Description |
 | ----- | ----- |
 | **1A: Set up the service** | <ul><li>Prepare your environment, review existing update policies and [General Considerations](#general-considerations)</li><li>Review and understand [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) when enrolling into the service</li><li>Enroll into the service and [add your admin contacts](../deploy/windows-autopatch-admin-contacts.md)</li><li>Review [Roles and responsibilities](../overview/windows-autopatch-roles-responsibilities.md)</li><li>Verify the [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) completed successfully</li></ul> |
 | **1B: Confirm update service needs and configure your workloads** | <ul><li>[Windows quality updates](../operate/windows-autopatch-windows-quality-update-overview.md): Expedite preferences and cadence customizations</li><li>[Windows feature updates](../operate/windows-autopatch-windows-feature-update-overview.md): Servicing version preferences</li><li>[Driver and firmware updates](../operate/windows-autopatch-manage-driver-and-firmware-updates.md): Set to either Manual or Automatic</li><li>[Microsoft 365 Apps for enterprise](../operate/windows-autopatch-microsoft-365-apps-enterprise.md): Set to either Monthly Enterprise Channel or opt-out</li><li>[Microsoft Edge](../operate/windows-autopatch-edge.md): Required. Beta and Stable Channel</li><li>[Microsoft Teams](../operate/windows-autopatch-teams.md): Required. Automatic</li></ul> |
 | **1C: Consider your Autopatch groups distribution** | Organizations have a range of Windows devices including desktop computers, laptops and tablets that might be grouped across multiple logical or physical locations. When planning your Autopatch groups strategy, consider the Autopatch group structure that best fits your organizational needs. It's recommended to utilize the service defaults as much as possible. However, if necessary, you can customize the [Default Autopatch group](../deploy/windows-autopatch-groups-overview.md#about-the-default-autopatch-group) with additional deployment rings and/or [create your own Custom Autopatch group(s)](../deploy/windows-autopatch-groups-overview.md#about-the-default-autopatch-group).<br><br><ul><li> Review your device inventory and consider a representative mix of devices across your distribution</li><li>Review your Azure AD groups that you wish to use to register devices into the service</li><li>Review [device registration options](../deploy/windows-autopatch-device-registration-overview.md) and [register your first devices](../deploy/windows-autopatch-register-devices.md)</li></ul> |
 | **1D: Review network optimization** | It's important to [prepare your network](../prepare/windows-autopatch-configure-network.md) to ensure that your devices have access to updates in the most efficient way, without impacting your infrastructure.<br><br>A recommended approach to manage bandwidth consumption is to utilize [Delivery Optimization](../prepare/windows-autopatch-configure-network.md#delivery-optimization). You can use Delivery Optimization to reduce bandwidth consumption by sharing the work of downloading these packages amongst multiple devices in your deployment. |
 ### Step two: Evaluate
 Evaluate Windows Autopatch with around 50 devices to ensure the service meets your needs. You can adjust this number based on your organizational make-up. It's recommended to monitor one update cycle during this evaluation step.
 | Step | Description |
 | ----- | ----- |
 | **2A: Review reporting capabilities** | <ul><li>[Windows quality update reports](../operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md#windows-quality-update-reports)</li><li>[Windows feature update reports](../operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md#windows-feature-update-reports)</li><li>[Windows Update for Business (WUfB) reports](/mem/intune/protect/windows-update-compatibility-reports#use-the-windows-feature-update-device-readiness-report)</li></ul>Windows Autopatch quality and feature update reports provide a progress view on the latest update cycle for your devices. These reports should be reviewed often to ensure you understand the update state of your Windows Autopatch devices.<br><br>There might be times when using Windows Autopatch for update deployment that it's beneficial to review Windows Update for Business (WUfB) reports.<br><br>For example, when preparing to deploy Windows 11, you might find it useful to evaluate your devices using the [Windows feature update device readiness](/mem/intune/protect/windows-update-compatibility-reports#use-the-windows-feature-update-device-readiness-report) and [Windows feature update compatibility risks reports](/mem/intune/protect/windows-update-compatibility-reports#use-the-windows-feature-update-compatibility-risks-report) in Intune.|
 | **2B: Review operational changes** | As part of the introduction of Windows Autopatch, you should consider how the service integrates with your existing operational processes.<br><ul><li>Identify service desk and end user computing process changes</li><li>Identify any alignment with third party support agreements</li><li>Review the default Windows Autopatch support process and alignment with your existing Premier and Unified support options</li><li>Identify IT admin process change & service interaction points</li></ul> |
 | **2C: Educate end users and key stakeholders**| Educate your end users by creating guides for the Windows Autopatch end user experience.<ul><li>[Windows quality updates](../operate/windows-autopatch-groups-windows-quality-update-end-user-exp.md)</li><li>[Windows feature updates](../operate/windows-autopatch-groups-windows-feature-update-overview.md)</li>[Microsoft 365 Apps for enterprise updates](../operate/windows-autopatch-microsoft-365-apps-enterprise.md)<li>[Microsoft Edge](../operate/windows-autopatch-edge.md)</li><li>[Microsoft Teams](../operate/windows-autopatch-teams.md)</li></ul><br>Include your IT support and help desk in the early stages of the Windows Autopatch deployment and planning process. Early involvement allows your support staff to:<br><ul><li>Gain knowledge and experience in identifying and resolving update issues more effectively</li><li>Prepare them to support production rollouts. Knowledgeable help desk and support teams also help end users adopt to changes</li></ul><br>Your support staff can experience a walkthrough of the Windows Autopatch admin experience through the [Windows Autopatch demo site](https://aka.ms/autopatchdemo). |
 | **2D: Pilot planning** | Identify target pilot group(s) of up to 500 devices. It's recommended to include a cross-section of your organizational make-up to ensure your pilot results are representative of your organizational environment. |
 ### Step three: Pilot
 Plan to pilot the service with around 500 devices to provide sufficient pilot coverage to be ready for deployment. You can adjust this number based on your organizational make-up. It's recommended to monitor one to two update cycles during the pilot step.
 | Step | Description |
 | ----- | ----- |
 | **3A: Register devices** | Register pilot device group(s) |
 | **3B: Monitor update process success** |<ul><li>Quality update: One to two update cycles</li><li>Feature update: Set of pilot devices scheduled across several weeks</li><li>Drivers and firmware: One to two update cycles</li><li>Microsoft 365 Apps for enterprise (if not opted-out): One to two update cycles</li><li>Microsoft Edge: One to two update cycles</li><li>Microsoft Teams: One to two update cycles</li> |
 | **3C: Review reports** |<ul><li>[Quality update reports](../operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md#windows-quality-update-reports): Monitor data in the reports across one to two update cycles</li><li>[Feature update reports](../operate/windows-autopatch-groups-windows-quality-and-feature-update-reports-overview.md#windows-feature-update-reports): Monitor data in the reports across the update schedule</li><li>[Windows Update for Business (WUfB) reports](/mem/intune/protect/windows-update-compatibility-reports#use-the-windows-feature-update-device-readiness-report): Monitor data in the report across one to two update cycles</li></ul> |
 | **3D: Implement operational changes** |<ul><li>Pilot Service Desk, end user computing and third party (if applicable) process changes with pilot representatives</li><li>IT admins must:<ul><li>Review deployment progress using Windows Autopatch reports</li><li>Respond to identified actions to help improve success rates</li></ul></ul> |
 | **3E: Communicate with stakeholders** | Review and action your stakeholder communication plan. |
 | **3F: Deployment planning** | Prepare target deployment groups for phased deployment of Windows Autopatch. |
 ### Step four: Deploy
 Following a successful pilot, you can commence deployment to your broader organization.  The pace at which you deploy is dependent on your own requirements; for example, deploying in groups of 500 to 5000 per week are commonly used approaches to complete the deployment of Windows Autopatch.
 | Step | Description |
 | ----- | ----- |
 | **4A: Review reports** |<ul><li>Review deployment progress using Windows Autopatch reports</li><li>Respond to identified actions to help improve success rates</li></ul> |
 | **4B: Communicate with stakeholders** | Review and action your stakeholder communication plan |
 | **4C: Complete operational changes** |<ul><li>Service Desk readiness is complete and in place</li><li>IT admins take the required action(s) based on the Autopatch reports</li></ul> |
 ## Migration considerations
 If you're an existing Windows Update for Business (WUfB) or Configuration Manager customer, there are several considerations that could accelerate your deployment along a shorter path.
 ### Why migrate from Windows Update for Business or Configuration Manager to Windows Autopatch?
 Customers who are using Windows Update for Business (WUfB) or Configuration Manager can quickly adopt Windows Autopatch and take advantage of the key benefits that Windows Autopatch provides.
 When moving from Windows Update for Business (WUfB) or Configuration Manager to Windows Autopatch, you can enhance and optimize the update experience that you're already familiar with.  
 Once migrated, there are several configuration tasks that you no longer need to carry out:
 | Autopatch benefit | Configuration Manager | Windows Update for Business (WUfB) |
 | ----- | ----- | ----- |
 | Automated setup and on-going configuration of Windows Update policies | Manage and perform recurring tasks such as:<ul><li>Download updates</li><li>Distribute to distribution points</li><li>Target update collections</li></ul> | Manage "static" deployment ring policies |
 | Automated management of deployment ring membership | Manually check collection membership and targets | Manage "static" deployment ring membership |
 | Maintain minimum Windows feature version and progressively move between servicing versions | Spend time developing, testing and rolling-out task sequence | Set up and deploy Windows feature update policies |
 | Service provides release management, signal monitoring, testing, and Windows Update deployment | Setup, target and monitor update test collections | Manage Test deployment rings and manually monitor update signals |
 | Simple, integrated process to turn on the service as part of the Windows 365 provisioning policy | Manually target Cloud PCs in device collections | Manually target Cloud PCs in Azure AD groups |
 In addition to the reports, other benefits include:
 | Autopatch benefit | Configuration Manager and Windows Update for Business (WUfB) |
 | ----- | ----- |
 | Windows quality and feature update reports with integrated alerts, deep filtering, and status-at-a-glance | Requires you to manually navigate and hunt for status and alerts |
 | Filter by action needed with integrated resolution documentation | Requires you to research and discover possible actions relating to update issues |
 | Better visibility for IT admins, Security compliance and proof for regulator | Requires you to pull together different reports and views across multiple admin portals |
 Service management benefits include:
 | Autopatch benefit | Configuration Manager and Windows Update for Business (WUfB) |
 | ----- | ----- |
 | Windows automation and Microsoft Insights | First or third-party resources required to support and manage updates internally |
 | Microsoft research and insights determine the 'go/no-go' for your update deployment | Limited signals and insights from your organization to determine the 'go/no-go' for your update deployment |
 | Windows Autopatch might pause or roll back an update. The pause or rollback is dependent on the scope of impact and to prevent end user disruption | Manual intervention required, widening the potential impact of any update issues |
 | By default, Windows Autopatch [expedites quality updates](../operate/windows-autopatch-groups-windows-quality-update-overview.md#expedited-releases) as needed. | Manual intervention required, widening the potential impact of any update issues |
 ### Migrating from Windows Update for Business (WUfB) to Windows Autopatch
 #### Assessing your readiness to migrate from Windows Update for Business (WUfB) to Windows Autopatch
 When moving from Windows Update for Business (WUfB) to Windows Autopatch, you can accelerate and simplify your adoption by assessing your readiness to quickly migrate to the Windows Autopatch service by considering key differences that might impact your deployment:
 | Step | Assessment step | Recommendation |
 | ----- | ----- | ----- |
 | **1** | "User based" vs. "device based" targeting | Windows Autopatch doesn't support "user based" targeting.  If your Windows Update deployment is "user based", you must plan to move to a device-based targeting model by adding and registering devices into Windows Autopatch. Use the [Consider your Autopatch groups guidance](#step-one-prepare) |
 | **2** | Microsoft Edge channels | Windows Autopatch deploys Microsoft Edge Stable channel to devices in all deployment rings except for the Test deployment ring. The Test deployment ring is configured for the Microsoft Edge Beta channel. If you're currently using different channels, your teams should understand that your Windows Autopatch devices use these channels. For more information, see [Confirm update service needs and configure your workloads](#step-one-prepare). |
 | **3** | Microsoft 365 Apps for enterprise | Windows Autopatch deploys the Monthly Enterprise Channel to all Microsoft 365 Apps for enterprise clients. If your organization is using a different channel and you don't wish to adopt the Monthly Enterprise Channel, you can opt out Microsoft 365 Apps for enterprise updates. For more information, see [Confirm update service needs and configure your workloads](#step-one-prepare) |
 | **4** | Prepare your policies | You should consider any existing policy configurations in your Windows Update for Business (WUfB), Intune or on-premises environment that could impact your deployment of Windows Autopatch. For more information, review [General considerations](#general-considerations) |
 | **5** | Network optimization technologies | We recommend you consider your network optimization technologies as part of your Windows Autopatch deployment.  However, if you're already using Windows Update for Business (WUfB) it's likely you already have your network optimization solution in place.  For more information, see [Review network optimization](#step-one-prepare) |
 ### Optimized deployment path: Windows Update for Business (WUfB) to Windows Autopatch
 Once you have assessed your readiness state to ensure you're aligned to Windows Autopatch readiness, you can optimize your deployment of Windows Autopatch to quickly migrate to the service. The following steps illustrate a recommended optimized deployment path:
 | Step | Example timeline | Task |
 | ----- | ----- | ----- |
 | **[Step one: Prepare > Set up the service](#step-one-prepare)** | Week one | Follow our standard guidance to turn on the Windows Autopatch service<ul><li>Prepare your environment, review existing update policies and [General Considerations](#general-considerations)</li><li>Review and understand the [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) when enrolling into the service</li><li>Enroll into the service and [add your admin contacts](../deploy/windows-autopatch-admin-contacts.md)</li><li>Review [Roles and responsibilities](../overview/windows-autopatch-roles-responsibilities.md)</li><li>Verify the [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) have completed successfully</li></ul> |
 | **[Step one: Prepare > Adjust the service configuration based on your migration readiness](#step-one-prepare)** | Week one | <ul><li>[Windows quality updates](../operate/windows-autopatch-windows-quality-update-overview.md)</li><li>[Windows feature updates](../operate/windows-autopatch-windows-feature-update-overview.md)</li><li>[Driver and firmware updates](../operate/windows-autopatch-manage-driver-and-firmware-updates.md)</li><li>[Microsoft 365 Apps for enterprise](../operate/windows-autopatch-microsoft-365-apps-enterprise.md)</li><li>[Microsoft Edge](../operate/windows-autopatch-edge.md)</li><li>[Microsoft Teams](../operate/windows-autopatch-teams.md)</li><li>Use the [Default Autopatch group](../deploy/windows-autopatch-groups-overview.md#about-the-default-autopatch-group) or [create a Custom Autopatch group](../deploy/windows-autopatch-groups-overview.md#about-custom-autopatch-groups)</li></ul> |
 | **[Step two: Evaluate](#step-two-evaluate)** | Week one to month two | Evaluate with around 50 devices for one update cycle to confirm the correct service configurations are in place |
 | **[Step three: Pilot](#step-three-pilot)** | Month two to three | Pilot with around 500 - 5000 devices for one update cycle to ensure you can further validate with your key stakeholders and Service Desk teams |
 | **[Step four: Deploy](#step-four-deploy)** | Month three to six | Phase deployments as necessary to migrate your estate. You can move as quickly as you feel comfortable |
 ### Migrating from Configuration Manager to Windows Autopatch
 Regardless of if you're migrating from Configuration Manager to Microsoft Intune or if you're remaining with Configuration Manager, if you're currently using Configuration Manager to manage updates, you can migrate the update workloads to Windows Autopatch and take advantage of the key benefits for your Configuration Manager environment.
 #### Assessing your readiness to migrate from Configuration Manager to Windows Autopatch
 When you migrate from Configuration Manager to Windows Autopatch, the fastest path to quickly gain value from Windows Autopatch is to already have co-management and the requisite workloads moved to Intune.
 | Step | Assessment step | Recommendation |
 | ----- | ----- | ----- |
 | **1** | Turn on co-management | If you're using co-management across Configuration Manager and your managed devices, you meet the key requirements to use Windows Autopatch.<br><br>If you don't have co-management, see [How to use co-management in Configuration Manager](/mem/configmgr/comanage/how-to-enable) |
 | **2** | Use required co-management workloads | Using Windows Autopatch requires that your managed devices use the following three co-management workloads:<ul><li>Windows Update policies workload</li><li>Device configuration workload</li><li>Office Click-to-Run apps workload</li></ul><br>If you have these workloads configured, you meet the key requirements to use Windows Autopatch. If you don't have these workloads configured, review [How to switch Configuration Manager workloads to Intune](/mem/configmgr/comanage/how-to-switch-workloads) |
 | **3** | Prepare your policies | You should consider any existing policy configurations in your Configuration Manager (or on-premises) environment that could impact your deployment of Windows Autopatch. For more information, review [General considerations](#general-considerations) |
 | **4** | Ensure Configuration Manager collections or Azure AD device groups readiness | To move devices to Windows Autopatch, you must register devices with the Windows Autopatch service. To do so, use either Azure AD device groups, or Configuration Manager collections. Ensure you have either Azure AD device groups or Configuration Manager collections that allow you to evaluate, pilot and then migrate to the Windows Autopatch service. For more information, see [Register your devices](../deploy/windows-autopatch-register-devices.md#before-you-begin). |  
 ### Optimized deployment path: Configuration Manager to Windows Autopatch
 Once you have assessed your readiness state to ensure you're aligned to Windows Autopatch readiness, you can optimize your deployment of Windows Autopatch to quickly migrate to the service.   The following steps illustrate a recommended optimized deployment path:
 | Step | Example timeline | Task |
 | ----- | ----- | ----- |
 | **[Step one: Prepare > Set up the service](#step-one-prepare)** | Week one | Follow our standard guidance to turn on the Windows Autopatch service<ul><li>Prepare your environment, review existing update policies and [General Considerations](#general-considerations).</li><li>Review and understand the [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) when enrolling into the service</li><li>Enroll into the service and [add your admin contacts](../deploy/windows-autopatch-admin-contacts.md)</li><li>Review [Roles and responsibilities](../overview/windows-autopatch-roles-responsibilities.md)</li><li>Verify the [changes made at tenant enrollment](../references/windows-autopatch-changes-to-tenant.md) have completed successfully.</li></ul> |
 | **[Step one: Prepare > Adjust the service configuration based on your migration readiness](#step-one-prepare)** | Week one | <ul><li>[Windows quality updates](../operate/windows-autopatch-windows-quality-update-overview.md)</li><li>[Windows feature updates](../operate/windows-autopatch-windows-feature-update-overview.md)</li><li>[Driver and firmware updates](../operate/windows-autopatch-manage-driver-and-firmware-updates.md)</li><li>[Microsoft 365 Apps for enterprise](../operate/windows-autopatch-microsoft-365-apps-enterprise.md)</li><li>[Microsoft Edge](../operate/windows-autopatch-edge.md)</li><li>[Microsoft Teams](../operate/windows-autopatch-teams.md)</li><li>Use the [Default Autopatch group](../deploy/windows-autopatch-groups-overview.md#about-the-default-autopatch-group) or [create a Custom Autopatch group](../deploy/windows-autopatch-groups-overview.md#about-custom-autopatch-groups)</li></ul> |
 | **[Step two: Evaluate](#step-two-evaluate)** | Week one to month two | Evaluate with around 50 devices for one update cycle to confirm the correct service configurations are in place |
 | **[Step three: Pilot](#step-three-pilot)** | Month two to three | Pilot with around 500 - 5000 devices for one update cycle to ensure you can further validate with your key stakeholders and Service Desk teams |
 | **[Step four: Deploy](#step-four-deploy)** | Month three to six | Phase deployments as necessary to migrate your estate. You can move as quickly as you feel comfortable |
 ## General considerations
 As part of your planning process, you should consider any existing enterprise configurations in your environment that could affect your deployment of Windows Autopatch.  
 Many organizations have existing policies and device management infrastructure, for example:
 - Group Policy Objects (GPO)
 - Registry settings
 - Configuration Manager
 - Existing Mobile Device Management (MDM) policies
 - Servicing profiles for Microsoft 365 Apps
 It's a useful exercise to create a baseline of your policies and existing settings to map out the configuration that could impact your move to Windows Autopatch.
 ### Group policy
 Review existing policies and their structure. Some policies might apply globally, some apply at the site level, and some are specific to a device. The goal is to know and understand the intent of global policies, the intent of local policies, and so on.
 On-premises AD group policies are applied in the LSDOU order (Local, Site, Domain, and Organizational Unit (OU)). In this hierarchy, OU policies overwrite domain policies, domain policies overwrite site policies, and so on.
 | Area | Path | Recommendation |
 | -----  | ----- | ----- |
 | Windows Update Group Policy settings | `Computer Configuration\Administrative Templates\Windows Components\Windows Updates` | The most common Windows Update settings delivered through Group Policy can be found under this path. This is a good place for you to start your review. |
 | Don't connect to any Windows Update Internet locations | `Computer Configuration\Administrative Templates\Windows Components\Windows update\Do not connect to any Windows Update Internet locations` | This is a common setting for organizations that rely solely on intranet update locations such as Windows Server Update Services (WSUS) servers and can often be overlooked when moving to cloud update services such as Windows Update for Business (WUfB)<br><br>When turned on, this policy prevents contact with the public Windows Update service and won't establish connections to Windows Update, and might cause the connection to Windows Update for Business (WUfB), and Delivery Optimization to stop working. |
 | Scan Source policy | `Computer Configuration\Administrative Templates\Windows Components\Windows Update\Manage updates offered from Windows Server Update Service` | You can choose what types of updates to get from either Windows Server Update Services (WSUS) or Windows Update for Business (WUfB) service with the Windows Update Scan Source policy.<br><br>You should review any scan source policy settings targeting devices to ensure:<ul><li>That no conflicts exist that could affect update deployment through Windows Autopatch</li><li>Such policies aren't targeting devices enrolled into Windows Autopatch</li></ul> |
 ### Registry settings
 Any policies, scripts or settings that create or edit values in the following registry keys might interfere with Windows and Office Update settings delivered through Autopatch. It's important to understand how these settings interact with each other and with the Windows and Office Update service as part of your Autopatch planning.
 | Key | Description |
 | ----- | ----- |
 | `HKLM\SOFTWARE\Microsoft\WindowsUpdate\UpdatePolicy\PolicyState`<br>(Intune MDM only cloud managed)<br><br>`HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate`<br>(If GPO/WSUS/Configuration Manager is deployed) | This key contains general settings for Windows Update, such as the update source, the service branch, and the deferral periods for feature and quality updates. |
 | `HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU`<br>(If GPO/WSUS/Configuration Manager is deployed) | This key contains settings for Automatic Updates, such as the schedule, the user interface, and the detection frequency. |
 | `HKLM\SOFTWARE\Microsoft\PolicyManager\default\Update`<br>(GPO/WSUS/Configuration Manager/Intune MDM Managed) | This key contains settings for update policies that are managed by Mobile Device Management (MDM) or Group Policy, such as pausing updates, excluding drivers, or configuring delivery optimization. |
 | `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Office\ClickToRun\Configuration`<br>(GPO/Configuration Manager/Intune MDM Managed) | This key contains the registry keys for the Update Channel. This is a dynamic key that changes (depending on the configured settings) and the CDNBaseUrl (set when Microsoft 365 installs on the device).<br><br>Look at the `UpdateChannel` value. The value tells you how frequently Office is updated.<br><br>For more information, see [Manage Microsoft 365 Apps with Configuration Manager](/mem/configmgr/sum/deploy-use/manage-office-365-proplus-updates#bkmk_channel) to review the values, and what they're set to. Windows Autopatch currently supports the Monthly Enterprise Channel. If you opt into Office updates, it should be set to the Monthly Enterprise channel. |
 > [!NOTE]
 > For more information about Windows Update Settings for Group Policy and Mobile Device Management (MDM), see [Manage additional Windows Update settings](/windows/deployment/update/waas-wu-settings).
 ### Configuration Manager
 #### Windows and Microsoft 365 Apps for enterprise updates
 When Configuration Manager is deployed, and if Software Update policies are configured, the Software Update policies could conflict with Windows Update for Business and Office Update policies.
 Configuration Manager could require custom settings to disable software updates and assist with troubleshooting conflicting legacy, on-premises configurations to ensure that Autopatch deliver Windows and Office updates. It's safe to implement this change if you aren't managing third party updates from Configuration Manager.
 To ensure that Software Update Policies don't conflict with Windows Update for Business (WUfB) and Office Update policies, create a Software Update Policy in Configuration Manager that has:
 - Windows and Office Update configuration disabled
 - Includes devices enrolled into Autopatch to remove any existing configuration(s).
 If this policy remains live, confirm that Autopatch devices aren't included in the live Software Update Policy in Configuration Manager.
 All devices that are enrolled in Autopatch use Windows and Office Update policies from the service, and any configurations that are applied through Configuration Manager Software Update Policies can be removed.
 For example, Configuration Manager Software Update Policy settings exclude Autopatch enrolled devices from receiving conflicting configuration for Windows and Office Updates:
 | Device setting | Recommended configuration |
 | ----- | ----- |
 | Enable software updates | No |
 | Enable management of the Office 365 Client Agent | No |
 > [!NOTE]
 > There is no requirement to create a Configuration Manager Software Update Policy if the policies aren’t in use.
 #### Existing Mobile Device Management (MDM) policies
 | Policy | Description |
 | ----- | ----- |
 | **MDM to win over GP** | As part of the tenant enrollment process, Autopatch deploys a Device configuration profile, which applies to all registered devices to set Mobile Device Management (MDM) to win over Group Policy (GP) with the "MDMWinsOverGP" CSP.<br><br>When applied, any MDM policy that's set, and has an equivalent GP Policy, results in the GP service blocking the policy setting. Setting the value to 0 (zero) or deleting the policy removes the GP policy blocks and restore the saved GP policies.<br><br>This setting doesn't apply to all scenarios. This setting doesn't work for:<ul><li>User scoped settings. This setting applies to device scoped settings only</li><li>Any custom Group Policy Object (GPO) outside of ADMX. For example, Microsoft Edge or Chrome settings</li><li>Any Windows Update for Business policies (WUfB). When you use Windows Update for Business (WUfB), ensure all previous Group Policies (GP) are removed that relate to Windows Update to ensure that Autopatch policies can take effect</li></ul><br><br>For more information and guidance on the expected behavior applied through this policy, see [ControlPolicyConflict Policy CSP](/windows/client-management/mdm/policy-csp-controlpolicyconflict) |
 | **Windows Update for Business (WUfB) policies** | If you have any existing *Deployment rings for Windows 10 and later or Windows feature update DSS policies* in place, ensure that the assignments don't target Windows Autopatch devices. This is to avoid creating policy conflicts and unexpected update behavior, which could impact update compliance and end user experience. |
 | **Update Policy CSP** | If any policies from the [Update Policy CSP](/windows/client-management/mdm/policy-csp-update) that aren't deployed and managed by Windows Autopatch are deployed to devices, policy conflicts and unexpected update behavior could occur and could affect update compliance and the end user experience. |
 #### Servicing profiles for Microsoft 365 Apps for enterprise
 You can use automation to deliver monthly updates to Microsoft 365 Apps for enterprise directly from the Office Content Delivery Network (CDN) using [Servicing profiles](/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise#compatibility-with-servicing-profiles). A servicing profile 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](/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise#device-eligibility) regardless of existing management tools in your environment.  
 You can consider retargeting servicing profiles to non-Windows Autopatch devices or if you plan to continue using them, you can [block Windows Autopatch delivered Microsoft 365 App updates](/windows/deployment/windows-autopatch/operate/windows-autopatch-microsoft-365-apps-enterprise#allow-or-block-microsoft-365-app-updates) for Windows Autopatch-enrolled devices.
 ## Business case
 Part of your planning might require articulating the business benefits of moving to Windows Autopatch from your existing update solution(s). Windows Autopatch provides several resources to help when building your business case.
 - [How Windows Autopatch works for you](https://www.microsoft.com/microsoft-365/windows/autopatch)
 - [What is Windows Autopatch?](https://techcommunity.microsoft.com/t5/windows-autopatch/windows-autopatch-resource-guide/m-p/3502461#_note3)
 - [Forrester - The Projected Total Economic Impact™ Of Windows Autopatch: Cost Savings And Business Benefits Enabled By Windows Autopatch](https://techcommunity.microsoft.com/t5/windows-autopatch/windows-autopatch-resource-guide/m-p/3502461#_note6)
 - [Windows Autopatch Skilling snack](https://techcommunity.microsoft.com/t5/windows-it-pro-blog/skilling-snack-windows-autopatch/ba-p/3787448)
 ## Stakeholder communications
 Change management relies on clear and helpful communication about upcoming changes. The best way to have a smooth deployment is to make sure end users and stakeholders are aware of all changes and disruptions. Your rollout communication plan should include all pertinent information, how to notify users, and when to communicate.  
 - Identify groups impacted by the Autopatch deployment
 - Identify key stakeholders in the impacted groups
 - Determine the types of communications needed
 - Develop your messaging based on the [Recommended deployment steps](#recommended-deployment-steps)
 - Create your stakeholder and communication plan schedule based on the [Recommended deployment steps](#recommended-deployment-steps)
 - Have communications drafted and reviewed, and consider your delivery channels such as:  
    - Social media posts
    - Internal messaging app (for example, Microsoft Teams)
    - Internal team site
    - Email
    - Company blog
    - Prerecorded on-demand videos
    - Virtual meeting(s)
    - In-person meetings
    - Team workshops
 - Deploy your stakeholder communication plan
 ## Review your objectives and business case with stakeholders
 Review your original objectives and business case with your key stakeholders to ensure your outcomes have been met and to ensure your expected value has been achieved.
 ## Need additional guidance?
 If you need assistance with your Windows Autopatch deployment journey, you have the following support options:
 - Microsoft Account Team
 - [Microsoft FastTrack](/windows/deployment/windows-autopatch/operate/windows-autopatch-support-request#microsoft-fasttrack)
 - Windows Autopatch Service Engineering Team
    - [Tenant enrollment support request](../prepare/windows-autopatch-enrollment-support-request.md)
    - [General support request](../operate/windows-autopatch-support-request.md)
 First contact your Microsoft Account team who can work with you to establish any guidance or support you might need. If you don't have a Microsoft Account Team contact or wish to explore other routes, Microsoft FastTrack offers Microsoft 365 deployment guidance for customers with 150 or more licenses of an eligible subscription at no additional cost. Finally, you can also log a support request with the Windows Autopatch Service Engineering Team.  
 ### Windows Autopatch Private Community (APC)
 Once you're underway with your deployment, consider joining the [Windows Autopatch Private Community (APC)](https://aka.ms/WindowsAutopatchPrivateCommunity) where you can:
 - Engage directly with the Windows Autopatch Engineering Teams and other Autopatch customers
 - Gain access to:
    - Exclusive virtual meetings
    - Focus groups
    - Surveys
    - Teams discussions
    - Previews
 ### Windows Autopatch Technology Adoption Program (TAP)  
 If you have at least 500 devices enrolled in the service, and will test and give Microsoft feedback at least once a year, consider signing up to the [Windows Autopatch Technology Adoption Program (TAP)](https://aka.ms/JoinWindowsAutopatchTAP) to try out new and upcoming Windows Autopatch features.
--- a/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md
+++ b/windows/deployment/windows-autopatch/whats-new/windows-autopatch-whats-new-2023.md
@ -27,6 +27,7 @@ Minor corrections such as typos, style, or formatting issues aren't listed.
 | Article | Description |
 | ----- | ----- |
 | [Deployment guide](../overview/windows-autopatch-deployment-guide.md) | New guide. This guide explains how to successfully deploy Windows Autopatch in your environment |
 | [Windows quality updates](../operate/windows-autopatch-groups-windows-quality-update-overview.md) | Added the **This pause is related to Windows Update** option to the [Pause and resume a release feature](../operate/windows-autopatch-groups-windows-quality-update-overview.md#pause-and-resume-a-release) |
 | [Manage driver and firmware updates](../operate/windows-autopatch-manage-driver-and-firmware-updates.md)| Added [policy settings](../operate/windows-autopatch-manage-driver-and-firmware-updates.md#view-driver-and-firmware-policies-created-by-windows-autopatch) for all deployment rings |
 | [Manage driver and firmware updates](../operate/windows-autopatch-manage-driver-and-firmware-updates.md) | General Availability<ul><li>[MC661218](https://admin.microsoft.com/adminportal/home#/MessageCenter)</li></ul> |
--- a/windows/security/docfx.json
+++ b/windows/security/docfx.json
@ -77,7 +77,6 @@
        "application-security//**/*.yml": "vinaypamnani-msft",
        "application-security/application-control/windows-defender-application-control/**/*.md": "jsuther1974",
        "application-security/application-control/windows-defender-application-control/**/*.yml": "jsuther1974",
        "application-security/application-control/user-account-control/*.md": "paolomatarazzo",
        "hardware-security/**/*.md": "vinaypamnani-msft",
        "hardware-security/**/*.yml": "vinaypamnani-msft",
        "information-protection/**/*.md": "vinaypamnani-msft",
@ -98,8 +97,6 @@
        "application-security//**/*.yml": "vinpa",
        "application-security/application-control/windows-defender-application-control/**/*.md": "jsuther",
        "application-security/application-control/windows-defender-application-control/**/*.yml": "jsuther",
        "application-security/application-control/user-account-control/*.md": "paoloma",
        "application-security/application-control/user-account-control/*.yml": "paoloma",
        "hardware-security//**/*.md": "vinpa",
        "hardware-security//**/*.yml": "vinpa",
        "information-protection/**/*.md": "vinpa",
--- a/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md
+++ b/windows/security/identity-protection/hello-for-business/hello-feature-pin-reset.md
@ -68,7 +68,9 @@ To register the applications, follow these steps:
 :::row-end:::
 :::row:::
  :::column span="3":::
-  3. Review the permissions requested by the *Microsoft Pin Reset Service Production* application and select **Accept** to confirm consent to both applications to access your organization
+  3. Review the permissions requested by the *Microsoft Pin Reset Service Production* application and select **Accept** to confirm consent to both applications to access your organization.
  >[!NOTE]
  >After accepance, the redirect page will show a blank page. This is a known behavior.
  :::column-end:::
  :::column span="1":::
    :::image type="content" alt-text="Screenshot showing the PIN reset service permissions final page." source="images/pinreset/pin-reset-service-prompt-2.png" lightbox="images/pinreset/pin-reset-service-prompt-2.png" border="true":::
@ -178,7 +180,7 @@ The _PIN reset_ configuration can be viewed by running [**dsregcmd /status**](/a
 **Applies to:** Azure AD joined devices
-PIN reset on Azure AD-joined devices uses a flow called *web sign-in* to authenticate users in the lock screen. Web sign-in only allows navigation to specific domains. If web sign-in attempts to navigate to a domain that isn't allowed, it displays a page with the error message: *We can't open that page right now*.\
+PIN reset on Azure AD-joined devices uses a flow called *web sign-in* to authenticate users in the lock screen. Web sign-in only allows navigation to specific domains. If web sign-in attempts to navigate to a domain that isn't allowed, it displays a page with the error message: *"We can't open that page right now"*.\
 If you have a federated environment and authentication is handled using AD FS or a third-party identity provider, then you must configure your devices with a policy to allow a list of domains that can be reached during PIN reset flows. When set, it ensures that authentication pages from that identity provider can be used during Azure AD joined PIN reset.
 [!INCLUDE [intune-settings-catalog-1](../../../../includes/configure/intune-settings-catalog-1.md)]
@ -196,7 +198,7 @@ Alternatively, you can configure devices using a [custom policy][INT-1] with the
 | <li> OMA-URI: `./Vendor/MSFT/Policy/Config/Authentication/ConfigureWebSignInAllowedUrls` </li><li>Data type: String </li><li>Value: Provide a semicolon delimited list of domains needed for authentication during the PIN reset scenario. An example value would be **signin.contoso.com;portal.contoso.com**</li>|
 > [!NOTE]
-> For Azure Government, there is a known issue with PIN reset on Azure AD Joined devices failing. When the user attempts to launch PIN reset, the PIN reset UI shows an error page that says, "We can't open that page right now." The ConfigureWebSignInAllowedUrls policy can be used to work around this issue. If you are experiencing this problem and you are using Azure US Government cloud, set **login.microsoftonline.us** as the value for the ConfigureWebSignInAllowedUrls policy.
+> For Azure Government, there is a known issue with PIN reset on Azure AD Joined devices failing. When the user attempts to launch PIN reset, the PIN reset UI shows an error page that says, *"We can't open that page right now"*. The ConfigureWebSignInAllowedUrls policy can be used to work around this issue. If you are experiencing this problem and you are using Azure US Government cloud, set **login.microsoftonline.us** as the value for the ConfigureWebSignInAllowedUrls policy.
 ## Use PIN reset
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/configure-pde-in-intune.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/configure-pde-in-intune.md
@ -1,30 +0,0 @@
 ---
 title: Configure Personal Data Encryption (PDE) in Intune
 description: Configuring and enabling Personal Data Encryption (PDE) required and recommended policies in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 <!-- Max 5963468 OS 32516487 -->
 <!-- Max 6946251 -->
 # Configure Personal Data Encryption (PDE) policies in Intune
 The various required and recommended policies needed for Personal Data Encryption (PDE) can be configured in Intune. The following links for both required and recommended policies contain step by step instructions on how to configure these policies in Intune.
 ## Required prerequisites
 1. [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 1. [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ## Security hardening recommendations
 1. [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 1. [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 1. [Disable hibernation](intune-disable-hibernation.md)
 1. [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## See also
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/configure.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/configure.md
@ -0,0 +1,141 @@
 ---
 title: PDE settings and configuration
 description: Learn about the available options to configure Personal Data Encryption (PDE) and how to configure them via Microsoft Intune or Configuration Service Providers (CSP).
 ms.topic: how-to
 ms.date: 08/11/2023
 ---
 # PDE settings and configuration
 This article describes the Personal Data Encryption (PDE) settings and how to configure them via Microsoft Intune or Configuration Service Providers (CSP).
 > [!NOTE]
 > PDE can be configured using MDM policies. The content to be protected by PDE can be specified using [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). There is no user interface in Windows to either enable PDE or protect content using PDE.
 >
 > The PDE APIs can be used to create custom applications and scripts to specify which content to protect and at what level to protect the content. Additionally, the PDE APIs can't be used to protect content until the PDE policy has been enabled.
 ## PDE settings
 The following table lists the required settings to enable PDE.
 | Setting name | Description |
 |-|-|
 |Enable Personal Data Encryption|PDE isn't enabled by default. Before PDE can be used, you must enable it.|
 |Sign-in and lock last interactive user automatically after a restart| Winlogon automatic restart sign-on (ARSO) isn't supported for use with PDE. To use PDE, ARSO must be disabled.|
 ## PDE hardening recommendations
 The following table lists the recommended settings to improve PDE's security.
 | Setting name | Description |
 |-|-|
 |Kernel-mode crash dumps and live dumps|Kernel-mode crash dumps and live dumps can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable kernel-mode crash dumps and live dumps.|
 |Windows Error Reporting (WER)/user-mode crash dumps|Disabling Windows Error Reporting prevents user-mode crash dumps. User-mode crash dumps can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable user-mode crash dumps.|
 |Hibernation|Hibernation files can potentially cause the keys used by Personal Data Encryption (PDE) to protect content to be exposed. For greatest security, disable hibernation.|
 |Allow users to select when a password is required when resuming from connected standby |When this policy isn't configured on Azure AD joined devices, users on a Connected Standby device can change the amount of time after the device´s screen turns off before a password is required to wake the device. During the time when the screen turns off but a password isn't required, the keys used by PDE to protect content could potentially be exposed. It's recommended to explicitly disable this policy on Azure AD joined devices.|
 ## Configure PDE with Microsoft Intune
 [!INCLUDE [intune-settings-catalog-1](../../../../../includes/configure/intune-settings-catalog-1.md)]
 | Category | Setting name | Value |
 |--|--|--|
 |**PDE**|Enable Personal Data Encryption (User)|Enable Personal Data Encryption|
 |**Administrative Templates > Windows Components > Windows Logon Options**|Sign-in and lock last interactive user automatically after a restart|Disabled|
 |**Memory Dump**|Allow Live Dump|Block|
 |**Memory Dump**|Allow Crash Dump|Block|
 |**Administrative Templates > Windows Components > Windows Error Reporting** | Disable Windows Error Reporting | Enabled|
 |**Power**|Allow Hibernate|Block|
 |**Administrative Templates > System > Logon** | Allow users to select when a password is required when resuming from connected standby | Disabled|
 [!INCLUDE [intune-settings-catalog-2](../../../../../includes/configure/intune-settings-catalog-2.md)]
 > [!TIP]
 > Use the following Graph call to automatically create the settings catalog policy in your tenant without assignments nor scope tags.
 >
 > When using this call, authenticate to your tenant in the Graph Explorer window. If it's the first time using Graph Explorer, you may need to authorize the application to access your tenant or to modify the existing permissions. This graph call requires *DeviceManagementConfiguration.ReadWrite.All* permissions.
 ```msgraph-interactive
 POST https://graph.microsoft.com/beta/deviceManagement/configurationPolicies
 Content-Type: application/json
 { "id": "00-0000-0000-0000-000000000000", "name": "_MSLearn_PDE", "description": "", "platforms": "windows10", "technologies": "mdm", "roleScopeTagIds": [ "0" ], "settings": [ { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_admx_credentialproviders_allowdomaindelaylock", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_admx_credentialproviders_allowdomaindelaylock_0", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_errorreporting_disablewindowserrorreporting", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_errorreporting_disablewindowserrorreporting_1", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_windowslogon_allowautomaticrestartsignon", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_windowslogon_allowautomaticrestartsignon_0", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_memorydump_allowcrashdump", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_memorydump_allowcrashdump_0", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_memorydump_allowlivedump", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_memorydump_allowlivedump_0", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "user_vendor_msft_pde_enablepersonaldataencryption", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "user_vendor_msft_pde_enablepersonaldataencryption_1", "children": [] } } }, { "@odata.type": "#microsoft.graph.deviceManagementConfigurationSetting", "settingInstance": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingInstance", "settingDefinitionId": "device_vendor_msft_policy_config_power_allowhibernate", "choiceSettingValue": { "@odata.type": "#microsoft.graph.deviceManagementConfigurationChoiceSettingValue", "value": "device_vendor_msft_policy_config_power_allowhibernate_0", "children": [] } } } ] }
 ```
 ## Configure PDE with CSP
 Alternatively, you can configure devices using the [Policy CSP][CSP-1] and [PDE CSP][CSP-2].
 |OMA-URI|Format|Value|
 |-|-|-|
 |`./User/Vendor/MSFT/PDE/EnablePersonalDataEncryption`|int|`1`|
 |`./Device/Vendor/MSFT/Policy/Config/WindowsLogon/AllowAutomaticRestartSignOn`|string|`<disabled/>`|
 |`./Device/Vendor/MSFT/Policy/Config/MemoryDump/AllowCrashDump`| int| `0`|
 |`./Device/Vendor/MSFT/Policy/Config/MemoryDump/AllowLiveDump` |int| `0`|
 |`./Device/Vendor/MSFT/Policy/Config/ErrorReporting/DisableWindowsErrorReporting`|string|`<enabled/>`|
 |`./Device/Vendor/MSFT/Policy/Config/Power/AllowHibernate` |int| `0`|
 |`./Device/Vendor/MSFT/Policy/Config/ADMX_CredentialProviders/AllowDomainDelayLock`|string|`<disabled/>`|
 ## Disable PDE
 Once PDE is enabled, it isn't recommended to disable it. However if you need to disable PDE, you can do so using the following steps.
 ### Disable PDE with a settings catalog policy in Intune
 [!INCLUDE [intune-settings-catalog-1](../../../../../includes/configure/intune-settings-catalog-1.md)]
 | Category | Setting name | Value |
 |--|--|--|
 |**PDE**|**Enable Personal Data Encryption (User)**|Disable Personal Data Encryption|
 [!INCLUDE [intune-settings-catalog-2](../../../../../includes/configure/intune-settings-catalog-2.md)]
 ### Disable PDE with CSP
 You can disable PDE with CSP using the following setting:
 |OMA-URI|Format|Value|
 |-|-|-|
 |`./User/Vendor/MSFT/PDE/EnablePersonalDataEncryption`|int|`0`|
 ## Decrypt PDE-encrypted content
 Disabling PDE doesn't decrypt any PDE protected content. It only prevents the PDE API from being able to protect any additional content. PDE-protected files can be manually decrypted using the following steps:
 1. Open the properties of the file
 1. Under the **General** tab, select **Advanced...**
 1. Uncheck the option **Encrypt contents to secure data**
 1. Select **OK**, and then **OK** again
 PDE-protected files can also be decrypted using [`cipher.exe`][WINS-1], which can be helpful in the following scenarios:
 - Decrypting a large number of files on a device
 - Decrypting files on multiple of devices
 To decrypt files on a device using `cipher.exe`:
 - Decrypt all files under a directory including subdirectories:
  ```cmd
  cipher.exe /d /s:<path_to_directory>
  ```
 - Decrypt a single file or all of the files in the specified directory, but not any subdirectories:
  ```cmd
  cipher.exe /d <path_to_file_or_directory>
  ```
 > [!IMPORTANT]
 > Once a user selects to manually decrypt a file, the user won't be able to manually protect the file again using PDE.
 ## Next steps
 - Review the [Personal Data Encryption (PDE) FAQ](faq.yml)
 <!--links used in this document-->
 [CSP-1]: /windows/client-management/mdm/policy-configuration-service-provider
 [CSP-2]: /windows/client-management/mdm/personaldataencryption-csp
 [WINS-1]: /windows-server/administration/windows-commands/cipher
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/faq-pde.yml
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/faq-pde.yml
@ -4,7 +4,7 @@ metadata:
  title: Frequently asked questions for Personal Data Encryption (PDE)
  description: Answers to common questions regarding Personal Data Encryption (PDE).
  ms.topic: faq
-  ms.date: 03/13/2023
+  ms.date: 08/11/2023
 title: Frequently asked questions for Personal Data Encryption (PDE)
 summary: |
@ -45,17 +45,9 @@ sections:
        answer: |
          No. PDE protected content can only be accessed after signing on locally to Windows with Windows Hello for Business credentials.
      - question: How can it be determined if a file is protected with PDE?
        answer: |
          - Files protected with PDE and EFS will both show a padlock on the file's icon. To verify whether a file is protected with PDE vs. EFS:
            1. In the properties of the file, navigate to **General** > **Advanced**. The option **Encrypt contents to secure data** should be selected.
            2. Select the **Details** button.
            3. If the file is protected with PDE, under **Protection status:**, the item **Personal Data Encryption is:** will be marked as **On**.
          - [`cipher.exe`](/windows-server/administration/windows-commands/cipher) can also be used to show the encryption state of the file.
      - question: Can users manually encrypt and decrypt files with PDE?
        answer: |
-          Currently users can decrypt files manually but they can't encrypt files manually. For information on how a user can manually decrypt a file, see the section **Disable PDE and decrypt files** in [Personal Data Encryption (PDE)](index.md).
+          Currently users can decrypt files manually but they can't encrypt files manually. For information on how a user can manually decrypt a file, see the section [Decrypt PDE-encrypted content](configure.md#decrypt-pde-encrypted-content). 
      - question: If a user signs into Windows with a password instead of Windows Hello for Business, will they be able to access their PDE protected content?
        answer: |
@ -64,9 +56,3 @@ sections:
      - question: What encryption method and strength does PDE use?
        answer: |
          PDE uses AES-CBC with a 256-bit key to encrypt content.
 additionalContent: |
  ## See also
    - [Personal Data Encryption (PDE)](index.md)
    - [Configure Personal Data Encryption (PDE) polices in Intune](configure-pde-in-intune.md)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/includes/pde-description.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/includes/pde-description.md
@ -1,20 +0,0 @@
 ---
 ms.topic: include
 ms.date: 03/13/2023
 ---
 <!-- Max 5963468 OS 32516487 -->
 <!-- Max 6946251 -->
 Starting in Windows 11, version 22H2, Personal Data Encryption (PDE) is a security feature that provides more encryption capabilities to Windows.
 PDE differs from BitLocker in that it  encrypts individual files and content instead of whole volumes and disks. PDE occurs in addition to other encryption methods such as BitLocker.
 PDE utilizes Windows Hello for Business to link data encryption keys with user credentials. This feature can minimize the number of credentials the user has to remember to gain access to content. For example, when using BitLocker with PIN, a user would need to authenticate twice - once with the BitLocker PIN and a second time with Windows credentials. This requirement requires users to remember two different credentials. With PDE, users only need to enter one set of credentials via Windows Hello for Business.
 Because PDE utilizes Windows Hello for Business, PDE is also accessibility friendly due to the accessibility features available when using Windows Hello for Business.
 Unlike BitLocker that releases data encryption keys at boot, PDE doesn't release data encryption keys until a user signs in using Windows Hello for Business. Users will only be able to access their PDE protected content once they've signed into Windows using Windows Hello for Business. Additionally, PDE has the ability to also discard the encryption keys when the device is locked.
 > [!NOTE]
 > PDE can be enabled using MDM policies. The content to be protected by PDE can be specified using [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). There is no user interface in Windows to either enable PDE or protect content using PDE.
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/index.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/index.md
@ -2,89 +2,40 @@
 title: Personal Data Encryption (PDE)
 description: Personal Data Encryption unlocks user encrypted files at user sign-in instead of at boot.
 ms.topic: how-to
-ms.date: 03/13/2023
+ms.date: 08/11/2023
 ---
 # Personal Data Encryption (PDE)
-[!INCLUDE [Personal Data Encryption (PDE) description](includes/pde-description.md)]
+Starting in Windows 11, version 22H2, Personal Data Encryption (PDE) is a security feature that provides file-based data encryption capabilities to Windows.
-[!INCLUDE [personal-data-encryption-pde](../../../../../includes/licensing/personal-data-encryption-pde.md)]
+PDE utilizes Windows Hello for Business to link *data encryption keys* with user credentials. When a user signs in to a device using Windows Hello for Business, decryption keys are released, and encrypted data is accessible to the user.\
 When a user logs off, decryption keys are discarded and data is inaccessible, even if another user signs into the device.
 The use of Windows Hello for Business offers the following advantages:
 - It reduces the number of credentials to access encrypted content: users only need to sign-in with Windows Hello for Business
 - The accessibility features available when using Windows Hello for Business extend to PDE protected content
 PDE differs from BitLocker in that it encrypts files instead of whole volumes and disks. PDE occurs in addition to other encryption methods such as BitLocker.\
 Unlike BitLocker that releases data encryption keys at boot, PDE doesn't release data encryption keys until a user signs in using Windows Hello for Business.
 ## Prerequisites
-### Required
+To use PDE, the following prerequisites must be met:
- [Azure AD joined device](/azure/active-directory/devices/concept-azure-ad-join)
+- Windows 11, version 22H2 and later
- [Windows Hello for Business Overview](../../../identity-protection/hello-for-business/index.md)
+- The devices must be [Azure AD joined][AAD-1]. Domain-joined and hybrid Azure AD joined devices aren't supported
- Windows 11, version 22H2 and later Enterprise and Education editions
+- Users must sign in using [Windows Hello for Business](../../../identity-protection/hello-for-business/index.md)
-### Not supported with PDE
+> [!IMPORTANT]
 > If you sign in with a password or a [security key][AAD-2], you can't access PDE protected content.
- [FIDO/security key authentication](/azure/active-directory/authentication/howto-authentication-passwordless-security-key)
+[!INCLUDE [personal-data-encryption-pde](../../../../../includes/licensing/personal-data-encryption-pde.md)]
 - [Winlogon automatic restart sign-on (ARSO)](/windows-server/identity/ad-ds/manage/component-updates/winlogon-automatic-restart-sign-on--arso-)
  - For information on disabling ARSO via Intune, see [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md).
 - [Protect your enterprise data using Windows Information Protection (WIP)](../../../information-protection/windows-information-protection/protect-enterprise-data-using-wip.md)
 - [Hybrid Azure AD joined devices](/azure/active-directory/devices/concept-azure-ad-join-hybrid)
 - Remote Desktop connections
 ### Security hardening recommendations
 - [Kernel-mode crash dumps  and live dumps disabled](/windows/client-management/mdm/policy-csp-memorydump#memorydump-policies)
   Kernel-mode crash dumps and live dumps can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable kernel-mode crash dumps and live dumps. For information on disabling crash dumps and live dumps via Intune, see [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md).
 - [Windows Error Reporting (WER) disabled/User-mode crash dumps disabled](/windows/client-management/mdm/policy-csp-errorreporting#errorreporting-disablewindowserrorreporting)
   Disabling Windows Error Reporting prevents user-mode crash dumps. User-mode crash dumps can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable user-mode crash dumps. For more information on disabling crash dumps via Intune, see [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md).
 - [Hibernation disabled](/windows/client-management/mdm/policy-csp-power#power-allowhibernate)
   Hibernation files can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable hibernation. For more information on disabling crash dumps via Intune, see [Disable hibernation](intune-disable-hibernation.md).
 - [Allowing users to select when a password is required when resuming from connected standby disabled](/windows/client-management/mdm/policy-csp-admx-credentialproviders#admx-credentialproviders-allowdomaindelaylock)
    When this policy isn't configured, the outcome between on-premises Active Directory joined devices and workgroup devices, including Azure Active Directory joined devices, is different:
  - On-premises Active Directory joined devices:
    - A user can't change the amount of time after the device´s screen turns off before a password is required when waking the device.
    - A password is required immediately after the screen turns off.
    The above is the desired outcome, but PDE isn't supported with on-premises Active Directory joined devices.
  - Workgroup devices, including Azure AD joined devices:
    - A user on a Connected Standby device can change the amount of time after the device´s screen turns off before a password is required to wake the device.
    - During the time when the screen turns off but a password isn't required, the keys used by PDE to protect content could potentially be exposed. This outcome isn't a desired outcome.
    Because of this undesired outcome, it's recommended to explicitly disable this policy on Azure AD joined devices instead of leaving it at the default of **Not configured**.
   For information on disabling this policy via Intune, see [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md).
 ### Highly recommended
 - [BitLocker Drive Encryption](../bitlocker/index.md) enabled
   Although PDE will work without BitLocker, it's recommended to also enable BitLocker. PDE is meant to work alongside BitLocker for increased security. PDE isn't a replacement for BitLocker.
 - Backup solution such as [OneDrive in Microsoft 365](/sharepoint/onedrive-overview)
   In certain scenarios such as TPM resets or destructive PIN resets, the keys used by PDE to protect content will be lost. In such scenarios, any content protected with PDE will no longer be accessible. The only way to recover such content would be from backup.
 - [Windows Hello for Business PIN reset service](../../../identity-protection/hello-for-business/hello-feature-pin-reset.md)
   Destructive PIN resets will cause keys used by PDE to protect content to be lost. A destructive PIN reset will make any content protected with PDE no longer accessible after the destructive PIN reset has occurred. Content protected with PDE will need to be recovered from a backup after a destructive PIN reset. For this reason Windows Hello for Business PIN reset service is recommended since it provides non-destructive PIN resets.
 - [Windows Hello Enhanced Sign-in Security](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security)
   Provides additional security when authenticating with Windows Hello for Business via biometrics or PIN
 ## PDE protection levels
-PDE uses AES-CBC with a 256-bit key to protect content and offers two levels of protection. The level of protection is determined based on the organizational needs. These levels can be set via the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager).
+PDE uses *AES-CBC* with a *256-bit key* to protect content and offers two levels of protection. The level of protection is determined based on the organizational needs. These levels can be set via the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager).
 | Item | Level 1 | Level 2 |
 |---|---|---|
@ -103,27 +54,11 @@ When a file is protected with PDE, its icon will show a padlock. If the user has
 Scenarios where a user will be denied access to PDE protected content include:
- User has signed into Windows via a password instead of signing in with Windows Hello for Business biometric or PIN.
+- User has signed into Windows via a password instead of signing in with Windows Hello for Business biometric or PIN
- If protected via level 2 protection, when the device is locked.
+- If protected via level 2 protection, when the device is locked
- When trying to access content on the device remotely. For example, UNC network paths.
+- When trying to access content on the device remotely. For example, UNC network paths
- Remote Desktop sessions.
+- Remote Desktop sessions
- Other users on the device who aren't owners of the content, even if they're signed in via Windows Hello for Business and have permissions to navigate to the PDE protected content.
+- Other users on the device who aren't owners of the content, even if they're signed in via Windows Hello for Business and have permissions to navigate to the PDE protected content
 ## How to enable PDE
 To enable PDE on devices, push an MDM policy to the devices with the following parameters:
 - Name: **Personal Data Encryption**
 - OMA-URI: **./User/Vendor/MSFT/PDE/EnablePersonalDataEncryption**
 - Data type: **Integer**
 - Value: **1**
 There's also a [PDE CSP](/windows/client-management/mdm/personaldataencryption-csp) available for MDM solutions that support it.
 > [!NOTE]
 > Enabling the PDE policy on devices only enables the PDE feature. It does not protect any content. To protect content via PDE, use the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). The PDE APIs can be used to create custom applications and scripts to specify which content to protect and at what level to protect the content. Additionally, the PDE APIs can't be used to protect content until the PDE policy has been enabled.
 For information on enabling PDE via Intune, see [Enable Personal Data Encryption (PDE)](intune-enable-pde.md).
 ## Differences between PDE and BitLocker
@ -132,8 +67,8 @@ PDE is meant to work alongside BitLocker. PDE isn't a replacement for BitLocker,
 | Item | PDE | BitLocker |
 |--|--|--|
 | Release of decryption key | At user sign-in via Windows Hello for Business | At boot |
-| Decryption keys discarded | When user signs out of Windows or one minute after Windows lock screen is engaged | At reboot |
+| Decryption keys discarded | When user signs out of Windows or one minute after Windows lock screen is engaged | At shutdown |
-| Files protected | Individual specified files | Entire volume/drive |
+| Protected content | All files in protected folders | Entire volume/drive |
 | Authentication to access protected content | Windows Hello for Business | When BitLocker with TPM + PIN is enabled, BitLocker PIN plus Windows sign-in |
 ## Differences between PDE and EFS
@ -143,61 +78,38 @@ The main difference between protecting files with PDE instead of EFS is the meth
 To see if a file is protected with PDE or with EFS:
 1. Open the properties of the file
-2. Under the **General** tab, select **Advanced...**
+1. Under the **General** tab, select **Advanced...**
-3. In the **Advanced Attributes** windows, select **Details**
+1. In the **Advanced Attributes** windows, select **Details**
 For PDE protected files, under **Protection status:** there will be an item listed as **Personal Data Encryption is:** and it will have the attribute of **On**.
 For EFS protected files, under **Users who can access this file:**, there will be a **Certificate thumbprint** next to the users with access to the file. There will also be a section at the bottom labeled **Recovery certificates for this file as defined by recovery policy:**.
-Encryption information including what encryption method is being used to protect the file can be obtained with the [cipher.exe /c](/windows-server/administration/windows-commands/cipher) command.
+Encryption information including what encryption method is being used to protect the file can be obtained with the [`cipher.exe /c`](/windows-server/administration/windows-commands/cipher) command.
-## Disable PDE and decrypt content
+## Recommendations for using PDE
-Once PDE is enabled, it isn't recommended to disable it. However if PDE does need to be disabled, it can be done so via the MDM policy described in the section [How to enable PDE](#how-to-enable-pde). The value of the OMA-URI needs to be changed from **`1`** to **`0`** as follows:
+The following are recommendations for using PDE:
- Name: **Personal Data Encryption**
+- Enable [BitLocker Drive Encryption](../bitlocker/index.md). Although PDE works without BitLocker, it's recommended to enable BitLocker. PDE is meant to work alongside BitLocker for increased security at it isn't a replacement for BitLocker
- OMA-URI: **./User/Vendor/MSFT/PDE/EnablePersonalDataEncryption**
+- Backup solution such as [OneDrive in Microsoft 365](/sharepoint/onedrive-overview). In certain scenarios, such as TPM resets or destructive PIN resets, the keys used by PDE to protect content will be lost making any PDE-protected content inaccessible. The only way to recover such content is from a backup. If the files are synced to OneDrive, to regain access you must re-sync OneDrive
- Data type: **Integer**
+- [Windows Hello for Business PIN reset service](../../../identity-protection/hello-for-business/hello-feature-pin-reset.md). Destructive PIN resets will cause keys used by PDE to protect content to be lost, making any content protected with PDE inaccessible. After a destructive PIN reset, content protected with PDE must be recovered from a backup. For this reason, Windows Hello for Business PIN reset service is recommended since it provides non-destructive PIN resets
- Value: **0**
+- [Windows Hello Enhanced Sign-in Security](/windows-hardware/design/device-experiences/windows-hello-enhanced-sign-in-security) offers additional security when authenticating with Windows Hello for Business via biometrics or PIN
 Disabling PDE doesn't decrypt any PDE protected content. It only prevents the PDE API from being able to protect any additional content. PDE protected files can be manually decrypted using the following steps:
 1. Open the properties of the file
 2. Under the **General** tab, select **Advanced...**
 3. Uncheck the option **Encrypt contents to secure data**
 4. Select **OK**, and then **OK** again
 PDE protected files can also be decrypted using [cipher.exe](/windows-server/administration/windows-commands/cipher). Using `cipher.exe` can be helpful to decrypt files in the following scenarios:
 - Decrypting a large number of files on a device
 - Decrypting files on a large number of devices.
 To decrypt files on a device using `cipher.exe`:
 - Decrypt all files under a directory including subdirectories:
    ```cmd
    cipher.exe /d /s:<path_to_directory>
    ```
 - Decrypt a single file or all of the files in the specified directory, but not any subdirectories:
    ```cmd
    cipher.exe /d <path_to_file_or_directory>
    ```
 > [!IMPORTANT]
 > Once a user selects to manually decrypt a file, the user will not be able to manually protect the file again using PDE.
 ## Windows out of box applications that support PDE
-Certain Windows applications support PDE out of the box. If PDE is enabled on a device, these applications will utilize PDE.
+Certain Windows applications support PDE out of the box. If PDE is enabled on a device, these applications will utilize PDE:
- Mail
+| App name | Details |
-  - Supports protecting both email bodies and attachments
+|-|-|
 | Mail | Supports protecting both email bodies and attachments|
-## See also
+## Next steps
- [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
+- Learn about the available options to configure Personal Data Encryption (PDE) and how to configure them via Microsoft Intune or configuration Service Provider (CSP): [PDE settings and configuration](configure.md)
- [Configure Personal Data Encryption (PDE) polices in Intune](configure-pde-in-intune.md)
+- Review the [Personal Data Encryption (PDE) FAQ](faq.yml)
 <!--links used in this document-->
 [AAD-1]: /azure/active-directory/devices/concept-azure-ad-join
 [AAD-2]: /azure/active-directory/authentication/howto-authentication-passwordless-security-key
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-arso.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-arso.md
@ -1,63 +0,0 @@
 ---
 title: Disable Winlogon automatic restart sign-on (ARSO) for PDE in Intune
 description: Disable Winlogon automatic restart sign-on (ARSO) for PDE in Intune
 ms.topic: how-to
 ms.date: 06/01/2023
 ---
 # Disable Winlogon automatic restart sign-on (ARSO) for PDE
 Winlogon automatic restart sign-on (ARSO) isn't supported for use with Personal Data Encryption (PDE). For this reason, in order to use PDE, ARSO needs to be disabled.
 ## Disable Winlogon automatic restart sign-on (ARSO) in Intune
 To disable ARSO using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Templates**
   1. When the templates appear, under **Template name**, select **Administrative templates**
   1. Select **Create** to close the **Create profile** window.
 1. The **Create profile** screen will open. In the **Basics** page:
   1. Next to **Name**, enter **Disable ARSO**
   1. Next to **Description**, enter a description
   1. Select **Next**
 1. In the **Configuration settings** page:
   1. On the left pane of the page, make sure **Computer Configuration** is selected
   1. Under **Setting name**, scroll down and select **Windows Components**
   1. Under **Setting name**, scroll down and select **Windows Logon Options**. You may need to navigate between pages on the bottom right corner before finding the **Windows Logon Options** option
   1. Under **Setting name** of the **Windows Logon Options** pane, select **Sign-in and lock last interactive user automatically after a restart**
   1. In the **Sign-in and lock last interactive user automatically after a restart** window that opens, select **Disabled**, and then select **OK**
   1. Select **Next**
 1. In the **Scope tags** page, configure if necessary and then select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to select **Add groups** under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 ### Security hardening recommendations
 - [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 - [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 - [Disable hibernation](intune-disable-hibernation.md)
 - [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-hibernation.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-hibernation.md
@ -1,62 +0,0 @@
 ---
 title: Disable hibernation for PDE in Intune
 description: Disable hibernation for PDE in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 # Disable hibernation for PDE
 Hibernation files can potentially cause the keys used by Personal Data Encryption (PDE) to protect content to be exposed. For greatest security, disable hibernation.
 ## Disable hibernation in Intune
 To disable hibernation using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Settings catalog**
   1. Select **Create** to close the **Create profile** window
 1. The **Create profile** screen will open. In the **Basics** page:
   1. Next to **Name**, enter **Disable Hibernation**
   1. Next to **Description**, enter a description
   1. Select **Next**
 1. In the **Configuration settings** page:
   1. select **Add settings**
   1. In the **Settings picker** window that opens:
      1. Under **Browse by category**, scroll down and select **Power**
      1. When the settings for the **Power** category appear under **Setting name** in the lower pane, select **Allow Hibernate**, and then select the **X** in the top right corner of the **Settings picker** window to close the window
   1. Change **Allow Hibernate** from **Allow** to **Block** by selecting the slider next to the option
   1. Select **Next**
 1. In the **Scope tags** page, configure if necessary and then select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to add the correct groups under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 - [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ### Security hardening recommendations
 - [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 - [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 - [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-memory-dumps.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-memory-dumps.md
@ -1,61 +0,0 @@
 ---
 title: Disable kernel-mode crash dumps and live dumps for PDE in Intune
 description: Disable kernel-mode crash dumps and live dumps for PDE in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 # Disable kernel-mode crash dumps and live dumps for PDE
 Kernel-mode crash dumps and live dumps can potentially cause the keys used by Personal Data Encryption (PDE) to protect content to be exposed. For greatest security, disable kernel-mode crash dumps and live dumps.
 ## Disable kernel-mode crash dumps and live dumps in Intune
 To disable kernel-mode crash dumps and live dumps using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Settings catalog**
   1. Select **Create** to close the **Create profile** window
 1. The **Create profile** screen will open. In the **Basics** page:
   1. Next to **Name**, enter **Disable Kernel-Mode Crash Dumps**
   1. Next to **Description**, enter a description.
   1. Select **Next**
 1. In the **Configuration settings** page:
   1. Select **Add settings**
   1. In the **Settings picker** window that opens:
      1. Under **Browse by category**, scroll down and select **Memory Dump**
      1. When the settings for the **Memory Dump** category appear under **Setting name** in the lower pane, select both **Allow Crash Dump** and **Allow Live Dump**, and then select the **X** in the top right corner of the **Settings picker** window to close the window
   1. Change both **Allow Live Dump** and **Allow Crash Dump** from **Allow** to **Block** by selecting the slider next to each option, and then select **Next**
 1. In the **Scope tags** page, configure if necessary and then select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to add the correct groups under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 - [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ### Security hardening recommendations
 - [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 - [Disable hibernation](intune-disable-hibernation.md)
 - [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-password-connected-standby.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-password-connected-standby.md
@ -1,76 +0,0 @@
 ---
 title: Disable allowing users to select when a password is required when resuming from connected standby for PDE in Intune
 description: Disable allowing users to select when a password is required when resuming from connected standby for PDE in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 # Disable allowing users to select when a password is required when resuming from connected standby for PDE
 When the **Disable allowing users to select when a password is required when resuming from connected standby** policy isn't configured, the outcome between on-premises Active Directory joined devices and workgroup devices, including Azure Active Directory joined devices, is different:
 - On-premises Active Directory joined devices:
  - A user can't change the amount of time after the device's screen turns off before a password is required when waking the device
  - A password is required immediately after the screen turns off
    The above is the desired outcome, but PDE isn't supported with on-premises Active Directory joined devices
 - Workgroup devices, including Azure AD joined devices:
  - A user on a Connected Standby device can change the amount of time after the device´s screen turns off before a password is required to wake the device
  - During the time when the screen turns off but a password isn't required, the keys used by PDE to protect content could potentially be exposed. This outcome isn't a desired outcome
 Because of this undesired outcome, it's recommended to explicitly disable this policy on Azure AD joined devices instead of leaving it at the default of **Not configured**.
 ## Disable allowing users to select when a password is required when resuming from connected standby in Intune
 To disable the policy **Disable allowing users to select when a password is required when resuming from connected standby** using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Settings catalog**
   1. Select **Create** to close the **Create profile** window
 1. The **Create profile** screen will open. In the **Basics** page:
    1. Next to **Name**, enter **Disable allowing users to select when a password is required when resuming from connected standby**
    1. Next to **Description**, enter a description
    1. Select **Next**.
 1. In the **Configuration settings** page:
   1. Select **Add settings**
   1. In the **Settings picker** window that opens:
      1. Under **Browse by category**, expand **Administrative Templates**
      1. Under **Administrative Templates**, scroll down and expand **System**
      1. Under **System**, scroll down and select **Logon**
      1. When the settings for the **Logon** subcategory appear under **Setting name** in the lower pane, select **Allow users to select when a password is required when resuming from connected standby**, and then select the **X** in the top right corner of the **Settings picker** window to close the window
   1. Leave the slider for **Allow users to select when a password is required when resuming from connected standby** at the default of **Disabled**
   1. select **Next**
 1. In the **Scope tags** page, configure if necessary and then select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to add the correct groups under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 - [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ### Security hardening recommendations
 - [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 - [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 - [Disable hibernation](intune-disable-hibernation.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-wer.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-disable-wer.md
@ -1,64 +0,0 @@
 ---
 title: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE in Intune
 description: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 # Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE
 Disabling Windows Error Reporting prevents user-mode crash dumps. User-mode crash dumps can potentially cause the keys used by PDE to protect content to be exposed. For greatest security, disable user-mode crash dumps.
 ## Disable Windows Error Reporting (WER)/user-mode crash dumps in Intune
 To disable Windows Error Reporting (WER) and user-mode crash dumps using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431)
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Settings catalog**
   1. Select **Create** to close the **Create profile** window
 1. The **Create profile** screen will open. In the **Basics** page:
   1. Next to **Name**, enter **Disable Windows Error Reporting (WER)**
   1. Next to **Description**, enter a description
   1. Select **Next**
 1. In the **Configuration settings** page:
   1. Select **Add settings**
   1. In the **Settings picker** window that opens:
      1. Under **Browse by category**, expand **Administrative Templates**
      1. Under **Administrative Templates**, scroll down and expand **Windows Components**
      1. Under **Windows Components**, scroll down and select **Windows Error Reporting**. Make sure to only select **Windows Error Reporting** and not to expand it
      1. When the settings for the **Windows Error Reporting** subcategory appear under **Setting name** in the lower pane, select **Disable Windows Error Reporting**, and then select the **X** in the top right corner of the **Settings picker** window to close the window
   1. Change **Disable Windows Error Reporting** from **Disabled** to **Enabled** by selecting the slider next to the option
   1. Select **Next**
 1. In the **Scope tags** page, configure if necessary and then select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to add the correct groups under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Enable Personal Data Encryption (PDE)](intune-enable-pde.md)
 - [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ### Security hardening recommendations
 - [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 - [Disable hibernation](intune-disable-hibernation.md)
 - [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-enable-pde.md
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/intune-enable-pde.md
@ -1,70 +0,0 @@
 ---
 title: Enable Personal Data Encryption (PDE) in Intune
 description: Enable Personal Data Encryption (PDE) in Intune
 ms.topic: how-to
 ms.date: 03/13/2023
 ---
 # Enable Personal Data Encryption (PDE)
 By default, Personal Data Encryption (PDE) is not enabled on devices. Before PDE can be used on a device, it needs to be enabled.  This can be done via a custom OMA-URI policy assigned to the device.
 > [!NOTE]
 > Enabling the PDE policy on devices only enables the PDE feature. It does not protect any content. To protect content via PDE, use the [PDE APIs](/uwp/api/windows.security.dataprotection.userdataprotectionmanager). The PDE APIs can be used to create custom applications and scripts to specify which content to protect and at what level to protect the content. Additionally, the PDE APIs can't be used to protect content until the PDE policy has been enabled.
 ## Enable Personal Data Encryption (PDE) in Intune
 To enable Personal Data Encryption (PDE) using Intune, follow the below steps:
 1. Sign in to the [Microsoft Intune admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
 1. In the **Home** screen, select **Devices** in the left pane
 1. In the **Devices | Overview** screen, under **Policy**, select **Configuration Profiles**
 1. In the **Devices | Configuration profiles** screen, make sure **Profiles** is selected at the top, and then select **Create profile**
 1. In the **Create profile** window that opens:
   1. Under **Platform**, select **Windows 10 and later**
   1. Under **Profile type**, select **Templates**
   1. When the templates appears, under **Template name**, select **Custom**
   1. Select **Create** to close the **Create profile** window
 1. The **Custom** screen will open. In the **Basics** page:
   1. Next to **Name**, enter **Personal Data Encryption**
   1. Next to **Description**, enter a description
   1. Select **Next**
 1. In **Configuration settings** page:
   1. Next to **OMA-URI Settings**, select **Add**
   1. In the **Add Row** window that opens:
     1. Next to **Name**, enter **Personal Data Encryption**
     1. Next to **Description**, enter a description
     1. Next to **OMA-URI**, enter in:
        **`./User/Vendor/MSFT/PDE/EnablePersonalDataEncryption`**
     1. Next to **Data type**, select **Integer**
     1. Next to **Value**, enter in **1**
     1. Select **Save** to close the **Add Row** window
   1. Select **Next**
 1. In the **Assignments** page:
   1. Under **Included groups**, select **Add groups**
        > [!NOTE]
        > Make sure to add the correct groups under **Included groups** and not under **Excluded groups**. Accidentally adding the desired device groups under **Excluded groups** will result in those devices being excluded and they won't receive the configuration profile.
   1. In the **Select groups to include** window that opens, select the groups that the configuration profile should be assigned to, and then select **Select** to close the **Select groups to include** window
   1. Under **Included groups** > **Groups**, ensure the correct group(s) are selected, and then select **Next**
 1. In **Applicability Rules**, configure if necessary and then select **Next**
 1. In **Review + create** page, review the configuration to make sure everything is configured correctly, and then select **Create**
 ## Additional PDE configurations in Intune
 The following PDE configurations can also be configured using Intune:
 ### Prerequisites
 - [Disable Winlogon automatic restart sign-on (ARSO)](intune-disable-arso.md)
 ### Security hardening recommendations
 - [Disable kernel-mode crash dumps and live dumps](intune-disable-memory-dumps.md)
 - [Disable Windows Error Reporting (WER)/user-mode crash dumps](intune-disable-wer.md)
 - [Disable hibernation](intune-disable-hibernation.md)
 - [Disable allowing users to select when a password is required when resuming from connected standby](intune-disable-password-connected-standby.md)
 ## More information
 - [Personal Data Encryption (PDE)](index.md)
 - [Personal Data Encryption (PDE) FAQ](faq-pde.yml)
--- a/windows/security/operating-system-security/data-protection/personal-data-encryption/toc.yml
+++ b/windows/security/operating-system-security/data-protection/personal-data-encryption/toc.yml
@ -1,19 +1,7 @@
 items:
- name: Overview
+- name: PDE overview
  href: index.md
- name: Configure PDE with Intune
+- name: Configure PDE
-  href: configure-pde-in-intune.md
+  href: configure.md
 - name: Enable Personal Data Encryption (PDE)
  href: intune-enable-pde.md
 - name: Disable Winlogon automatic restart sign-on (ARSO) for PDE
  href: intune-disable-arso.md
 - name: Disable kernel-mode crash dumps and live dumps for PDE
  href: intune-disable-memory-dumps.md
 - name: Disable Windows Error Reporting (WER)/user-mode crash dumps for PDE
  href: intune-disable-wer.md
 - name: Disable hibernation for PDE
  href: intune-disable-hibernation.md
 - name: Disable allowing users to select when a password is required when resuming from connected standby for PDE
  href: intune-disable-password-connected-standby.md
 - name: PDE frequently asked questions (FAQ)
-  href: faq-pde.yml
+  href: faq.yml
--- a/windows/whats-new/deprecated-features.md
+++ b/windows/whats-new/deprecated-features.md
@ -1,7 +1,7 @@
 ---
 title: Deprecated features in the Windows client
 description: Review the list of features that Microsoft is no longer developing in Windows 10 and Windows 11.
-ms.date: 08/01/2023
+ms.date: 08/17/2023
 ms.prod: windows-client
 ms.technology: itpro-fundamentals
 ms.localizationpriority: medium
@ -50,6 +50,7 @@ The features in this article are no longer being actively developed, and might b
 | Microsoft Edge | The legacy version of Microsoft Edge is no longer being developed.| 2004 |
 | Companion Device Framework | The [Companion Device Framework](/windows-hardware/design/device-experiences/windows-hello-companion-device-framework) is no longer under active development.| 2004 |
 | Dynamic Disks | The [Dynamic Disks](/windows/win32/fileio/basic-and-dynamic-disks#dynamic-disks) feature is no longer being developed. This feature will be fully replaced by [Storage Spaces](/windows-server/storage/storage-spaces/overview) in a future release.| 2004 |
 | Microsoft BitLocker Administration and Monitoring (MBAM)| [Microsoft BitLocker Administration and Monitoring (MBAM)](/microsoft-desktop-optimization-pack/mbam-v25/), part of the [Microsoft Desktop Optimization Pack (MDOP)](/lifecycle/announcements/mdop-extended) is is no longer being developed. | September, 2019 |
 | Language Community tab in Feedback Hub | The Language Community tab will be removed from the Feedback Hub. The standard feedback process: [Feedback Hub - Feedback](feedback-hub://?newFeedback=true&feedbackType=2) is the recommended way to provide translation feedback. | 1909 |
 | My People / People in the Shell |  My People is no longer being developed. It may be removed in a future update. | 1909 |
 | Package State Roaming (PSR) |  PSR will be removed in a future update. PSR allows non-Microsoft developers to access roaming data on devices, enabling developers of UWP applications to write data to Windows and synchronize it to other instantiations of Windows for that user. <br>&nbsp;<br>The recommended replacement for PSR is [Azure App Service](/azure/app-service/). Azure App Service is widely supported, well documented, reliable, and supports cross-platform/cross-ecosystem scenarios such as iOS, Android and web. <br>&nbsp;<br>PSR was removed in Windows 11.| 1909 |