X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/9e157aebeecce93ec9f05e0c442e7df9667d1404..57fa7c4c90dc4a6c4108df9069150e2f663ce9c8:/windows/en-US/firefox.adml?ds=sidebyside diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index d608c35..0ef09a9 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1,5 +1,5 @@ - + @@ -545,11 +545,11 @@ If this policy is enabled, any shutdown preferences explicitly set via policy ca If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior). Blocked websites - If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit. + If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. There is a 1000 entry limit. If this policy is disabled or not configured, no websites are blocked. Exceptions to blocked websites - If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit. + If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. There is a 1000 entry limit. If this policy is disabled or not configured, there are no exceptions to the website filter. Bookmark 01 @@ -810,7 +810,9 @@ If this policy is disabled or not configured, Firefox defaults are used. For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. Preferences - If this policy is enabled, you can use JSON to configure preferences. + Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section. + +If this policy is enabled, you can use JSON to configure preferences. If this policy is disabled or not configured, preferences are not modified.