Merge pull request #6570 from MandiOhlinger/ado10926184-round4

ADO 10926184 - Round 4: Adding Win10

Author: Angela Fleischmann

memdocs/intune/configuration/holographic-upgrade.md

@@ -6,7 +6,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 01/28/2021
+ms.date: 01/19/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -40,13 +40,13 @@ As part of your mobile device management (MDM) solution, use these settings to u
 
 As an Intune administrator, you can create and assign these settings to your 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).
 
 ## 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 client edition upgrade and mode switch device configuration profile](edition-upgrade-configure-windows-10.md#create-the-profile).
 
-When you create a Windows 10 edition upgrade and mode switch device 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 client edition upgrade and mode switch device 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.
 
 ## Edition upgrade
 
@@ -59,4 +59,4 @@ When you create a Windows 10 edition upgrade and mode switch device configuratio
 
 [Assign the profile](device-profile-assign.md), and [monitor its status](device-profile-monitor.md).
 
-You can also create edition upgrade profiles for [Windows 10 and later](edition-upgrade-windows-settings.md) devices.
+You can also create edition upgrade profiles for [Windows 10/11](edition-upgrade-windows-settings.md) devices.

memdocs/intune/configuration/index.yml

@@ -14,7 +14,7 @@ metadata:
     - highpri
   author: dougeby
   ms.author: dougeby
-  ms.date: 02/18/2020
+  ms.date: 01/19/2022
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
 
@@ -42,11 +42,11 @@ landingContent:
             url: device-profile-monitor.md
 
   # Card (optional)
-  - title: Settings for Windows 10 and later
+  - title: Settings for Windows 10/11
     linkLists:
     - linkListType: how-to-guide
       links:
-      - text: Use Windows 10 templates to configure group policy settings
+      - text: Use Windows client templates to configure group policy settings
         url: administrative-templates-windows.md
       - text: Configure device restriction settings
         url: device-restrictions-configure.md
@@ -66,7 +66,7 @@ landingContent:
     linkLists:
     - linkListType: how-to-guide      
       links:
-      - text: Upgrade Windows 10 editions or switch out of S mode
+      - text: Upgrade Windows client editions or switch out of S mode
         url: edition-upgrade-configure-windows-10.md
       - text: Settings to run as a dedicated kiosk
         url: kiosk-settings.md
@@ -158,7 +158,7 @@ landingContent:
         url: ios-device-features-settings.md
       - text: macOS
         url: macos-device-features-settings.md
-      - text: Windows 10 and later
+      - text: Windows 10/11
         url: delivery-optimization-settings.md
       - text: Windows Holographic for Business
         url: device-restrictions-windows-holographic.md                      

memdocs/intune/configuration/ios-device-features-settings.md

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

memdocs/intune/configuration/kernel-extensions-overview-macos.md

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

memdocs/intune/configuration/kernel-extensions-settings-macos.md

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

