X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/66e1b122642b735ddf520628c3d8a1871236ede8..419d7d4aa30bf920b0650dc3ceb732093b37649f:/README.md?ds=sidebyside

diff --git a/README.md b/README.md
index 7b4e707..c0d8424 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-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/Content/Resources/distribution.
+**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.
 
 The content of the JSON file should look like this:
 ```
@@ -8,11 +10,14 @@ The content of the JSON file should look like this:
   }
 }
 ```
-Policies are documented below. Note that even though comments are used in this file for documentation, comments are not allowed for JSON files.
+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 are only available on the ESR for security reasons. These policies are marked ESR only.
+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".
 
-### Authentication (ESR only)
+### Authentication (Machine only)
 This policy is for configuring sites that support integrated authentication. See https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication for more information.
 ```
 {
@@ -20,7 +25,11 @@ This policy is for configuring sites that support integrated authentication. See
     "Authentication": {
       "SPNEGO": ["mydomain.com", "https://myotherdomain.com"],
       "Delegated": ["mydomain.com", "https://myotherdomain.com"],
-      "NTLM": ["mydomain.com", "https://myotherdomain.com"]
+      "NTLM": ["mydomain.com", "https://myotherdomain.com"],
+      "AllowNonFQDN": {
+        "SPNEGO": true,
+        "NTLM": true
+      }
     }
   }
 }
@@ -70,7 +79,7 @@ This policy removes the "Set As Desktop Background..." menuitem when right click
 }
 ```
 ### Certificates
-This is a Windows only policy that tells Firefox to read certificates from the Windows certificate store.
+If this Windows only policy is set to true, Firefox reads certificates from the Windows certificate store.
 ```
 {
   "policies": {
@@ -97,7 +106,7 @@ This policy controls various settings related to cookies.
 }
 ```
 ### DisableMasterPasswordCreation
-This policy removes the master password functionality if set to true.
+If this policy is set to true, the master password functionality is removed.
 ```
 {
   "policies": {
@@ -105,7 +114,7 @@ This policy removes the master password functionality if set to true.
   }
 }
 ```
-### DisableAppUpdate (ESR only)
+### DisableAppUpdate (Machine only)
 This policy turns off application updates.
 ```
 {
@@ -133,7 +142,7 @@ This policy removes access to all developer tools.
 }
 ```
 ### DisableFeedbackCommands
-This policy disables the menus for reporting sites (Submit Feedback, Report Deceptive Site)
+This policy disables the menus for reporting sites (Submit Feedback, Report Deceptive Site).
 ```
 {
   "policies": {
@@ -142,7 +151,7 @@ This policy disables the menus for reporting sites (Submit Feedback, Report Dece
 }
 ```
 ### DisableFirefoxScreenshots
-This policy removes access to Firefox Screenshots
+This policy removes access to Firefox Screenshots.
 ```
 {
   "policies": {
@@ -151,7 +160,7 @@ This policy removes access to Firefox Screenshots
 }
 ```
 ### DisableFirefoxAccounts
-This policy disables Sync
+This policy disables Sync.
 ```
 {
   "policies": {
@@ -160,7 +169,7 @@ This policy disables Sync
 }
 ```
 ### DisableFirefoxStudies
-This policy disables Firefox studies (Shield)
+This policy disables Firefox studies (Shield).
 ```
 {
   "policies": {
@@ -169,7 +178,7 @@ This policy disables Firefox studies (Shield)
 }
 ```
 ### DisableForgetButton
-This policy disables the "Forget" button
+This policy disables the "Forget" button.
 ```
 {
   "policies": {
@@ -178,7 +187,7 @@ This policy disables the "Forget" button
 }
 ```
 ### DisableFormHistory
-This policy turns off the browser.formfill.enable preferences
+This policy turns off the browser.formfill.enable preferences.
 ```
 {
   "policies": {
@@ -187,7 +196,7 @@ This policy turns off the browser.formfill.enable preferences
 }
 ```
 ### DisablePocket
-This policy turns off Pocket
+This policy turns off Pocket.
 ```
 {
   "policies": {
@@ -196,7 +205,7 @@ This policy turns off Pocket
 }
 ```
 ### DisablePrivateBrowsing
-This policy removes access to private browsing
+This policy removes access to private browsing.
 ```
 {
   "policies": {
@@ -205,7 +214,7 @@ This policy removes access to private browsing
 }
 ```
 ### DisableProfileImport
