Integrate user strings into the JSON policy template file

chrome/app/policy/policy_templates.json

Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 39684a52ab44d9e8ad7bc43d4a3e00e3ca727a8a..84cac8f28b80bb43c2180e524320b57f7237b7fa 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -89,15 +89,28 @@
     {
       'name': 'Homepage',
       'type': 'group',
+      'caption': '''Home page''',
+      'desc': '''Configure the default home page in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing it.
+
+      The user's home page settings are only completely locked down, if you either select the home page to be the new tab page, or set it to be a URL and specify a home page URL. If you don't specify the home page URL, then the user is still able to set the home page to the new tab page by specifying 'chrome://newtab'.''',
       'policies': [
         {
-          'name':  'HomepageLocation',
+          'name': 'HomepageLocation',
           'type': 'string',
           'supported_on': ['chrome.*:8-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'http://chromium.org',
-          }
+          },
+          'caption': '''Configure the home page URL''',
+          'desc': '''Configures the default home page URL in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing it.
+
+      The home page type can either be set to a URL you specify here or set to the New Tab Page.
+
+      If you select the New Tab Page, then this policy is ignored.
+
+      If you enable this setting, users cannot change their home page URL in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>, but they can still can choose the New Tab Page as their home page.''',
+          'label': '''Home page URL''',
         },
         {
           'name': 'HomepageIsNewTabPage',
@@ -106,9 +119,17 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': True,
-          }
-        }
-      ]
+          },
+          'caption': '''Use New Tab Page as homepage''',
+          'desc': '''Configures the type of the default home page in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing home page preferences. The home page can either be set to a URL you specify or set to the New Tab Page.
+
+      If you enable this setting, always the New Tab Page is used for the home page, and the home page URL location is ignored.
+
+      If you disable this setting, the user's homepage will never be the New Tab Page, unless its URL is set to 'chrome://newtab'.
+
+      If you enable or disable this setting, users cannot change their homepage type in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
+        },
+      ],
     },
     {
       'name': 'ApplicationLocaleValue',
@@ -118,6 +139,13 @@
         'features': {'dynamic_refresh': 0},
         'example_value': 'en',
       },
+      'caption': '''Application locale''',
+      'desc': '''Configures the application locale in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing the locale.
+
+      If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> uses the specified locale. If the configured locale is not supported, 'en-US' is used instead.
+
+      If this setting is disabled or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> uses either the user-specified preferred locale (if configured), the system locale or the fallback locale 'en-US'.''',
+      'label': '''Application locale''',
     },
     {
       'name': 'AlternateErrorPagesEnabled',
@@ -127,6 +155,14 @@
         'features': {'dynamic_refresh': 1},
         'example_value': True,
       },
+      'caption': '''Enable alternate error pages''',
+      'desc': '''Enables the use of alternate error pages that are built into <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> (such as 'page not found') and prevents users from changing this setting.
+
+      If you enable this setting, alternate error pages are used.
+
+      If you disable this setting, alternate error pages are never used.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'SearchSuggestEnabled',
@@ -135,7 +171,15 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable search suggestions''',
+      'desc': '''Enables search suggestions in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s Omnibox and prevents users from changing this setting.
+
+      If you enable this setting, search suggestions are used.
+
+      If you disable this setting, search suggestions are never used.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'DnsPrefetchingEnabled',
@@ -144,7 +188,11 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable DNS prefetching''',
+      'desc': '''Enables DNS prefetching in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'DisableSpdy',
@@ -153,7 +201,9 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Disable SPDY protocol''',
+      'desc': '''Disables use of the SPDY protocol in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'JavascriptEnabled',
@@ -162,7 +212,13 @@
       'annotations': {
         'features': {'dynamic_refresh': 0},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable JavaScript''',
+      'desc': '''Enables JavaScript in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+
+      If this setting is enabled or not configured, web pages can use JavaScript.
+
+      If this setting is disabled, web pages cannot use JavaScript.''',
     },
     {
       'name': 'SavingBrowserHistoryDisabled',
@@ -171,7 +227,13 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Disable saving browser history''',
+      'desc': '''Disables saving browser history in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+
+      If this setting is enabled, browsing history is not saved.
+
+      If this setting is disabled or not configured, browsing history is saved.''',
     },
     {
       'name': 'PrintingEnabled',
@@ -180,7 +242,13 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable printing''',
+      'desc': '''Enables printing in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+
+      If this setting is enabled or not configured, users can print.
+
+      If this setting is disabled, users cannot print from <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. Printing is disabled in the wrench menu, extensions, JavaScript applications, etc. It is still possible to print from plugins that bypass <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> while printing. For example certain Flash applications has the print option in their context menu, and that will not be disabled.''',
     },
     {
       'name': 'SafeBrowsingEnabled',
@@ -189,7 +257,15 @@
       'annotations': {
         'features': {'dynamic_refresh': 0},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable Safe Browsing''',
+      'desc': '''Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s Safe Browsing feature and prevents users from changing this setting.
+
+      If you enable this setting, Safe Browsing is always active.
+
+      If you disable this setting, Safe Browsing is never active.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'MetricsReportingEnabled',
@@ -198,29 +274,55 @@
       'annotations': {
         'features': {'dynamic_refresh': 0},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable reporting of usage and crash-related data''',
+      'desc': '''Enables anonymous reporting of usage and crash-related data about <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to Google and prevents users from changing this setting.
+
+      If you enable this setting, anonymous reporting of usage and crash-related data is sent to Google.
+
+      If you disable this setting, anonymous reporting of usage and crash-related data is never sent to Google.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'PasswordManager',
       'type': 'group',
-      'policies': [{
-        'name': 'PasswordManagerEnabled',
-        'type': 'main',
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': True,
-        }
-      },
-      {
-        'name': 'PasswordManagerAllowShowPasswords',
-        'type': 'main',
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': False,
-        }
-      }]
+      'caption': '''Password manager''',
+      'desc': '''Configures the password manager. If the password manager is enabled, then you can choose to enable or disable whether the user may show stored passwords in clear text.''',
+      'policies': [
+        {
+          'name': 'PasswordManagerEnabled',
+          'type': 'main',
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': True,
+          },
+          'caption': '''Enable the password manager''',
+          'desc': '''Enables saving passwords and using saved passwords in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+
+      If you enable this setting, users can have <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> memorize passwords and provide them automatically the next time they log in to a site.
+
+      If you disable this setting, users are not able to save passwords or use already saved passwords.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
+        },
+        {
+          'name': 'PasswordManagerAllowShowPasswords',
+          'type': 'main',
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': False,
+          },
+          'caption': '''Allow users to show passwords in Password Manager''',
+          'desc': '''Controls whether the user may show passwords in clear text in the password manager.
+
+      If you disable this setting, the password manager does not allow showing stored passwords in clear text in the password manager window.
+
+      If you enable or do not configure this setting, users can view their passwords in clear text in the password manager.''',
+        },
+      ],
     },
     {
       'name': 'AutoFillEnabled',
@@ -229,7 +331,13 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': False,
-      }
+      },
+      'caption': '''Enable AutoFill''',
+      'desc': '''Enables <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>'s AutoFill feature and allows users to auto complete web forms using previously stored information such as address or credit card information.
+
+    If you disable this setting, AutoFill will be inaccessible to users.
+
+    If you enable this setting or do not configure a value, AutoFill will remain under the control of the user. This will allow them to configure AutoFill profiles and to switch AutoFill on or off at their own discretion.''',
     },
     {
       'name': 'DisabledPlugins',
@@ -238,7 +346,14 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': ['Java', 'Shockwave Flash', 'Chrome PDF Viewer'],
-      }
+      },
+      'caption': '''Specify a list of disabled plugins''',
+      'desc': '''Specifies a list of plugins that are disabled in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
+
+      The wildcard characters '*' and '?' can be used to match sequences of arbitrary characters. '*' matches an arbitrary number of characters while '?' specifies an optional single character, i.e. matches zero or one characters. The escape character is '\\', so to match actual '*', '?', or '\\' characters, you can put a '\\' in front of them.
+
+      If you enable this setting, the specified list of plugins is never used in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. The plugins are marked as disabled in 'about:plugins' and users cannot enable them.''',
+      'label': '''List of disabled plugins''',
     },
     {
       'name': 'SyncDisabled',
@@ -247,21 +362,71 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Disable synchronization of data with Google''',
+      'desc': '''Disables data synchronization in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> using Google-hosted synchronization services and prevents users from changing this setting.
+
+      If you enable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'Proxy',
       'type': 'group',
+      'caption': '''Proxy server''',
+      'desc': '''Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
+
+      If you choose to never use a proxy server and always connect directly, all other options are ignored.
+
+      If you choose to auto detect the proxy server, all other options are ignored.
+
+      For detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
+
+      If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.''',
       'policies': [
         {
           'name': 'ProxyMode',
           'type': 'string-enum',
+          'caption': '''Choose how to specify proxy server settings''',
+          'desc': '''Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
+
+      If you choose to never use a proxy server and always connect directly, all other options are ignored.
+
+      If you choose to use system proxy settings or auto detect the proxy server, all other options are ignored.
+
+      If you choose fixed server proxy mode, you can specify further options in 'Address or URL of proxy server' and 'Comma-separated list of proxy bypass rules'.
+
+      If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'.
+
+      For detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>   
+
+      If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.''',
           'items': [
-            {'name': 'ProxyDisabled', 'value': 'direct'},
-            {'name': 'ProxyAutoDetect', 'value': 'auto_detect'},
-            {'name': 'ProxyPacScript', 'value': 'pac_script'},
-            {'name': 'ProxyFixedServers', 'value': 'fixed_servers'},
-            {'name': 'ProxyUseSystem', 'value': 'system'},
+            {
+              'name': 'ProxyDisabled',
+              'value': 'direct',
+              'caption': '''Never use a proxy''',
+            },
+            {
+              'name': 'ProxyAutoDetect',
+              'value': 'auto_detect',
+              'caption': '''Auto detect proxy settings''',
+            },
+            {
+              'name': 'ProxyPacScript',
+              'value': 'pac_script',
+              'caption': '''Use a .pac proxy script''',
+            },
+            {
+              'name': 'ProxyFixedServers',
+              'value': 'fixed_servers',
+              'caption': '''Use fixed proxy servers''',
+            },
+            {
+              'name': 'ProxyUseSystem',
+              'value': 'system',
+              'caption': '''Use system proxy settings''',
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
@@ -273,17 +438,48 @@
           'name': 'ProxyServerMode',
           'type': 'int-enum',
           'items': [
-            {'name': 'ProxyServerDisabled', 'value': 0},
-            {'name': 'ProxyServerAutoDetect', 'value': 1},
-            {'name': 'ProxyServerManual', 'value': 2},
-            {'name': 'ProxyServerUseSystem', 'value': 3},
+            {
+              'name': 'ProxyServerDisabled',
+              'value': 0,
+              'caption': '''Never use a proxy'''
+            },
+            {
+              'name': 'ProxyServerAutoDetect',
+              'value': 1,
+              'caption': '''Auto detect proxy settings'''
+            },
+            {
+              'name': 'ProxyServerManual',
+              'value': 2,
+              'caption': '''Manually specify proxy settings'''
+            },
+            {
+              'name': 'ProxyServerUseSystem',
+              'value': 3,
+              'caption': '''Use system proxy settings'''
+            },
           ],
           'supported_on': ['chrome.*:8-'],
           'deprecated' : True,
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 2,
-          }
+          },
+          'caption': '''Choose how to specify proxy server settings''',
+          'desc': '''This policy is deprecated, use ProxyMode instead.      
+
+      Allows you to specify the proxy server used by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy settings.
+
+      If you choose to never use a proxy server and always connect directly, all other options are ignored.
+
+      If you choose to use system proxy settings or auto detect the proxy server, all other options are ignored.
+
+      If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'.
+
+      For detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>
+
+      If you enable this setting, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> ignores all proxy-related options specified from the command line.''',
         },
         {
           'name': 'ProxyServer',
@@ -292,7 +488,14 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': '123.123.123.123:8080',
-          }
+          },
+          'caption': '''Address or URL of proxy server''',
+          'desc': '''You can specify the URL of the proxy server here.
+
+      This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
+
+      For more options and detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>''',
         },
         {
           'name': 'ProxyPacUrl',
@@ -300,8 +503,15 @@
           'supported_on': ['chrome.*:8-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
-            'example_value': 'http://internal.site/example.pac'
-          }
+            'example_value': 'http://internal.site/example.pac',
+          },
+          'caption': '''URL to a proxy .pac file''',
+          'desc': '''You can specify a URL to a proxy .pac file here.
+
+      This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
+
+      For detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>''',
         },
         {
           'name': 'ProxyBypassList',
@@ -309,16 +519,24 @@
           'supported_on': ['chrome.*:8-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
-            'example_value':
-              'http://www.example1.com,'
-              'http://www.example2.com,http://internalsite/',
-          }
+            'example_value': 'http://www.example1.com,http://www.example2.com,http://internalsite/',
+          },
+          'caption': '''Proxy bypass rules''',
+          'desc': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will bypass any proxy for the list of hosts given here.
+
+      This policy only takes effect if you have selected manual proxy settings at 'Choose how to specify proxy server settings'.
+
+      For more detailed examples, visit:
+      <ph name="PROXY_HELP_URL">$2<ex>http://www.chromium.org/developers/design-documents/network-settings#TOC-Command-line-options-for-proxy-sett</ex></ph>''',
+          'label': '''Comma-separated list of proxy bypass rules''',
         },
