Merge pull request #1123 from vossni/master

[policy-templates.git] / docs / index.md

diff --git a/docs/index.md b/docs/index.md
index 2ac1142005c2208022980baedb4dc00b3325c494..3939dc85fa4dcba8f5477be841bc0e43c89fb15a 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,6 @@
 Firefox policies can be specified using the [Group Policy templates on Windows](https://github.com/mozilla/policy-templates/tree/master/windows), [Intune on Windows](https://support.mozilla.org/kb/managing-firefox-intune), [configuration profiles on macOS](https://github.com/mozilla/policy-templates/tree/master/mac), or by creating a file called `policies.json`. On Windows, create a directory called `distribution` where the EXE is located and place the file there. On Mac, the file goes into `Firefox.app/Contents/Resources/distribution`.  On Linux, the file goes into `firefox/distribution`, where `firefox` is the installation directory for firefox, which varies by distribution or you can specify system-wide policy by placing the file in `/etc/firefox/policies`.
 
 Unfortunately, JSON files do not support comments, but you can add extra entries to the JSON to use as comments. You will see an error in about:policies, but the policies will still work properly. For example:
 Firefox policies can be specified using the [Group Policy templates on Windows](https://github.com/mozilla/policy-templates/tree/master/windows), [Intune on Windows](https://support.mozilla.org/kb/managing-firefox-intune), [configuration profiles on macOS](https://github.com/mozilla/policy-templates/tree/master/mac), or by creating a file called `policies.json`. On Windows, create a directory called `distribution` where the EXE is located and place the file there. On Mac, the file goes into `Firefox.app/Contents/Resources/distribution`.  On Linux, the file goes into `firefox/distribution`, where `firefox` is the installation directory for firefox, which varies by distribution or you can specify system-wide policy by placing the file in `/etc/firefox/policies`.
 
 Unfortunately, JSON files do not support comments, but you can add extra entries to the JSON to use as comments. You will see an error in about:policies, but the policies will still work properly. For example:

-

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


@@ -12,6 +11,7 @@ Unfortunately, JSON files do not support comments, but you can add extra entries
   }
 }
 ```
   }
 }
 ```

+Note: The `policies.json` must use the UTF-8 encoding.

 
 | Policy Name | Description
 | --- | --- |
 
 | Policy Name | Description
 | --- | --- |


@@ -3613,7 +3613,7 @@ Value (string):
 ```
 <dict>
   <key>HttpsOnlyMode</key>
 ```
 <dict>
   <key>HttpsOnlyMode</key>

-  <string>allowed | disallowed | enabled| force_enabled</string>
+  <string>allowed | disallowed | enabled | force_enabled</string>

 </dict>
 ```
 #### policies.json
 </dict>
 ```
 #### policies.json