From: Daniel Stenberg Date: Wed, 31 May 2017 06:45:36 +0000 (+0200) Subject: CURLOPT_PROXY.3: fix test 1140 breakage X-Git-Tag: curl-7_54_1~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6ad28a75e55859f6bb66a1eaf339154f59691a8;p=thirdparty%2Fcurl.git CURLOPT_PROXY.3: fix test 1140 breakage --- diff --git a/docs/libcurl/opts/CURLOPT_PROXY.3 b/docs/libcurl/opts/CURLOPT_PROXY.3 index 02de8f4b9b..c543c2c5d7 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY.3 @@ -81,7 +81,7 @@ considered. \fBall_proxy\fP is used if no protocol specific proxy was set. If \fBno_proxy\fP (or \fBNO_PROXY\fP) is set, it can specify a list of host names to not use a proxy for (even if one of the previous mention variables -are set). That is the exact equivalent of setting the \fBCURLOPT_NOPROXY(3)\fP +are set). That is the exact equivalent of setting the \fICURLOPT_NOPROXY(3)\fP option. The \fICURLOPT_PROXY(3)\fP option overrides environment variables.