Merge branch 'master' of github.com:mozilla/policy-templates

[policy-templates.git] / README.md

diff --git a/README.md b/README.md
index 7533b089b373509eac66d02b75c327abb56377f7..bc823efc19cea538402f50d5557ca885dd0a950f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -44,7 +44,8 @@ Policies can be specified using the Group Policy templates on Windows (https://g
 | **[`DefaultDownloadDirectory`](#defaultdownloaddirectory)** | Set the default download directory.
 | **[`DownloadDirectory`](#downloaddirectory)** | Set and lock the download directory.
 | **[`EnableTrackingProtection`](#enabletrackingprotection)** | Configure tracking protection.
 | **[`DefaultDownloadDirectory`](#defaultdownloaddirectory)** | Set the default download directory.
 | **[`DownloadDirectory`](#downloaddirectory)** | Set and lock the download directory.
 | **[`EnableTrackingProtection`](#enabletrackingprotection)** | Configure tracking protection.

-| **[`Extensions` (Deprecated)](#extensions-deprecated)** | Control the installation, uninstallation and locking of extensions.
+| **[`EnterprisePoliciesEnabled`](#enterprisepoliciesenabled)** | Enable policy support on macOS.
+| **[`Extensions`](#extensions)** | Control the installation, uninstallation and locking of extensions.

 | **[`ExtensionSettings`](#extensionsettings)** | Manage all aspects of extensions.
 | **[`ExtensionUpdate`](#extensionupdate)** | Control extension updates.
 | **[`FlashPlugin`](#flashplugin)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed.
 | **[`ExtensionSettings`](#extensionsettings)** | Manage all aspects of extensions.
 | **[`ExtensionUpdate`](#extensionupdate)** | Control extension updates.
 | **[`FlashPlugin`](#flashplugin)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed.


@@ -1256,7 +1257,21 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Locked = 0x1 | 0x0
     }
 }
 ```
     }
 }
 ```

-### Extensions (Deprecated)
+### EnterprisePoliciesEnabled
+Enable policy support on macOS.
+
+**Compatibility:** Firefox 63, Firefox ESR 60.3 (macOS only)\
+**CCK2 Equivalent:** N/A\
+**Preferences Affected:** N/A
+
+#### macOS
+```
+<dict>
+  <key>EnterprisePoliciesEnabled</key>
+  <true/>
+</dict>
+```
+### Extensions

 Control the installation, uninstallation and locking of extensions.
 
 `Install` is a list of URLs or native paths for extensions to be installed. 
 Control the installation, uninstallation and locking of extensions.
 
 `Install` is a list of URLs or native paths for extensions to be installed. 


@@ -1337,10 +1352,7 @@ The configuration for each extension is another dictionary that can contain the
 **Preferences Affected:** N/A
 
 #### Windows
 **Preferences Affected:** N/A
 
 #### Windows

-Due to limitations with group policy on Windows, you need to create the JSON that corresponds to your settings and set that directly into the entry field for the policy.
-```
-Software\Policies\Mozilla\Firefox\ExtensionSettings = JSON from below
-```
+Due to a bug in Firefox 68, this policy is not working via GPO on Windows. We will have a fix soon.

 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>


@@ -2055,7 +2067,7 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v
 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>

-  <key>Preference</key>
+  <key>Preferences</key>

   <dict>
     <key>boolean_preference_name</key>
     <true/> | <false/>
   <dict>
     <key>boolean_preference_name</key>
     <true/> | <false/>


@@ -2068,7 +2080,7 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v
 ```
 {
   "policies": {
 ```
 {
   "policies": {

-    "Preference": {
+    "Preferences": {

       "boolean_preference_name": true | false,
       "string_preference_name": "string_value"
     }
       "boolean_preference_name": true | false,
       "string_preference_name": "string_value"
     }