X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/2cec53ec0f8fa31e8eff137e6e0bc26744d62625..f07de5ce188cfd42ca028c5cb47c3dc5c3f03ae4:/README.md?ds=inline

diff --git a/README.md b/README.md
index c45aff6..96ec640 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 **IMPORTANT**: This file is in active development along with the policies in Firefox. To get the policy information that corresponds to a specific release, go to https://github.com/mozilla/policy-templates/releases.
 
-Policies can either be specified using the Group Policy templates or by creating a file called `policies.json`. On Windows, create a directory called `distribution` where the EXE is located and place the file there. On Mac, the file goes into `Firefox.app/Contents/Resources/distribution`.  On Linux, the file goes into `firefox/distribution`, where `firefox` is the installation directory for firefox, which varies by distribution.
+Policies can be specified using the Group Policy templates on Windows (https://github.com/mozilla/policy-templates/tree/master/windows), configuration profiles on macOS (https://github.com/mozilla/policy-templates/tree/master/mac), or by creating a file called `policies.json`. On Windows, create a directory called `distribution` where the EXE is located and place the file there. On Mac, the file goes into `Firefox.app/Contents/Resources/distribution`.  On Linux, the file goes into `firefox/distribution`, where `firefox` is the installation directory for firefox, which varies by distribution.
 
 The content of the JSON file should look like this:
 ```
@@ -15,7 +15,14 @@ Policies are documented below.
 
 **Note**: though comments are used in this readme file for documentation, comments are not valid in actual JSON files. Remove all comments before attempting to deploy.
 
-Some of the policies were originally only available on the ESR for security reasons. As of Firefox 62, these policies are available outside of the ESR, but only via JSON file or a Local Machine-based Group Policy. User-based Group Policies are not allowed to set values for these policies. The descriptions below mark such policies as "Machine only".
+### AppUpdateURL
+This policy is for changing the URL used for application update
+```
+{
+  "AppUpdateURL": "http://yoursite.com"
+}
+```
+
 
 ### Authentication
 This policy is for configuring sites that support integrated authentication. See https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication for more information.
@@ -89,12 +96,38 @@ same folder name are grouped together.
 }
 ```
 ### Certificates
-If this policy is set to any value, Firefox reads certificates from the system certificate store. This is currently only supported on Windows, but will be available on macOS with Firefox 63.
+This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows.
+
+The ImportEnterpriseRoots key will cause Firefox to import from the system certificate store.
+
+The Install Certificates key by default will search for certificates in the locations listed below. 
+Starting in Firefox 65 you can specify a fully qualified path including UNC. (See cert3.der and cert4.pem, in example).
+
+**Be advised if you wish to load a certificate from a UNC path you must use double backslahes.**
+Example: \\SERVER\\CERTS\CERT5.PEM
+
+
+If Firefox does not find something at your fully qualified path, it will search the default directories.
+
+Certificates can be located in the following locations:
+- Windows
+  - %USERPROFILE%\AppData\Local\Mozilla\Certificates
+  - %USERPROFILE%\AppData\Roaming\Mozilla\Certificates
+- macOS
+  - /Library/Application Support/Mozilla/Certificates
+  - ~/Library/Application Support/Mozilla/Certificates
+- Linux
+  - /usr/lib/mozilla/certificates
+  - /usr/lib64/mozilla/certificates
+  - ~/.mozilla/certificates
+
+
 ```
 {
   "policies": {
     "Certificates": {
-      "ImportEnterpriseRoots": true
+      "ImportEnterpriseRoots": true,
+      "Install": ["cert1.der", "cert2.pem", "%SYSTEMDRIVE%\Company\cert3.der", "/Library/Company/cert4.pem", "\\server\\certs\\cert.pem"]
     }
   }
 }
@@ -110,11 +143,25 @@ This policy controls various settings related to cookies.
       "Default": [true|false], /* This sets the default value for "Accept cookies from websites" */
       "AcceptThirdParty": ["always", "never", "from-visited"], /* This sets the default value for "Accept third-party cookies" */
       "ExpireAtSessionEnd":  [true|false], /* This determines when cookies expire */
+      "RejectTracker": [true|false], /* Only reject trackers */
       "Locked": [true|false] /* If this is true, cookies preferences can't be changed */
     }
   }
 }
 ```
+### DNSOverHTTPS
+This policy configures DNS over HTTPS.
+```
+{
+  "policies": {
+    "DNSOverHTTPS": {
+      "Enabled": [true|false],
+      "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",
+      "Locked": [true|false]
+    }
+  }
+}
+```
 ### DisableSetDesktopBackground
 This policy removes the "Set As Desktop Background..." menuitem when right clicking on an image.
 ```
@@ -133,7 +180,7 @@ If this policy is set to true, the master password functionality is removed.
   }
 }
 ```
-### DisableAppUpdate (Machine only)
+### DisableAppUpdate
 This policy turns off application updates.
 ```
 {
@@ -251,7 +298,7 @@ This policy disables the Refresh Firefox button on about:support and support.moz
 }
 ```
 ### DisableSafeMode
-This policy disables safe mode on Windows only.
+This policy disables safe mode on Windows and macOS only.
 ```
 {
   "policies": {
@@ -271,7 +318,7 @@ This policy prevents the user from bypassing security in certain cases.
   }
 }
 ```
-### DisableSystemAddonUpdate (Machine only)
+### DisableSystemAddonUpdate
 This policy prevents system add-ons from being updated or installed.
 ```
 {
@@ -280,7 +327,7 @@ This policy prevents system add-ons from being updated or installed.
   }
 }
 ```
-### DisableTelemetry (Machine only)
+### DisableTelemetry
 This policy prevents the upload of telemetry data.
 
 Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours.
@@ -323,9 +370,11 @@ This policy affects tracking protection.
 
 If this policy is not configured, tracking protection is not enabled by default in the browser, but it is enabled by default in private browsing and the user can change it.
 
-If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
+If Value is set to false, tracking protection is disabled and locked in both the regular browser and private browsing.
+
+If Value is set to true, tracking protection is enabled by default in both the regular browser and private browsing.
 
-If Value is set to true, tracking protection is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
+You can choose to set the Locked value if you want to prevent the user from changing it.
 ```
 {
   "policies": {
@@ -335,7 +384,7 @@ If Value is set to true, tracking protection is enabled by default in both the b
     }
 }
 ```
-### Extensions (Machine only)
+### Extensions
 This policy controls the installation, uninstallation and locking of extensions. Locked extensions cannot be disabled or uninstalled.
 For Install, you specify a list of URLs or paths.
 For Uninstall and Locked, you specify extension IDs.
@@ -347,6 +396,7 @@ For Uninstall and Locked, you specify extension IDs.
       "Uninstall": ["addon_id@mozilla.org"],
       "Locked":  ["addon_id@mozilla.org"]
     }