-      ]
+      ],
     },
     {
       'name': 'HTTPAuthentication',
       'type': 'group',
+      'caption': '''Policies for HTTP Authentication''',
+      'desc': '''Policies related to integrated HTTP authentication.''',
       'policies': [
         {
           'name': 'AuthSchemes',
@@ -327,7 +545,11 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': 'basic,digest,ntlm,negotiate',
-          }
+          },
+          'caption': '''Supported authentication schemes''',
+          'desc': '''Specifies which HTTP Authentication schemes are supported by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+
+      Possible values are 'basic', 'digest', 'ntlm' and 'negotiate'. Separate multiple values with commas.''',
         },
         {
           'name': 'DisableAuthNegotiateCnameLookup',
@@ -336,7 +558,13 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': False,
-          }
+          },
+          'caption': '''Disable CNAME lookup when negotiating Kerberos authentication''',
+          'desc': '''Specifies whether the generated Kerberos SPN is based on the canonical DNS name or the original name entered.
+
+      If you enable this setting, CNAME lookup will be skipped and the server name will be used as entered.
+
+      If you enable this setting, the canonical name of the server will be determined via CNAME lookup.''',
         },
         {
           'name': 'EnableAuthNegotiatePort',
@@ -345,7 +573,13 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': False,
-          }
+          },
+          'caption': '''Include non-standard port in Kerberos SPN''',
+          'desc': '''Specifies whether the generated Kerberos SPN should include a non-standard port.
+
+      If you enable this setting, and a non-standard port (i.e., a port other than 80 or 443) is entered, it will be included in the generated Kerberos SPN.
+
+      If you disable this setting, the generated Kerberos SPN will not include a port in any case.''',
         },
         {
           'name': 'AuthServerWhitelist',
@@ -354,7 +588,11 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': '*example.com,foobar.com,*baz',
-          }
+          },
+          'caption': '''Authentication server whitelist''',
+          'desc': '''Specifies which servers should be whitelisted for integrated authentication. Integrated authentication is only enabled when <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> receives an authentication challenge from a proxy or from a server which is in this permitted list.
+
+      Separate multiple server names with commas. Wildcards (*) are allowed.''',
         },
         {
           'name': 'AuthNegotiateDelegateWhitelist',
@@ -363,7 +601,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': 'foobar.example.com',
-          }
+          },
+          'caption': '''Kerberos delegation server whitelist''',
+          'desc': '''Servers that <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> may delegate to.''',
         },
         {
           'name': 'GSSAPILibraryName',
@@ -372,43 +612,65 @@
           'annotations': {
             'features': {'dynamic_refresh': 0},
             'example_value': 'libgssapi_krb5.so.2',
-          }
+          },
+          'caption': '''GSSAPI library name''',
+          'desc': '''Specifies which GSSAPI library to use for HTTP Authentication. You can set either just a library name, or a full path. If no setting is provided, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will fall back to using a default library name.''',
         },
