X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/9387163a9b1dd93500867fcb3b33598b6d559e89..7aa7b765f893d5997c9690de2ff054cea26fb93f:/README.md?ds=sidebyside

diff --git a/README.md b/README.md
index 23e5939..8e09c21 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,8 @@ Policies can be specified using the Group Policy templates on Windows (https://g
 | **[`DisableSystemAddonUpdate`](#disablesystemaddonupdate)** | Prevent system add-ons from being installed or update.
 | **[`DisableTelemetry`](#disabletelemetry)** | DisableTelemetry
 | **[`DisplayBookmarksToolbar`](#displaybookmarkstoolbar)** | Set the initial state of the bookmarks toolbar.
-| **[`DisplayMenuBar`](#displaymenubar)** | Set the initial state of the menubar.
+| **[`DisplayMenuBar (Deprecated)`](#displaymenubar-deprecated)** | Set the initial state of the menubar.
+| **[`DisplayMenuBar`](#displaymenubar)** | Set the state of the menubar.
 | **[`DNSOverHTTPS`](#dnsoverhttps)** | Configure DNS over HTTPS.
 | **[`DontCheckDefaultBrowser`](#dontcheckdefaultbrowser)** | Don't check if Firefox is the default browser at startup.
 | **[`DefaultDownloadDirectory`](#defaultdownloaddirectory)** | Set the default download directory.
@@ -92,7 +93,7 @@ Change the URL for application update.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `app.update.url`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\AppUpdateURL = "https://yoursite.com"
 ```
@@ -103,7 +104,7 @@ Software\Policies\Mozilla\Firefox\AppUpdateURL = "https://yoursite.com"
   <string>https://yoursite.com</string>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -117,11 +118,11 @@ Configure sites that support integrated authentication.
 
 See https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication for more information.
 
-**Compatibility:** Firefox 60, Firefox ESR 60 (AllowNonFQDN added in 62/60.2, AllowProxies added in 70/68.2)\
+**Compatibility:** Firefox 60, Firefox ESR 60 (AllowNonFQDN added in 62/60.2, AllowProxies added in 70/68.2, Locked added in 71/68.3)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.negotiate-auth.trusted-uris`,`network.negotiate-auth.delegation-uris`,`network.automatic-ntlm-auth.trusted-uris`,`network.automatic-ntlm-auth.allow-non-fqdn`,`network.negotiate-auth.allow-non-fqdn`,`network.automatic-ntlm-auth.allow-proxies`,`network.negotiate-auth.allow-proxies`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Authentication\SPNEGO\1 = "mydomain.com"
 Software\Policies\Mozilla\Firefox\Authentication\SPNEGO\2 = "https://myotherdomain.com"
@@ -133,6 +134,7 @@ Software\Policies\Mozilla\Firefox\Authentication\AllowNonFQDN\SPNEGO = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Authentication\AllowNonFQDN\NTLM = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Authentication\AllowProxies\SPNEGO = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Authentication\AllowProxies\NTLM = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\Authentication\Locked = 0x1 | 0x0
 ```
 #### macOS
 ```
@@ -168,10 +170,12 @@ Software\Policies\Mozilla\Firefox\Authentication\AllowProxies\NTLM = 0x1 | 0x0
       <key>NTLM</key>
       <true/> | <false/>
     </dict>
+    <key>Locked</key>
+    <true/> | <false/>
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -186,7 +190,8 @@ Software\Policies\Mozilla\Firefox\Authentication\AllowProxies\NTLM = 0x1 | 0x0
       "AllowProxies": {
         "SPNEGO": true | false,
         "NTLM": true | false
-      }
+      },
+      "Locked": true | false
     }
   }
 }
@@ -199,7 +204,7 @@ Block access to the Add-ons Manager (about:addons).
 **CCK2 Equivalent:** `disableAddonsManager`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\BlockAboutAddons = 0x1 | 0x0
 ```
@@ -210,7 +215,7 @@ Software\Policies\Mozilla\Firefox\BlockAboutAddons = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -226,7 +231,7 @@ Block access to about:config.
 **CCK2 Equivalent:** `disableAboutConfig`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\BlockAboutConfig = 0x1 | 0x0
 ```
@@ -237,7 +242,7 @@ Software\Policies\Mozilla\Firefox\BlockAboutConfig = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -253,7 +258,7 @@ Block access to About Profiles (about:profiles).
 **CCK2 Equivalent:** `disableAboutProfiles`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\BlockAboutProfiles = 0x1 | 0x0
 ```
@@ -264,7 +269,7 @@ Software\Policies\Mozilla\Firefox\BlockAboutProfiles = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -280,7 +285,7 @@ Block access to Troubleshooting Information (about:support).
 **CCK2 Equivalent:** `disableAboutSupport`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\BlockAboutSupport = 0x1 | 0x0
 ```
@@ -291,7 +296,7 @@ Software\Policies\Mozilla\Firefox\BlockAboutSupport = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -307,7 +312,7 @@ Add bookmarks in either the bookmarks toolbar or menu. Only `Title` and `URL` ar
 **CCK2 Equivalent:** `bookmarks.toolbar`,`bookmarks.menu`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Bookmarks\1\Title = "Example"
 Software\Policies\Mozilla\Firefox\Bookmarks\1\URL = "https://example.com"
@@ -335,7 +340,7 @@ Software\Policies\Mozilla\Firefox\Bookmarks\1\Folder = "FolderName"
   </array>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -358,7 +363,7 @@ Enable or disable the detection of captive portals.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.captive-portal-service.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\CaptivePortal = 0x1 | 0x0
 ```
@@ -369,7 +374,7 @@ Software\Policies\Mozilla\Firefox\CaptivePortal = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -389,7 +394,7 @@ See https://support.mozilla.org/kb/setting-certificate-authorities-firefox for m
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `security.enterprise_roots.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Certificates\ImportEnterpriseRoots = 0x1 | 0x0
 ```
@@ -403,7 +408,7 @@ Software\Policies\Mozilla\Firefox\Certificates\ImportEnterpriseRoots = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -440,7 +445,7 @@ Binary (DER) and ASCII (PEM) certificates are both supported.
 **CCK2 Equivalent:** `certs.ca`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Certificates\Install\1 = "cert1.der"
 Software\Policies\Mozilla\Firefox\Certificates\Install\2 = "C:\Users\username\cert2.pem"
@@ -458,7 +463,7 @@ Software\Policies\Mozilla\Firefox\Certificates\Install\2 = "C:\Users\username\ce
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -489,7 +494,7 @@ Configure cookie preferences.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.cookie.cookieBehavior`,`network.cookie.lifetimePolicy`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Cookies\Allow\1 = "https://example.com"
 Software\Policies\Mozilla\Firefox\Cookies\Block\1 = "https://example.org"
@@ -525,7 +530,7 @@ Software\Policies\Mozilla\Firefox\Cookies\Locked = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -533,7 +538,7 @@ Software\Policies\Mozilla\Firefox\Cookies\Locked = 0x1 | 0x0
       "Allow": ["http://example.org/"],
       "Block": ["http://example.edu/"],
       "Default": true | false,
-      "AcceptThirdParty": "always" | "never" | "from-visited"],
+      "AcceptThirdParty": "always" | "never" | "from-visited",
       "ExpireAtSessionEnd": true | false,
       "RejectTracker": true | false,
       "Locked": true | false
@@ -548,7 +553,7 @@ Remove the "Set As Desktop Background..." menuitem when right clicking on an ima
 **CCK2 Equivalent:** `removeSetDesktopBackground`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableSetDesktopBackground = 0x1 | 0x0
 ```
@@ -560,7 +565,7 @@ Software\Policies\Mozilla\Firefox\DisableSetDesktopBackground = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -575,7 +580,7 @@ Remove the master password functionality.
 **CCK2 Equivalent:** `noMasterPassword`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableMasterPasswordCreation = 0x1 | 0x0
 ```
@@ -587,7 +592,7 @@ Software\Policies\Mozilla\Firefox\DisableMasterPasswordCreation = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -602,7 +607,7 @@ Turn off application updates.
 **CCK2 Equivalent:** `disableFirefoxUpdates`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableAppUpdate = 0x1 | 0x0
 ```
@@ -613,7 +618,7 @@ Software\Policies\Mozilla\Firefox\DisableAppUpdate = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -628,7 +633,7 @@ Disable the built in PDF viewer. PDF files are downloaded and sent externally.
 **CCK2 Equivalent:** `disablePDFjs`\
 **Preferences Affected:** `pdfjs.disabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableBuiltinPDFViewer = 0x1 | 0x0
 ```
@@ -640,7 +645,7 @@ Software\Policies\Mozilla\Firefox\DisableBuiltinPDFViewer = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -655,7 +660,7 @@ Remove access to all developer tools.
 **CCK2 Equivalent:** `removeDeveloperTools`\
 **Preferences Affected:** `devtools.policy.disabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableDeveloperTools = 0x1 | 0x0`
 ```
@@ -667,7 +672,7 @@ Software\Policies\Mozilla\Firefox\DisableDeveloperTools = 0x1 | 0x0`
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -682,7 +687,7 @@ Disable the menus for reporting sites (Submit Feedback, Report Deceptive Site).
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableFeedbackCommands = 0x1 | 0x0
 ```
@@ -693,7 +698,7 @@ Software\Policies\Mozilla\Firefox\DisableFeedbackCommands = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -708,7 +713,7 @@ Remove access to Firefox Screenshots.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `extensions.screenshots.disabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableFirefoxScreenshots = 0x1 | 0x0
 ```
@@ -719,7 +724,7 @@ Software\Policies\Mozilla\Firefox\DisableFirefoxScreenshots = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -734,7 +739,7 @@ Disable Firefox Accounts integration (Sync).
 **CCK2 Equivalent:** `disableSync`\
 **Preferences Affected:** `identity.fxaccounts.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableFirefoxAccounts = 0x1 | 0x0
 ```
@@ -745,7 +750,7 @@ Software\Policies\Mozilla\Firefox\DisableFirefoxAccounts = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -757,10 +762,10 @@ Software\Policies\Mozilla\Firefox\DisableFirefoxAccounts = 0x1 | 0x0
 Disable Firefox studies (Shield).
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
-**CCK2 Equivalent:** `disableForget`\
+**CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableFirefoxStudies = 0x1 | 0x0
 ```
@@ -771,7 +776,7 @@ Software\Policies\Mozilla\Firefox\DisableFirefoxStudies = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -786,7 +791,7 @@ Disable the "Forget" button.
 **CCK2 Equivalent:** `disableForget`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableForgetButton = 0x1 | 0x0
 ```
@@ -797,7 +802,7 @@ Software\Policies\Mozilla\Firefox\DisableForgetButton = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -812,7 +817,7 @@ Turn off saving information on web forms and the search bar.
 **CCK2 Equivalent:** `disableFormFill`\
 **Preferences Affected:** ` browser.formfill.enable`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableFormHistory = 0x1 | 0x0
 ```
@@ -823,7 +828,7 @@ Software\Policies\Mozilla\Firefox\DisableFormHistory = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -831,6 +836,33 @@ Software\Policies\Mozilla\Firefox\DisableFormHistory = 0x1 | 0x0
   }
 }
 ```
+### DisablePasswordReveal
+Do not allow passwords to be shown in saved logins
+
+**Compatibility:** Firefox 71, Firefox ESR 68.3\
+**CCK2 Equivalent:** N/A
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\DisablePasswordReveal = 0x1 | 0x0
+```
+
+#### macOS
+```
+<dict>
+  <key>DisablePasswordReveal</key>
+  <true/> | <false/>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "DisablePasswordReveal": true | false
+  }
+}
+```
 ### DisablePocket
 Remove Pocket in the Firefox UI. It does not remove it from the new tab page.
 
@@ -838,7 +870,7 @@ Remove Pocket in the Firefox UI. It does not remove it from the new tab page.
 **CCK2 Equivalent:** `disablePocket`\
 **Preferences Affected:** `extensions.pocket.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisablePocket = 0x1 | 0x0
 ```
@@ -849,7 +881,7 @@ Software\Policies\Mozilla\Firefox\DisablePocket = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -864,7 +896,7 @@ Remove access to private browsing.
 **CCK2 Equivalent:** `disablePrivateBrowsing`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisablePrivateBrowsing = 0x1 | 0x0
 ```
@@ -875,7 +907,7 @@ Software\Policies\Mozilla\Firefox\DisablePrivateBrowsing = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -890,7 +922,7 @@ Disables the "Import data from another browser" option in the bookmarks window.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableProfileImport = 0x1 | 0x0
 ```
@@ -901,7 +933,7 @@ Software\Policies\Mozilla\Firefox\DisableProfileImport = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -916,7 +948,7 @@ Disable the Refresh Firefox button on about:support and support.mozilla.org, as
 **CCK2 Equivalent:** `disableResetFirefox`\
 **Preferences Affected:** `browser.disableResetPrompt`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableProfileRefresh = 0x1 | 0x0
 ```
@@ -927,7 +959,7 @@ Software\Policies\Mozilla\Firefox\DisableProfileRefresh = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -944,7 +976,7 @@ On Windows, this disables safe mode via the command line as well.
 **CCK2 Equivalent:** `disableSafeMode`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableSafeMode = 0x1 | 0x0
 ```
@@ -955,7 +987,7 @@ Software\Policies\Mozilla\Firefox\DisableSafeMode = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -974,7 +1006,7 @@ Prevent the user from bypassing security in certain cases.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `security.certerror.hideAddException`,`browser.safebrowsing.allowOverride`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableSecurityBypass\InvalidCertificate = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\DisableSecurityBypass\SafeBrowsing = 0x1 | 0x0
@@ -991,7 +1023,7 @@ Software\Policies\Mozilla\Firefox\DisableSecurityBypass\SafeBrowsing = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1009,7 +1041,7 @@ Prevent system add-ons from being installed or update.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```Software\Policies\Mozilla\Firefox\DisableSystemAddonUpdate = 0x1 | 0x0
 ```
 #### macOS
@@ -1019,7 +1051,7 @@ Prevent system add-ons from being installed or update.
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1036,7 +1068,7 @@ Mozilla recommends that you do not disable telemetry. Information collected thro
 **CCK2 Equivalent:** `disableTelemetry`\
 **Preferences Affected:** `datareporting.healthreport.uploadEnabled,datareporting.policy.dataSubmissionEnabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisableTelemetry = 0x1 | 0x0
 ```
@@ -1047,7 +1079,7 @@ Software\Policies\Mozilla\Firefox\DisableTelemetry = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1062,7 +1094,7 @@ Set the initial state of the bookmarks toolbar. A user can still hide it and it
 **CCK2 Equivalent:** `displayBookmarksToolbar`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisplayBookmarksToolbar = 0x1 | 0x0
 ```
@@ -1073,7 +1105,7 @@ Software\Policies\Mozilla\Firefox\DisplayBookmarksToolbar = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1081,14 +1113,14 @@ Software\Policies\Mozilla\Firefox\DisplayBookmarksToolbar = 0x1 | 0x0
   }
 }
 ```
-### DisplayMenuBar
+### DisplayMenuBar (Deprecated)
 Set the initial state of the menubar. A user can still hide it and it will stay hidden.
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (Windows, some Linux)\
 **CCK2 Equivalent:** `displayMenuBar`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DisplayMenuBar = 0x1 | 0x0
 ```
@@ -1099,7 +1131,7 @@ Software\Policies\Mozilla\Firefox\DisplayMenuBar = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1107,6 +1139,40 @@ Software\Policies\Mozilla\Firefox\DisplayMenuBar = 0x1 | 0x0
   }
 }
 ```
+### DisplayMenuBar
+Set the state of the menubar.
+
+`always` means the menubar is shown and cannot be hidden.
+
+`never` means the menubar is hidden and cannot be shown.
+
+`default-on` means the menubar is on by default but can be hidden.
+
+`default-off` means the menubar is off by default but can be shown.
+
+**Compatibility:** Firefox 73, Firefox ESR 68.5 (Windows, some Linux)\
+**CCK2 Equivalent:** `displayMenuBar`\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\DisplayMenuBar = "always", "never", "default-on", "default-off"
+```
+#### macOS
+```
+<dict>
+  <key>DisplayMenuBar</key>
+  <string>always | never | default-on | default-off</string>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "DisplayMenuBar": "always", "never", "default-on", "default-off"
+  }
+}
+```
 ### DNSOverHTTPS
 Configure DNS over HTTPS.
 
