Merge pull request #7831 from MicrosoftDocs/main

Publish 06/15/2022 3:30 PM PT

Author: Angela Fleischmann

memdocs/intune/configuration/device-profile-troubleshoot.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 03/07/2022
+ms.date: 06/15/2022
 ms.topic: troubleshooting
 ms.service: microsoft-intune
 ms.subservice: configuration
@@ -58,7 +58,7 @@ If devices recently enroll, then the compliance, non-compliance, and configurati
 | Windows 10/11 PCs enrolled as devices | Every 3 minutes for 15 minutes, then every 15 minutes for 2 hours, and then around every 8 hours | 
 | Windows 8.1 | Every 5 minutes for 15 minutes, then every 15 minutes for 2 hours, and then around every 8 hours | 
 
-At any time, users can open the Company Portal app, **Settings** > **Sync** to immediately check for policy or profile updates. For related information about the Intune Management Extention agent or Win32 apps, see [Win32 app management in Microsoft Intune](../apps/apps-win32-app-management.md).
+At any time, users can open the Company Portal app, **Settings** > **Sync** to immediately check for policy or profile updates. For related information about the Intune Management Extension agent or Win32 apps, see [Win32 app management in Microsoft Intune](../apps/apps-win32-app-management.md).
 
 ## What actions cause Intune to immediately send a notification to a device?
 
@@ -80,6 +80,8 @@ When two or more policies are assigned to the same user or device, then the sett
 
 - If a configuration policy setting conflicts with a setting in another configuration policy, this conflict is shown in Intune. Manually resolve these conflicts.
 
+In the Endpoint Manager admin center, there are few places you can create configuration policies, including Group Policy analytics, Endpoint Security, Security Baselines, and more. If there's a conflict and you have multiple policies, then check all the places you've configured policies. Also, the built-in reporting features can help with conflicts. For more information on the available reports, go to [Intune reports](../fundamentals/reports.md).
+
 ## What happens when app protection policies conflict with each other? Which one is applied to the app?
 
 Conflict values are the most restrictive settings available in an app protection policy. The exception is numeric entry fields, such as PIN attempts before reset. Numeric entry fields are set the same as the values, as if you created a MAM policy using the recommended settings option.
@@ -94,6 +96,8 @@ Intune doesn't evaluate the payload of Apple Configuration files or a custom Ope
 
 When you assign a custom policy, confirm that the configured settings don't conflict with compliance, configuration, or other custom policies. If a custom policy and its settings conflict, then the settings are applied randomly.
 
+The built-in reporting features can help with conflicts. For more information on the available reports, go to [Intune reports](../fundamentals/reports.md).
+
 ## What happens when a profile is deleted or no longer applicable?
 
 When you delete a profile, or remove a device from a group that's assigned the profile, then the profile and settings are removed from the device. Specifically, they're removed as described in the following list:

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

@@ -110,6 +110,10 @@ Provisioning is intended to be used on new Windows devices. Provisioning failure
 
 You can check for success/failure of the settings in your package in the **Provisioning-Diagnostics-Provider** Admin log in Event Viewer.
 
+> [!NOTE]
+> Bulk enrollment is considered a userless enrollment method, and because of it, only the "Default" enrollment restriction in Intune would apply during enrollment. Make sure Windows platform is allowed in the default restriction, otherwise, the enrollment will fail.
+> To check the capabilities alongside other Windows enrollment methods, see [Intune enrollment method capabilities for Windows devices](enrollment-method-capab.md).  
+
 ### Bulk enrollment with Wi-Fi 
 
 When not using an open network, you must use [device-level certificates](../protect/certificates-configure.md) to initiate connections. Bulk enrolled devices are unable to use to user-targeted certificates for network access. 

memdocs/intune/fundamentals/deployment-guide-enrollment-mamwe.md

@@ -7,7 +7,7 @@ keywords:
 author: MandiOhlinger
 ms.author: mandia
 manager: dougeby
-ms.date: 04/04/2022
+ms.date: 06/15/2022
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: enrollment
@@ -30,7 +30,7 @@ ms.collection:
 
 # Deployment guide: Mobile Application Management (MAM) for unenrolled devices in Microsoft Intune
 
-MAM for unenrolled devices uses app configuration profile to deploy or configure apps on devices without enrolling the device. When combined with app protection policies, you can protect data within an app.
+MAM for unenrolled devices uses app configuration profiles to deploy or configure apps on devices without enrolling the device. When combined with app protection policies, you can protect data within an app.
 
 MAM for unenrolled devices is commonly used for personal or bring your own devices (BYOD). Or, used for enrolled devices that need extra security. MAM is an option for users who don't enroll their personal devices, but still need access to organization email, Teams meetings, and more.
 
@@ -70,10 +70,11 @@ Use for personal or bring your own devices (BYOD). Or, use on organization-owned
 This task list provides an overview. For more specific information, see [Microsoft Intune app management](../apps/app-management.md).
 
 - Be sure your devices are [supported](supported-devices-browsers.md).
+- To deploy or assign apps to Windows devices, the Windows devices must be enrolled in Microsoft Intune. For any additional requirements, including supported app types, go to [Windows 10/11 app deployment using Microsoft Intune](../apps/apps-windows-10-app-deploy.md).
 - In the [Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431), [add your apps](../apps/apps-supported-intune-apps.md) or [configure your apps](../apps/app-configuration-policies-overview.md). When the apps are on the device, the apps are considered "managed" by Intune. After you add or configure the app, create an [app protection policy](../apps/app-protection-policy-settings-ios.md). For example, create a policy that allows or blocks features within the app, such as copy and paste.
-- Tell users how to get the app. For example, you can:
+- Tell users how to get different apps. For example, you can:
 
-  - Direct users to the Company Portal web site at `portal.manage.microsoft.com`. When they sign in with their organization credentials, they see a list of apps, including required apps. They can get the apps from this site.
+  - Direct users to the Company Portal web site at `portal.manage.microsoft.com`. When they sign in with their organization credentials, they see a list of apps, including required apps. They can get apps from this site.
   - Have users download and install the Company Portal app from the app store. Once authenticated, users can install apps, including required apps.
 
 ### MAM end user tasks