diff --git a/windows/configuration/settings/page-visibility.md b/windows/configuration/settings/page-visibility.md
index c7f798daa6..2bc3491bd8 100644
--- a/windows/configuration/settings/page-visibility.md
+++ b/windows/configuration/settings/page-visibility.md
@@ -45,7 +45,7 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`:
[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
-#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune)
[!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)]
@@ -55,7 +55,9 @@ Hide only the Bluetooth page, which has the URI `ms-settings:bluetooth`:
[!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)]
-Alternatively, you can configure devices using a [custom policy][INT-1] with the [Policy CSP][CSP-1].
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
+
+You can configure devices using the [Policy CSP][CSP-1].
| Setting |
|--|
diff --git a/windows/configuration/shell-launcher/configure.md b/windows/configuration/shell-launcher/configure.md
index da5de3ddb3..474ff83e21 100644
--- a/windows/configuration/shell-launcher/configure.md
+++ b/windows/configuration/shell-launcher/configure.md
@@ -150,7 +150,7 @@ To learn how to configure the Shell Launcher XML file, see [Create a Shell Launc
[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
-#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune)
You can configure devices using a [custom policy][MEM-1] with the [AssignedAccess CSP][WIN-3].
@@ -159,12 +159,19 @@ You can configure devices using a [custom policy][MEM-1] with the [AssignedAcces
Assign the policy to a group that contains as members the devices that you want to configure.
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
+
+You can configure devices using the [AssignedAccess CSP][WIN-3].
+
+- **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
+- **Value:** content of the XML configuration file
+
#### [:::image type="icon" source="../images/icons/provisioning-package.svg"::: **PPKG**](#tab/ppkg)
You can configure Shell Launcher by creating a provisioning package and then applying the provisioning package during image deployment time or at runtime:
- If you're creating an installation media with settings for Shell Launcher included in the image, or you're applying a provisioning package during setup, you must enable Shell Launcher on the installation media with DISM for a provisioning package to successfully apply
-- If exectuing the provisioning package at runtime, ensure to [enable Shell Launcher](#enable-shell-launcher) before applying the provisioning package
+- If executing the provisioning package at runtime, ensure to [enable Shell Launcher](#enable-shell-launcher) before applying the provisioning package
[!INCLUDE [provisioning-package-1](../../../includes/configure/provisioning-package-1.md)]
@@ -233,7 +240,11 @@ Depending on your configuration, you can have a user to automatically sign in to
Here are the options to remove Shell Launcher, select the method that best fits your needs:
-#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune)
+
+Unassign or delete the policy that contains the configuration.
+
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
Unassign or delete the policy that contains the configuration.
diff --git a/windows/configuration/shell-launcher/quickstart-kiosk.md b/windows/configuration/shell-launcher/quickstart-kiosk.md
index c7e587aafe..600d9df1de 100644
--- a/windows/configuration/shell-launcher/quickstart-kiosk.md
+++ b/windows/configuration/shell-launcher/quickstart-kiosk.md
@@ -24,7 +24,7 @@ The examples can be modified to fit your specific requirements. For example, you
[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
-#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg"::: **Intune**](#tab/intune)
> [!TIP]
> Use the following Graph call to automatically create a custom policy in your Microsoft Intune tenant without assignments nor scope tags.
@@ -35,13 +35,18 @@ The examples can be modified to fit your specific requirements. For example, you
Assign the policy to a group that contains as members the devices that you want to configure.
-Alternatively, you can configure devices using a [custom policy][MEM-1] with the [AssignedAccess CSP][WIN-3].
-
-- **Setting:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
-- **Value:**
-
[!INCLUDE [quickstart-xml](includes/quickstart-xml.md)]
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp)
+
+You can configure devices using the [AssignedAccess CSP][WIN-3].
+
+| Setting |
+|--|
+|- **OMA-URI:** `./Vendor/MSFT/AssignedAccess/ShellLauncher`
- **Data type:** string
- **Value:** content of the following XML |
+
+ [!INCLUDE [quickstart-xml](includes/quickstart-xml.md)]
+
#### [:::image type="icon" source="../images/icons/powershell.svg"::: **PowerShell**](#tab/ps)
[!INCLUDE [powershell-wmi-bridge-1](../../../includes/configure/powershell-wmi-bridge-1.md)]
diff --git a/windows/configuration/store/index.md b/windows/configuration/store/index.md
index b6b7609319..93d20d428c 100644
--- a/windows/configuration/store/index.md
+++ b/windows/configuration/store/index.md
@@ -17,7 +17,7 @@ You can use configuration service provider (CSP) or group policy (GPO) settings
[!INCLUDE [tab-intro](../../../includes/configure/tab-intro.md)]
-#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune/CSP**](#tab/intune)
+#### [:::image type="icon" source="../images/icons/intune.svg" border="false"::: **Intune**](#tab/intune)
[!INCLUDE [intune-settings-catalog-1](../../../includes/configure/intune-settings-catalog-1.md)]
@@ -27,7 +27,10 @@ You can use configuration service provider (CSP) or group policy (GPO) settings
[!INCLUDE [intune-settings-catalog-2](../../../includes/configure/intune-settings-catalog-2.md)]
-Alternatively, you can configure devices using a [custom policy][INT-1] with the [Policy CSP][CSP-1].
+
+#### [:::image type="icon" source="../images/icons/csp.svg"::: **CSP**](#tab/csp-11)
+
+You can configure devices using the [Policy CSP][CSP-1].
| Setting |
|--|
diff --git a/windows/configuration/toc.yml b/windows/configuration/toc.yml
index 3905feae74..84222e90c6 100644
--- a/windows/configuration/toc.yml
+++ b/windows/configuration/toc.yml
@@ -11,8 +11,10 @@ items:
href: background/index.md
- name: Windows spotlight
href: windows-spotlight/index.md
-- name: Settings page visibility
- href: settings/page-visibility.md
+- name: Settings
+ items:
+ - name: Page visibility
+ href: settings/page-visibility.md
- name: Microsoft Store
href: store/toc.yml
- name: Quick machine recovery
diff --git a/windows/deployment/do/waas-delivery-optimization.md b/windows/deployment/do/waas-delivery-optimization.md
index 53fd47a91e..2a785d27d8 100644
--- a/windows/deployment/do/waas-delivery-optimization.md
+++ b/windows/deployment/do/waas-delivery-optimization.md
@@ -85,8 +85,6 @@ In Windows client Enterprise, Professional, and Education editions, Delivery Opt
At Microsoft, to help ensure that ongoing deployments weren't affecting our network and taking away bandwidth for other services, Microsoft IT used a couple of different bandwidth management strategies. Delivery Optimization, peer-to-peer caching enabled through Group Policy, was piloted and then deployed to all managed devices using Group Policy. Based on recommendations from the Delivery Optimization team, we used the "group" configuration to limit sharing of content to only the devices that are members of the same Active Directory domain. The content is cached for 24 hours. More than 76 percent of content came from peer devices versus the Internet.
-For more information, check out the [Adopting Windows as a Service at Microsoft](https://www.microsoft.com/itshowcase/Article/Content/851/Adopting-Windows-as-a-service-at-Microsoft) technical case study.
-
## Using a proxy with Delivery Optimization
If a proxy is being used in your environment, see [Using a proxy with Delivery Optimization](delivery-optimization-proxy.md) to understand the proxy settings needed to properly using Delivery Optimization.
diff --git a/windows/hub/zone-pivot-groups.yml b/windows/hub/zone-pivot-groups.yml
index d68e890c3d..a4e09a33da 100644
--- a/windows/hub/zone-pivot-groups.yml
+++ b/windows/hub/zone-pivot-groups.yml
@@ -20,9 +20,9 @@ groups:
title: Windows versions
prompt: "Select the Windows version you want to learn about:"
pivots:
- - id: windows-insider
- title: Windows Insider
- id: windows-11
title: Windows 11
- id: windows-10
- title: Windows 10
\ No newline at end of file
+ title: Windows 10
+ - id: windows-insider
+ title: Windows Insider
\ No newline at end of file
diff --git a/windows/security/operating-system-security/network-security/windows-firewall/dynamic-keywords.md b/windows/security/operating-system-security/network-security/windows-firewall/dynamic-keywords.md
index 30210647b8..dd9e1afa52 100644
--- a/windows/security/operating-system-security/network-security/windows-firewall/dynamic-keywords.md
+++ b/windows/security/operating-system-security/network-security/windows-firewall/dynamic-keywords.md
@@ -7,9 +7,6 @@ ms.date: 04/07/2025
# Windows Firewall dynamic keywords
-> [!IMPORTANT]
->This article describes features or settings that are in preview. The content is subject to change and may have dependencies on other features or services in preview.
-
Windows Firewall includes a functionality called *dynamic keywords*, which simplifies the configuration and management of Windows Firewall.
With dynamic keywords, you can define a set of IP address ranges, fully qualified domain names (FQDNs), and **autoresolution** options, to which one or more Firewall rules can refer.
diff --git a/windows/whats-new/deprecated-features.md b/windows/whats-new/deprecated-features.md
index 43334b47ec..a5c5d31254 100644
--- 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 actively developing in Windows 10 and Windows 11.
-ms.date: 04/24/2025
+ms.date: 05/02/2025
ms.service: windows-client
ms.subservice: itpro-fundamentals
ms.localizationpriority: medium
@@ -48,10 +48,10 @@ The features in this article are no longer being actively developed, and might b
| Feature | Details and mitigation | Deprecation announced |
|---|---|---|
| Maps app | Maps app is deprecated. It will be removed from the Microsoft Store by July 2025 and will no longer be supported. For more information, see [Resources for deprecated features](deprecated-features-resources.md#maps-app). | April 2025 |
-| VBS enclaves for Windows 11, version 23H2 and earlier | [VBS enclaves](/windows/win32/trusted-execution/vbs-enclaves) are being deprecated on Windows 11, version 23H2 and earlier versions of Windows. Support for VBS enclaves will continue for Windows 11, version 24H2 and later. VBS enclaves are being [deprecated on Windows Server 2022](/windows-server/get-started/removed-deprecated-features-windows-server) and earlier versions of Windows Server. Support for VBS enclaves will continue for Windows Server 2025 and later. | April 2025 |
+| VBS enclaves for Windows 11, version 23H2 and earlier | [VBS enclaves](/windows/win32/trusted-execution/vbs-enclaves) are being deprecated on Windows 11, version 23H2 and earlier versions of Windows. Support for VBS enclaves will continue for Windows 11, version 24H2 and later. **[Update May 2025]** Existing enclaves signed with the EKU 1.3.6.1.4.1.311.76.57.1.15 will continue to be supported for all Windows 11, version 23H2 and earlier versions of Windows, so long as no changes are made to the enclave that requires a re-sign of it. If a re-sign of the enclave occurs, the new EKU will be used to re-sign and the enclave will only be supported on Windows 11, version 24H2 and later. Existing enclaves signed with EKU 1.3.6.1.4.1.311.76.57.1.15 will continue to function without disruption on the following operating systems until a re-sign is needed: