Merge pull request #57 from mozilla/PolicyUpdates

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 53cb7d837ab8510d664d495f4703fceda2d6c95e..33d27f131235832d6bff61c9429b541db21d84d4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -57,12 +57,12 @@ This policy removes access to about:support.
     "BlockAboutSupport": true
 }
 ```
-### BlockSetDesktopBackground
+### DisableSetDesktopBackground
 This policy removes the "Set As Desktop Background..." menuitem when right clicking on an image.
 ```
 {
   "policies": {
-    "BlockAboutSupport": true
+    "DisableSetDesktopBackground": true
   }
 }
 ```
@@ -86,19 +86,19 @@ This policy controls various settings related to cookies.
       "Allow": ["http://example.org/"], /* Domains where cookies are always allowed */
       "Block": ["http://example.edu/"], /* Domains where cookies are always blocked */
       "Default": [true|false], /* This sets the default value for "Accept cookies from websites" */
-      "AcceptThirdParty": ["all", "none", "from-visited"], /* This sets the default value for "Accept third-party cookies" */
+      "AcceptThirdParty": ["always", "never", "from-visited"], /* This sets the default value for "Accept third-party cookies" */
       "ExpireAtSessionEnd":  [true|false], /* This determines when cookies expire */
       "Locked": [true|false] /* If this is true, cookies preferences can't be changed */
     }
   }
 }
 ```
-### CreateMasterPassword
-This policy removes the master password functionality.
+### DisableMasterPasswordCreation
+This policy removes the master password functionality if set to true.
 ```
 {
   "policies": {
-    "CreateMasterPassword": false
+    "DisableMasterPasswordCreation": [true|false]
   }
 }
 ```
@@ -231,12 +231,12 @@ This policy prevents the user from bypassign security in certain cases.
   }
 }
 ```
-### DisableSysAddonUpdate
+### DisableSystemAddonUpdate
 This policy prevents system add-ons from being updated or installed.
 ```
 {
   "policies": {
-    "DisableSysAddonUpdate": true
+    "DisableSystemAddonUpdate": true
   }
 }
 ```
@@ -314,12 +314,12 @@ Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent
   }
 }
 ```
-### RememberPasswords
-This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
+### OfferToSaveLogins
+This policy sets the signon.rememberSignons preference. It determines whether or not Firefox offers to save passwords. It can either be enabled or disabled.
 ```
 {
   "policies": {
-    "RememberPasswords": true
+    "OfferToSaveLogins": true
   }
 }
 ```
@@ -337,42 +337,65 @@ This policy sets the default homepage value. It can also be used to lock the hom
   }
 }
 ```
-### Popups
-This policy sets domains for which popups are allowed
+### PopupBlocking
+This policy sets domains for which pop-up windows are allowed. It also set the default pop-up policy
 ```
 {
   "policies": {
-    "Popups": {
+    "PopupBlocking": {
       "Allow": ["http://example.org/",
-                "http://example.edu/"]
+                "http://example.edu/"],
+      "Default": [true|false], /* If this is set to false, pop-up window are enabled by default. */
+      "Locked": [true|false]
     }
   }
 }
 ```
-### InstallAddons
-This policy sets domains that can install extensions
+### InstallAddonsPermission
+This policy sets domains that can install extensions, as well as the default behavior.
 ```
 {
   "policies": {
-    "InstallAddons": {
+    "InstallAddonsPermission": {
       "Allow": ["http://example.org/",
                 "http://example.edu/"]
+      "Default": [true|false], /* If this is set to false, add-ons cannot be installed by the user */
     }
   }
 }
 ```
 ### FlashPlugin
-This policy sets domains that can use or not use Flash
+This policy sets the behavior of Flash on the specified domains, as well as the default behavior.
 ```
 {
   "policies": {
     "FlashPlugin": {
-      "Allow": ["http://example.org/"],
-      "Block": ["http://example.edu/"]
+      "Allow": ["http://example.org/"], /* Sites on the allow list do not override Flash being completely disabled */
+      "Block": ["http://example.edu/"],
+      "Default": [true|false], /* If this is set to true, flash is always enabled. If it is set to false, Flash is never enabled */
+      "Locked": [true|false]
     }
   }
 }
 ```
+### OverrideFirstRunPage
+This policy allowed you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
+```
+{
+  "policies": {
+    "OverrideFirstRunPage": "http://example.org"
+  }
+}
+```
+### OverridePostUpdatePage
+This policy allowed you to override the upgrade page page. If you leave the URL blank, the upgrade page will not be displayed.
+```
+{
+  "policies": {
+    "OverridePostUpdatePage": "http://example.org"
+  }
+}
+```
 ### Bookmarks
 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
@@ -413,3 +436,21 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se
   }
 }
 ```
+### 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.
+```
+{
+  "policies": {
+    "SanitizeOnShutdown": [true|false]
+  }
+}
+```
+### SearchBar
+This policy can be used to determine if the search bar is separate or combined with the URL bar.
+```
+{
+  "policies": {
+    "SearchBar": ["unified", "separate"]
+  }
+}
+```