Merge pull request #51 from mozilla/OverridePostUpdatePage_Policy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 53cb7d837ab8510d664d495f4703fceda2d6c95e..34da6c7ccf711e57a495106ccba9b0b53378914f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -350,29 +350,50 @@ This policy sets domains for which popups are allowed
 }
 ```
 ### InstallAddons
 }
 ```
 ### InstallAddons

-This policy sets domains that can install extensions
+This policy sets domains that can install extensions, as well as the default behavior.

 ```
 {
   "policies": {
     "InstallAddons": {
       "Allow": ["http://example.org/",
                 "http://example.edu/"]
 ```
 {
   "policies": {
     "InstallAddons": {
       "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
     }
   }
 }
 ```
 ### 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": {
 ```
 {
   "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
 ### 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