Update policy-csp-controlpolicyconflict.md

Change description field for RS5. In RS5, delete command and set the value to 0 after setting it to be 1 will be supported. Please review the text with Peter Kaufman.
This commit is contained in:
Yuhang Zhu
2018-07-10 15:41:42 -07:00
committed by GitHub
parent fb3afb6be6
commit 52e27832d2

View File

@ -67,7 +67,8 @@ Added in Windows 10, version 1803. This policy allows the IT admin to control wh
> [!Note] > [!Note]
> MDMWinsOverGP only applies to policies in Policy CSP. It does not apply to other MDM settings with equivalent GP settings that are defined on other configuration service providers. > MDMWinsOverGP only applies to policies in Policy CSP. It does not apply to other MDM settings with equivalent GP settings that are defined on other configuration service providers.
This policy is used to ensure that MDM policy wins over GP when same setting is set by both GP and MDM channel. This policy doesnt support Delete command. This policy doesnt support setting the value to be 0 again after it was previously set 1. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1. This policy is used to ensure that MDM policy wins over GP when same setting is set by both GP and MDM channel. The default value is 0. The MDM policies in Policy CSP will behave as described if this policy value is set 1.
Note: This policy doesnt support Delete command. This policy doesnt support setting the value to be 0 again after it was previously set 1. In Windows 10, version 1809, Delete command and setting the value to be 0 again if it was previously set to 1 will be supported.
The following list shows the supported values: The following list shows the supported values: