Merge pull request #377 from MS-PC/patch-1

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index ee137d0f166c622d459535a25651efd05b21932e..742404b6630870bef38604536f39bb8bcb5d5937 100644 (file)
--- a/README.md
+++ b/README.md
@@ -95,10 +95,19 @@ same folder name are grouped together.
   }
 }
 ```
   }
 }
 ```

+### CaptivePortal
+This policy enables or disables captive portal support by setting and locking the preference `network.captive-portal-service.enabled`.
+```
+{
+  "policies": {
+    "CaptivePortal": [true|false]
+}
+```

 ### Certificates
 This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows.
 
 ### Certificates
 This policy can be used to install certificates or to read certificates from the system certificate store on Mac and Windows.
 

-The ImportEnterpriseRoots key will cause Firefox to import from the system certificate store.
+The ImportEnterpriseRoots key will cause Firefox to import 3rd party certificates that have been added by a user administrator from the system certificate store.
+It does not import all certificates. These certificates will not display in the Firefox certificates manager.

 
 The Install Certificates key by default will search for certificates in the locations listed below. 
 Starting in Firefox 65 you can specify a fully qualified path including UNC. (See cert3.der and cert4.pem, in example).
 
 The Install Certificates key by default will search for certificates in the locations listed below. 
 Starting in Firefox 65 you can specify a fully qualified path including UNC. (See cert3.der and cert4.pem, in example).


@@ -127,7 +136,7 @@ Certificates can be located in the following locations:
   "policies": {
     "Certificates": {
       "ImportEnterpriseRoots": true,
   "policies": {
     "Certificates": {
       "ImportEnterpriseRoots": true,

-      "Install": ["cert1.der", "cert2.pem", "%SYSTEMDRIVE%\Company\cert3.der", "/Library/Company/cert4.pem", "\\server\\certs\\cert.pem"]
+      "Install": ["cert1.der", "cert2.pem", "%SYSTEMDRIVE%\\Company\\cert3.der", "/Library/Company/cert4.pem", "\\\\server\\certs\\cert.pem"]

     }
   }
 }
     }
   }
 }


@@ -399,6 +408,14 @@ For Uninstall and Locked, you specify extension IDs.
   }
 }
 ```
   }
 }
 ```

+### ExtensionUpdate
+This policy enables or disables extension updates by setting and locking the preference `extensions.update.enabled`.
+```
+{
+  "policies": {
+    "ExtensionUpdate": [true|false]
+}
+```

 ### HardwareAcceleration
 This policy disables hardware acceleration by locking the preference layers.acceleration.disabled to true.
 ```
 ### HardwareAcceleration
 This policy disables hardware acceleration by locking the preference layers.acceleration.disabled to true.
 ```


@@ -482,6 +499,14 @@ This policy sets the behavior of Flash on the specified domains, as well as the
   }
 }
 ```
   }
 }
 ```

+### NetworkPrediction
+This policy enables or disables network prediction (DNS prefetching) by setting and locking the preferences `network.dns.disablePrefetch` and `network.dns.disablePrefetchFromHTTPS`.
+```
+{
+  "policies": {
+    "NetworkPrediction": [true|false]
+}
+```

 ### OverrideFirstRunPage
 This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
 ```
 ### OverrideFirstRunPage
 This policy allows you to override the first run page. If you leave the URL blank, the first run page will not be displayed.
 ```


@@ -630,6 +655,7 @@ This policy allows you to add PKCS #11 Modules
     }
   }
 }
     }
   }
 }

+```

 ### SSLVersionMin
 This policy allows you to set the minimum TLS version.
 ```
 ### SSLVersionMin
 This policy allows you to set the minimum TLS version.
 ```


@@ -648,5 +674,4 @@ This policy allows you to set the maximum TLS version.
     "SSSLVersionMax": ["tls1", "tls1.1", "tls1.2",. "tls1.3"]
   }
 }
     "SSSLVersionMax": ["tls1", "tls1.1", "tls1.2",. "tls1.3"]
   }
 }

-

 ```
 ```