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

Merge branch 'main' into vinaypamnani-msft-patch-6

Browse Source
This commit is contained in:
Jeff Borsecnik 2022-11-29 14:54:14 -08:00 committed by GitHub
commit 0919150d88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,25 +20,16 @@ manager: aaroncz
<!--Policies-->
## ControlPolicyConflict policies
<dl>
<dd>
<a href="#controlpolicyconflict-mdmwinsovergp">ControlPolicyConflict/MDMWinsOverGP</a>
</dd>
</dl>
<hr/>
<!--Policy-->
<a href="" id="controlpolicyconflict-mdmwinsovergp"></a>**ControlPolicyConflict/MDMWinsOverGP**
> [!NOTE]
> This setting doesn't apply to the following types of group policies:
>
> - 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.
> - If they don't map to an MDM policy. For example, Windows Settings > Security Settings > Public Key Policies.
> - If they are group policies that aren't defined by an ADMX template. For example, Windows Settings > Scripts.
> - If they have list entries. For example, Administrative Templates > Windows Components > ActiveX Installer Service > Approved Installation Sites for ActiveX Controls.
> - If they are in the Windows Update category.
<!--SupportedSKUs-->