Merge branch 'main' into release-cm2201-tp

Author: v-alje

memdocs/endpoint-manager-overview.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 04/14/2021
+ms.date: 01/19/2022
 ms.topic: overview
 ms.service: mem
 ms.subservice: fundamentals
@@ -33,7 +33,7 @@ ms.collection:
 
 Microsoft Endpoint Manager helps deliver the modern workplace and modern management to keep your data secure, in the cloud and on-premises. Endpoint Manager includes the services and tools you use to manage and monitor mobile devices, desktop computers, virtual machines, embedded devices, and servers.
 
-Endpoint Manager combines services you may know and already be using, including Microsoft Intune, Configuration Manager, Desktop Analytics, co-management, and Windows Autopilot. These services are part of the Microsoft 365 stack to help secure access, protect data, and respond and manage risk.
+Endpoint Manager combines services you may know and already be using, including Microsoft Intune, Configuration Manager, Desktop Analytics, co-management, and Windows Autopilot. These services are part of the Microsoft 365 stack to help secure access, protect data, respond to risk, and manage risk.
 
 ## What you get
 

memdocs/intune/configuration/custom-settings-ios.md

@@ -20,6 +20,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
+ms.reviewer: beflamm
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:

memdocs/intune/configuration/custom-settings-macos.md

@@ -19,7 +19,7 @@ ms.technology:
 
 #ROBOTS:
 #audience:
-ms.reviewer: kakyker
+ms.reviewer: beflamm
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:

memdocs/intune/configuration/device-features-configure.md

@@ -19,7 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
-ms.reviewer: 
+ms.reviewer: beflamm
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:

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

@@ -1,13 +1,13 @@
 ---
 # required metadata
 
-title: Upgrade or use S mode on Windows 10 devices - Microsoft Intune
-description: Use Microsoft Intune to upgrade Windows 10 devices to a different edition, or switch S mode. Administrators can use a device configuration profile to upgrade Windows 10 Professional to Windows 10 Enterprise, and switch out of S mode. See the supported upgrade paths for Windows 10 Pro, N Edition, Education, Cloud, Enterprise, Core, Holographic, and Mobile. 
+title: Upgrade Windows 10/11 edition or switch S mode in Microsoft Intune
+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
 ms.author: mandia
 manager: dougeby
-ms.date: 01/29/2021
+ms.date: 01/19/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -20,29 +20,28 @@ ms.assetid: ae8b6528-7979-47d8-abe0-58cea1905270
 #ROBOTS:
 #audience:
 
-ms.reviewer: dagerrit
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
 ms.custom: intune-azure
 ms.collection: M365-identity-device-management
 ---
 
-# Upgrade Windows 10 editions or switch out of S mode on devices using Microsoft Intune
+# Upgrade Windows 10/11 editions or switch out of S mode on devices using Microsoft Intune
 
-As part of your mobile device management (MDM) solution, you may want to upgrade your Windows 10 devices. For example, you want to upgrade your Windows 10 Professional devices to Windows 10 Enterprise. Or, you want the device to switch out of S mode.
+As part of your mobile device management (MDM) solution, you may want to 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.
 
