aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2006-08-23 21:49:44 +0000
committerDaniel Stenberg <daniel@haxx.se>2006-08-23 21:49:44 +0000
commitda48a6ba87f76f64287bb14bcae37b1aa00a0a0a (patch)
treedf43ec14395c5b04b4b4313a32c25ec205abdc69
parentcd6c58216a7d6bb3c7bf7099fd91d7f8b6901333 (diff)
clarify the string syntax support in the CURLOPT_PROXY section
-rw-r--r--docs/libcurl/curl_easy_setopt.37
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 7bab361fb..0fce61a98 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -365,9 +365,10 @@ libcurl respects the environment variables \fBhttp_proxy\fP, \fBftp_proxy\fP,
\fBall_proxy\fP etc, if any of those is set. The \fICURLOPT_PROXY\fP option
does however override any possibly set environment variables.
-Starting with 7.14.1, the proxy host string can be specified the exact same
-way as the proxy environment variables, include protocol prefix (http://) and
-embedded user + password.
+Starting with 7.14.1, the proxy host string given in environment variables can
+be specified the exact same way as the proxy can be set with
+\fICURLOPT_PROXY\fP, include protocol prefix (http://) and embedded user +
+password.
.IP CURLOPT_PROXYPORT
Pass a long with this option to set the proxy port to connect to unless it is
specified in the proxy string \fICURLOPT_PROXY\fP.