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?ds=sidebyside;hp=-c

Merge branch 'master' into 1429177_Proxy
---

2b52e782571fede63f28c27bd7e2a29684623902
diff --combined README.md
index 5296410,ca54c36..d744abf
--- a/README.md
+++ b/README.md
@@@ -314,17 -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.
- 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]
- Z   "HTTPProxy": "URL_TO_PROXY",
+     "HTTPProxy": "hostname",
      "UseHTTPProxyForAllProtocols": [true, false]
-     "SSLProxy": "URL_TO_PROXY",
-     "FTPProxy": "URL_TO_PROXY",
-     "SOCKSProxy": { "URL_TO_PROXY",
+     "SSLProxy": "hostname",
+     "FTPProxy": "hostname",
 -    "SOCKSProxy": { "hostname",
++    "SOCKSProxy": "hostname",
      "SOCKSVersion": [4, 5],
      "Passthrough": "List of passthrough addresses/domains",
      "AutoConfigURL": "URL_TO_AUTOCONFIG",