-      ]
+      ],
     },
     {
       'name': 'Extensions',
       'type': 'group',
-      'policies': [{
-        'name': 'ExtensionInstallBlacklist',
-        'type': 'list',
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': ['extension_id1', 'extension_id2']
-        }
-      },
-      {
-        'name': 'ExtensionInstallWhitelist',
-        'type': 'list',
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': ['extension_id1', 'extension_id2']
-        }
-      },
-      {
-        'name': 'ExtensionInstallForcelist',
-        'type': 'list',
-        'supported_on': ['chrome.*:9-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 0},
-          'example_value': [
-            'lcncmkcnkcdbbanbjakcencbaoegdjlp;'
-            'https://clients2.google.com/service/update2/crx'
-          ]
-        }
-      }]
+      'caption': '''Extensions''',
+      'desc': '''Configures extension-related policies. The user is not allowed to install blacklisted extensions unless they are whitelisted. You can also force <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> to automatically install extensions by specifying them in <ph name="EXTENSIONINSTALLFORCELIST_POLICY_NAME">ExtensionInstallForcelist</ph>. The blacklist takes precedence over the list of forced extensions.''',
+      'policies': [
+        {
+          'name': 'ExtensionInstallBlacklist',
+          'type': 'list',
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': ['extension_id1', 'extension_id2'],
+          },
+          'caption': '''Configure extension installation blacklist''',
+          'desc': '''Allows you to specify which extensions the users can NOT install.
+
+      A blacklist value of * means all extensions are blacklisted unless they are explicitly listed in the whitelist.''',
+          'label': '''Extension IDs the user should be prevented from installing (or * for all)''',
+        },
+        {
+          'name': 'ExtensionInstallWhitelist',
+          'type': 'list',
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': ['extension_id1', 'extension_id2'],
+          },
+          'caption': '''Configure extension installation whitelist''',
+          'desc': '''Allows you to specify which extensions are not subject to the blacklist.
+
+      A blacklist value of * means all extensions are blacklisted and users can only install extensions listed in the whitelist.
+
+      By default, all extensions are whitelisted, but if all extensions have been blacklisted by policy, the whitelist can be used to override that policy.''',
+          'label': '''Extension IDs to exempt from the blacklist''',
+        },
+        {
+          'name': 'ExtensionInstallForcelist',
+          'type': 'list',
+          'supported_on': ['chrome.*:9-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 0},
+            'example_value': ['lcncmkcnkcdbbanbjakcencbaoegdjlp;https://clients2.google.com/service/update2/crx'],
+          },
+          'caption': '''Configure the list of force-installed extensions''',
+          'desc': '''Allows you to specify a list of extensions that will be installed silently, without user interaction.
+
+      Each item of the list is a string, that contains an extension ID and an update URL delimited by a semicolon (<ph name="SEMICOLON">;</ph>). For example: <ph name="EXTENSION_POLICY_EXAMPLE">lcncmkcnkcdbbanbjakcencbaoegdjlp;https://clients2.google.com/service/update2/crx</ph>. For each item, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will retrieve the extension specified by the ID from the specified URL and silently install it. The following pages explain how you can host extensions on your own server. About update URLs: <ph name="LINK_TO_EXTENSION_DOC1">http://code.google.com/chrome/extensions/autoupdate.html</ph> , about hosting extensions in general: <ph name="LINK_TO_EXTENSION_DOC2">http://code.google.com/chrome/extensions/hosting.html</ph>.
+
+      Users will be unable to uninstall extensions that are specified by this policy. If you remove an extension from this list, then it will be automatically uninstalled by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>. Extensions that are blacklisted in 'ExtensionInstallBlacklist' and not whitelisted, cannot be force-installed by this policy.''',
+          'label': '''Extension IDs and update URLs to be silently installed''',
+        },
+      ],
     },
     {
       'name': 'ShowHomeButton',
@@ -416,8 +678,17 @@
       'supported_on': ['chrome.*:8-'],
       'annotations': {
         'features': {'dynamic_refresh': 1},
-        'example_value': True
-      }
+        'example_value': True,
+      },
+      'caption': '''Show Home button on toolbar''',
+      'desc': '''Shows the Home button on <ph name="PRODUCT_NAME">$1<ex>Google
+        Chrome</ex></ph>'s toolbar.
+
+    If you enable this setting, the Home button is always shown.
+
+    If you disable this setting, the Home button is never shown.
+
+    If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
     },
     {
       'name': 'DeveloperToolsDisabled',
@@ -426,37 +697,74 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': False,
-      }
+      },
+      'caption': '''Disable Developer Tools''',
+      'desc': '''Disables the Developer Tools and the JavaScript console.
+
+      If you enable this setting, the Developer Tools can not be accessed and web-site elements can not be inspected anymore. Any keyboard shortcuts and any menu or context menu entries to open the Developer Tools or the JavaScript Console will be disabled.''',
     },
     {
       'name': 'RestoreOnStartupGroup',
       'type': 'group',
-      'policies': [{
-        'name': 'RestoreOnStartup',
-        'type': 'int-enum',
-        'items': [
-          {'name': 'RestoreOnStartupIsNone', 'value': 0},
-          {'name': 'RestoreOnStartupIsLastSession', 'value': 1},
-          {'name': 'RestoreOnStartupIsURLs', 'value': 4},
-        ],
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': 4,
-        }
-      },{
-        'name': 'RestoreOnStartupURLs',
-        'type': 'list',
-        'supported_on': ['chrome.*:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 1},
-          'example_value': ['http://example.com', 'http://chromium.org'],
-        }
-      }]
+      'caption': '''Startup pages''',
+      'desc': '''Allows you to configure the pages that are loaded on startup.
+
+      The contents of the list 'URLs to open at startup' are ignored unless you select 'Open a list of URLs' in 'Action on startup'.''',
+      'policies': [
+        {
+          'name': 'RestoreOnStartup',
+          'type': 'int-enum',
+          'items': [
+            {
+              'name': 'RestoreOnStartupIsNone',
+              'value': 0,
+              'caption': '''Open home page'''
+            },
+            {
+              'name': 'RestoreOnStartupIsLastSession',
+              'value': 1,
+              'caption': '''Reopen the URLs that were open last'''
+            },
+            {
+              'name': 'RestoreOnStartupIsURLs',
+              'value': 4,
+              'caption': '''Open a list of URLs'''
+            },
+          ],
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': 4,
+          },
+          'caption': '''Action on startup''',
+          'desc': '''Allows you to specify the behavior on startup.
+
+      If you choose 'Open home page' the home page will always be opened when you start <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+
+      If you choose 'Reopen the URLs that were open last', the URLs that were open last time <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> was closed will be reopened.
+
+      If you choose 'Open a list of URLs', the list of 'URLs to open on startup' will be opened when a user starts <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>.''',
+        },
+        {
+          'name': 'RestoreOnStartupURLs',
+          'type': 'list',
+          'supported_on': ['chrome.*:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 1},
+            'example_value': ['http://example.com', 'http://chromium.org'],
+          },
+          'caption': '''URLs to open on startup''',
+          'desc': '''If 'Open a list of URLs' is selected as the startup action, this allows you to specify the list of URLs that are opened.''',
+        },
+      ],
     },
     {
       'name': 'DefaultSearchProvider',
       'type': 'group',
+      'caption': '''Default search provider''',
+      'desc': '''Configures the default search provider. You can specify the default search provider that the user will use or choose to disable default search.''',
       'policies': [
         {
           'name': 'DefaultSearchProviderEnabled',
@@ -465,7 +773,19 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': True,
-          }
+          },
+          'caption': '''Enable the default search provider''',
+          'desc': '''Enables the use of a default search provider.
+
+      If you enable this setting, a default search is performed when the user types text in the omnibox that is not a URL.
+
+      You can specify the default search provider to be used by setting the rest of the default search policies. If these are left empty, the user can choose the default provider.
+
+      If you diable this setting, no search is performed when the user enters non-URL text in the omnibox.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">
+        $1<ex>Google Chrome</ex>
+      </ph>.''',
         },
         {
           'name': 'DefaultSearchProviderName',
@@ -474,7 +794,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'My Intranet Search',
-          }
+          },
+          'caption': '''Default search provider name''',
+          'desc': '''Specifies the name of the default search provider. If left empty, the host name specified by the search URL will be used.''',
         },
         {
           'name': 'DefaultSearchProviderKeyword',
@@ -483,7 +805,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'mis',
-          }
+          },
+          'caption': '''Default search provider keyword''',
+          'desc': '''Specifies the keyword, which is the shortcut used in the omnibox to trigger the search for this provider. Optional.''',
         },
         {
           'name': 'DefaultSearchProviderSearchURL',
@@ -492,7 +816,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'http://search.my.company/search?q={searchTerms}',
-          }
+          },
+          'caption': '''Default search provider search URL''',
+          'desc': '''Specifies the URL of the search engine used when doing a default search. The URL should contain the string '<ph name="SEARCH_TERM_MARKER">{searchTerms}</ph>', which will be replaced at query time by the terms the user is searching for.''',
         },
         {
           'name': 'DefaultSearchProviderSuggestURL',
@@ -501,7 +827,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'http://search.my.company/suggest?q={searchTerms}',
-          }
+          },
+          'caption': '''Default search provider suggest URL''',
+          'desc': '''Specifies the URL of the search engine used to provide search suggestions. The URL should contain the string '<ph name="SEARCH_TERM_MARKER">{searchTerms}</ph>', which will be replaced at query time by the text the user has entered so far. Optional.''',
         },
         {
           'name': 'DefaultSearchProviderInstantURL',
@@ -510,7 +838,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'http://search.my.company/suggest?q={searchTerms}',
-          }
+          },
+          'caption': '''Default search provider instant URL''',
+          'desc': '''Specifies the URL of the search engine used to provide instant results. The URL should contain the string <ph name="SEARCH_TERM_MARKER">'{searchTerms}'</ph>, which will be replaced at query time by the text the user has entered so far. Optional.''',
         },
         {
           'name': 'DefaultSearchProviderIconURL',
@@ -519,7 +849,9 @@
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 'http://search.my.company/favicon.ico',
-          }
+          },
+          'caption': '''Default search provider icon''',
+          'desc': '''Specifies the favorite icon URL of the default search provider. Optional.''',
         },
         {
           'name': 'DefaultSearchProviderEncodings',
@@ -527,165 +859,289 @@
           'supported_on': ['chrome.*:8-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
-            'example_value': ['UTF-8', 'UTF-16', 'GB2312', 'ISO-8859-1']
-          }
+            'example_value': ['UTF-8', 'UTF-16', 'GB2312', 'ISO-8859-1'],
+          },
+          'caption': '''Default search provider encodings''',
+          'desc': '''Specifies the character encodings supported by the search provider. Encodings are code page names like UTF-8, GB2312, and ISO-8859-1. They are tried in the order provided. The default is UTF-8.''',
         },
-      ]
+      ],
     },
     {
       'name': 'ContentSettings',
       'type': 'group',
+      'caption': '''Content Settings''',
+      'desc': '''Content Settings allow you to specify how contents of a specific type (for example Cookies, Images or JavaScript) is handled.''',
       'policies': [
         {
           'name': 'DefaultCookiesSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowCookies', 'value': 0},
-            {'name': 'BlockCookies', 'value': 1},
+            {
+              'name': 'AllowCookies',
+              'value': 0,
+              'caption': '''Allow all sites to set local data.'''
+            },
+            {
+              'name': 'BlockCookies',
+              'value': 1,
+              'caption': '''Do not allow any site to set local data'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
-          }
+          },
+          'caption': '''Default cookies setting''',
+          'desc': '''Allows you to set whether websites are allowed to set local data. Setting local data can be either allowed for all websites or denied for all websites.''',
         },
         {
           'name': 'DefaultImagesSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowImages', 'value': 0},