-This policy disables the"Import data from another browser" option in the bookmarks window.
+This policy disables the "Import data from another browser" option in the bookmarks window.
 ```
 {
   "policies": {
@@ -223,7 +232,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 only.
 ```
 {
   "policies": {
@@ -232,7 +241,7 @@ This policy disables safe mode on Windows only
 }
 ```
 ### DisableSecurityBypass
-This policy prevents the user from bypassign security in certain cases.
+This policy prevents the user from bypassing security in certain cases.
 ```
 {
   "policies": {
@@ -243,7 +252,7 @@ This policy prevents the user from bypassign security in certain cases.
   }
 }
 ```
-### DisableSystemAddonUpdate (ESR only)
+### DisableSystemAddonUpdate (Machine only)
 This policy prevents system add-ons from being updated or installed.
 ```
 {
@@ -252,7 +261,7 @@ This policy prevents system add-ons from being updated or installed.
   }
 }
 ```
-### DisableTelemetry (ESR only)
+### DisableTelemetry (Machine only)
 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.
@@ -264,7 +273,7 @@ Mozilla recommends that you do not disable telemetry. Information collected thro
 }
 ```
 ### DisplayBookmarksToolbar
-This policy turns on the bookmarks toolbar by default. A user can still turn it off and it will stay off.
+This policy turns on the bookmarks toolbar by default. A user can still turn it off, and it will stay off.
 ```
 {
   "policies": {
@@ -273,7 +282,7 @@ This policy turns on the bookmarks toolbar by default. A user can still turn it
 }
 ```
 ### DisplayMenuBar
-This policy turns on the menubar by default. A user can still turn it off and it will stay off.
+This policy turns on the menubar by default. A user can still turn it off, and it will stay off.
 ```
 {
   "policies": {
@@ -293,7 +302,7 @@ This policy stops Firefox from checking if it is the default browser at startup.
 ### EnableTrackingProtection
 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 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.
 
@@ -305,10 +314,11 @@ If Value is set to true, private browsing is enabled by default in both the brow
       "Value": [true, false],
       "Locked": [true, false]
     }
+}
 ```
-### Extensions (ESR only)
-This policy controls the install, uninstall and locking of extensions. Locked extensions cannot be disabled or uninstalled.
-For Install, you can specify a list of URLs or paths.
+### Extensions (Machine only)
+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.
 ```
 {
@@ -318,9 +328,10 @@ For Uninstall and Locked, you specify extension IDs.
       "Uninstall": ["addon_id@mozilla.org"],
       "Locked":  ["addon_id@mozilla.org"]
     }
+}
 ```
 ### NoDefaultBookmarks
-Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.
+This policy prevents the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags) from being created. Note: this policy is only effective if used before the first run of the profile.
 ```
 {
   "policies": {
@@ -337,7 +348,7 @@ This policy sets the signon.rememberSignons preference. It determines whether or
   }
 }
 ```
-### Homepage (ESR only)
+### Homepage (Machine only)
 This policy sets the default homepage value. It can also be used to lock the homepage and add additional homepages.
 ```
 {
@@ -352,7 +363,7 @@ This policy sets the default homepage value. It can also be used to lock the hom
 }
 ```
 ### PopupBlocking
-This policy sets domains for which pop-up windows are allowed. It also set the default pop-up policy
+This policy sets domains for which pop-up windows are allowed. It also sets the default pop-up policy.
 ```
 {
   "policies": {
@@ -392,8 +403,8 @@ This policy sets the behavior of Flash on the specified domains, as well as the
   }
 }
 ```
-### OverrideFirstRunPage (ESR only)
-This policy allowed you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
+### OverrideFirstRunPage (Machine only)
+This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
 ```
 {
   "policies": {
@@ -401,8 +412,8 @@ This policy allowed you to override the first run page. If you leave the URL bla
   }
 }
 ```
-### OverridePostUpdatePage (ESR only)
-This policy allowed you to override the upgrade page page. If you leave the URL blank, the upgrade page will not be displayed.
+### OverridePostUpdatePage (Machine only)
+This policy allows you to override the upgrade page. If you leave the URL blank, the upgrade page will not be displayed.
 ```
 {
   "policies": {
@@ -411,7 +422,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL
 }
 ```
 ### Bookmarks
-This policy allows you to specify bookmarks. You can have any number of bookmarks although only ten are specified in the ADMX file.
+This policy allows you to specify bookmarks. You can have any number of bookmarks, although only ten are specified in the ADMX file.
 Placement can be specified as either toolbar or menu. If a folder is specified, it is automatically created and bookmarks with the
 same folder name are grouped together.
 
@@ -462,7 +473,7 @@ If this policy is set to true,  all data is cleared when Firefox is closed. This
   }
 }
 ```
-### SearchBar (ESR only)
+### SearchBar (Machine only)
 This policy can be used to determine if the search bar is separate or combined with the URL bar.
 ```
 {
@@ -471,8 +482,8 @@ This policy can be used to determine if the search bar is separate or combined w
   }
 }
 ```
-### WebsiteFilter (ESR only)
-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 accesses are supported at the moment. The arrays are limited to 1000 entries each.
+### WebsiteFilter (Machine only)
+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.
 ```
 {
   "policies": {
@@ -483,7 +494,7 @@ Blocks websites from being visited. The parameters take an array of Match Patter
   }
 }
 ```
-### Search Engines (ESR only)
+### Search Engines (Machine only)
 This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
 ```
 {