From: Michael Kaply <consulting@kaply.com>
Date: Tue, 27 Mar 2018 16:05:46 +0000 (-0500)
Subject: Merge branch 'master' into 1429177_Proxy
X-Git-Tag: 0.9~28^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/2b52e782571fede63f28c27bd7e2a29684623902?hp=0ecdfca165593ea4d7f5c70d74a0394a2001bc07

Merge branch 'master' into 1429177_Proxy
---

diff --git a/README.md b/README.md
index ca54c36..d744abf 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,7 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se
     "UseHTTPProxyForAllProtocols": [true, false]
     "SSLProxy": "hostname",
     "FTPProxy": "hostname",
-    "SOCKSProxy": { "hostname",
+    "SOCKSProxy": "hostname",
     "SOCKSVersion": [4, 5],
     "Passthrough": "List of passthrough addresses/domains",
     "AutoConfigURL": "URL_TO_AUTOCONFIG",
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1511902..9ff5205 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -516,12 +516,12 @@
         <enum id="SOCKSVersion" valueName="SOCKSVersion">
           <item displayName="$(string.SOCKSVersion4)">
             <value>
-              <string>4</string>
+              <decimal value="4"/>
             </value>
           </item>
           <item displayName="$(string.SOCKSVersion5)">
             <value>
-              <string>5</string>
+              <decimal value="5"/>
             </value>
           </item>
         </enum>