Index: chrome/app/policy/policy_templates.json |
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json |
index ab0f65936d8f06f93d3d8d77fbd821ac41603f5d..7205842888af75c6c52d98792b17cf781aafe191 100644 |
--- a/chrome/app/policy/policy_templates.json |
+++ b/chrome/app/policy/policy_templates.json |
@@ -5162,11 +5162,11 @@ |
<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, but their Windows registry locations differ. |
+ The list of supported policies is the same for Chromium and Google Chrome. |
- It starts with <ph name="CHROMIUM_KEY">Software\Policies\Chromium</ph> for Chromium policies and with <ph name="GOOGLE_CHROME_KEY">Software\Policies\Google\Chrome</ph> for Google Chrome policies. |
+ 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. |
- 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.''' |
}, |
'doc_back_to_top': { |
'desc': '''Text of a link in the generated policy documentation, that takes the user to the top of the page''', |