Merge conflicts

Author: Brenduns

memdocs/autopilot/add-devices.md

@@ -1,18 +1,13 @@
 ---
 title: Manually register devices with Windows Autopilot
 description: Learn how to manually add devices to Windows Autopilot.
-keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune
 ms.prod: w10
-ms.mktglfcycl: deploy
 ms.localizationpriority: medium
-ms.sitesec: library
-ms.pagetype: deploy
-audience: itpro
 author: aczechowski
 ms.author: aaroncz
 ms.reviewer: jubaptis
 manager: dougeby
-ms.date: 08/05/2021
+ms.date: 06/03/2022
 ms.topic: how-to
 ms.collection: 
 - M365-modern-desktop
@@ -166,7 +161,8 @@ Keep these other requirements for the CSV file in mind:
 - You can use only ANSI-format text files (not Unicode). 
 - Headers are case-sensitive. 
 
-Because of these requirements, editing an Excel file and saving it as .csv will not generate a usable file for importing into the Intune portal.
+> [!IMPORTANT]
+> Use a plain-text editor with this CSV file, like Notepad. Don't use Microsoft Excel. Because of the requirements, editing an Excel file and saving it as `.csv` won't generate a usable file for importing to Intune.
    
 When you upload a CSV file to assign a user, make sure that you assign valid User Principal Names (UPNs). If you assign an invalid UPN (that is, an incorrect username), your device might be inaccessible until you remove the invalid assignment. 
 

memdocs/intune/configuration/settings-catalog-printer-provisioning.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 05/23/2022
+ms.date: 06/06/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -30,7 +30,7 @@ ms.collection: M365-identity-device-management
 # Create a Universal Print policy in Microsoft Intune
 
 > [!NOTE]
-> This feature will release over several days and won't be available to all customers immediately.
+> This feature will release over several days and won't be available to all tenants immediately.
 
 Many organizations are moving their printer infrastructure to the cloud. [Universal Print](/universal-print/fundamentals/universal-print-whatis) is a cloud-based printing solution in Microsoft 365. It uses built-in cloud printers, built-in legacy printers, and runs entirely in Microsoft Azure.
 
@@ -60,9 +60,11 @@ This article shows you how to create a Universal Print policy in Microsoft Intun
   - **Printer Administrator** or **Global Administrator** roles: Needed to add printers.
 
     For more information on these roles, go to [Azure AD built-in roles](/azure/active-directory/roles/permissions-reference).
+
   - **Intune Administrator** or **Global Administrator** roles: Needed to create and assign Intune policies.
 
     For more information on these roles, go to [Role-based access control (RBAC) with Microsoft Intune](../fundamentals/role-based-access-control.md)
+
   - An assigned Universal Print license.
 
 - End user accounts need the following permissions/licenses:
@@ -72,6 +74,8 @@ This article shows you how to create a Universal Print policy in Microsoft Intun
 
   If the profile is assigned to an Azure AD user/user group that can't access the printers because of permissions, then Intune grants the assigned user/user group the permissions.
 
+- These settings use the [UniversalPrint CSP](/windows/client-management/mdm/universalprint-csp).
+
 ## Create the policy
 
 This policy includes your printer information. When you assign the policy, the printers are automatically installed. Then, on their devices, users select a printer that you added.

memdocs/intune/enrollment/apple-school-manager-set-up-ios.md

@@ -117,7 +117,7 @@ Now that you've installed your token, you can create an enrollment profile for A
    - The **Settings** > **General** > **About** screen says: "This iPhone is supervised. Contoso can monitor your Internet traffic and locate this device."
 
      > [!NOTE]
-     > A device enrolled without supervision can only be reset to supervised by using the Apple Configurator. Resetting the device in this manner requires connecting an iOS/iPadOS device to a Mac with a USB cable. Learn more about this on [Apple Configurator docs](http://help.apple.com/configurator/mac/2.3).
+     > A device enrolled without supervision can only be reset to supervised by using the Apple Configurator. Resetting the device in this manner requires connecting an iOS/iPadOS device to a Mac with a USB cable. Learn more about this on [Apple Configurator docs](https://support.apple.com/guide/apple-configurator-mac).
 
 7. Choose if you want locked enrollment for devices using this profile. **Locked enrollment** disables iOS/iPadOS settings that allow the management profile to be removed from the **Settings** menu. After device enrollment, you can't change this setting without wiping the device. Such devices must have the **Supervised** Management Mode set to *Yes*. 
 

memdocs/intune/enrollment/device-enrollment-program-enroll-ios.md

@@ -253,7 +253,7 @@ Now that you've installed your token, you can create an enrollment profile for A
     - The **Settings** > **General** > **About** screen says: **This iPhone is supervised. *Company name* can monitor your Internet traffic and locate this device.**
 
      > [!NOTE]
-     > If a device is enrolled without supervision, you need to use Apple Configurator if you want to set it to supervised. To reset the device in this way, you need to connect it to a Mac with a USB cable. For more information, see [Apple Configurator Help](http://help.apple.com/configurator/mac/2.3).
+     > If a device is enrolled without supervision, you need to use Apple Configurator if you want to set it to supervised. To reset the device in this way, you need to connect it to a Mac with a USB cable. For more information, see [Apple Configurator Help](https://support.apple.com/guide/apple-configurator-mac).
 
 11. In the **Locked enrollment** list, select **Yes** or **No**. Locked enrollment disables iOS/iPadOS settings that allow the management profile to be removed from the **Settings** menu. After device enrollment, you can't change this setting without wiping the device. To use this option, the device must have the **Supervised** management option set to **Yes**.
 

memdocs/intune/enrollment/macos-enroll.md

@@ -69,7 +69,7 @@ Intune supports the following enrollment methods for company-owned macOS devices
 ## Bootstrap tokens (preview)    
 
 > [!IMPORTANT]
-> This feature is in [public preview](../fundamentals/public-preview.md). It is not available in GCC High and government cloud tenants.  
+> This feature is in [public preview](../fundamentals/public-preview.md).   
 
 Intune supports the use of bootstrap tokens on enrolled Macs running macOS 10.15 or later. Bootstrap tokens grant volume ownership status to local user and guest accounts, so that non-admin users can approve important operations that an admin would otherwise need to do.  Operations such as: 
 

memdocs/intune/enrollment/windows-bulk-enroll.md

@@ -70,6 +70,9 @@ Azure AD users are standard users on these devices and receive assigned Intune p
 6. Select **Enroll in Azure AD**, enter a **Bulk Token Expiry** date, and then select **Get Bulk Token**. The token validity period is 180 days.
    ![Screenshot of account management in the Windows Configuration Designer app](./media/windows-bulk-enroll/bulk-enroll-account.png)
 
+> [!NOTE]
+> Once a provisioning package is created, it can be revoked before its expiration by removing the associated package_{GUID} user account from Azure AD.
+
 7. Provide your Azure AD credentials to get a bulk token.
    ![Screenshot of signing in to the Windows Configuration Designer app](./media/windows-bulk-enroll/bulk-enroll-cred.png)