Merge pull request #54 from mozilla/PopupBlocking_Policy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 34da6c7ccf711e57a495106ccba9b0b53378914f..4ca48a026597487a0b82005785242e370e2f959a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -337,14 +337,16 @@ 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]

     }
   }
 }
     }
   }
 }


@@ -390,7 +392,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL
 ```
 {
   "policies": {
 ```
 {
   "policies": {

-    "OverridePostUpdatePage": "http://example.org"
+    "OverridePostUpdatePagep": "http://example.org"

   }
 }
 ```
   }
 }
 ```