Merge pull request #8194 from MicrosoftDocs/main

Publish main to live on 8/4 @ 10:30 am

Author: v-stsavell

memdocs/autopilot/known-issues.md

@@ -80,7 +80,7 @@ When ESP fails during the pre-provisioning flow and the user selects the reset b
 
 ### TPM attestation failure on Windows 11 error code 0x81039023
 
-Some devices may fail TPM attestation on Windows 11 during the pre-provisioning technician flow or self-deployment mode with the error code 0x81039023. This issue is resolved with the [April Windows cumulative update for Windows 10 and 11](https://answers.microsoft.com/en-us/windows/forum/all/cumulative-updates-for-windows-10-and-windows-11/c2b48afa-7541-460f-adf7-ddd180fe0517). 
+Some devices may fail TPM attestation on Windows 11 during the pre-provisioning technician flow or self-deployment mode with the error code 0x81039023. This issue is resolved with the [May Windows cumulative update for Windows 10 and 11](https://answers.microsoft.com/en-us/windows/forum/all/cumulative-updates-for-windows-10-and-windows-11/6d7fccc6-e125-4ae4-9fbb-db7077065c31). 
 
 ### Duplicate device objects with hybrid Azure AD deployments
 

memdocs/intune/fundamentals/deployment-guide-platform-macos.md

@@ -123,7 +123,7 @@ As you set up apps and app policies, think about your organization's requirement
 | Task | Detail | 
 | ---- | ------ | 
 |[Add Intune Company Portal app ](../apps/apps-company-portal-macos.md)|Learn how to get Company Portal on devices or instruct users how to do it on their own. | 
-|[Add Microsoft Edge](../apps/manage-microsoft-edge.md) | Add and assign Microsoft Edge in Intune. | 
+|[Add Microsoft Edge](../apps/apps-edge-macos.md) | Add and assign Microsoft Edge in Intune. | 
 |[Add Microsoft 365 ](../apps/apps-add-office365-macos.md)| Add and assign Microsoft 365 apps in Intune. | 
 |[Add line-of-business apps ](../apps/lob-apps-macos.md)| Add and assign macOS line-of-business (LOB) apps in Intune.| 
 |[Assign apps to groups ](../apps/apps-deploy.md)|After you add apps to Intune, assign them to users and devices.|

memdocs/intune/remote-actions/custom-notifications.md

@@ -80,7 +80,7 @@ If you have the Company Portal app open on an Android device, the notification r
 
 - Intune sends messages to the users' Company Portal app or the Microsoft Intune app, which then creates the push notification. Users don't need to be signed into the app for the notification to be pushed on the device, but the device must have been enrolled by the targeted user.
 - Intune, the Company Portal app, and the Microsoft Intune app, can't guarantee delivery of a custom notification. Custom notifications might show up after several hours of delay, if at all, so they shouldn't be used for urgent messages.
-- Custom notification messages from Intune appear on devices as standard push notifications. If the Company Portal app is open on an iOS/iPadOS device when it receives the notification, the notification displays in the app instead of as a system push notification.  
+- Custom notification messages from Intune appear on devices as standard push notifications. If the Company Portal app is open on an iOS/iPadOS device when it receives the notification, the notification displays in the app instead of as a system push notification. The user will need to go to the Notifications tab and pull-to-refresh to see the notification.  
 - Custom notifications can be visible on lock screens on both iOS/iPadOS and Android devices depending on device settings.  
 - On Android devices, other apps might have access to the data in your custom notifications. Don't use them for sensitive communications.  
 - Users of a device that was recently unenrolled, or users that were removed from a group, might still receive a custom notification that is later sent to that group.  Likewise, if you add a user to a group after a custom notification was sent to the group, it's possible for the newly added use to receive that previously sent notification message.  
@@ -127,7 +127,7 @@ Intune processes the message immediately. The only confirmation that the message
 
 On a device, users see custom notification messages that are sent by Intune as a standard push notification from the Company Portal app or the Microsoft Intune app. These notifications are similar to the push notifications users receive from other apps on the device.  
 
-On iOS/iPadOS devices, if the Company Portal app is open when the notification is received, the notification displays in the app instead of being a push notification.  
+On iOS/iPadOS devices, if the Company Portal app is open when the notification is received, the notification displays in the app instead of being a push notification. The user will need to go to the Notifications tab and pull-to-refresh to see the notification.  
 
 The notification remains until the user dismisses it.  
 

memdocs/intune/user-help/unenroll-your-device-from-intune-windows.md

@@ -76,33 +76,7 @@ After you unenroll a device running Windows 8.1 RT:
 
 
 ## Remove Windows 10/11 devices  
-This section describes how to remove a Windows 10/11 device from Intune. If one set of instructions doesn't work for you, try the next set.    
-
-### Remove in Company Portal, homepage    
-
-1. Open the Company Portal app.  
-2. On the **Home** page, scroll down to **My Devices**.  
-3. Select the device you want to remove.  
-3. In the top, right-corner of the app, select the **See more** icon.  
-4. Select **Remove**.  
-5. To confirm device removal, select **Remove**.  
-
-### Remove in Company Portal, device context menu  
-
-1. Open the Company Portal app and go to **My Devices**.  
-
-    ![Example screenshot of the Company Portal app for Windows, Home page, highlighting the My Devices section.](./media/1809_CheckAccess_Context_Select_Device.png)
-
-2. Right-click or press and hold a device to open its [context menu](/windows/uwp/design/controls-and-patterns/menus).  
-
-3. Select **Remove**.  
-
-    ![Example screenshot of the Company Portal app for Windows, Home page. Device context menu is visible in the **My Devices** section of the page and shows "Rename", "Remove", and "Check access" actions.](./media/1809_DeviceContextMenu_Windows_CP.png)  
-
-5. In the confirmation, click **Learn More** to read how your access to work and school resources might change. To confirm device removal, select **Remove**.   
-
-     ![Example screenshot of the Company Portal app for Windows, Home page. Rename field appears over device where user can type in new name and click Rename or Cancel.](./media/1808_RemoveDevice_Popup.png)  
-
+This section describes how to remove a Windows 10/11 device from Intune.   
 
 ### Remove in device Settings app
 1. Open the Settings app.