@@ -1120,7 +1186,7 @@ Configure DNS over HTTPS.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.trr.mode`,`network.trr.uri`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ProviderURL = "URL_TO_ALTERNATE_PROVIDER"
@@ -1140,7 +1206,7 @@ Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1159,7 +1225,7 @@ Don't check if Firefox is the default browser at startup.
 **CCK2 Equivalent:** `dontCheckDefaultBrowser`\
 **Preferences Affected:** `browser.shell.checkDefaultBrowser`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DontCheckDefaultBrowser = 0x1 | 0x0
 ```
@@ -1170,7 +1236,7 @@ Software\Policies\Mozilla\Firefox\DontCheckDefaultBrowser = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1187,7 +1253,7 @@ You can use ${home} for the native home directory.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.download.dir`,`browser.download.folderList`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DefaultDownloadDirectory = "${home}\Downloads"
 ```
@@ -1198,14 +1264,14 @@ Software\Policies\Mozilla\Firefox\DefaultDownloadDirectory = "${home}\Downloads"
   <string>${home}/Downloads</string>
 </dict>
 ```
-#### JSON (macOS and Linux)
+#### policies.json (macOS and Linux)
 ```
 {
   "policies": {
     "DefaultDownloadDirectory": "${home}/Downloads"
 }
 ```
-#### JSON (Windows)
+#### policies.json (Windows)
 ```
 {
   "policies": {
@@ -1221,7 +1287,7 @@ You can use ${home} for the native home directory.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.download.dir`,`browser.download.folderList`,`browser.download.useDownloadDir`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\DownloadDirectory = "${home}\Downloads"
 ```
@@ -1232,14 +1298,14 @@ Software\Policies\Mozilla\Firefox\DownloadDirectory = "${home}\Downloads"
   <string>${home}/Downloads</string>
 </dict>
 ```
-#### JSON (macOS and Linux)
+#### policies.json (macOS and Linux)
 ```
 {
   "policies": {
     "DownloadDirectory": "${home}/Downloads"
 }
 ```
-#### JSON (Windows)
+#### policies.json (Windows)
 ```
 {
   "policies": {
@@ -1259,16 +1325,19 @@ If `Cryptomining` is set to true, cryptomining scripts on websites are blocked.
 
 If `Fingerprinting` is set to true, fingerprinting scripts on websites are blocked.
 
-**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2)\
-**CCK2 Equivalent:** `dontCheckDefaultBrowser`\
+`Exceptions` are origins for which tracking protection is not enabled.
+
+**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5)\
+**CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.trackingprotection.enabled`,`privacy.trackingprotection.pbmode.enabled`,`privacy.trackingprotection.cryptomining.enabled`,`privacy.trackingprotection.fingerprinting.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Value = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Cryptomining = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions\1 = "https://example.com"
 ```
 #### macOS
 ```
@@ -1277,16 +1346,20 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1
   <dict>
     <key>Value</key>
     <true/> | <false/>
-    <key><Locked/key>
+    <key><Locked</key>
     <true/> | <false/>
-    <key><Cryptomining/key>
+    <key><Cryptomining</key>
     <true/> | <false/>
-    <key><Fingerprinting/key>
+    <key><Fingerprinting</key>
     <true/> | <false/>
+    <key>Exceptions</key>
+    <array>
+      <string>https://example.com</string>
+    </array>
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1294,7 +1367,8 @@ Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Fingerprinting = 0x1
       "Value": [true, false],
       "Locked": [true, false],
       "Cryptomining": [true, false],
-      "Fingerprinting": [true, false]
+      "Fingerprinting": [true, false],
+      "Exceptions": ["https://example.com"]
     }
 }
 ```
@@ -1325,7 +1399,7 @@ Control the installation, uninstallation and locking of extensions.
 **CCK2 Equivalent:** `addons`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Extensions\Install\1 = "https://addons.mozilla.org/firefox/downloads/somefile.xpi"
 Software\Policies\Mozilla\Firefox\Extensions\Install\2 = "//path/to/xpi"
@@ -1353,9 +1427,7 @@ Software\Policies\Mozilla\Firefox\Extensions\Locked\1 = "addon_id@mozilla.org"
   </dict>
 </dict>
 ```
-#### JSON
-
-
+#### policies.json
 ```
 {
   "policies": {
@@ -1392,9 +1464,21 @@ The configuration for each extension is another dictionary that can contain the
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
-Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = '{"*": {"installation_mode": "blocked"}}'
+Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) =
+{
+  "*": {
+    "blocked_install_message": "Custom error message.",
+    "install_sources": ["https://addons.mozilla.org/"],
+    "installation_mode": "blocked",
+    "allowed_types": ["extension"]
+  },
+  "uBlock0@raymondhill.net": {
+    "installation_mode": "force_installed",
+    "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"
+  }
+}
 ```
 #### macOS
 ```
@@ -1411,6 +1495,10 @@ Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = '{"*": {"in
       </array>
       <key>installation_mode</key>
       <string>blocked</string>
+      <key>allowed_types</key>
+      <array>
+        <string>extension</string>
+      </array>
     </dict>
     <key>uBlock0@raymondhill.net</key>
     <dict>
@@ -1422,7 +1510,7 @@ Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = '{"*": {"in
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1430,7 +1518,8 @@ Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = '{"*": {"in
       "*": {
         "blocked_install_message": "Custom error message.",
         "install_sources": ["https://addons.mozilla.org/"],
-        "installation_mode": "blocked"
+        "installation_mode": "blocked",
+        "allowed_types": ["extension"]
       },
       "uBlock0@raymondhill.net": {
         "installation_mode": "force_installed",
@@ -1447,7 +1536,7 @@ Control extension updates.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `extensions.update.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\ExtensionUpdate = 0x1 | 0x0
 ```
@@ -1458,7 +1547,7 @@ Software\Policies\Mozilla\Firefox\ExtensionUpdate = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1481,7 +1570,7 @@ Configure the default Flash plugin policy as well as origins for which Flash is
 **CCK2 Equivalent:** `permissions.plugin`\
 **Preferences Affected:** `plugin.state.flash`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\FlashPlugin\Allow\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\FlashPlugin\Block\1 = "https://example.edu"
@@ -1508,7 +1597,7 @@ Software\Policies\Mozilla\Firefox\FlashPlugin\Locked = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1528,7 +1617,7 @@ Customize the Firefox Home page.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`,`browser.newtabpage.activity-stream.feeds.topsites`,`browser.newtabpage.activity-stream.feeds.section.highlights`,`browser.newtabpage.activity-stream.feeds.section.topstories`,`browser.newtabpage.activity-stream.feeds.snippets`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\FirefoxHome\Search = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0
@@ -1557,7 +1646,7 @@ Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1579,7 +1668,7 @@ Control hardware acceleration.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `layers.acceleration.disabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\HardwareAcceleration = 0x1 | 0x0
 ```
@@ -1590,7 +1679,7 @@ Software\Policies\Mozilla\Firefox\HardwareAcceleration = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1613,7 +1702,7 @@ Configure the default homepage and how Firefox starts.
 **CCK2 Equivalent:** `homePage`,`lockHomePage`\
 **Preferences Affected:** `browser.startup.homepage`,`browser.startup.page`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Homepage\URL = "https://example.com"
 Software\Policies\Mozilla\Firefox\Homepage\Locked = 0x1 | 0x0
@@ -1636,11 +1725,11 @@ Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" |  "p
       <string>http://example.edu</string>
     </array>
     <key>StartPage</key>
-    <string>always | never | from-visited</string>
+    <string>none | homepage | previous-session</string>
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1649,7 +1738,7 @@ Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" |  "p
       "Locked": true | false,
       "Additional": ["http://example.org/",
                      "http://example.edu/"],
-      "StartPage": "none" | "homepage" |  "previous-session"
+      "StartPage": "none" | "homepage" | "previous-session"
     }
   }
 }
