Merge pull request #56 from mozilla/SearchBar_Policy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 34da6c7ccf711e57a495106ccba9b0b53378914f..5c9515cae86cee1813a29e788ad556cb41b14b2e 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]

     }
   }
 }
     }
   }
 }


@@ -434,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"]
+  }
+}
+```