Merge pull request #127 from derekdata/patch-1

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 6c26bd1842a3a61b6576aebffa9460e9b960142c..3be6f355bb4accac5d22b407ca47980d1425f104 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-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.
+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`.  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:
 ```
 
 The content of the JSON file should look like this:
 ```


@@ -164,7 +164,7 @@ This policy disables Firefox studies (Shield)
 ```
 {
   "policies": {
 ```
 {
   "policies": {

-    "DisableFirefoxAccounts": true
+    "DisableFirefoxStudies": true

   }
 }
 ```
   }
 }
 ```


@@ -232,7 +232,7 @@ This policy disables safe mode on Windows only
 }
 ```
 ### DisableSecurityBypass
 }
 ```
 ### DisableSecurityBypass

-This policy prevents the user from bypassign security in certain cases.
+This policy prevents the user from bypassing security in certain cases.

 ```
 {
   "policies": {
 ```
 {
   "policies": {


@@ -305,6 +305,7 @@ If Value is set to true, private browsing is enabled by default in both the brow
       "Value": [true, false],
       "Locked": [true, false]
     }
       "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.
 ```
 ### Extensions (ESR only)
 This policy controls the install, uninstall and locking of extensions. Locked extensions cannot be disabled or uninstalled.


@@ -318,6 +319,7 @@ For Uninstall and Locked, you specify extension IDs.
       "Uninstall": ["addon_id@mozilla.org"],
       "Locked":  ["addon_id@mozilla.org"]
     }
       "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.
 ```
 ### 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.