@@ -1665,7 +1754,7 @@ Configure the default extension install policy as well as origins for extension
 **CCK2 Equivalent:** `permissions.install`\
 **Preferences Affected:** `xpinstall.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\InstallAddonsPermission\Allow\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\InstallAddonsPermission\Allow\2 = "https://example.edu"
@@ -1686,7 +1775,7 @@ Software\Policies\Mozilla\Firefox\InstallAddonsPermission\Default = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1711,7 +1800,7 @@ This policy only work on Windows via GPO (not policies.json).
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\LegacyProfiles = = 0x1 | 0x0
 ```
@@ -1722,7 +1811,7 @@ Enable linking to local files by origin.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `capability.policy.localfilelinks.*`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\LocalFileLinks\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\LocalFileLinks\2 = "https://example.edu"
@@ -1737,7 +1826,7 @@ Software\Policies\Mozilla\Firefox\LocalFileLinks\2 = "https://example.edu"
   </array>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1755,7 +1844,7 @@ This policy is only effective if the user profile has not been created yet.
 **CCK2 Equivalent:** `removeDefaultBookmarks`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\NoDefaultBookmarks = 0x1 | 0x0
 ```
@@ -1766,7 +1855,7 @@ Software\Policies\Mozilla\Firefox\NoDefaultBookmarks = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1781,7 +1870,7 @@ Enable or disable network prediction (DNS prefetching).
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.dns.disablePrefetch`,`network.dns.disablePrefetchFromHTTPS`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\NetworkPrediction = 0x1 | 0x0
 ```
@@ -1792,7 +1881,7 @@ Software\Policies\Mozilla\Firefox\NetworkPrediction = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1806,7 +1895,7 @@ Enable or disable the New Tab page.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.newtabpage.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\NewTabPage = 0x1 | 0x0
 ```
