Slight corrections

diff --git a/README.md b/README.md
index 5296410c2bf1f5a90dae37ded7db76b4b6557900..ca54c367677605abef7b7d92f6e172906d338b69 100644 (file)
--- a/README.md
+++ b/README.md
@@ -314,17 +314,17 @@ same folder name are grouped together.
 ```
 ### Proxy
 This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences.
 ```
 ### Proxy
 This policy allows you to specify proxy settings. These settings correspond to the connection settings in Firefox preferences.

-To specify ports, append them to the URLs with a colon (:). If Locked is set to true, the values can't be changed by the user.
+To specify ports, append them to the hostnames with a colon (:). If Locked is set to true, the values can't be changed by the user.

 ```
 {
   "Proxy": {
     "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"]
     "Locked": [true, false]
 ```
 {
   "Proxy": {
     "Mode": ["none", "system", "manual", "autoDetect", "autoConfig"]
     "Locked": [true, false]

-Z   "HTTPProxy": "URL_TO_PROXY",
+    "HTTPProxy": "hostname",

     "UseHTTPProxyForAllProtocols": [true, false]
     "UseHTTPProxyForAllProtocols": [true, false]

-    "SSLProxy": "URL_TO_PROXY",
-    "FTPProxy": "URL_TO_PROXY",
-    "SOCKSProxy": { "URL_TO_PROXY",
+    "SSLProxy": "hostname",
+    "FTPProxy": "hostname",
+    "SOCKSProxy": { "hostname",

     "SOCKSVersion": [4, 5],
     "Passthrough": "List of passthrough addresses/domains",
     "AutoConfigURL": "URL_TO_AUTOCONFIG",
     "SOCKSVersion": [4, 5],
     "Passthrough": "List of passthrough addresses/domains",
     "AutoConfigURL": "URL_TO_AUTOCONFIG",

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index ebb57c870c0fad2b26a32f489446532fdcf9e543..d67882d8bf15b5ccb1f359f41cc2b2d1539fce84 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -141,7 +141,7 @@ If this policy is enabled, private browsing is enabled by default in both the br
         </textBox>
       </presentation>
       <presentation id="Proxy">
         </textBox>
       </presentation>
       <presentation id="Proxy">

-        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox> 
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>

         <text>Connection Type:</text>
         <dropdownList refId="ConnectionType"/>
         <text>HTTP Proxy:</text>
         <text>Connection Type:</text>
         <dropdownList refId="ConnectionType"/>
         <text>HTTP Proxy:</text>