Skip to content

Commit 129845f

Browse files
authored
Merge pull request #8162 from MicrosoftDocs/main
Publish main to live on 8/1 @ 10:30 am
2 parents c2e8972 + bc1c36f commit 129845f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ For corporate-owned devices with a work profile, some settings only apply in the
8888
- **Beam data using NFC (work-profile level)**: **Block** prevents using the Near Field Communication (NFC) technology to beam data from apps. When set to **Not configured** (default), Intune doesn't change or update this setting. By default, the OS might allow using NFC to share data between devices.
8989
- **Developer settings**: Choose **Allow** to let users access developer settings on the device. When set to **Not configured** (default), Intune doesn’t change or update this setting. By default, the OS might prevent users from accessing developer settings on the device.
9090
- **Microphone adjustment**: **Block** prevents users from unmuting the microphone and adjusting the microphone volume. When set to **Not configured** (default), Intune doesn't change or update this setting. By default, the OS might allow users to use and adjust the volume of the microphone on the device.
91-
- **Factory reset protection emails**: Choose **Google account email addresses**. Enter the email addresses of device administrators that can unlock the device after it's wiped. Be sure to separate the email addresses with a semi-colon, such as `[email protected];[email protected]`. If an email isn't entered, anyone can unlock the device after it's restored to the factory settings. These emails only apply when a non-user factory reset is run, such as running a factory reset using the recovery menu.
91+
- **Factory reset protection emails**: Choose **Google account email addresses**. Enter the email addresses of device administrators that can unlock the device after it's wiped. Be sure to separate the email addresses with a semi-colon, such as `[email protected];[email protected]`. These emails only apply when a non-user factory reset is run, such as running a factory reset using the recovery menu.
9292

9393
When set to **Not configured** (default), Intune doesn't change or update this setting.
9494

memdocs/intune/fundamentals/licenses-assign.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: Erikre
88
ms.author: erikre
99
manager: dougeby
10-
ms.date: 06/09/2022
10+
ms.date: 08/01/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: fundamentals
@@ -67,7 +67,7 @@ See this [overview of School Data Sync](https://support.office.com/article/Overv
6767

6868
- Each **user** that you assign a user software license to may access and use the online services and related software (including System Center software) to manage applications and up to 15 MDM devices.
6969
- You can purchase licenses for any devices separately from user licenses. Device licenses do not need to be assigned to the devices. Each device that accesses and uses the online services and related software (including System Center software) must have a device license.
70-
- If a device is used by more than one user, each requires a device software license or all users require a user software license.
70+
- If a device is used by more than one user, each device requires a device based software license or all users require a user software license.
7171
- If you remove a license from a user that has managed devices, it may affect the compliance or management of those devices.
7272

7373
## How to restore users accidentally unlicensed

windows-365/enterprise/create-provisioning-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: ErikjeMS
88
ms.author: erikje
99
manager: dougeby
10-
ms.date: 02/08/2022
10+
ms.date: 08/01/2022
1111
ms.topic: how-to
1212
ms.service: cloudpc
1313
ms.subservice:
@@ -61,7 +61,7 @@ A few things to keep in mind:
6161
- **Windows Autopatch (preview)** is a cloud service that automates updates for Windows, Microsoft 365 Apps for enterprise, Microsoft Edge, and Microsoft Teams on both physical and virtual devices. For more information, see [What is What is Windows Autopatch?](/windows/deployment/windows-autopatch/overview/windows-autopatch-overview) and the [Windows Autopatch FAQ](https://go.microsoft.com/fwlink/?linkid=2200228).
6262
- **Microsoft Managed Desktop** is a cloud service that helps with device deployment, service management and operations, and security. For more information, see [What is Microsoft Managed Desktop?](/managed-desktop/intro/)
6363
9. Select **Next**.
64-
10. On the **Assignments** page, choose **Select groups** > choose the groups you want this policy assigned to > **Select** > **Next**.
64+
10. On the **Assignments** page, choose **Select groups** > choose the groups you want this policy assigned to > **Select** > **Next**. Nested groups aren't currently supported.
6565
11. On the **Review + create** page, select **Create**. If you used Hybrid Azure AD Join as the join type, it can take up to 60 minutes for the policy creation process to complete. The time depends on when the Azure AD connect sync last happened.
6666

6767
<!-- ########################## -->

0 commit comments

Comments
 (0)