@@ -1817,7 +1906,7 @@ Software\Policies\Mozilla\Firefox\NewTabPage = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1831,7 +1920,7 @@ Control whether or not Firefox offers to save passwords.
 **CCK2 Equivalent:** `dontRememberPasswords`\
 **Preferences Affected:** `signon.rememberSignons`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\OfferToSaveLogins = 0x1 | 0x0
 ```
@@ -1842,7 +1931,7 @@ Software\Policies\Mozilla\Firefox\OfferToSaveLogins = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1857,7 +1946,7 @@ Sets the default value of signon.rememberSignons without locking it.
 **CCK2 Equivalent:** `dontRememberPasswords`\
 **Preferences Affected:** `signon.rememberSignons`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\OfferToSaveLoginsDefault = 0x1 | 0x0
 ```
@@ -1868,7 +1957,7 @@ Software\Policies\Mozilla\Firefox\OfferToSaveLoginsDefault = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1883,7 +1972,7 @@ Override the first run page. If the value is blank, no first run page is display
 **CCK2 Equivalent:** `welcomePage`,`noWelcomePage`\
 **Preferences Affected:** `startup.homepage_welcome_url`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\OverrideFirstRunPage = "http://example.org"
 ```
@@ -1894,7 +1983,7 @@ Software\Policies\Mozilla\Firefox\OverrideFirstRunPage = "http://example.org"
   <string>http://example.org</string>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1908,7 +1997,7 @@ Override the upgrade page. If the value is blank, no upgrade page is displayed.
 **CCK2 Equivalent:** `upgradePage`,`noUpgradePage`\
 **Preferences Affected:** `startup.homepage_override_url`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\OverridePostUpdatePage = "http://example.org"
 ```