-            {'name': 'BlockImages', 'value': 1},
+            {
+              'name': 'AllowImages',
+              'value': 0,
+              'caption': '''Allow all sites to show all images'''
+            },
+            {
+              'name': 'BlockImages',
+              'value': 1,
+              'caption': '''Do not allow any site to show images'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
-          }
+          },
+          'caption': '''Default images setting''',
+          'desc': '''Allows you to set whether websites are allowed to display images. Displaying images can be either allowed for all websites or denied for all websites.''',
         },
-	{
+        {
           'name': 'DefaultJavaScriptSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowJavaScript', 'value': 0},
-            {'name': 'BlockJavaScript', 'value': 1},
+            {
+              'name': 'AllowJavaScript',
+              'value': 0,
+              'caption': '''Allow all sites to run JavaScript'''
+            },
+            {
+              'name': 'BlockJavaScript',
+              'value': 1,
+              'caption': '''Do not allow any site to run JavaScript'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
-          }
+          },
+          'caption': '''Default JavaScript setting''',
+          'desc': '''Allows you to set whether websites are allowed to run JavaScript. Running JavaScript can be either allowed for all websites or denied for all websites.''',
         },
-	{
+        {
           'name': 'DefaultPluginsSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowPlugins', 'value': 0},
-            {'name': 'BlockPlugins', 'value': 1},
+            {
+              'name': 'AllowPlugins',
+              'value': 0,
+              'caption': '''Allow all sites to automatically run plugins'''
+            },
+            {
+              'name': 'BlockPlugins',
+              'value': 1,
+              'caption': '''Block all plugins'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
-          }
+          },
+          'caption': '''Default plugins setting''',
+          'desc': '''Allows you to set whether websites are allowed to automatically run plugins. Automatically running plugins can be either allowed for all websites or denied for all websites.''',
         },
-	{
+        {
           'name': 'DefaultPopupsSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowPopups', 'value': 0},
-            {'name': 'BlockPopups', 'value': 1},
+            {
+              'name': 'AllowPopups',
+              'value': 0,
+              'caption': '''Allow all sites to show pop-ups'''
+            },
+            {
+              'name': 'BlockPopups',
+              'value': 1,
+              'caption': '''Do not allow any site to show popups'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 1,
-          }
+          },
+          'caption': '''Default popups setting''',
+          'desc': '''Allows you to set whether websites are allowed to show pop-ups. Showing popups can be either allowed for all websites or denied for all websites.''',
         },
         {
           'name': 'DefaultNotificationSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowNotifications', 'value': 0},
