diff --git a/windows/configuration/images/windows-update.png b/windows/configuration/images/windows-update.png new file mode 100644 index 0000000000..26b2732b44 Binary files /dev/null and b/windows/configuration/images/windows-update.png differ diff --git a/windows/configuration/includes/cfr-note.md b/windows/configuration/includes/cfr-note.md new file mode 100644 index 0000000000..bc8eea2413 --- /dev/null +++ b/windows/configuration/includes/cfr-note.md @@ -0,0 +1,17 @@ +--- +author: paolomatarazzo +ms.author: paoloma +ms.topic: include +ms.date: 04/01/2025 +--- + +:::row::: +:::column span="1"::: +:::image type="content" source="../images/windows-update.png" alt-text="Logo of Windows Update." border="false"::: +:::column-end::: +:::column span="3"::: +> [!IMPORTANT] +>This article describes a Windows feature that is currently being rolled out using Controlled Feature Rollout (CFR) technology. If your device doesn't have the described feature yet, check again at a later time. For more information, see [Delivering continuous innovation in Windows](https://support.microsoft.com/topic/b0aa0a27-ea9a-4365-9224-cb155e517f12). + +:::column-end::: +:::row-end::: diff --git a/windows/configuration/quick-machine-recovery/images/update-history.png b/windows/configuration/quick-machine-recovery/images/update-history.png new file mode 100644 index 0000000000..0846324d62 Binary files /dev/null and b/windows/configuration/quick-machine-recovery/images/update-history.png differ diff --git a/windows/configuration/quick-machine-recovery/index.md b/windows/configuration/quick-machine-recovery/index.md index 89b736888d..f797ba1830 100644 --- a/windows/configuration/quick-machine-recovery/index.md +++ b/windows/configuration/quick-machine-recovery/index.md @@ -2,11 +2,11 @@ title: Quick Machine Recovery description: Learn about quick machine recovery and how to configure it with the RemoteRemediation configuration service provider (CSP). ms.topic: how-to -ms.date: 03/28/2025 +ms.date: 04/02/2025 ms.author: paoloma author: paolomatarazzo appliesto: - - "✅ Windows Insider" + - "✅ Windows Insider (Beta Channel)" --- # Quick machine recovery @@ -215,19 +215,20 @@ To simulate the quick machine recovery experience, use the following commands fr ``` 1. Reboot your device. The system goes through autoremediation of a simulated crash and reboots back to Windows -> [!NOTE] -> If after reboot the device goes into Windows RE instead of starting test mode, follow these steps: -> -> 1. In Windows RE, select **Continue** to boot Windows normally -> 1. In Windows, execute the two commands: -> -> - `reagentc.exe /Disable` -> - `reagentc.exe /Enable` -> -> 1. Retry the quick machine recovery simulation starting from step 1 + > [!NOTE] + > If after reboot the device goes into Windows RE instead of starting test mode, follow these steps: + > + > 1. In Windows RE, select **Continue** to boot Windows normally + > 1. In Windows, execute the two commands: + > + > - `reagentc.exe /Disable` + > - `reagentc.exe /Enable` + > + > 1. Retry the quick machine recovery simulation starting from step 1 - +1. To verify the quick machine recovery remediation, go to **Settings** > **Windows Update** > **[Update history](ms-settings:windowsupdate-history)**. The remediation should be listed under **Quality updates** + + :::image type="content" source="images/update-history.png" border="false" lightbox="images/update-history.png" alt-text="Screenshot of the Setting app - Windows Update - showing the installation of a quick machie recovery update."::: ### :::image type="icon" source="../images/icons/feedback.svg" border="false"::: Provide feedback diff --git a/windows/deployment/do/waas-delivery-optimization-reference.md b/windows/deployment/do/waas-delivery-optimization-reference.md index 59d11c87f8..8ea753be60 100644 --- a/windows/deployment/do/waas-delivery-optimization-reference.md +++ b/windows/deployment/do/waas-delivery-optimization-reference.md @@ -14,7 +14,7 @@ appliesto: - ✅ Windows 11 - ✅ Windows 10 - ✅ Delivery Optimization -ms.date: 10/15/2024 +ms.date: 04/03/2025 --- # Delivery Optimization reference @@ -335,6 +335,8 @@ Configure this policy to designate Delivery Optimization in Network Cache server > [!NOTE] > If you format the DHCP Option ID incorrectly, the client will fall back to the Cache Server Hostname policy value if that value has been configured. +> +> If the [LocalPolicyMerge](/windows/security/operating-system-security/network-security/windows-firewall/rules#local-policy-merge-and-application-rules) setting is configured, such as part of security baselines, it can impact DHCP client and prevent it from retrieving this DHCP option, especially in Autopilot scenarios. ### Maximum foreground download bandwidth (in KB/s) diff --git a/windows/deployment/do/waas-delivery-optimization.md b/windows/deployment/do/waas-delivery-optimization.md index c52b1fff78..39fed0922d 100644 --- a/windows/deployment/do/waas-delivery-optimization.md +++ b/windows/deployment/do/waas-delivery-optimization.md @@ -15,7 +15,7 @@ ms.localizationpriority: medium appliesto: - ✅ Windows 11 - ✅ Windows 10 -ms.date: 05/23/2024 +ms.date: 04/03/2025 --- # What is Delivery Optimization? @@ -47,9 +47,6 @@ The following table lists the minimum Windows 10 version that supports Delivery #### Windows Client -> [!NOTE] -> Starting March 4, 2025, Edge Browser updates will temporarily not utilize Delivery Optimization for downloads. We are actively working to resolve this issue. - | Windows Client | Minimum Windows version | HTTP Downloader | Peer to Peer | Microsoft Connected Cache | |------------------|---------------|----------------|----------|----------------| | Windows Update ([feature updates quality updates, language packs, drivers](../update/get-started-updates-channels-tools.md#types-of-updates)) | Windows 10 1511, Windows 11 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |