projects
/
curl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5340562
)
CURLOPT_PROXY.3: fix test 1140 breakage
author
Daniel Stenberg
<daniel@haxx.se>
Wed, 31 May 2017 06:45:36 +0000
(08:45 +0200)
committer
Daniel Stenberg
<daniel@haxx.se>
Wed, 31 May 2017 06:45:36 +0000
(08:45 +0200)
docs/libcurl/opts/CURLOPT_PROXY.3
patch
|
blob
|
history
diff --git
a/docs/libcurl/opts/CURLOPT_PROXY.3
b/docs/libcurl/opts/CURLOPT_PROXY.3
index 02de8f4b9b94330ac23eab29585fea349e9abbc6..c543c2c5d78a8baedac078245c5e973f91fb54e7 100644
(file)
--- 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 \f
B
CURLOPT_NOPROXY(3)\fP
+are set). That is the exact equivalent of setting the \f
I
CURLOPT_NOPROXY(3)\fP
option.
The \fICURLOPT_PROXY(3)\fP option overrides environment variables.