deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-12 13:27:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

revise from email discussion

Browse Source
This commit is contained in:
Aaron Czechowski 2022-05-24 18:12:00 -07:00 committed by GitHub
parent 6c547dc349
commit c483e4abad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windows/client-management/mdm/policy-csp-controlpolicyconflict.md
View File

@ -33,12 +33,12 @@ manager: dansimp
<a href="" id="controlpolicyconflict-mdmwinsovergp"></a>**ControlPolicyConflict/MDMWinsOverGP**
> [!NOTE]
> This setting is applicable to a limited set of group policies. It doesn't apply to the following group policy settings:
> This setting doesn't apply to the following types of group policies:
>
> - Group policies that don't have a mapping with an MDM policy that's controlled through the policy CSP.
> - Group policies that aren't defined by an administrative template (ADMX). For example: Password policy - minimum password age.
> - Group policies under the Windows Update category.
> - If they don't map to an MDM policy. For example, firewall policies and account lockout policies
> - If they aren't defined by an ADMX. For example, Password policy - minimum password age.
> - If they're in the Windows Update category.
> - If they have list entries. For example, the Microsoft Edge CookiesAllowedForUrls policy.
<!--SupportedSKUs-->