@@ -1919,7 +2008,7 @@ Software\Policies\Mozilla\Firefox\OverridePostUpdatePage = "http://example.org"
   <string>http://example.org</string>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1931,9 +2020,9 @@ Remove access to the password manager via preferences and blocks about:logins on
 
 **Compatibility:** Firefox 70, Firefox ESR 60.2\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `prefs.privacy.disable_button.view_passwords`
+**Preferences Affected:** `pref.privacy.disable_button.view_passwords`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\PasswordManagerEnabled = 0x1 | 0x0
 ```
@@ -1944,7 +2033,7 @@ Software\Policies\Mozilla\Firefox\PasswordManagerEnabled = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -1953,7 +2042,7 @@ Software\Policies\Mozilla\Firefox\PasswordManagerEnabled = 0x1 | 0x0
 }
 ```
 ### Permissions
-Set permissions associated with camera, microphone, location, and notifications
+Set permissions associated with camera, microphone, location, notifications, and autoplay. Because these are origins, not domains, entries with unique ports must be specified separately. See examples below.
 
 `Allow` is a list of origins where the feature is allowed.
 
@@ -1963,13 +2052,14 @@ Set permissions associated with camera, microphone, location, and notifications
 
 `Locked` prevents the user from changing preferences for the feature.
 
-**Compatibility:** Firefox 62, Firefox ESR 60.2\
+**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Permissions\Camera\Allow\1 = "https://example.org"
+Software\Policies\Mozilla\Firefox\Permissions\Camera\Allow\2 = "https://example.org:1234"
 Software\Policies\Mozilla\Firefox\Permissions\Camera\Block\1 = "https://example.edu"
 Software\Policies\Mozilla\Firefox\Permissions\Camera\BlockNewRequests = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Camera\Locked = 0x1 | 0x0
@@ -1985,6 +2075,8 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Allow\1 = "https://e
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Block\1 = "https://example.edu"
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org"
+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu"
 ```
 #### macOS
 ```
@@ -1996,6 +2088,7 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
       <key>Allow</key>
       <array>
         <string>https://example.org</string>
+        <string>https://example.org:1234</string>
       </array>
       <key>Block</key>
       <array>
@@ -2051,16 +2144,27 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
       <key>Locked</key>
       <true/>
     </dict>
+    <key>Autoplay</key>
+    <dict>
+      <key>Allow</key>
+      <array>
+        <string>https://example.org</string>
+      </array>
+      <key>Block</key>
+      <array>
+        <string>https://example.edu</string>
+      </array>
+    </dict>
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
     "Permissions": {
       "Camera": {
-        "Allow": ["https://example.org"],
+        "Allow": ["https://example.org","https://example.org:1234"],
         "Block": ["https://example.edu"],
         "BlockNewRequests": true | false,
         "Locked": true | false
@@ -2082,6 +2186,10 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
         "Block": ["https://example.edu"],
         "BlockNewRequests": true | false,
         "Locked": true | false
+      },
+      "Autoplay": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"]
       }
     }
   }
