added docs about the new proxy string support
diff --git a/docs/curl.1 b/docs/curl.1
index fa6d720..ba7932f 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -21,7 +21,7 @@
.\" * $Id$
.\" **************************************************************************
.\"
-.TH curl 1 "28 Apr 2005" "Curl 7.14.0" "Curl Manual"
+.TH curl 1 "24 Jun 2005" "Curl 7.14.1" "Curl Manual"
.SH NAME
curl \- transfer a URL
.SH SYNOPSIS
@@ -958,11 +958,11 @@
authenticate with your current user and password.
.RE
.IP "-w/--write-out <format>"
-Defines what to display after a completed and successful operation. The format
-is a string that may contain plain text mixed with any number of variables. The
-string can be specified as "string", to get read from a particular file you
-specify it "@filename" and to tell curl to read the format from stdin you
-write "@-".
+Defines what to display on stdout after a completed and successful
+operation. The format is a string that may contain plain text mixed with any
+number of variables. The string can be specified as "string", to get read from
+a particular file you specify it "@filename" and to tell curl to read the
+format from stdin you write "@-".
The variables present in the output format will be substituted by the value or
text that curl thinks fit, as described below. All variables are specified
@@ -1058,6 +1058,10 @@
operations might not be available. This is not the case if you can tunnel
through the proxy, as done with the \fI-p/--proxytunnel\fP option.
+Starting with 7.14.1, the proxy host can be specified the exact same way as
+the proxy environment variables, include protocol prefix (http://) and
+embedded user + password.
+
If this option is used several times, the last one will be used.
.IP "-X/--request <command>"
(HTTP)
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index ecdfdce..78a6d37 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -21,7 +21,7 @@
.\" * $Id$
.\" **************************************************************************
.\"
-.TH curl_easy_setopt 3 "12 May 2005" "libcurl 7.14.0" "libcurl Manual"
+.TH curl_easy_setopt 3 "24 Jun 2005" "libcurl 7.14.1" "libcurl Manual"
.SH NAME
curl_easy_setopt - set options for a curl easy handle
.SH SYNOPSIS
@@ -283,6 +283,10 @@
\fBNOTE2:\fP libcurl respects the environment variables \fBhttp_proxy\fP,
\fBftp_proxy\fP, \fBall_proxy\fP etc, if any of those is set.
+
+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.
.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.