-            {'name': 'BlockNotifications', 'value': 1},
-            {'name': 'AskNotifications', 'value': 2},
+            {
+              'name': 'AllowNotifications',
+              'value': 0,
+              'caption': '''Allow sites to show desktop notifications'''
+            },
+            {
+              'name': 'BlockNotifications',
+              'value': 1,
+              'caption': '''Do not allow any site to show desktop notifications'''
+            },
+            {
+              'name': 'AskNotifications',
+              'value': 2,
+              'caption': '''Ask every time a site wants to show desktop notifications'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 2,
-          }
+          },
+          'caption': '''Default notification setting''',
+          'desc': '''Allows you to set whether websites are allowed to display desktop notifications. Displaying desktop notifications can be allowed by default, denied by default or the user can be asked everytime a website wants to show desktop notifications.''',
         },
         {
           'name': 'DefaultGeolocationSetting',
           'type': 'int-enum',
           'items': [
-            {'name': 'AllowGeolocation', 'value': 0},
-            {'name': 'BlockGeolocation', 'value': 1},
-            {'name': 'AskGeolocation', 'value': 2},
+            {
+              'name': 'AllowGeolocation',
+              'value': 0,
+              'caption': '''Allow sites to track the users' physical location'''
+            },
+            {
+              'name': 'BlockGeolocation',
+              'value': 1,
+              'caption': '''Do not allow any site to track the users' physical location'''
+            },
+            {
+              'name': 'AskGeolocation',
+              'value': 2,
+              'caption': '''Ask whenever a site wants to track the users' physical location'''
+            },
           ],
           'supported_on': ['chrome.*:10-'],
           'annotations': {
             'features': {'dynamic_refresh': 1},
             'example_value': 0,
-          }
+          },
+          'caption': '''Default geolocation setting''',
+          'desc': '''Allows you to set whether websites are allowed to track the users' physical location. Tracking the users' physical location can be allowed by default, denied by default or the user can be asked everytime a website requests the pysical location.''',
         },
