Merge pull request #70 from Archaeopteryx/proxyFixes

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 77fdbdea0a0dcee13d64dfca19ad35066801bb29..64a8602bfea2e7207ffc8382b2b92102d13e26a0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -201,6 +201,15 @@ This policy removes access to private browsing
   }
 }
 ```
   }
 }
 ```

+### DisableProfileImport
+This policy disables the"Import data from another browser" option in the bookmarks window.
+```
+{
+  "policies": {
+    "DisableProfileImport": true
+  }
+}
+```

 ### DisableProfileRefresh
 This policy disables the Refresh Firefox button on about:support and support.mozilla.org.
 ```
 ### DisableProfileRefresh
 This policy disables the Refresh Firefox button on about:support and support.mozilla.org.
 ```


@@ -360,8 +369,8 @@ This policy sets domains that can install extensions, as well as the default beh
   "policies": {
     "InstallAddonsPermission": {
       "Allow": ["http://example.org/",
   "policies": {
     "InstallAddonsPermission": {
       "Allow": ["http://example.org/",

-                "http://example.edu/"]
-      "Default": [true|false], /* If this is set to false, add-ons cannot be installed by the user */
+                "http://example.edu/"],
+      "Default": [true|false] /* If this is set to false, add-ons cannot be installed by the user */

     }
   }
 }
     }
   }
 }


@@ -423,19 +432,21 @@ This policy allows you to specify proxy settings. These settings correspond to t
 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.
 ```
 {
 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]
+  "policies": {
+    "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]
+    }

   }
 }
 ```
   }
 }
 ```


@@ -462,8 +473,10 @@ Blocks websites from being visited. The parameters take an array of Match Patter
 ```
 {
   "policies": {
 ```
 {
   "policies": {

-    "Block": ["<all_urls>"],
-    "Exceptions": ["http://example.org/*"]
+    "WebsiteFilter": {
+      "Block": ["<all_urls>"],
+      "Exceptions": ["http://example.org/*"]
+    }

   }
 }
 ```
   }
 }
 ```