@@ -2100,7 +2208,7 @@ Configure the default pop-up window policy as well as origins for which pop-up w
 **CCK2 Equivalent:** `permissions.popup`\
 **Preferences Affected:** `dom.disable_open_during_load`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\PopupBlocking\Allow\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\PopupBlocking\Allow\2 = "https://example.edu"
@@ -2124,7 +2232,7 @@ Software\Policies\Mozilla\Firefox\PopupBlocking\Locked = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2146,35 +2254,37 @@ Set and lock certain preferences.
 
 | Preference | Type | Compatibility | Default
 | --- | --- | --- | ---
-| accessibility.force_disabled | integer | Firefox 70, Firefox ESR 6.2 | 0
+| accessibility.force_disabled | integer | Firefox 70, Firefox ESR 68.2 | 0
 | &nbsp;&nbsp;&nbsp;&nbsp;If set to 1, platform accessibility is disabled.
 | app.update.auto | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, Firefox doesn't automatically install update.
-| browser.bookmarks.autoExportHTML | boolean | Firefox 70, Firefox ESR 6.2 | false
+| browser.bookmarks.autoExportHTML | boolean | Firefox 70, Firefox ESR 68.2 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, bookmarks are exported on shutdown.
-| browser.bookmarks.file | string | Firefox 70, Firefox ESR 6.2 | N/A
+| browser.bookmarks.file | string | Firefox 70, Firefox ESR 68.2 | N/A
 | &nbsp;&nbsp;&nbsp;&nbsp;If set, the name of the file where bookmarks are exported and imported.
-| browser.bookmarks.restore_default_bookmarks | string | Firefox 70, Firefox ESR 6.2 | N/A
+| browser.bookmarks.restore_default_bookmarks | boolean | Firefox 70, Firefox ESR 68.2 | N/A
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, bookmarks are restored to their defaults.
 | browser.cache.disk.enable | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, don't store cache on the hard drive.
-| browser.cache.disk.parent_directory | string | Firefox 68, Firefox ESR 68 | Profile temporary directory
-| &nbsp;&nbsp;&nbsp;&nbsp;If set, changes the location of the disk cache.
+| ~browser.cache.disk.parent_directory~ | string | Firefox 68, Firefox ESR 68 | Profile temporary directory
+| &nbsp;&nbsp;&nbsp;&nbsp;~If set, changes the location of the disk cache.~ This policy doesn't work. It's being worked on.
 | browser.fixup.dns_first_for_single_words | boolean | Firefox 68, Firefox ESR 68 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, single words are sent to DNS, not directly to search.
-| browser.places.importBookmarksHTML | string | Firefox 70, Firefox ESR 6.2
+| browser.newtabpage.activity-stream.default.sites | string | Firefox 72, ESR 68.4 | Locale dependent
+| &nbsp;&nbsp;&nbsp;&nbsp;If set, a list of URLs to use as the default top sites on the new tab page.
+| browser.places.importBookmarksHTML | boolean | Firefox 70, Firefox ESR 68.2
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, bookmarks are always imported on startup.
-| browser.safebrowsing.phishing.enabled | string | Firefox 70, Firefox ESR 6.2 | true
+| browser.safebrowsing.phishing.enabled | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, phishing protection is not enabled (Not recommended)
-| browser.safebrowsing.malware.enabled | string | Firefox 70, Firefox ESR 6.2 | true
-| &nbsp;&nbsp;&nbsp;&nbsp;IF false, malware protection is not enabled (Not recommended)
+| browser.safebrowsing.malware.enabled | boolean | Firefox 70, Firefox ESR 68.2 | true
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, malware protection is not enabled (Not recommended)
 | browser.search.update | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, updates for search engines are not checked.
-| browser.slowStartup.notificationDisabled | string | Firefox 70, Firefox ESR 6.2 | false
+| browser.slowStartup.notificationDisabled | boolean | Firefox 70, Firefox ESR 68.2 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, a notification isn't shown if startup is slow.
 | browser.tabs.warnOnClose | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, there is no warning when the browser is closed.
-| browser.taskbar.previews.enable | string | Firefox 70, Firefox ESR 6.2 (Windows only) | false
+| browser.taskbar.previews.enable | boolean | Firefox 70, Firefox ESR 68.2 (Windows only) | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, tab previews are shown in the Windows taskbar.
 | browser.urlbar.suggest.bookmark | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, bookmarks aren't suggested when typing in the URL bar.
@@ -2184,7 +2294,7 @@ Set and lock certain preferences.
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, open tabs aren't suggested when typing in the URL bar.
 | datareporting.policy.dataSubmissionPolicyBypassNotification | boolean | Firefox 68, Firefox ESR 68 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, don't show the privacy policy tab on first run.
-| dom.allow_scripts_to_close_windows | string | Firefox 70, Firefox ESR 6.2 | false
+| dom.allow_scripts_to_close_windows | boolean | Firefox 70, Firefox ESR 68.2 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, web page can close windows.
 | dom.disable_window_flip | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, web pages can focus and activate windows.
@@ -2196,37 +2306,54 @@ Set and lock certain preferences.
 | &nbsp;&nbsp;&nbsp;&nbsp;See https://support.mozilla.org/en-US/kb/dom-events-changes-introduced-firefox-66
 | dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl | string | Firefox 68, Firefox ESR 68 | N/A
 | &nbsp;&nbsp;&nbsp;&nbsp;See https://support.mozilla.org/en-US/kb/dom-events-changes-introduced-firefox-66
-| extensions.blocklist.enabled | string | Firefox 70, Firefox ESR 6.2 | true
+| dom.xmldocument.load.enabled | boolean | Firefox ESR 68.5 | true.
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, XMLDocument.load is not available.
+| dom.xmldocument.async.enabled | boolean | Firefox ESR 68.5 | true
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, XMLDocument.async is not available.
+| extensions.blocklist.enabled | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the extensions blocklist is not used (Not recommended)
 | extensions.getAddons.showPane | boolean | Firefox 68, Firefox ESR 68 | N/A
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the Recommendations tab is not displayed in the Add-ons Manager.
-| geo.enabled | string | Firefox 70, Firefox ESR 6.2 | true
+| extensions.htmlaboutaddons.recommendations.enabled | boolean | Firefox 72, Firefox ESR 68.4 | true
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, recommendations are not shown on the Extensions tab in the Add-ons Manager.
+| geo.enabled | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the geolocation API is disabled. | Language dependent
-| intl.accept_languages | string | Firefox 70, Firefox ESR 6.2
+| intl.accept_languages | string | Firefox 70, Firefox ESR 68.2
 | &nbsp;&nbsp;&nbsp;&nbsp;If set, preferred language for web pages.