+  }
 }
 ```
 ### HardwareAcceleration
@@ -376,8 +426,8 @@ This policy sets the signon.rememberSignons preference. It determines whether or
   }
 }
 ```
-### Homepage (Machine only)
-This policy sets the default homepage value. It can also be used to lock the homepage and add additional homepages.
+### Homepage
+This policy sets the default homepage value and the default start page.  It can also be used to lock the homepage or add additional homepages.
 ```
 {
   "policies": {
@@ -385,7 +435,8 @@ This policy sets the default homepage value. It can also be used to lock the hom
       "URL": "http://example.com/",
       "Locked": true,
       "Additional": ["http://example.org/",
-                     "http://example.edu/"]
+                     "http://example.edu/"],
+      "StartPage": ["none", "homepage", "previous-session"]
     }
   }
 }
@@ -431,7 +482,7 @@ This policy sets the behavior of Flash on the specified domains, as well as the
   }
 }
 ```
-### OverrideFirstRunPage (Machine only)
+### OverrideFirstRunPage
 This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
 ```
 {
@@ -440,7 +491,7 @@ This policy allows you to override the first run page. If you leave the URL blan
   }
 }
 ```
-### OverridePostUpdatePage (Machine only)
+### OverridePostUpdatePage
 This policy allows you to override the upgrade page. If you leave the URL blank, the upgrade page will not be displayed.
 ```
 {
@@ -506,6 +557,15 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se
   }
 }
 ```
+### RequestedLocales
+This policy sets the list of requested locales for the application in order of preference. It will cause the corresponding language pack to become active.
+```
+{
+  "policies": {
+    "RequestedLocales": ["de", "en-US"]
+  }
+}
+```
 ### SanitizeOnShutdown
 If this policy is set to true,  all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data.
 ```
@@ -524,7 +584,7 @@ This policy can be used to determine if the search bar is separate or combined w
   }
 }
 ```
-### WebsiteFilter (Machine only)
+### WebsiteFilter
 This policy blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. The arrays are limited to 1000 entries each.
 ```
 {
@@ -565,9 +625,9 @@ This policy allows you to add PKCS #11 Modules
 ```
 {
   "policies": {
-    "SecurityDevices": [
+    "SecurityDevices": {
       "NAME_OF_DEVICE": "PATH_TO_LIBRARY_FOR_DEVICE"
-    ]
+    }
   }
 }
 ```