Merge pull request #54 from mozilla/PopupBlocking_Policy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index b8a949a131e8fd20faf9a85c261646a66c751221..4ca48a026597487a0b82005785242e370e2f959a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -337,26 +337,29 @@ 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": {
 ```
 {
   "policies": {

-    "Popups": {
+    "PopupBlocking": {

       "Allow": ["http://example.org/",
       "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
     }
   }
 }
 ```
 ### 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 */

     }
   }
 }
     }
   }
 }


@@ -375,6 +378,24 @@ This policy sets the behavior of Flash on the specified domains, as well as the
   }
 }
 ```
   }
 }
 ```

+### 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": {
+    "OverridePostUpdatePagep": "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