Commit 313ab237 authored by Owen Min's avatar Owen Min Committed by Commit Bot

Update CloudPolicyOverridesPlatformPolicy template.

Remove the future flag for the policy.
Update its description for more details.

Bug: 749530
Change-Id: I8a99841f7f199c2d4107b7e9bfd044b0da508a8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1572582Reviewed-by: default avatarJulian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652151}
parent d73d5d33
...@@ -12488,12 +12488,11 @@ ...@@ -12488,12 +12488,11 @@
'id': 381, 'id': 381,
'caption': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cloud policy overrides Platform policy.''', 'caption': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> cloud policy overrides Platform policy.''',
'tags': [], 'tags': [],
'future': True,
'desc': ''' 'desc': '''
If the policy is set to true, cloud policy takes precedence if it conflicts with platform policy. If the policy is set to true, cloud policy takes precedence if it conflicts with platform policy.
If the policy is set to false or not configured, platform policy takes precedence if it conflicts with cloud policy. If the policy is set to false or not configured, platform policy takes precedence if it conflicts with cloud policy.
This policy is only available as a platform. This policy is only available as a mandatory machine platform policy and it only affects machine scope cloud policies.
''', ''',
}, },
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment