Merge pull request #6588 from MicrosoftDocs/main

1/20/2022 PM Publish

Author: Taojunshen

memdocs/intune/configuration/preference-file-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/settings-catalog.md

@@ -2,12 +2,12 @@
 # required metadata
 
 title: Create a policy using settings catalog in Microsoft Intune
-description: Use settings catalog in Microsoft Intune and Endpoint Manager to configure thousands of settings for Windows 10 devices, and configure Microsoft Edge on macOS devices. Add these settings in a device configuration profile to secure devices, and control different programs and features.
+description: Use settings catalog in Microsoft Intune and Endpoint Manager to configure thousands of settings for Windows 10/11 client devices, and configure Microsoft Edge on macOS devices. Add these settings in a device configuration profile to secure devices, and control different programs and features.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 12/16/2021
+ms.date: 01/20/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -42,7 +42,7 @@ This feature applies to:
   - **Configure Microsoft Edge version 77 and newer**. Previously, you had to [use a property list (plist) file](/deployedge/configure-microsoft-edge-on-mac) (opens another Microsoft website). For a list of the settings you can configure, see [Microsoft Edge - Policies](/DeployEdge/microsoft-edge-policies) (opens another Microsoft website). Be sure macOS is listed as a supported platform. If some settings aren't available in the settings catalog, then it's recommended to continue using the [preference file](preference-file-settings-macos.md).
   - **Configure Microsoft Defender for Endpoint**. Previously, you had to [use a property list (plist) file](/microsoft-365/security/defender-endpoint/mac-install-with-intune) (opens another Microsoft website). For a list of the settings you can configure, see [Set preferences for Microsoft Defender for Endpoint on macOS](/microsoft-365/security/defender-endpoint/mac-preferences) (opens another Microsoft website). Be sure macOS is listed as a supported platform. If some settings aren't available in the settings catalog, then it's recommended to continue using the [preference file](preference-file-settings-macos.md).
 
-- **Windows 10 and newer**
+- **Windows 10/11**
 
   There are thousands of settings to choose, including settings that haven't been available before. These settings are directly generated from the Windows configuration service providers (CSPs). You can also configure Administrative Templates, and have more Administrative Template settings available. As Windows adds or exposes more settings to MDM providers, these settings are added quicker to Microsoft Intune for you to configure.
 

memdocs/intune/configuration/shared-user-device-settings-windows-holographic.md

