diff options
| author | tnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 23:45:03 +0000 |
|---|---|---|
| committer | tnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-25 23:45:03 +0000 |
| commit | a5859bd7fc3cecaf929a78b118390c7283559155 (patch) | |
| tree | e78071afc1dcaa46617a9178fa8a5a0f8e66fc8e /components/policy | |
| parent | 4ce634b28c5da8beebd0031a657cae063ad1a20e (diff) | |
| download | chromium_src-a5859bd7fc3cecaf929a78b118390c7283559155.zip chromium_src-a5859bd7fc3cecaf929a78b118390c7283559155.tar.gz chromium_src-a5859bd7fc3cecaf929a78b118390c7283559155.tar.bz2 | |
Policy docs: Mention that policies for unreleased versions are subject to change.
BUG=365663
Review URL: https://codereview.chromium.org/254523003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy')
| -rw-r--r-- | components/policy/resources/policy_templates.json | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index b491930..a59a6e7 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json @@ -6375,17 +6375,21 @@ }, 'doc_intro': { 'desc': '''Introduction text for the generated policy documentation''', - 'text': '''This is the list of policies that <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> respects. + 'text': '''(This document may include policies that are targeted for later + <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> versions, those are + subject to change without notice. The list of supported policies is the + same for Chromium and Google Chrome.) You don't need to change these settings by hand! You can download easy-to-use templates from <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">http://www.chromium.org/administrators/policy-templates<ex> http://www.chromium.org/administrators/policy-templates</ex></ph>. - The list of supported policies is the same for Chromium and Google Chrome. - These policies are strictly intended to be used to configure instances of Chrome internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors. - Note: starting with Chrome 28, policies are loaded directly from the Group Policy API on Windows. Policies manually written to the registry will be ignored. See http://crbug.com/259236 for details.''' + Note: Starting with <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> + 28, policies are loaded directly from the Group Policy API on + Windows. Policies manually written to the registry will be ignored. See + http://crbug.com/259236 for details.''' }, 'doc_back_to_top': { 'desc': '''Text of a link in the generated policy documentation, that takes the user to the top of the page''', |