| Index: chrome/app/policy/policy_templates.json
|
| diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
|
| index f08b1c98b44ddd7264d0b2e5e2a90689d2790ea9..0f5a07726dd78c30b1e183b751dcf9c15a76f36f 100644
|
| --- a/chrome/app/policy/policy_templates.json
|
| +++ b/chrome/app/policy/policy_templates.json
|
| @@ -263,14 +263,19 @@
|
| 'type': 'main',
|
| 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
|
| 'features': {'dynamic_refresh': 0},
|
| + 'deprecated': True,
|
| 'example_value': True,
|
| 'id': 9,
|
| 'caption': '''Enable JavaScript''',
|
| - 'desc': '''Enables JavaScript in <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing this setting.
|
| + 'desc': '''This policy is deprecated, please use DefaultJavaScriptSetting instead.
|
| +
|
| + 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.''',
|
| + If this setting is disabled, web pages cannot use JavaScript.
|
| +
|
| + The DefaultJavaScriptSetting policy will override this policy when both are set.''',
|
| },
|
| {
|
| 'name': 'IncognitoEnabled',
|
|
|