Merge pull request #36 from mozilla/1429177_Proxy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index c263320b4dc7f04d9783949a2bcd742c8fd29325..d744abf695041d64d8cd8aedbf1ba26e3cd28004 100644 (file)
--- a/README.md
+++ b/README.md
@@ -212,8 +212,9 @@ If Value is set to true, private browsing is enabled by default in both the brow
       "Value": [true, false],
       "Locked": [true, false]
     }
+```
 ### NoDefaultBookmarks
-Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+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": {
@@ -221,15 +222,6 @@ Don't create the default bookmarks. Note: this policy is only effective if used
   }
 }
 ```
-### NoSmartBookmarks
-Remove the Smart Bookmarks (Most Visited, Recent Tags)
-```
-{
-  "policies": {
-    "NoSmartBookmarks": true
-  }
-}
-```
 ### RememberPasswords
 This policy sets the signon.rememberSignons preference. It can either be enabled or disabled.
 ```
@@ -320,3 +312,24 @@ same folder name are grouped together.
   }
 }
 ```
+### 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 hostnames 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]
+    "HTTPProxy": "hostname",
+    "UseHTTPProxyForAllProtocols": [true, false]
+    "SSLProxy": "hostname",
+    "FTPProxy": "hostname",
+    "SOCKSProxy": "hostname",
+    "SOCKSVersion": [4, 5],
+    "Passthrough": "List of passthrough addresses/domains",
+    "AutoConfigURL": "URL_TO_AUTOCONFIG",
+    "AutoLogin":  [true, false],
+    "UseProxyForDNS": [true, false]
+  }
+}
+```