From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 18 Aug 2020 20:47:00 +0000 (-0500)
Subject: Merge pull request #664 from clear-code/fix-issue-663
X-Git-Tag: v2.2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/7792572a798bd96ceb997f89c5f171bc1ea21b5a?hp=a5e0c5982d4f273eb04e14ef91c988575b2a9f95

Merge pull request #664 from clear-code/fix-issue-663

Fix inverted label for PopupBlocking_Default in English
---

diff --git a/README.md b/README.md
index 60d8464..f688606 100644
--- a/README.md
+++ b/README.md
@@ -2478,7 +2478,7 @@ Within each handler type, you specify the given mimeType/extension/scheme as a k
 
 #### Windows (GPO)
 ```
-Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) =
+Software\Policies\Mozilla\Firefox\Handlers (REG_MULTI_SZ) =
 {
   "mimeTypes": {
     "application/msword": {
@@ -3906,7 +3906,7 @@ To specify ports, append them to the hostnames with a colon (:).
 
 #### Windows (GPO)
 ```
-Software\Policies\Mozilla\Firefox\Proxy\Mode = "none", "system", "manual", "autoDetect", "autoConfig"
+Software\Policies\Mozilla\Firefox\Proxy\Mode = "none" | "system" | "manual" | "autoDetect" | "autoConfig"
 Software\Policies\Mozilla\Firefox\Proxy\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\=Proxy\HTTPProxy = https://httpproxy.example.com
 Software\Policies\Mozilla\Firefox\Proxy\UseHTTPProxyForAllProtocols = 0x1 | 0x0
@@ -3977,7 +3977,7 @@ Value (string):
 {
   "policies": {
     "Proxy": {
-      "Mode": "none", "system", "manual", "autoDetect", "autoConfig",
+      "Mode": "none" | "system" | "manual" | "autoDetect" | "autoConfig",
       "Locked": true | false,
       "HTTPProxy": "hostname",
       "UseHTTPProxyForAllProtocols": true | false,