Merge pull request #49 from mozilla/InstallAddons_Updates

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 53cb7d837ab8510d664d495f4703fceda2d6c95e..b9c181914352a8cdae49bf84fcb02eb46129847e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -350,25 +350,28 @@ 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]

     }
   }
 }
     }
   }
 }