memdocs/intune/configuration/kiosk-settings-holographic.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 05/18/2020
+ms.date: 01/19/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -19,6 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
@@ -38,9 +39,9 @@ To learn more about the Windows kiosk feature in Intune, see [configure kiosk se
 
 ## Before you begin
 
-- [Create a Windows 10 kiosk device configuration profile](kiosk-settings.md#create-the-profile).
+- [Create a Windows 10/11 kiosk device configuration profile](kiosk-settings.md#create-the-profile).
 
-  When you create a Windows 10 kiosk device 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 client kiosk device 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.
 
 - This kiosk profile is directly related to the device restrictions profile you create using the [Microsoft Edge kiosk settings](device-restrictions-windows-holographic.md#microsoft-edge-browser). To summarize:
 
@@ -116,4 +117,4 @@ Apps in this mode are available on the start menu. These apps are the only apps
 
 [Assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
 
-You can also create kiosk profiles for [Android](device-restrictions-android.md#kiosk), [Android Enterprise](device-restrictions-android-for-work.md#device-experience), and [Windows 10 and later](kiosk-settings-windows.md) devices.
+You can also create kiosk profiles for [Android](device-restrictions-android.md#kiosk), [Android Enterprise](device-restrictions-android-for-work.md#device-experience), and [Windows 10/11](kiosk-settings-windows.md) devices.

memdocs/intune/configuration/kiosk-settings-windows.md

@@ -1,13 +1,13 @@
 ---
 # required metadata
 
-title: Kiosk settings for Windows 10 in Microsoft Intune
-description: Configure your Windows 10 and later devices as single-app and multi-app kiosks, customize the start menu, add apps, show the task bar, and configure a web browser in Microsoft Intune. 
+title: Kiosk settings for Windows 10/11 in Microsoft Intune
+description: Configure your Windows 10/11 client devices as single-app and multi-app kiosks, customize the start menu, add apps, show the task bar, and configure a web browser in Microsoft Intune. 
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 02/26/2021
+ms.date: 01/19/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -19,6 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
@@ -28,22 +29,22 @@ ms.collection:
   - highpri
 ---
 
-# Windows 10 and newer device settings to run as a kiosk in Intune
+# Windows 10/11 and newer device settings to run as a kiosk in Intune
 
 > [!NOTE]
 > [!INCLUDE [not-all-settings-are-documented](../includes/not-all-settings-are-documented.md)]
 
-On Windows 10 and newer devices, you can configure these devices to run in single-app kiosk mode, or multi-app kiosk mode.
+On Windows 10/11 devices, you can configure these devices to run in single-app kiosk mode. On Windows 10 devices, you can configure these devices to run in multi-app kiosk mode.
 
-This article describes some of the settings you can control on Windows 10 and newer devices. As part of your mobile device management (MDM) solution, use these settings to configure your Windows 10 and newer devices to run in kiosk mode.
+This article describes some of the settings you can control on Windows client devices. As part of your mobile device management (MDM) solution, use these settings to configure your Windows client devices to run in kiosk mode.
 
 As an Intune administrator, you can create and assign these settings to your devices.
 
 To learn more about the Windows kiosk feature in Intune, see [configure kiosk settings](kiosk-settings.md).
 
 ## Before you begin
 
-- Create a [Windows 10 kiosk device configuration profile](kiosk-settings.md#create-the-profile).
+- Create a [Windows 10/11 kiosk device configuration profile](kiosk-settings.md#create-the-profile).
 
 - This kiosk profile is directly related to the device restrictions profile you create using the [Microsoft Edge kiosk settings](device-restrictions-windows-10.md#microsoft-edge-legacy-version-45-and-older). To summarize:
 
@@ -124,7 +125,7 @@ Runs only one app on the device, such as a web browser or Store app.
       `office.com`
 
     > [!NOTE]
-    > Windows 10 Kiosks with Autologon enabled using Microsoft Kiosk Browser must use an offline license from the Microsoft Store for Business. This requirement is because Autologon uses a local user account with no Azure Active Directory (AD) credentials. So, online licenses can't be evaluated. For more information, see [Distribute offline apps](/microsoft-store/distribute-offline-apps).
+    > Windows 10/11 Kiosks with Autologon enabled using Microsoft Kiosk Browser must use an offline license from the Microsoft Store for Business. This requirement is because Autologon uses a local user account with no Azure Active Directory (AD) credentials. So, online licenses can't be evaluated. For more information, see [Distribute offline apps](/microsoft-store/distribute-offline-apps).
 
   - **Add Store app**: Select **Add a store app**, and choose an app from the list.
 
@@ -246,4 +247,4 @@ Runs multiple app on the device. Apps in this mode are available on the start me
 
 You can also create kiosk profiles for [Android](device-restrictions-android.md#kiosk), [Android Enterprise](device-restrictions-android-for-work.md#device-experience), and [Windows Holographic for Business](kiosk-settings-holographic.md) devices.
 
-Also see [set up a single-app kiosk](/windows/configuration/kiosk-single-app) or [set up a multi-app kiosk](/windows/configuration/lock-down-windows-10-to-specific-apps) in the Windows guidance.
+Also see [set up a single-app kiosk](/windows/configuration/kiosk-single-app) or [set up a multi-app kiosk](/windows/configuration/lock-down-windows-10-to-specific-apps) in the Windows guidance.

memdocs/intune/configuration/kiosk-settings.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 10/05/2021
+ms.date: 01/19/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -19,6 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
@@ -42,7 +43,7 @@ Intune supports one kiosk profile per device. If you need multiple kiosk profile
 
 Intune uses "configuration profiles" to create and customize these settings for your organization's needs. After you add these features in a profile, push or deploy these settings to groups in your organization.
 
-This article shows you how to create a device configuration profile. For a list of all the settings, and what they do, see [Windows 10 kiosk settings](kiosk-settings-windows.md) and [Windows Holographic for Business kiosk settings](kiosk-settings-holographic.md).
+This article shows you how to create a device configuration profile. For a list of all the settings, and what they do, see [Windows client kiosk settings](kiosk-settings-windows.md) and [Windows Holographic for Business kiosk settings](kiosk-settings-holographic.md).
 
 ## Create the profile
 
@@ -76,7 +77,7 @@ This article shows you how to create a device configuration profile. For a list
 
     For a list of all settings, and what they do, see:
 
-      - [Windows 10 kiosk settings](kiosk-settings-windows.md)
+      - [Windows client kiosk settings](kiosk-settings-windows.md)
       - [Windows Holographic for Business kiosk settings](kiosk-settings-holographic.md)
 
 8. Select **Next**.
@@ -101,5 +102,5 @@ You can also create kiosk profiles for devices that run the following platforms:
 
 - [Android device administrator](device-restrictions-android.md#kiosk)
 - [Android Enterprise](device-restrictions-android-for-work.md#device-experience)
-- [Windows 10 and later](kiosk-settings-windows.md)
+- [Windows 10/11](kiosk-settings-windows.md)
 - [Windows Holographic for Business](kiosk-settings-holographic.md)

memdocs/intune/configuration/macos-device-features-settings.md

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

memdocs/intune/configuration/network-boundary-windows.md

@@ -2,12 +2,12 @@
 # required metadata
 
 title: Create a Windows Network Boundary profile in Microsoft Intune
-description: Add a Windows Network Boundary profile to add trusted sites, trusted domains, IPv4 and IPv6 ranges, and proxy servers on Windows 10 devices in Microsoft Intune. Sites in this boundary are trusted by Microsoft Defender Application Guard in Microsoft Edge.
+description: Add a Windows Network Boundary profile to add trusted sites, trusted domains, IPv4 and IPv6 ranges, and proxy servers on Windows 10/11 devices in Microsoft Intune. Sites in this boundary are trusted by Microsoft Defender Application Guard in Microsoft Edge.
 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
@@ -19,7 +19,7 @@ ms.technology:
 #ROBOTS:
 #audience:
 
-ms.reviewer: 
+ms.reviewer: mikedano
 ms.suite: ems
 search.appverid: MET150
 #ms.tgt_pltfrm:
@@ -33,11 +33,12 @@ When using Microsoft Defender Application Guard and Microsoft Edge, you can prot
 
 In Intune, you can create a network boundary profile, and deploy the profile to your devices.
 
-For more information on using Microsoft Defender Application Guard in Intune, see [Windows 10 settings to protect devices using Intune](../protect/endpoint-protection-windows-10.md#microsoft-defender-application-guard).
+For more information on using Microsoft Defender Application Guard in Intune, see [Windows client settings to protect devices using Intune](../protect/endpoint-protection-windows-10.md#microsoft-defender-application-guard).
 
 This feature applies to:
 
-- Windows 10 and newer devices enrolled in Intune
+- Windows 11 devices enrolled in Intune
+- Windows 10 devices enrolled in Intune
 
 This article shows you how to create the profile, and add trusted sites.