-| media.eme.enabled | string | Firefox 70, Firefox ESR 6.2 | true
+| media.eme.enabled | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, Encrypted Media Extensions are not enabled.
 | media.gmp-gmpopenh264.enabled | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the OpenH264  plugin is not downloaded.
 | media.gmp-widevinecdm.enabled | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the Widevine plugin is not downloaded.
+| media.peerconnection.enabled | boolean | Firefox 72, Firefox ESR 68.4 | true
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, WebRTC is disabled
+| media.peerconnection.ice.obfuscate_host_addresses.whitelist | string | Firefox 72, Firefox ESR 68.4 | N/A
+| &nbsp;&nbsp;&nbsp;&nbsp;If set, a list of domains for which mDNS hostname obfuscation is
+disabled
 | network.dns.disableIPv6 | boolean | Firefox 68, Firefox ESR 68 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, IPv6 DNS lokoups are disabled.
 | network.IDN_show_punycode | boolean | Firefox 68, Firefox ESR 68 | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, display the punycode version of internationalized domain names. 
 | places.history.enabled | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, history is not enabled.
-| print.save_print_settings | string | Firefox 70, Firefox ESR 6.2 | true
+| print.save_print_settings | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, print settings are not saved between jobs.
 | security.default_personal_cert | string | Firefox 68, Firefox ESR 68 | Ask Every Time
 | &nbsp;&nbsp;&nbsp;&nbsp;If set to Select Automatically, Firefox automatically chooses the default personal certificate.
-| security.mixed_content.block_active_content | string | Firefox 70, Firefox ESR 6.2 | true
+| security.mixed_content.block_active_content | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, mixed active content (HTTP and HTTPS) is not blocked.
+| security.osclientcerts.autoload | boolean | Firefox 72, Firefox ESR 68.4 (Windows only) | false
+| &nbsp;&nbsp;&nbsp;&nbsp;If true, client certificates are loaded from the operating system certificate store.
 | security.ssl.errorReporting.enabled | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, SSL errors cannot be sent to Mozilla.
+| security.tls.hello_downgrade_check | boolean | Firefox 72, Firefox ESR 68.4 | true
+| &nbsp;&nbsp;&nbsp;&nbsp;If false, the TLS 1.3 downgrade check is disabled.
 | ui.key.menuAccessKeyFocuses | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, the Alt key doesn't show the menubar on Windows.
-#### Windows
+| widget.content.gtk-theme-override | string | Firefox 72, Firefox ESR 68.4 (Linux only) | N/A
+| &nbsp;&nbsp;&nbsp;&nbsp;If set, overrides the GTK theme for widgets.
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Preferences\boolean_preference_name = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_value"
@@ -2243,7 +2370,7 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2258,10 +2385,10 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v
 Ask where to save each file before downloading.
 
 **Compatibility:** Firefox 68, Firefox ESR 68\
-**CCK2 Equivalent:** N/A
+**CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.download.useDownloadDir`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\PromptForDownloadLocation = 0x1 | 0x0
 ```
@@ -2272,7 +2399,7 @@ Software\Policies\Mozilla\Firefox\PromptForDownloadLocation = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2312,7 +2439,7 @@ To specify ports, append them to the hostnames with a colon (:).
 **CCK2 Equivalent:** `networkProxy*`\
 **Preferences Affected:** `network.proxy.type`,`network.proxy.autoconfig_url`,`network.proxy.socks_remote_dns`,`signon.autologin.proxy`,`network.proxy.socks_version`,`network.proxy.no_proxies_on`,`network.proxy.share_proxy_settings`,`network.proxy.http`,`network.proxy.http_port`,`network.proxy.ftp`,`network.proxy.ftp_port`,`network.proxy.ssl`,`network.proxy.ssl_port`,`network.proxy.socks`,`network.proxy.socks_port`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Proxy\Mode = "none", "system", "manual", "autoDetect", "autoConfig"
 Software\Policies\Mozilla\Firefox\Proxy\Locked = 0x1 | 0x0
@@ -2333,7 +2460,7 @@ Software\Policies\Mozilla\Firefox\Proxy\UseProxyForDNS = 0x1 | 0x0
   <key>Proxy</key>
   <dict>
     <key>Mode</key>
-    <string>none | system | manual | autoDetect| autoConfig</string>
+    <string>none | system | manual | autoDetect | autoConfig</string>
     <key>Locked</key>
     <true> | </false>
     <key>HTTPProxy</key>
@@ -2359,7 +2486,7 @@ Software\Policies\Mozilla\Firefox\Proxy\UseProxyForDNS = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2388,7 +2515,7 @@ Note: For Firefox 68, this can now be a string so that you can specify an empty
 **Compatibility:** Firefox 64, Firefox ESR 60.4, Updated in Firefox 68, Firefox ESR 68\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\RequestedLocales\1 = "de"
 Software\Policies\Mozilla\Firefox\RequestedLocales\2 = "en-US"
@@ -2415,7 +2542,7 @@ or
 </dict>
 
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2434,10 +2561,12 @@ or
 ### SanitizeOnShutdown (Selective)
 Clear data on shutdown. Choose from Cache, Cookies, Download History, Form & Search History, Browsing History, Active Logins, Site Preferences and Offline Website Data.
 