-      ]
+      ],
     },
     {
       'name': 'Disable3DAPIs',
       'type': 'main',
       'supported_on': ['chrome.*:9-'],
       'annotations': {
-        # It'll be difficult to support dynamically disabling access to these APIs.
         'features': {'dynamic_refresh': 0},
         'example_value': False,
-      }
+      },
+      'caption': '''Disable support for 3D graphics APIs''',
+      'desc': '''Disable support for 3D graphics APIs.
+
+      Enabling this setting prevents web pages from accessing the graphics processing unit (GPU). Specifically, web pages can not access the WebGL API and plugins can not use the Pepper 3D API.
+
+      Disabling this setting potentially allows web pages to use the WebGL API and plugins to use the Pepper 3D API. The default settings of the browser may still require command line arguments to be passed in order to use these APIs.''',
     },
     {
       'name': 'ChromeFrameRendererSettings',
       'type': 'group',
-      'policies': [{
-        'name': 'ChromeFrameRendererSettings',
-        'type': 'int-enum',
-        'items': [
-            {'name': 'RenderInHost', 'value': 0},
-            {'name': 'RenderInChromeFrame', 'value': 1},
-        ],
-        'supported_on': ['chrome_frame:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 0},
-          'example_value': 1,
-        }
-      }, {
-        'name': 'RenderInChromeFrameList',
-        'type': 'list',
-        'supported_on': ['chrome_frame:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 0},
-          'example_value': ['http://www.example.com', 'http://www.example.edu'],
-        }
-      }, {
-        'name': 'RenderInHostList',
-        'type': 'list',
-        'supported_on': ['chrome_frame:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 0},
-          'example_value': ['http://www.example.com', 'http://www.example.edu'],
-        }
-      }],
+      'caption': '''Default HTML renderer for <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>''',
+      'desc': '''Allows you to configure the default HTML renderer when <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex>
+      </ph> is installed.
+      The default setting is to allow the host browser do the rendering, but you
+      can optionally override this and have <ph name="PRODUCT_FRAME_NAME">$3<ex>
+        Google Chrome Frame</ex></ph> render HTML pages by default.''',
+      'policies': [
+        {
+          'name': 'ChromeFrameRendererSettings',
+          'type': 'int-enum',
+          'items': [
+            {
+              'name': 'RenderInHost',
+              'value': 0,
+              'caption': '''Use the host browser by default'''
+            },
+            {
+              'name': 'RenderInChromeFrame',
+              'value': 1,
+              'caption': '''Use <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> by default'''
+            },
+          ],
+          'supported_on': ['chrome_frame:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 0},
+            'example_value': 1,
+          },
+          'caption': '''Default HTML renderer for <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>''',
+          'desc': '''Allows you to configure the default HTML renderer when <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex>
+      </ph> is installed.
+      The default setting is to allow the host browser do the rendering, but you
+      can optionally override this and have <ph name="PRODUCT_FRAME_NAME">$3<ex>
+        Google Chrome Frame</ex></ph> render HTML pages by default.''',
+        },
+        {
+          'name': 'RenderInChromeFrameList',
+          'type': 'list',
+          'supported_on': ['chrome_frame:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 0},
+            'example_value': ['http://www.example.com', 'http://www.example.edu'],
+          },
+          'caption': '''Always render the following URL patterns in <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>''',
+          'desc': '''Customize the list of URL patterns that should always be rendered by <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph>.
+
+      For example patterns see http://www.chromium.org/developers/how-tos/chrome-frame-getting-started.''',
+        },
+        {
+          'name': 'RenderInHostList',
+          'type': 'list',
+          'supported_on': ['chrome_frame:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 0},
+            'example_value': ['http://www.example.com', 'http://www.example.edu'],
+          },
+          'caption': '''Always render the following URL patterns in the host browser''',
+          'desc': '''Customize the list of URL patterns that should always be rendered by the host browser.
+      For example patterns see http://www.chromium.org/developers/how-tos/chrome-frame-getting-started.''',
+        },
+      ],
     },
     {
       'name': 'ChromeFrameContentTypes',
       'type': 'group',
-      'policies': [{
-        'name': 'ChromeFrameContentTypes',
-        'type': 'list',
-        'supported_on': ['chrome_frame:8-'],
-        'annotations': {
-          'features': {'dynamic_refresh': 0},
-          'example_value': ['text/xml', 'application/xml'],
-        }
-      }],
+      'caption': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types.''',
+      'desc': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types.''',
+      'policies': [
+        {
+          'name': 'ChromeFrameContentTypes',
+          'type': 'list',
+          'supported_on': ['chrome_frame:8-'],
+          'annotations': {
+            'features': {'dynamic_refresh': 0},
+            'example_value': ['text/xml', 'application/xml'],
+          },
+          'caption': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types.''',
+          'desc': '''Allow <ph name="PRODUCT_FRAME_NAME">$3<ex>Google Chrome Frame</ex></ph> to handle the following content types.''',
+        },
+      ],
     },
     {
       'name': 'ChromeOsLockOnIdleSuspend',
@@ -694,9 +1150,104 @@
       'annotations': {
         'features': {'dynamic_refresh': 1},
         'example_value': True,
-      }
+      },
+      'caption': '''Enable lock when ChromeOS devices become idle or suspended.''',
+      'desc': '''Enable lock when ChromeOS devices become idle or suspended.
+
+      If you enable this setting, users will be asked for a password to unlock ChromeOS devices from sleep.
+
+      If you disable this setting, users will not be asked for a password to wake ChromeOS devices from sleep.
+
+      If you enable or disable this setting, users cannot change or override this setting in <ph name="PRODUCT_NAME">$1<ex>Google Chrome OS</ex></ph>.''',
     },
   ],
+  'messages': {
+    # Messages that are not associated to any policies.
+    'win_supported_winxpsp2': {
+      'desc': '''A label specifying the oldest possible compatible version of Windows. This text will appear right next to a label containing the text 'Supported on:'.''',
+      'text': '''Microsoft Windows XP SP2 or later'''
+    },
+    'mac_chrome_preferences': {
+      'desc': '''A text indicating in Mac OS X Workgroup Manager, that currently the preferences of Chrome are being edited''',
+      'text': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> preferences'''
+    },
+    'doc_data_type': {
+      'desc': '''Caption text of the field 'data type' in the summary chart of a policy in the generated documentation''',
+      'text': '''Data type:'''
+    },
+    'doc_win_reg_loc': {
+      'desc': '''Caption text of the field 'windows registry location' in the summary chart of a policy in the generated documentation''',
+      'text': '''Windows registry location:'''
+    },
+    'doc_mac_linux_pref_name': {
+      'desc': '''Caption text of the field 'mac/linux preference name' in the summary chart of a policy in the generated documentation''',
+      'text': '''Mac/Linux preference name:'''
+    },
+    'doc_supported_on': {
+      'desc': '''Caption text of the list of 'products, platforms and versions where this policy is supported' in the summary chart of a policy in the generated documentation''',
+      'text': '''Supported on:'''
+    },
+    'doc_since_version': {
+      'desc': '''Text in the summary chart of a policy that specifies the version number in which the policy was introduced.''',
+      'text': '''since version <ph name="SINCE_VERSION">$6<ex>8</ex></ph>'''
+    },
+    'doc_until_version': {
+      'desc': '''Text in the summary chart of a policy that specifies the version number after which the policy was dropped.''',
+      'text': '''until version <ph name="UNTIL_VERSION">$6<ex>10</ex></ph>'''
+    },
+    'doc_supported_features': {
+      'desc': '''Caption text of the list of 'policy features that this policy supports' in the summary chart of a policy in the generated documentation''',
+      'text': '''Supported features:'''
+    },
+    'doc_description': {
+      'desc': '''Caption text of the 'description text' in the summary chart of a policy in the generated documentation''',
+      'text': '''Description:'''
+    },
+    'doc_example_value': {
+      'desc': '''Caption text of the field 'example value' in the summary chart of a policy in the generated documentation''',
+      'text': '''Example value:'''
+    },
+    '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.
+
+      You don't need to change these settings by hand!  You can download easy-to-use templates from
+      <ph name="POLICY_TEMPLATE_DOWNLOAD_URL">$5<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.
+
+      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.'''
+    },
+    'doc_back_to_top': {
+      'desc': '''Text of a link in the generated policy documentation, that takes the user to the top of the page''',
+      'text': '''Back to top'''
+    },
+    'doc_supported': {
+      'desc': '''Appears next to the name of each supported feature in the 'list of supported policy features' in the generated policy documentation''',
+      'text': '''Yes'''
+    },
+    'doc_not_supported': {
+      'desc': '''Appears next to the name of each unsupported feature in the 'list of supported policy features' in the generated policy documentation''',
+      'text': '''No'''
+    },
+    'doc_name_column_title': {
+      'desc': '''Appears at the top of the policy summary table, over the column of policy names, in the generated policy documentation''',
+      'text': '''Policy Name'''
+    },
+    'doc_description_column_title': {
+      'desc': '''Appears at the top of the policy summary table, over the column of short policy descriptions, in the generated policy documentation''',
+      'text': '''Description'''
+    },
+    'doc_feature_dynamic_refresh': {
+      'desc': '''The name of the feature that indicates for a given policy that changes to it are respected by Chrome without a browser restart''',
+      'text': '''Dynamic Policy Refresh'''
+    },
+    'doc_deprecated': {
+      'desc': '''Text appended in parentheses to the policy name to indicate t hat it has been deprecated''',
+      'text': 'deprecated',
+    }
+  },
   'placeholders': [
     # Note: keys $1 and $3 are reserved for Chromium and Chromium Frame.
     # Key $6 is reserved for doc_writer.