@@ -41,9 +41,9 @@ For more information on this feature in Intune, see [Control access, accounts, a
 
 ## Before your begin
 
-[Create a Windows 10 shared multi-user device configuration profile](shared-user-device-settings.md).
+[Create a Windows 10/11 shared multi-user device configuration profile](shared-user-device-settings.md).
 
-When you create a Windows 10 shared user 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 10/11 shared user 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.
 
 ## Shared multi-user device settings
 
@@ -70,4 +70,4 @@ When you create a Windows 10 shared user device configuration profile, there are
 ## Next steps
 
 - [Assign the profile](device-profile-assign.md) and [monitor its status](device-profile-monitor.md).
-- See the shared user device settings for [Windows 10 and newer](shared-user-device-settings-windows.md).
+- See the shared user device settings for [Windows 10/11](shared-user-device-settings-windows.md).

memdocs/intune/configuration/shared-user-device-settings-windows.md

@@ -1,13 +1,13 @@
 ---
 # required metadata
 
-title: Windows 10 shared device settings - Microsoft Intune
-description: Add and use Windows 10 to configure devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft Surface. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
+title: Windows 10/11 shared device settings - Microsoft Intune
+description: Add and use Windows 10/11 to configure devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft Surface. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 03/01/2021
+ms.date: 01/20/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -28,22 +28,22 @@ ms.custom: intune-azure; seodec18
 ms.collection: M365-identity-device-management
 ---
 
-# Windows 10 and newer settings to manage shared devices using Intune
+# Windows 10/11 and newer settings to manage shared devices using Intune
 
 > [!NOTE]
 > [!INCLUDE [not-all-settings-are-documented](../includes/not-all-settings-are-documented.md)]
 
-Windows 10 and newer devices, such as the Microsoft Surface, can be used by many users. Devices that have multiple users are called shared devices, and are a part of mobile device management (MDM) solutions.
+Windows 10/11 client devices, such as the Microsoft Surface, can be used by many users. Devices that have multiple users are called shared devices, and are a part of mobile device management (MDM) solutions.
 
-Using Microsoft Intune, end-users can sign in to these shared devices with a guest account. As they use the device, they only get access to features you allow. As the Intune administrator, you configure access, choose when accounts are deleted, control power management settings, and more for your shared Windows 10 devices.
+Using Microsoft Intune, end-users can sign in to these shared devices with a guest account. As they use the device, they only get access to features you allow. As the Intune administrator, you configure access, choose when accounts are deleted, control power management settings, and more for your shared Windows client devices.
 
 This article describes some of the settings you can configure in a device configuration profile. When the profile is created in Intune, you deploy or assign the profile to device groups in your organization. You can also assign this profile to device groups with mixed device types and Windows OS versions.
 
 For more information on this feature in Intune, see [Control access, accounts, and power features on shared PC or multi-user devices](shared-user-device-settings.md). For more information on the Windows CSP, see [SharedPC CSP](/windows/client-management/mdm/sharedpc-csp).
 
 ## Before your begin
 
-Create a [Windows 10 shared multi-user device configuration profile](shared-user-device-settings.md).
+Create a [Windows 10/11 shared multi-user device configuration profile](shared-user-device-settings.md).
 
 ## Shared multi-user device settings
 
@@ -102,7 +102,7 @@ These settings use the [SharedPC CSP](/windows/client-management/mdm/sharedpc-cs
   For more information on what the education policies do, see [Windows 10 configuration recommendations for education customers](/education/windows/configure-windows-for-education).
 
 > [!TIP]
-> [Set up a shared or guest PC](/windows/configuration/set-up-shared-or-guest-pc) (opens another docs web site) is a great resource on this Windows 10 feature, including concepts and group policies that can be set in shared mode.
+> [Set up a shared or guest PC](/windows/configuration/set-up-shared-or-guest-pc) (opens another docs web site) is a great resource on this Windows client feature, including concepts and group policies that can be set in shared mode.
 
 ## Next steps
 

memdocs/intune/configuration/shared-user-device-settings.md

@@ -2,13 +2,13 @@
 # required metadata
 
 title: Shared or multi-user device settings in Microsoft Intune
-description: Add and use Windows 10 and Windows Holographic for Business devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft HoloLens. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
+description: Add and use Windows 10/11 and Windows Holographic for Business devices that are shared, or used by multiple users in Microsoft Intune. See a list of all the settings and what they do on the devices, including Microsoft HoloLens. Control guest accounts, manage accounts and delete inactive accounts, allow or prevent saving to local storage, set power and sleep options, choose when updates are installed, and use devices in education environments in a device configuration profile.
 keywords:
 author: MandiOhlinger
 
 ms.author: mandia
 manager: dougeby
-ms.date: 01/29/2021
+ms.date: 01/20/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -33,8 +33,8 @@ ms.collection: M365-identity-device-management
 
 Devices that have multiple users are called shared devices, and are a common part of mobile device management (MDM) solutions. Using Microsoft Intune, you can customize shared devices running the following platforms:
 
-- Windows 10 Professional and newer
-- Windows 10 Enterprise and newer
+- Windows 10/11 Professional
+- Windows 10/11 Enterprise
 - Windows Holographic for Business, such as the HoloLens
 
 For example, schools have devices that are typically used by many students. With this setting, the school Intune administrator can turn on the Shared PC feature to allow one user at a time. Students can't switch between different signed-in accounts on the device. When the student signs out, you also choose to remove all user-specific settings.
@@ -63,7 +63,7 @@ When the profile is created in Intune, you deploy or assign the profile to devic
 6. Select **Next**.
 7. In **Configuration settings**, depending on the platform you chose, the settings you can configure are different. Choose your platform for detailed settings:
 
-    - [Windows 10 and newer](shared-user-device-settings-windows.md)
+    - [Windows 10/11](shared-user-device-settings-windows.md)
     - [Windows Holographic for Business](shared-user-device-settings-windows-holographic.md)
 
 8. Select **Next**.
@@ -85,5 +85,5 @@ The next time each device checks in, the policy is applied.
 
 ## Next steps
 
-- See all the settings for [Windows 10 and newer](shared-user-device-settings-windows.md) and [Windows Holographic for Business](shared-user-device-settings-windows-holographic.md).
+- See all the settings for [Windows 10/11](shared-user-device-settings-windows.md) and [Windows Holographic for Business](shared-user-device-settings-windows-holographic.md).
 - After the [profile is assigned](device-profile-assign.md), [monitor its status](device-profile-monitor.md).

memdocs/intune/configuration/toc.yml

@@ -211,7 +211,7 @@ items:
         href: wi-fi-settings-macos.md
       - name: Wired networks
         href: wired-network-settings-macos.md
-    - name: Windows 10 and later
+    - name: Windows 10/11
       items:
       - name: Custom
         href: custom-settings-windows-10.md

memdocs/intune/configuration/tutorial-walkthrough-administrative-templates.md

@@ -2,12 +2,12 @@
 # required metadata
 
 title: Walkthrough - Create administrative template in Microsoft Intune
-description: This tutorial or walkthrough uses Microsoft Intune to configure Office, Windows, and Microsoft Edge ADMX templates on Windows 10 and newer devices.
+description: This tutorial or walkthrough uses Microsoft Intune to configure Office, Windows, and Microsoft Edge ADMX templates on Windows 10/11 client devices.
 keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 02/26/2021
+ms.date: 01/20/2022
 ms.topic: tutorial
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -27,21 +27,21 @@ search.appverid: MET150
 ms.custom: intune-azure
 ms.collection: M365-identity-device-management
 
-#Customer intent: As an administrator, I want learn and use ADMX templates in the cloud so that I can control and manage Office, Windows, and Microsoft Edge settings on Windows 10 devices.
+#Customer intent: As an administrator, I want learn and use ADMX templates in the cloud so that I can control and manage Office, Windows, and Microsoft Edge settings on Windows 10/11 devices.
 ---
 
-# Tutorial: Use the cloud to configure group policy on Windows 10 devices with ADMX templates and Microsoft Intune
+# Tutorial: Use the cloud to configure group policy on Windows 10/11 devices with ADMX templates and Microsoft Intune
 
 > [!NOTE]
 > This tutorial was created as a technical workshop for Microsoft Ignite. It has more prerequisites than typical tutorials, as it compares using and configuring ADMX policies in Intune and on-premises.
 
-Group policy administrative templates, also known as ADMX templates, include settings you can configure on Windows 10 devices, including PCs. The ADMX template settings are available by different services. These settings are used by Mobile Device Management (MDM) providers, including Microsoft Intune. For example, you can turn on Design Ideas in PowerPoint, set a home page in Microsoft Edge, block ActiveX controls in Internet Explorer, and more.
+Group policy administrative templates, also known as ADMX templates, include settings you can configure on Windows client devices, including PCs. The ADMX template settings are available by different services. These settings are used by Mobile Device Management (MDM) providers, including Microsoft Intune. For example, you can turn on Design Ideas in PowerPoint, set a home page in Microsoft Edge, block ActiveX controls in Internet Explorer, and more.
 
 ADMX templates are available for the following services:
 
 - **Microsoft Edge**: Download at [Microsoft Edge policy file](https://www.microsoftedgeinsider.com/en-us/enterprise).
 - **Office**: Download at [Microsoft 365 Apps, Office 2019, and Office 2016](https://www.microsoft.com/download/details.aspx?id=49030).
-- **Windows**: Built in to the Windows 10 OS.
+- **Windows**: Built in to the Windows client OS.
 
 For more information on ADMX policies, see [Understanding ADMX-backed policies](/windows/client-management/mdm/understanding-admx-backed-policies).
 
@@ -59,6 +59,7 @@ By the end of this lab, you'll have the skills to start using Intune and Microso
 
 This feature applies to:
 
+- Windows 11
 - Windows 10 version 1709 and newer
 
 > [!TIP]
@@ -82,10 +83,10 @@ This feature applies to:
       - [Office administrative templates](https://www.microsoft.com/download/details.aspx?id=49030)
       - [Microsoft Edge administrative templates > Policy file](https://www.microsoftedgeinsider.com/en-us/enterprise)
 
-  2. Create a group policy to push these templates to a Windows 10 Enterprise administrator computer in the same domain as the DC. In this tutorial:
+  2. Create a group policy to push these templates to a Windows 10/11 Enterprise administrator computer in the same domain as the DC. In this tutorial:
 
       - The group policy we created with these templates is called **OfficeandEdge**. You'll see this name in the images.
-      - The Windows 10 Enterprise administrator computer we use is called the **Admin computer**.
+      - The Windows 10/11 Enterprise administrator computer we use is called the **Admin computer**.
 
       In some organizations, a domain administrator has two accounts:  
         - A typical domain work account
@@ -595,4 +596,4 @@ In this tutorial, you got more familiar with the [Microsoft Endpoint Manager adm
 For more information on administrative templates in Intune, see:
 
 > [!div class="nextstepaction"]
-> [Use Windows 10 templates to configure group policy settings in Intune](administrative-templates-windows.md)
+> [Use Windows 10/11 templates to configure group policy settings in Intune](administrative-templates-windows.md)

memdocs/intune/configuration/use-enterprise-sso-plug-in-ios-ipados-macos.md

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