-**Compatibility:** Firefox 68, Firefox ESR 68\
+Previously, these values were always locked. Starting with Firefox 74 and Firefox ESR 68.6, you can use the `Locked` option to either keep the values unlocked (set it to false), or lock only the values you set (set it to true). If you want the old behavior of locking everything, do not set `Locked` at all.
+
+**Compatibility:** Firefox 68, Firefox ESR 68 (Locked added in 74/68.6)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.sanitize.sanitizeOnShutdown`,`privacy.clearOnShutdown.cache`,`privacy.clearOnShutdown.cookies`,`privacy.clearOnShutdown.downloads`,`privacy.clearOnShutdown.formdata`,`privacy.clearOnShutdown.history`,`privacy.clearOnShutdown.sessions`,`privacy.clearOnShutdown.siteSettings`,`privacy.clearOnShutdown.offlineApps`
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cache = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cookies = 0x1 | 0x0
@@ -2447,6 +2576,7 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\History = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Sessions = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\SiteSettings = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Locked = 0x1 | 0x0
 ```
 #### macOS
 ```
@@ -2469,10 +2599,12 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
     <true/> | <false/>
     <key>OfflineApps</key>
     <true/> | <false/>
+    <key>Locked</key>
+    <true/> | <false/>
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2484,7 +2616,8 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
-      "OfflineApps": true | false
+      "OfflineApps": true | false,
+      "Locked": true | false
     }
   }
 }
@@ -2495,7 +2628,7 @@ Clear all data on shutdown, including Browsing & Download History, Cookies, Acti
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.sanitize.sanitizeOnShutdown`,`privacy.clearOnShutdown.cache`,`privacy.clearOnShutdown.cookies`,`privacy.clearOnShutdown.downloads`,`privacy.clearOnShutdown.formdata`,`privacy.clearOnShutdown.history`,`privacy.clearOnShutdown.sessions`,`privacy.clearOnShutdown.siteSettings`,`privacy.clearOnShutdown.offlineApps`
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown = 0x1 | 0x0
 ```
@@ -2506,7 +2639,7 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2521,7 +2654,7 @@ Set whether or not search bar is displayed.
 **CCK2 Equivalent:** `showSearchBar`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchBar = "unified" | "separate"
 ```
@@ -2533,7 +2666,7 @@ Software\Policies\Mozilla\Firefox\SearchBar = "unified" | "separate"
 </dict>
 ```
 
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2556,7 +2689,7 @@ Set the default search engine. This policy is only available on the ESR.
 **CCK2 Equivalent:** `defaultSearchEngine`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchEngines\Default = NAME_OF_SEARCH_ENGINE
 ```
@@ -2570,7 +2703,7 @@ Software\Policies\Mozilla\Firefox\SearchEngines\Default = NAME_OF_SEARCH_ENGINE
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2588,7 +2721,7 @@ Prevent installing search engines from webpages.
 **CCK2 Equivalent:** `disableSearchEngineInstall`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchEngines\PreventInstalls = 0x1 | 0x0
 ```
@@ -2602,7 +2735,7 @@ Software\Policies\Mozilla\Firefox\SearchEngines\PreventInstalls = 0x1 | 0x0
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2620,7 +2753,7 @@ Hide built-in search engines. This policy is only available on the ESR.
 **CCK2 Equivalent:** `removeDefaultSearchEngines` (removed all built-in engines)\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchEngines\Remove\1 = NAME_OF_SEARCH_ENGINE
 ```
@@ -2636,7 +2769,7 @@ Software\Policies\Mozilla\Firefox\SearchEngines\Remove\1 = NAME_OF_SEARCH_ENGINE
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2670,7 +2803,7 @@ Add new search engines (up to five). This policy is only available on the ESR. `
 **CCK2 Equivalent:** `searchplugins`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Name = "Example1"
 Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\URLTemplate = "https://www.example.org/q={searchTerms}"
@@ -2711,7 +2844,7 @@ Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\PostData = "name=value&q={
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2740,7 +2873,7 @@ Enable search suggestions.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `browser.urlbar.suggest.searches`,`browser.search.suggest.enabled`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SearchSuggestEnabled = 0x1 | 0x0
 ```
@@ -2751,7 +2884,7 @@ Software\Policies\Mozilla\Firefox\SearchSuggestEnabled = 0x1 | 0x0
   <true/> | <false/>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2767,7 +2900,7 @@ Install PKCS #11 modules.
 **CCK2 Equivalent:** `certs.devices`\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SecurityDevices\NAME_OF_DEVICE = PATH_TO_LIBRARY_FOR_DEVICE
 ```
@@ -2782,7 +2915,7 @@ Software\Policies\Mozilla\Firefox\SecurityDevices\NAME_OF_DEVICE = PATH_TO_LIBRA
 </dict>
 ```
 
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2800,7 +2933,7 @@ Set and lock the maximum version of TLS.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `security.tls.version.max`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SSLVersionMax = "tls1" | "tls1.1" | "tls1.2" | "tls1.3"
 ```
@@ -2812,7 +2945,7 @@ Software\Policies\Mozilla\Firefox\SSLVersionMax = "tls1" | "tls1.1" | "tls1.2" |
 </dict>
 ```
 
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2828,7 +2961,7 @@ Set and lock the minimum version of TLS.
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `security.tls.version.min`
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SSLVersionMin = "tls1" | "tls1.1" | "tls1.2" | "tls1.3"
 ```
@@ -2840,7 +2973,7 @@ Software\Policies\Mozilla\Firefox\SSLVersionMin = "tls1" | "tls1.1" | "tls1.2" |
 </dict>
 ```
 
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2855,7 +2988,7 @@ Add a menuitem to the help menu for specifying support information.
 **CCK2 Equivalent:** helpMenu\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SupportMenu\Title = "Support Menu"
 Software\Policies\Mozilla\Firefox\SupportMenu\URL = "http://example.com/support"
@@ -2875,7 +3008,7 @@ Software\Policies\Mozilla\Firefox\SupportMenu\AccessKey = "S"
   </dict>
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {
@@ -2894,7 +3027,7 @@ Block websites from being visited. The parameters take an array of Match Pattern
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
-#### Windows
+#### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\WebsiteFilters\Block\1 = "<all_urls>"
 Software\Policies\Mozilla\Firefox\WebsiteFilters\Exceptions\1 = "http://example.org/*"
@@ -2916,7 +3049,7 @@ Software\Policies\Mozilla\Firefox\WebsiteFilters\Exceptions\1 = "http://example.
 
 </dict>
 ```
-#### JSON
+#### policies.json
 ```
 {
   "policies": {