Merge branch 'master' into 1429177_Proxy

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 42e038291bc027fde2c091d5bea0a930de554ac8..5296410c2bf1f5a90dae37ded7db76b4b6557900 100644 (file)
--- a/README.md
+++ b/README.md
@@ -197,21 +197,28 @@ This policy stops Firefox from checking if it is the default browser at startup.
   }
 }
 ```
-### NoDefaultBookmarks
-Don't create the default bookmarks. Note: this policy is only effective if used before the first run of the profile.
+### EnableTrackingProtection
+This policy affects tracking protection.
+
+If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+
+If Value is set to false, tracking protection is disabled and locked in both the browser and private browsing.
+
+If Value is set to true, private browsing is enabled by default in both the browser and private browsing and you can choose set the Locked value if you want to prevent the user from changing it.
 ```
 {
   "policies": {
-    "NoDefaultBookmarks": true
-  }
-}
+    "EnableTrackingProtection": {
+      "Value": [true, false],
+      "Locked": [true, false]
+    }
 ```
-### NoSmartBookmarks
-Remove the Smart Bookmarks (Most Visited, Recent Tags)
+### 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": {
-    "NoSmartBookmarks": true
+    "NoDefaultBookmarks": true
   }
 }
 ```
@@ -305,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 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]
+  }
+}
+```