-[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. And once you switch out of S mode, you can't go back to Windows 10 S mode.
-
-See some [commonly-asked questions](https://support.microsoft.com/help/4020089/windows-10-in-s-mode-faq) about 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. And once you switch out of S mode, you can't go back to Windows 10 S mode. See some [commonly-asked questions](https://support.microsoft.com/help/4020089/windows-10-in-s-mode-faq) about S mode.
 
 This feature applies to:
 
-- Windows 10 and newer
+- Windows 11
+- Windows 10
 - Windows 10 1809 and newer for S mode
 - Windows Holographic for Business
 
-These features are available in Intune, and are configurable by the administrator. 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 10 devices in your organization. When you deploy the profile, Intune automatically upgrades the devices or switches out of S mode.
+These features are available in Intune, and are configurable by the administrator. 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.
 
 This article lists the supported upgrade paths, and shows you how to create the device configuration profile. You can also see all the available upgrade and S mode settings for [Windows 10](edition-upgrade-windows-settings.md).
 
@@ -53,26 +52,26 @@ This article lists the supported upgrade paths, and shows you how to create the
 
 Before you upgrade devices, be sure you have the following prerequisites:
 
-- A valid product key to install the updated Windows version on all devices that you target with the policy (for Windows 10 Desktop editions). You can use either Multiple Activation Keys (MAK) or Key Management Server (KMS) keys.
+- A valid product key to install the updated Windows version on all devices that you target with the policy (for Windows client Desktop editions). 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.
-- The Windows 10 devices you assign the policy are enrolled in Microsoft Intune. 
+- The Windows client devices you assign the policy are enrolled in Microsoft Intune.
 
 ## Supported upgrade paths
 
 The following table lists the supported upgrade paths for the Windows 10 edition upgrade profile.
 
 | Upgrade from | Upgrade to |
 |---|---|
-| Windows 10 Pro | Windows 10 Education <br/>Windows 10 Enterprise <br/>Windows 10 Pro Education |
-| Windows 10 Pro N edition | Windows 10 Education N edition <br/>Windows 10 Enterprise N edition <br/>Windows 10 Pro Education N edition | 
-| Windows 10 Pro Education | Windows 10 Education | 
-| Windows 10 Pro Education N edition | Windows 10 Education N edition |
-| Windows 10 Cloud | Windows 10 Education <br/>Windows 10 Enterprise <br/>Windows 10 Pro <br/>Windows 10 Pro Education | 
-| Windows 10 Cloud N edition | Windows 10 Education N edition <br/>Windows 10 Enterprise N edition <br/>Windows 10 Pro N edition <br/>Windows 10 Pro Education N edition | 
-| Windows 10 Enterprise | Windows 10 Education | 
-| Windows 10 Enterprise N edition | Windows 10 Education N edition | 
-| Windows 10 Core | Windows 10 Education <br/>Windows 10 Enterprise <br/>Windows 10 Pro Education | 
-| Windows 10 Core N edition | Windows 10 Education N edition <br/>Windows 10 Enterprise N edition <br/>Windows 10 Pro Education N edition | 
+| 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 |
 
 <!--The following table provides information about the supported upgrade paths for Windows 10 editions in this policy:
@@ -107,7 +106,7 @@ 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 edition upgrade profile` or `Windows 10 switch off S mode`.
+    - **Name**: Enter a descriptive name for the new profile. For example, enter something like `Windows 10/11 edition upgrade profile` or `Windows 10 switch off S mode`.
     - **Description**: Enter a description for the profile. This setting is optional, but recommended.
 
 6. Select **Next**.
@@ -134,4 +133,4 @@ The next time each device checks in, the policy is applied.
 
 After the [profile is assigned](device-profile-assign.md), [monitor its status](device-profile-monitor.md).
 
-See the upgrade and S mode settings for [Windows 10](edition-upgrade-windows-settings.md) and [Windows Holographic for Business](holographic-upgrade.md) devices.
+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.

memdocs/intune/configuration/edition-upgrade-windows-settings.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 01/29/2021
+ms.date: 01/19/2022
 ms.topic: reference
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -20,32 +20,34 @@ ms.assetid:
 #ROBOTS:
 #audience:
 
-ms.reviewer: dagerrit
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
 ms.custom: intune-azure
 ms.collection: M365-identity-device-management
 ---
 
-# Windows 10 (and newer) device settings to upgrade editions or enable S mode in Intune
+# Windows 10/11 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 editions or enable S mode on Windows 10 devices. These settings are created in an upgrade configuration profile in Intune that are pushed 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 enable S mode on Windows 10 devices. These settings are created in an upgrade configuration profile in Intune that are pushed or deployed to devices.
 
-As part of your mobile device management (MDM) solution, use these settings to control the edition and S mode options for your Windows 10 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.
 
-For more information on this feature, see [Upgrade Windows 10 editions or enable S mode](edition-upgrade-configure-windows-10.md).
+For more information on this feature, see [Upgrade Windows 10/11 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).
 
 ## Before you begin
 
-Create a [Windows 10 edition upgrade and mode switch device configuration profile](edition-upgrade-configure-windows-10.md#create-the-profile).
+Create a [Windows 10/11 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 10 edition that you're upgrading to. The devices targeted by this policy are upgraded to the edition you choose.
+- **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.
 - **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**, choose **Browse** to select the license file you received from Microsoft. This license file includes license information for the editions you're upgrading the devices to.
 

memdocs/intune/configuration/email-settings-configure.md

@@ -8,7 +8,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 08/02/2021
+ms.date: 01/19/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -38,7 +38,8 @@ You can use email profiles to configure the built-in email settings for the foll
 - Android Enterprise personally-owned devices with a work profile
 - iOS 11.0 and newer
 - iPadOS 13.0 and newer
-- Windows 10 (desktop)
+- Windows 11
+- Windows 10
 
 This article shows you how to create an email profile in Microsoft Intune. It also includes links to the different platforms for more specific settings.
 
@@ -60,7 +61,7 @@ This article shows you how to create an email profile in Microsoft Intune. It al
 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: Email settings for all Windows 10 devices**.
+    - **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: Email settings for all Windows 10/11 devices**.
     - **Description**: Enter a description for the policy. This setting is optional, but recommended.
 
 6. Select **Next**.
@@ -70,7 +71,7 @@ This article shows you how to create an email profile in Microsoft Intune. It al
     - [Android device administrator (Samsung Knox Standard)](email-settings-android.md)
     - [Android Enterprise](email-settings-android-enterprise.md)
     - [iOS/iPadOS](email-settings-ios.md)
-    - [Windows 10](email-settings-windows-10.md)
+    - [Windows 10/11](email-settings-windows-10.md)
 
 8. Select **Next**.
 9. In **Scope tags** (optional), assign a tag to filter the profile to specific IT groups, such as `US-NC IT Team` or `JohnGlenn_ITDepartment`. For more information about scope tags, see [Use RBAC and scope tags for distributed IT](../fundamentals/scope-tags.md).
@@ -148,4 +149,4 @@ If you make changes to an email profile you previously assigned, end users may s
 
 ## Next steps
 
-Once the profile is created, it isn't doing anything yet. Next, [assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
+Once the profile is created, it isn't doing anything yet. Next, [assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).

memdocs/intune/configuration/email-settings-ios.md

@@ -19,6 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
+ms.reviewer: beflamm, tycast
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:

memdocs/intune/configuration/email-settings-windows-10.md

@@ -1,13 +1,13 @@
 ---
 # required metadata
 
-title: Email settings for Windows 10 devices in Microsoft Intune
-description: Create a device configuration email profile that that uses Exchange servers, and retrieves attributes from Azure Active Directory. You can also enable SSL, and synchronize email and schedules on Windows 10 devices using Microsoft Intune.
+title: Email settings for Windows 10/11 devices in Microsoft Intune
+description: Create a device configuration email profile that that uses Exchange servers, and retrieves attributes from Azure Active Directory. You can also enable SSL, and synchronize email and schedules on Windows 10/11 client devices using Microsoft Intune.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 08/02/2021
+ms.date: 01/19/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -18,14 +18,15 @@ ms.technology:
 
 #ROBOTS:
 #audience:
+ms.reviewer: mikedano, tycast
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
 ms.custom: intune-azure
 ms.collection: M365-identity-device-management
 ---
 
-# Email profile settings for devices running Windows 10 in Microsoft Intune
+# Email profile settings for devices running Windows 10/11 in Microsoft Intune
 
 > [!NOTE]
 > [!INCLUDE [not-all-settings-are-documented](../includes/not-all-settings-are-documented.md)]
@@ -34,13 +35,14 @@ In Microsoft Intune, you can create and configure email to connect to an Exchang
 
 This feature applies to:
 
-- Windows 10 and newer
+- Windows 11
+- Windows 10
 
 This article describes some of the settings you can configure. You can create a device configuration profile to push or deploy these email settings to your iOS/iPadOS devices.
 
 ## Before you begin
 
-Create a [Windows 10 Email device configuration profile](email-settings-configure.md).
+Create a [Windows 10/11 Email device configuration profile](email-settings-configure.md).
 
 ## Email settings
 

memdocs/intune/configuration/email-settings-windows-phone-8-1.md

@@ -8,7 +8,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 08/11/2020
+ms.date: 01/19/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -34,7 +34,7 @@ ms.collection: M365-identity-device-management
 This article shows you the email profile settings you can configure for your devices running Windows Phone 8.1.
 
 >[!IMPORTANT]
->Windows Phone 8.1 email profiles are also applied to Windows 10 devices.
+>Windows Phone 8.1 email profiles are also applied to Windows 10/11 devices.
 
 ## Before you begin
 
@@ -74,6 +74,6 @@ This article shows you the email profile settings you can configure for your dev
 
 ## Next steps
 
-You can also configure the email settings on [Android](email-settings-android.md), [Android Enterprise](email-settings-android-enterprise.md), [iOS/iPadOS](email-settings-ios.md), and [Windows 10](email-settings-windows-10.md).
+You can also configure the email settings on [Android](email-settings-android.md), [Android Enterprise](email-settings-android-enterprise.md), [iOS/iPadOS](email-settings-ios.md), and [Windows 10/11](email-settings-windows-10.md).
 
 [Configure email settings in Intune](email-settings-configure.md).