[svn] Added Keith Moore in the CREDITS section.

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 1ed2155567a2b186ae6d16aa36fc11cb064cd319..b25ec6e7db3946f83e0200403414dc999eefe719 100644 (file)
--- 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}.
 
@@ -1313,12 +1311,12 @@ use chunked unless it knows it's talking to an HTTP/1.1 server.  And it
 can't know that until it receives a response, which in turn requires the
 request to have been completed -- a chicken-and-egg problem.
 
-Note: if Wget is redirected after the POST request is completed, it will
-not send the POST data to the redirected URL.  This is because URLs that
-process POST often respond with a redirection to a regular page
-(although that's technically disallowed), which does not desire or
-accept POST.  It is not yet clear that this behavior is optimal; if it
-doesn't work out, it will be changed.
+Note: if Wget is redirected after the POST request is completed, it
+will not send the POST data to the redirected URL.  This is because
+URLs that process POST often respond with a redirection to a regular
+page, which does not desire or accept POST.  It is not completely
+clear that this behavior is optimal; if it doesn't work out, it might
+be changed in the future.
 
 This example shows how to log to a server using POST and then proceed to
 download the desired pages, presumably only accessible to authorized
@@ -1383,12 +1381,13 @@ invalid certificates.  This option forces an ``insecure'' mode of
 operation that turns the certificate verification errors into warnings
 and allows you to proceed.
 
-If you see errors involving ``certificate verify failed'' or ``common
-name doesn't match requested host name'', you need to use this option
-to proceed with the download.  @emph{Only use this option if you are
-otherwise convinced of the site's authenticity, or if you don't care
-about the certificate validity.}  It is almost always a bad idea to
-use this option when transmitting confidential or important data.
+If you encounter ``certificate verification'' errors or ones saying
+that ``common name doesn't match requested host name'', you can use
+this option to bypass the verification and proceed with the download.
+@emph{Only use this option if you are otherwise convinced of the
+site's authenticity, or if you really don't care about the validity of
+its certificate.}  It is almost always a bad idea not to check the
+certificates when transmitting confidential or important data.
 
 @cindex SSL certificate
 @item --certificate=@var{file}
@@ -3208,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}
@@ -3724,6 +3720,7 @@ Jordan Mendelson,
 Lin Zhe Min,
 Jan Minar,
 Tim Mooney,
+Keith Moore,
 Adam D. Moss,
 Simon Munton,
 Charlie Negyesi,