Merge branch 'main' into patch-6

memdocs/intune/developer/app-sdk-ios-phase6.md

@@ -7,7 +7,7 @@ keywords:
 author: Erikre
 ms.author: erikre
 manager: dougeby
-ms.date: 11/18/2024
+ms.date: 11/19/2024
 ms.topic: reference
 ms.service: microsoft-intune
 ms.subservice: developer
@@ -55,6 +55,10 @@ In addition to the Intune SDK, you need these two components to enable App Prote
 
 :::image type="content" alt-text="Diagram of MAM-CA remediation flow." source="./media/app-sdk-ios/app-ca-flow.png" lightbox="./media/app-sdk-ios/app-ca-flow.png":::
 
+### MAM compliance process flow
+
+:::image type="content" alt-text="Diagram of MAM compliance process flow." source="./media/app-sdk-ios/mam-compliance-flow.png" lightbox="./media/app-sdk-ios/mam-compliance-flow.png":::
+
 ### New APIs
 Most of the new APIs can be found in the IntuneMAMComplianceManager.h. The app needs to be aware of three differences in behavior explained below.
 
@@ -157,6 +161,7 @@ guard let authorityURL = URL(string: kAuthority) else {
         self.applicationContext = try MSALPublicClientApplication(configuration: msalConfiguration)
 
 ```
+
 To fetch the Microsoft Entra object ID for the accountId parameter of the MAM SDK compliance remediation APIs, you need to do the following steps:
 - First get the homeAccountId from userInfo[MSALHomeAccountIdKey] within MSALError object sent back by MSAL when it reports ERROR_SERVER_PROTECTION_POLICY_REQUIRED to the app.
 - This homeAccountId is in the format ObjectId.TenantId. Extract the ObjectId value by splitting the string on the '.' and then use that value for the accountId parameter in remediation API remediateComplianceForAccountId.
@@ -182,11 +187,11 @@ Test Case	| How to test	|	Expected Outcome	|
 --	| --	| --	|
 MAM-CA always applied		| Ensure the user is targeted for both App Protection CA and MAM policy before enrolling in your app.|  Verify that your app handles the remediation cases described above and the app can get an access token.	|
 MAM-CA applied after user enrolled	| The user should be logged into the app already, but not targeted for App Protection CA.	| Target the user for App Protection CA in the console and verify that you correctly handle MAM remediation	|
-MAM-CA noncompliance	| Set up an App Protection CA policy, but don't assign a MAM policy.	| The user shouldn't be able to acquire an access token. This is useful for testing how your app handles IntuneMAMComplianceStatus error cases.	|
+MAM-CA noncompliance	| Setup an App Protection CA policy, but don't assign a MAM policy.	| The user shouldn't be able to acquire an access token. This is useful for testing how your app handles IntuneMAMComplianceStatus error cases.	|
 
 ## Next Steps
 
-After you've completed all the [Exit Criteria] above, your app is now successfully integrated with App Protection CA support. The subsequent section, [Stage 7: Web-view features], may or may not be required, depending on your app's desired app protection policy support.
+After you've completed all the [Exit Criteria] above, your app is now successfully integrated with App Protection CA support. The subsequent section, [Stage 7: Web-view features] may or may not be required, depending on your app's desired app protection policy support.
 
 <!-- Stage 6 links -->
 [Exit Criteria]:#exit-criteria

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

@@ -218,8 +218,7 @@ At the end of this procedure, you can assign this profile to Microsoft Entra dev
 The following table describes the Setup Assistant screens shown during automated device enrollment for Macs. You can show or hide these screens on supported devices during enrollment. For more information about how each Setup Assistant screen affects the user experience, see these Apple resources: 
 
 - [Apple Platform Deployment guide: Manage Setup Assistant for Apple devices](https://support.apple.com/en-mide/guide/deployment/depdeff4a547/web) 
-- [Apple Developer documentation: ShipKeys](https://developer.apple.com/documentation/devicemanagement/skipkeys)  
--   
+- [Apple Developer documentation: ShipKeys](https://developer.apple.com/documentation/devicemanagement/skipkeys)   
 
 | Setup Assistant screen | What happens when visible  |
 |------------------------------------------|------------------------------------------|

windows-365/enterprise/report-cloud-pc-connection-quality.md

@@ -51,6 +51,7 @@ The device list shows the individual Cloud PCs with the following columns:
 - **Client IP address**
 - **Protocol for most recent (or current) connection**
 - **UDP Utilization average over date range**
+- **Device type**: The type of Cloud PC based on the offering (Enterprise, Frontline dedicated, Frontline shared).
 
 Each row in the report gives links to the specific Cloud PC where you can find greater detail regarding the devices connection history and related performance.
 

windows-365/enterprise/report-cloud-pc-utilization.md

@@ -55,11 +55,12 @@ The report shows the following tenant data aggregated for the last four weeks:
   - **No active time connected**: Zero hours.
 - List of individual Cloud PCs with the following columns:
   - **Device name**
-  - **Primary user UPN**: The user's identifier in Active Directory in the form of an email address.
+  - **User UPN**: The user's identifier in Active Directory in the form of an email address.
   - **PC type**
   - **Time connected**: The total hours that the user has been connected to the Cloud PC over the last four weeks.
   - **Date last connected**: The date when the user most recently connected to their Cloud PC (within the last 60 days). If the user isn't currently connected to the Cloud PC, this date is the sign out time. If the user is connected to the Cloud PC, this date is the most recent connection time.
   - **Date created**: The date the Cloud PC was created.
+  - **Device type**: The type of Cloud PC based on the offering (Enterprise, Frontline dedicated, Frontline shared).
 
 ### Filters