http.proxy: also mention https_proxy and all_proxy
The current wording of the http.proxy documentation suggests that http_proxy is somehow equivalent to http.proxy. However, while http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the proxy for both HTTP and HTTPS protocols, the http_proxy environment variable is used only for HTTP. But since the docs mention only http_proxy, a user might expect it to apply to all HTTP-like protocols. Avoid any such misunderstanding by explicitly mentioning https_proxy and all_proxy as well. Also replace linkgit:curl[1] with a literal 'curl(1)', because the former gets translated to a dead link in the HTML pages. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher committed
Mar 4, 2012 at 17:50 UTC
b2c8c6d944722f9a4f27370f4e89d13f61243302
1 file changed
+4
-3
Documentation/config.txt
+4
-3
@@ -1260,9 +1260,10 @@ help.autocorrect::
1260
This is the default.
1261
1262
http.proxy::
1263
- Override the HTTP proxy, normally configured using the 'http_proxy'
1264
- environment variable (see linkgit:curl[1]). This can be overridden
1265
- on a per-remote basis; see remote.<name>.proxy
1263
+ Override the HTTP proxy, normally configured using the 'http_proxy',
1264
+ 'https_proxy', and 'all_proxy' environment variables (see
1265
+ `curl(1)`). This can be overridden on a per-remote basis; see
1266
+ remote.<name>.proxy
1267
1268
http.cookiefile::
1269
File containing previously stored cookie lines which should be used