Merge pull request #74 from mozilla/typo_fix

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index ada3d52e62b5f3ae0de1ff59f1588039ea5ee4df..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.
 ```


@@ -241,7 +250,9 @@ This policy prevents system add-ons from being updated or installed.
 }
 ```
 ### DisableTelemetry
 }
 ```
 ### DisableTelemetry

-This policy prevents the upload of telemetry data. Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so.
+This policy prevents the upload of telemetry data.
+
+Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours.

 ```
 {
   "policies": {
 ```
 {
   "policies": {


@@ -351,15 +362,15 @@ This policy sets domains for which pop-up windows are allowed. It also set the d
   }
 }
 ```
   }
 }
 ```

-### InstallAddons
+### InstallAddonsPermission

 This policy sets domains that can install extensions, as well as the default behavior.
 ```
 {
   "policies": {
 This policy sets domains that can install extensions, as well as the default behavior.
 ```
 {
   "policies": {

-    "InstallAddons": {
+    "InstallAddonsPermission": {

       "Allow": ["http://example.org/",
       "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 */

     }
   }
 }
     }
   }
 }


@@ -405,12 +416,13 @@ same folder name are grouped together.
 {
   "policies": {
     "Bookmarks": [
 {
   "policies": {
     "Bookmarks": [

-    {"Title": "Example",
-     "URL": "http://example.org",
-     "Favicon": "http://example.com/favicon.ico",
-     "Placement": ["toolbar", "menu"],
-     "Folder": "FolderName"
-     }
+      {
+        "Title": "Example",
+        "URL": "http://example.org",
+        "Favicon": "http://example.com/favicon.ico",
+        "Placement": ["toolbar", "menu"],
+        "Folder": "FolderName"
+      }

     ]
   }
 }
     ]
   }
 }


@@ -420,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]
+    }

   }
 }
 ```
   }
 }
 ```


@@ -454,3 +468,38 @@ This policy can be used to determine if the search bar is separate or combined w
   }
 }
 ```
   }
 }
 ```

+### WebsiteFilter
+Blocks websites from being visited. The parameters take an array of Match Patterns, as documented in https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. The arrays are limited to 1000 entries each.
+```
+{
+  "policies": {
+    "WebsiteFilter": {
+      "Block": ["<all_urls>"],
+      "Exceptions": ["http://example.org/*"]
+    }
+  }
+}
+```
+### Search Engines
+This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
+```
+{
+  "policies": {
+    "SearchEngines": {
+      "Add": [
+        {
+          "Name": "",
+          "URLTemplate": "URL including {searchTerms} to substitute for the terms",
+          "Method": ["GET", "POST"],
+          "IconURL": "URL to icon",
+          "Alias": "Alias that can be used to access the engine",
+          "Description": "Description",
+          "SuggestURLTemplate": "URL for suggestions using {searchTerms}"
+        }
+      ],
+      "Default": "Name of engine",
+      "PreventInstalls": [true|false]
+    }
+  }
+}
+```