Merge branch 'main' into release-cm2206-tp

Author: v-alje

memdocs/cloud-native-windows-endpoints.md

@@ -534,11 +534,11 @@ The settings catalog is a single location where all configurable Windows setting
 
 > [!NOTE]
 >
-> - While the settings catalog is in preview, some settings might not be available in the catalog but are available in Templates for Intune device configuration profiles.
+> - Some settings might not be available in the catalog but are available in Templates for Intune device configuration profiles.
 >
 > - Many of the settings you're familiar with from group policy are already available in the settings catalog. For more information, go to [The latest in Group Policy settings parity in Mobile Device Management](https://techcommunity.microsoft.com/t5/intune-customer-success/the-latest-in-group-policy-settings-parity-in-mobile-device/ba-p/2269167).
 >
-> - If you intend to leverage either ADMX templates or settings catalog (recommended), be sure to update your devices with the September 2021 ‘patch Tuesday’ update ([KB5005565](https://support.microsoft.com/topic/september-14-2021-kb5005565-os-builds-19041-1237-19042-1237-and-19043-1237-292cf8ed-f97b-4cd8-9883-32b71e3e6b44)) for Windows 10 versions 2004 and later. This monthly update includes [KB5005101](https://support.microsoft.com/topic/september-1-2021-kb5005101-os-builds-19041-1202-19042-1202-and-19043-1202-preview-82a50f27-a56f-4212-96ce-1554e8058dc1) which which brings [1,400+ group policy settings to MDM](https://blogs.windows.com/windows-insider/2021/08/18/releasing-windows-10-build-19043-1198-21h1-to-release-preview-channel/#:~:text=We%20enabled%20over,new%20MDM%20policies.). Failure to apply this update will result in a 'Not Applicable' message alongside the setting in the MEM portal. These policies only work on Windows Enterprise and Education versions. Windows 11 includes the necessary updates to make these policies work.
+> - If you intend to leverage either ADMX templates or settings catalog (recommended), be sure to update your devices with the September 2021 ‘patch Tuesday’ update ([KB5005565](https://support.microsoft.com/topic/september-14-2021-kb5005565-os-builds-19041-1237-19042-1237-and-19043-1237-292cf8ed-f97b-4cd8-9883-32b71e3e6b44)) for Windows 10 versions 2004 and later. This monthly update includes [KB5005101](https://support.microsoft.com/topic/september-1-2021-kb5005101-os-builds-19041-1202-19042-1202-and-19043-1202-preview-82a50f27-a56f-4212-96ce-1554e8058dc1) which brings [1,400+ group policy settings to MDM](https://blogs.windows.com/windows-insider/2021/08/18/releasing-windows-10-build-19043-1198-21h1-to-release-preview-channel/#:~:text=We%20enabled%20over,new%20MDM%20policies.). Failure to apply this update will result in a 'Not Applicable' message alongside the setting in the MEM portal. While initially only appliable to the Enterprise and Edu versions of Windows, as of May 2022, these additional settings now also work on the Pro versions of Windows 10/11. If using the Pro versions of Windows 10/11, ensure that you install [KB5013942](https://support.microsoft.com/topic/may-10-2022-kb5013942-os-builds-19042-1706-19043-1706-and-19044-1706-60b51119-85be-4a34-9e21-8954f6749504) or later on Windows 10 and [KB5013943](https://support.microsoft.com/topic/may-10-2022-kb5013943-os-build-22000-675-14aa767a-aa87-414e-8491-b6e845541755) or later on Windows 11 as mentioned in [The latest in Group Policy settings parity in Mobile Device Management](https://techcommunity.microsoft.com/t5/intune-customer-success/the-latest-in-group-policy-settings-parity-in-mobile-device/ba-p/2269167).
 
 Following are some settings available in the settings catalog that might be relevant to your organization:
 

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

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 06/06/2022
+ms.date: 06/14/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -29,9 +29,6 @@ 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 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.
 
 When Universal Print is deployed with Universal Print-compatible printers, it doesn't require any on-premises infrastructure. For a guided simulation, go to [Universal Print guided simulation](https://regale.cloud/Microsoft/viewer/1265/index.html#/0/0).

memdocs/intune/remote-actions/device-supervised-mode.md

@@ -38,7 +38,7 @@ Apple iOS/iPadOS supervised mode gives administrators more options when managing
 
 Intune supports supervised mode as part of the Apple [Device Enrollment Program (DEP)](../enrollment/device-enrollment-program-enroll-ios.md).
 
-For a list of Apple controls that require supervision, see Apple's [Payload settings reference](http://help.apple.com/configurator/mac/2.4/#/cad5370d089).
+For a list of Apple controls that require supervision, see Apple's [Payload settings reference](https://support.apple.com/guide/deployment/depcdc2bfa19/web).
 
 ## Turn on supervised mode during enrollment
 

memdocs/intune/user-help/send-errors-macos.md

@@ -1,8 +1,8 @@
 ---
 # required metadata
 
-title: Send errors from your Mac device to your company support | Microsoft Docs
-description: Company Portal provides you with an email template and helps you upload the diagnostic details to give your IT team the context to support you. 
+title: Report Company Portal app problems | Microsoft Docs
+description: Report an enrollment or app problem in Intune Company Portal app.  
 keywords:
 author: lenewsad
 
@@ -32,26 +32,26 @@ ms.collection:
 
 # Report Company Portal app problems  
 
-Get help or report a problem with the Company Portal app. Company Portal provides you with an email template and helps you upload and send diagnostic details.   
+Get help or report a problem with the Company Portal app. Company Portal provides you with an email template and helps you upload and share diagnostic details. You can share diagnostic details with both your support person and Microsoft app developers.   
 
 ## Get help from support  
-
-1. When you receive the error message, select **Report**. 
-2. In the Company Portal app, go to the menu bar and select the **Help** menu > **Save Diagnostic Report**. 
-3. Choose a location to save the file. 
-4. Go to **Help** > **Send Diagnostic Report** > **Email details** to compose a message.
-5. Enter your support person's email address in the **To** line.  
-6. Attach the diagnostics report file if it wasn't automatically done.   
-6. In the body of the email, describe your experience with the app. Include the steps you took right up until the error occurred. 
-7. Send the email, and follow up with your support person if needed.      
+For troubleshooting and support, report the problem to your support person. Reproduce the problem, if you can, and then complete these steps.  
+1. In the Company Portal app, go to the menu bar and select the **Help** menu > **Save Diagnostic Report**. 
+2. Choose a location to save the file. 
+3. Open your email app and attach the diagnostics file to a new email.   
+6. In the body of the email, describe the steps you took right up until the error occurred. 
+7. Send the email to your support person, and follow up with them after the email if needed.      
 
 ## Share diagnostic details 
 
-If Company Portal behaves unexpectedly, you can share the diagnostic details with Microsoft. Microsoft uses the Company Portal-specific logs to learn from and improve upon future products. 
+Microsoft uses the Company Portal-specific diagnostics to learn from and improve upon future products. 
+
+First, try to reproduce the problem so that you receive the error message again. Then select **Report** to immediately upload and share the diagnostic logs. 
+
+If the error message can't be reproduced, you can access the diagnostics options from the Help menu.   
 
-1. Open the Company Portal app.
-2. Go to the menu bar and select the **Help** menu > **Send diagnostic report**.  
-3. After the logs are uploaded, you'll receive an incident ID. Copy and save the ID for your personal record. 
+1. Go to the Company Portal menu bar and select **Help**. 
+2. Select **Send diagnostic report**.  
 
 ## Contact information  
 To find your organization's contact information, sign in to the Company Portal app or [website](https://go.microsoft.com/fwlink/?linkid=2010980) and select **Support**.