From: Michael Kaply Date: Mon, 26 Mar 2018 15:09:39 +0000 (-0500) Subject: Slight corrections X-Git-Tag: 0.9~29^2 X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/873628baf7af37426c07c4c0cdbfe25e7275a8b0?ds=sidebyside;hp=--cc Slight corrections --- 873628baf7af37426c07c4c0cdbfe25e7275a8b0 diff --git a/README.md b/README.md index 5296410..ca54c36 100644 --- 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. -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", "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 ebb57c8..d67882d 100644 --- 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 - Don't allow proxy settings to be changed. + Don't allow proxy settings to be changed. Connection Type: HTTP Proxy: