Merge branch 'master' into 1429177_Proxy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 34d0bf5473565b06c3924af54e09e0e36b85001a..5296410c2bf1f5a90dae37ded7db76b4b6557900 100644 (file)
--- a/README.md
+++ b/README.md
@@ -27,6 +27,15 @@ This policy removes access to about:config.
   }
 }
 ```
   }
 }
 ```

+### BlockAboutProfiles
+This policy removes access to about:profiles.
+```
+{
+  "policies": {
+    "BlockAboutProfiles": true
+  }
+}
+```

 ### BlockAboutSupport
 This policy removes access to about:support.
 ```
 ### BlockAboutSupport
 This policy removes access to about:support.
 ```


@@ -203,6 +212,13 @@ If Value is set to true, private browsing is enabled by default in both the brow
       "Value": [true, false],
       "Locked": [true, false]
     }
       "Value": [true, false],
       "Locked": [true, false]
     }

+```
+### NoDefaultBookmarks
+Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.
+```
+{
+  "policies": {
+    "NoDefaultBookmarks": true

   }
 }
 ```
   }
 }
 ```


@@ -289,10 +305,31 @@ same folder name are grouped together.
     {"Title": "Example",
      "URL": "http://example.org",
      "Favicon": "http://example.com/favicon.ico",
     {"Title": "Example",
      "URL": "http://example.org",
      "Favicon": "http://example.com/favicon.ico",

-     "Placement": "toolbar",
-     "Folder": "Bookmarks"
+     "Placement": ["toolbar", "menu"],
+     "Folder": "FolderName"

      }
     ]
   }
 }
 ```
      }
     ]
   }
 }
 ```

+### Proxy
+This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences.
+To specify ports, append them to the URLs with a colon (:). If Locked is set to true, the values can't be changed by the user.
+```
+{
+  "Proxy": {
+    "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"]
+    "Locked": [true, false]
+Z   "HTTPProxy": "URL_TO_PROXY",
+    "UseHTTPProxyForAllProtocols": [true, false]
+    "SSLProxy": "URL_TO_PROXY",
+    "FTPProxy": "URL_TO_PROXY",
+    "SOCKSProxy": { "URL_TO_PROXY",
+    "SOCKSVersion": [4, 5],
+    "Passthrough": "List of passthrough addresses/domains",
+    "AutoConfigURL": "URL_TO_AUTOCONFIG",
+    "AutoLogin":  [true, false],
+    "UseProxyForDNS": [true, false]
+  }
+}
+```