| Index: components/policy/resources/policy_templates.json
|
| diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
|
| index 452bfb58f9eb6280dda31525f8f371b97e1d8cc8..c7a9f5b0b24057d5eb8e6327d6ef468d5899bdbb 100644
|
| --- a/components/policy/resources/policy_templates.json
|
| +++ b/components/policy/resources/policy_templates.json
|
| @@ -1536,7 +1536,9 @@
|
|
|
| If this policy is left not set Google Sync will be available for the user to choose whether to use it or not.
|
|
|
| - To fully disable Google Sync, it is recommended that you disable the Google Sync service in the Google Admin console.''',
|
| + To fully disable Google Sync, it is recommended that you disable the Google Sync service in the Google Admin console.
|
| +
|
| + This policy should not be enabled when <ph name="ROAMING_PROFILE_SUPPORT_ENABLED_POLICY_NAME">RoamingProfileSupportEnabled</ph> policy is set to enabled as that feature shares the same client side functionality. The Google-hosted synchronization is disabled in this case completely.''',
|
| 'arc_support': 'Disabling Google Sync will cause Android Backup and Restore to not function properly.',
|
| },
|
| {
|
| @@ -1552,13 +1554,11 @@
|
| 'id': 358,
|
| 'caption': '''Enable the creation of roaming copies for <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profile data''',
|
| 'tags': ['local-data-access'],
|
| - 'desc': '''If you enable this setting, the settings stored in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profiles like bookmarks, autofill data, passwords, etc. will also be written to a file stored in the Roaming user profile folder or a location specified by the Administrator through the <ph name="ROAMING_PROFILE_LOCATION_POLICY_NAME">$1<ex>RoamingProfileLocation</ex></ph> policy.
|
| -
|
| - Google Sync is automatically disabled when this policy is enabled.
|
| + 'desc': '''If you enable this setting, the settings stored in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profiles like bookmarks, autofill data, passwords, etc. will also be written to a file stored in the Roaming user profile folder or a location specified by the Administrator through the <ph name="ROAMING_PROFILE_LOCATION_POLICY_NAME">$1<ex>RoamingProfileLocation</ex></ph> policy. Enabling this policy disables cloud sync.
|
|
|
| - To prevent accidental data leaks it is advisable to also set the <ph name="SIGNIN_ALLOWED_POLICY_NAME">$1<ex>SigninAllowed</ex></ph> policy to False.
|
| + If this policy is disabled or left not set only the regular local profiles will be used.
|
|
|
| - If this policy is disabled or left not set only the regular local profiles will be used.''',
|
| + The <ph name="SYNC_DISABLED_POLICY_NAME">SyncDisabled</ph> policy disables all data synchronization, overriding RoamingProfileSupportEnabled.''',
|
| 'label': '''Enable the creation of roaming copies for <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profile data.''',
|
| },
|
| {
|
|
|