Merge pull request #18708 from MicrosoftDocs/main

[AutoPublish] main to live - 09/18 19:49 PDT | 09/19 08:19 IST

Author: aditisrivastava07

intune/intune-service/configuration/delivery-optimization-settings.md

@@ -31,16 +31,15 @@ ms.reviewer: juidaewo; davguy
 With Intune, you can use Delivery Optimization settings for your Windows devices to reduce bandwidth consumption when those devices download applications and updates. This article describes how to configure Delivery Optimization settings as part of an Intune device configuration profile. After you create a profile, you then assign or deploy that profile to your Windows devices.
 
 > [!IMPORTANT]
-> In April 2025, the settings format of the Delivery Optimization template was updated. Profiles for this new platform use the settings format as found in the Settings Catalog.  With this change you can no longer create new versions of the old profile. Your existing instances of the old profile remain available to use. 
+> In April 2025, the settings format of the Delivery Optimization template was updated. Profiles for this new platform use the settings format as found in the Settings Catalog.  With this change you can no longer create new versions of the old profile. Your existing instances of the old profile remain available to use.
 >
 > For more information about this change, see the Intune Customer Success blog at [Support tip: Windows device configuration policies migrating to unified settings platform in Intune](https://techcommunity.microsoft.com/blog/intunecustomersuccess/support-tip-windows-device-configuration-policies-migrating-to-unified-settings-/4189665).
 
 - Learn about [Delivery Optimization updates](/windows/deployment/update/waas-delivery-optimization) in the Windows documentation.
 
 This feature applies to:
 
-- Windows 10
-- Windows 11
+- Windows
 
 ## Create the profile
 

intune/intune-service/configuration/delivery-optimization-windows.md

@@ -97,7 +97,7 @@ This feature supports:
 
 ## Delivery optimization
 
-[Delivery optimization](delivery-optimization-windows.md) provides a better experience to delivery software updates. These settings are replacing the **Software Updates** > **Windows 10 update ring** settings.
+[Delivery optimization](delivery-optimization-windows.md) provides a better experience to delivery software updates.
 
 Use these settings to control how software updates are downloaded to devices in your organization. For example, you can let users get their own updates, or get updates using the delivery optimization cloud services in a device profile.
 

intune/intune-service/configuration/device-profiles.md

@@ -1230,5 +1230,5 @@ Android Open Source Project (AOSP) devices are Android devices that don't have G
 ## Related articles
 
 - [Assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
-- You can also create dedicated device kiosk profiles for [Android](device-restrictions-android.md#kiosk) and [Windows 10](kiosk-settings.md) devices.
+- You can also create dedicated device kiosk profiles for [Android](device-restrictions-android.md#kiosk) and [Windows](kiosk-settings.md) devices.
 - [Configure and troubleshoot Android enterprise devices in Microsoft Intune](https://support.microsoft.com/help/4476974).

intune/intune-service/configuration/device-restrictions-android-for-work.md

@@ -130,4 +130,4 @@ This article shows you the Microsoft Intune device restrictions settings that yo
 
 ## Related articles
 
-- Create a device restrictions profile on [Windows 10 and newer](device-restrictions-windows-10.md).
+- Create a device restrictions profile on [Windows devices](device-restrictions-windows-10.md).

intune/intune-service/configuration/device-restrictions-windows-8-1.md

@@ -35,9 +35,9 @@ As an Intune administrator, you can create and assign these settings to your dev
 
 ## Before you begin
 
-[Create a Windows 10/11 device restrictions configuration profile](device-restrictions-configure.md#create-the-profile).
+- [Create a Windows device restrictions configuration profile](device-restrictions-configure.md#create-the-profile).
 
-When you create a Windows 10/11 device restrictions configuration profile, there are more settings than what's listed in this article. The settings in this article are supported on Windows Holographic for Business devices.
+When you create a Windows device restrictions configuration profile, there are more settings than what's listed in this article. The settings in this article are supported on Windows Holographic for Business devices.
 
 ## App Store
 

intune/intune-service/configuration/device-restrictions-windows-holographic.md

@@ -1,7 +1,7 @@
 ---
 # required metadata
 
-title: Domain join profile settings for Windows 10/11 in Microsoft Intune
+title: Domain join profile settings for Windows devices in Microsoft Intune
 description: Create a domain join device configuration profile for Microsoft Entra hybrid joined devices. Use this profile to deploy on-premises Active Directory domain information to devices provisioned with Windows Autopilot and Microsoft Intune.
 keywords:
 author: MandiOhlinger
@@ -35,8 +35,7 @@ A **Domain Join** configuration profile includes on-premises Active Directory do
 
 This feature applies to:
 
-- Windows 11
-- Windows 10
+- Windows
 - Microsoft Entra hybrid joined devices
 - Hybrid deployment with Windows Autopilot + Intune
 
@@ -58,8 +57,8 @@ This article shows you how to create a domain join profile for a hybrid Windows
 4. Select **Create**.
 5. In **Basics**, enter the following properties:
 
-    - **Name**: Enter a descriptive name for the policy. Name your policies so you can easily identify them later. For example, a good policy name is **Windows 10/11: Windows Autopilot domain join**.
-    - **Description**: Enter a description for the policy. This setting is optional, but recommended. For example, enter **Windows 10/11: Domain join profile that includes on-premises domain information to enroll hybrid AD joined devices with Windows Autopilot**.
+    - **Name**: Enter a descriptive name for the policy. Name your policies so you can easily identify them later. For example, a good policy name is **Windows Autopilot domain join**.
+    - **Description**: Enter a description for the policy. This setting is optional, but recommended. For example, enter **Windows: Domain join profile that includes on-premises domain information to enroll hybrid AD joined devices with Windows Autopilot**.
 
 6. Select **Next**.
 7. In **Configuration settings**, enter the following properties:

intune/intune-service/configuration/domain-join-configure.md

@@ -1,7 +1,7 @@
 ---
 # required metadata
 
-title: Upgrade Windows 10/11 edition or switch S mode using Intune policy
+title: Upgrade Windows editions or switch S mode using Intune policy
 description: Use Microsoft Intune to upgrade Windows 10/11 client devices to a different edition, or switch S mode. Administrators can use a device configuration profile to upgrade Windows client Professional to Windows client Enterprise, and switch out of S mode. See the supported upgrade paths for Windows 10/11 Pro, N Edition, Education, Cloud, Enterprise, Core, and Holographic. 
 keywords:
 author: MandiOhlinger
@@ -29,21 +29,19 @@ ms.collection:
 - M365-identity-device-management
 ---
 
-# Upgrade Windows 10/11 editions or switch out of S mode on devices using Microsoft Intune
+# Upgrade Windows editions or switch out of S mode on devices using Microsoft Intune
 
 You can create a Microsoft Intune policy that upgrades Windows editions, or switches out of S mode.
 
-As part of your mobile device management (MDM) solution, you can upgrade your Windows 10/11 devices. For example, you want to upgrade your Windows 10 Professional devices to Windows 10 Enterprise. Or, you want the Windows 10 device to switch out of S mode.
+As part of your mobile device management (MDM) solution, you can upgrade your Windows devices. For example, you want to upgrade your Windows Professional devices to Windows Enterprise. Or, you want the Windows device to switch out of S mode.
 
-[Windows 10 S mode](https://support.microsoft.com/help/4456067/windows-10-switch-out-of-s-mode) (opens another Microsoft web site) is designed for security and performance. You can use Intune to switch out of S mode. Switching out of S mode is one way. So once you switch out of S mode, you can't go back to Windows 10 S mode.
+[Windows S mode](https://support.microsoft.com/help/4456067/windows-10-switch-out-of-s-mode) (opens another Microsoft web site) is designed for security and performance. You can use Intune to switch out of S mode. Switching out of S mode is one way. So once you switch out of S mode, you can't go back to Windows S mode.
 
 For more information, go to [commonly asked questions about S mode](https://support.microsoft.com/help/4020089/windows-10-in-s-mode-faq).
 
 This feature applies to:
 
-- Windows 11
-- Windows 10
-- Windows 10 1809 and newer for S mode
+- Windows
 - Windows Holographic for Business
 
 Intune uses **configuration profiles** to create and customize these settings for your organization's needs. After you add these features in a profile, you can then push or deploy the profile to Windows client devices in your organization. When you deploy the profile, Intune automatically upgrades the devices or switches out of S mode. When the device checks-in with the Intune service, the policy applies and Intune upgrades the device or switches out of S mode.
@@ -56,27 +54,26 @@ This article lists the supported upgrade paths, and shows you how to create the
 ## Prerequisites
 
 - To install the updated Windows version on the devices that you target with the policy (for Windows client Desktop editions), you need a valid product key. You can use either Multiple Activation Keys (MAK) or Key Management Server (KMS) keys.
-- For Windows 10 Holographic editions, you can use a Microsoft license file. The license file includes the licensing information to install the updated edition on all devices that you target with the policy.
+- For Windows Holographic editions, you can use a Microsoft license file. The license file includes the licensing information to install the updated edition on all devices that you target with the policy.
 - The Windows client devices you assign the policy are enrolled in Microsoft Intune.
 - To create the policy, at a minimum, sign in with an account that has the **Policy and Profile Manager** Intune role. For more information, go to [Role-based access control (RBAC) with Microsoft Intune](../fundamentals/role-based-access-control.md).
 
 ## Supported upgrade paths
 
-The following table lists the supported upgrade paths for the Windows 10 edition upgrade profile.
+The following table lists the supported upgrade paths for the Windows edition upgrade profile.
 
 | Upgrade from | Upgrade to |
 |---|---|
-| Windows 10/11 Pro | Windows 10/11 Education <br/>Windows 10/11 Enterprise <br/>Windows 10/11 Pro Education |
-| Windows 10/11 Pro N edition | Windows 10/11 Education N edition <br/>Windows 10/11 Enterprise N edition <br/>Windows 10/11 Pro Education N edition | 
-| Windows 10/11 Pro Education | Windows 10/11 Education | 
-| Windows 10/11 Pro Education N edition | Windows 10/11 Education N edition |
-| Windows 10/11 Cloud | Windows 10/11 Education <br/>Windows 10/11 Enterprise <br/>Windows 10/11 Pro <br/>Windows 10/11 Pro Education | 
-| Windows 10/11 Cloud N edition | Windows 10/11 Education N edition <br/>Windows 10/11 Enterprise N edition <br/>Windows 10/11 Pro N edition <br/>Windows 10/11 Pro Education N edition | 
-| Windows 10/11 Enterprise | Windows 10/11 Education | 
-| Windows 10/11 Enterprise N edition | Windows 10/11 Education N edition | 
-| Windows 10/11 Core | Windows 10/11 Education <br/>Windows 10/11 Enterprise <br/>Windows 10/11 Pro Education | 
-| Windows 10/11 Core N edition | Windows 10/11 Education N edition <br/>Windows 10/11 Enterprise N edition <br/>Windows 10/11 Pro Education N edition | 
-| Windows 10 Holographic | Windows 10 Holographic for Business |
+| Windows Pro | Windows Education <br/>Windows Enterprise <br/>Windows Pro Education |
+| Windows Pro N edition | Windows Education N edition <br/>Windows Enterprise N edition <br/>Windows Pro Education N edition |
+| Windows Pro Education | Windows Education |
+| Windows Pro Education N edition | Windows Education N edition |
+| Windows Cloud | Windows Education <br/>Windows Enterprise <br/>Windows Pro <br/>Windows Pro Education |
+| Windows Cloud N edition | Windows Education N edition <br/>Windows Enterprise N edition <br/>Windows Pro N edition <br/>Windows Pro Education N edition |
+| Windows Enterprise | Windows Education |
+| Windows Enterprise N edition | Windows Education N edition |
+| Windows Core | Windows Education <br/>Windows Enterprise <br/>Windows Pro Education |
+| Windows Core N edition | Windows Education N edition <br/>Windows Enterprise N edition <br/>Windows Pro Education N edition |
 
 ## Create the profile
 
@@ -90,13 +87,13 @@ The following table lists the supported upgrade paths for the Windows 10 edition
 4. Select **Create**.
 5. In **Basics**, enter the following properties:
 
-    - **Name**: Enter a descriptive name for the new profile. For example, enter something like `Windows 10/11 edition upgrade profile` or `Windows 10 turn off S mode`.
+    - **Name**: Enter a descriptive name for the new profile. For example, enter something like `Windows edition upgrade profile` or `Windows - turn off S mode`.
     - **Description**: Enter a description for the profile. This setting is optional, but recommended.
 
 6. Select **Next**.
 7. In **Configuration settings**, enter the settings you want to configure. For a list of all settings, and what they do, go to:
 
-    - [Windows 10 upgrade and S mode](edition-upgrade-windows-settings.md)
+    - [Windows upgrade and S mode](edition-upgrade-windows-settings.md)
     - [Windows Holographic for Business](holographic-upgrade.md)
 
 8. Select **Next**.
@@ -117,4 +114,4 @@ The next time each device checks in with Intune, the policy applies.
 
 - [Assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
 
-- See the upgrade and S mode settings for [Windows 10/11](edition-upgrade-windows-settings.md) and [Windows Holographic for Business](holographic-upgrade.md) devices.
+- See the upgrade and S mode settings for [Windows](edition-upgrade-windows-settings.md) and [Windows Holographic for Business](holographic-upgrade.md) devices.

intune/intune-service/configuration/edition-upgrade-configure-windows-10.md

@@ -1,8 +1,8 @@
 ---
 # required metadata
 
-title: Windows 10 upgrade and S mode settings in Microsoft Intune
-description: See a list of all the settings, and what they do when upgrading a Windows 10 edition on a device, or switch out of S mode on a device using a device configuration profile in Microsoft Intune.
+title: Windows upgrade and S mode settings in Microsoft Intune
+description: See a list of all the settings, and what they do when upgrading a Windows edition on a device, or switch out of S mode on a device using a device configuration profile in Microsoft Intune.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
@@ -29,32 +29,32 @@ ms.collection:
 - M365-identity-device-management
 ---
 
-# Windows 10/11 device settings to upgrade editions or enable S mode in Intune
+# Windows device settings to upgrade editions or enable S mode in Intune
 
 > [!NOTE]
 > [!INCLUDE [not-all-settings-are-documented](../includes/not-all-settings-are-documented.md)]
 
-Microsoft Intune includes many settings to help manage and protect your devices. This article describes some of the settings to upgrade Windows client editions, or switch out of S mode on Windows 10 devices. These settings are created in an upgrade configuration profile in Intune that are assigned or deployed to devices.
+Microsoft Intune includes many settings to help manage and protect your devices. This article describes some of the settings to upgrade Windows client editions, or switch out of S mode on Windows devices. These settings are created in an upgrade configuration profile in Intune that are assigned or deployed to devices.
 
 As part of your mobile device management (MDM) solution, use these settings to control the Windows client edition and Window 10 S mode options for your Windows devices.
 
 This feature applies to:
 
-- Windows 10
+- Windows
 
-For more information on this feature, see [Upgrade Windows 10/11 editions or enable S mode](edition-upgrade-configure-windows-10.md).
+For more information on this feature, see [Upgrade Windows editions or enable S mode](edition-upgrade-configure-windows-10.md).
 
-For information on other options to upgrade Windows editions, see [Windows 10/11 edition upgrade](/windows/deployment/upgrade/windows-10-edition-upgrades).
+For information on other options to upgrade Windows editions, see [Windows edition upgrade](/windows/deployment/upgrade/windows-10-edition-upgrades).
 
 ## Before you begin
 
-- Create a [Windows 10/11 edition upgrade and mode switch device configuration profile](edition-upgrade-configure-windows-10.md#create-the-profile).
+- Create a [Windows edition upgrade and mode switch device configuration profile](edition-upgrade-configure-windows-10.md#create-the-profile).
 
 ## Edition upgrade
 
 - **Edition to upgrade to**: Select the Windows edition that you're upgrading to. The devices targeted by this policy are upgraded to the edition you choose. When set to **Not configuration**, Intune doesn't change or update this setting.
 - **Product Key**: Enter the product key that you received from Microsoft. After you create the policy with the product key, the key can't be updated, and is hidden for security reasons. To change the product key, enter the entire key again.
-- **License File**: For **Windows 10 Holographic for Business**, browse and select the license file you received from Microsoft. This license file includes license information for the editions you're upgrading the devices to.
+- **License File**: For **Windows Holographic for Business**, browse and select the license file you received from Microsoft. This license file includes license information for the editions you're upgrading the devices to.
 
 ## Mode switch