From 01f3d4b33cb54aadb5433c65219e0fe3128a05b6 Mon Sep 17 00:00:00 2001
From: hniksic <devnull@localhost>
Date: Sat, 14 May 2005 13:06:34 -0700
Subject: [PATCH] [svn] Document --[no-]proxy as being primarily used to turn
 *off* proxies.

---
 doc/ChangeLog |  5 +++++
 doc/wget.texi | 13 ++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e87ae3ca..be7a6120 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-14  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* wget.texi (Overview): Document --[no-]proxy as primarily being
+	used to turn *off* the use of proxies.
+
 2005-05-11  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* wget.texi (HTTPS (SSL/TLS) Options): Explain certificate
diff --git a/doc/wget.texi b/doc/wget.texi
index 5bc2966c..5f72c35a 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -835,11 +835,9 @@ recommendation to block many unrelated users from a web site due to the
 actions of one.
 
 @cindex proxy
-@item -Y on/off
-@itemx --proxy
 @itemx --no-proxy
-Turn proxy support on or off.  The proxy is on by default if the
-appropriate environment variable is defined.
+Don't use proxies, even if the appropriate @code{*_proxy} environment
+variable is defined.
 
 For more information about the use of proxies with Wget, @xref{Proxies}.
 
@@ -3209,13 +3207,10 @@ In addition to the environment variables, proxy location and settings
 may be specified from within Wget itself.
 
 @table @samp
-@item -Y on/off
-@itemx --proxy
 @itemx --no-proxy
 @itemx proxy = on/off
-This option may be used to turn the proxy support on or off.  Proxy
-support is on by default, provided that the appropriate environment
-variables are set.
+This option and the corresponding command may be used to suppress the
+use of proxy, even if the appropriate environment variables are set.
 
 @item http_proxy = @var{URL}
 @itemx ftp_proxy = @var{URL}