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

Update policy-csp-controlpolicyconflict.md

Browse Source
This commit is contained in:
Vinay Pamnani 2022-11-29 15:46:59 -05:00 committed by GitHub
parent e8eb6bfd69
commit 3538d7b7ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,10 @@ manager: aaroncz
> [!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-->