From: Clemens Buchacher Date: Sun, 04 Mar 2012 16:50:43 GMT Subject: [PATCH v2] http.proxy: also mention https_proxy and all_proxy Message-ID: <20120304165043.GA4677@ecki> In-Reply-To: <20120303174252.GC28602@sigill.intra.peff.net> 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 --- On Sat, Mar 03, 2012 at 12:42:52PM -0500, Jeff King wrote: > > I think just using: `curl(1)` might be sufficient. Done. Documentation/config.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index abeb82b..f0ab288 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1258,9 +1258,10 @@ help.autocorrect:: This is the default. http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy' - environment variable (see linkgit:curl[1]). This can be overridden - on a per-remote basis; see remote..proxy + Override the HTTP proxy, normally configured using the 'http_proxy', + 'https_proxy', and 'all_proxy' environment variables (see + `curl(1)`). This can be overridden on a per-remote basis; see + remote..proxy http.cookiefile:: File containing previously stored cookie lines which should be used -- 1.7.9.2