Merge getpass with quote, plus my NEWS entry.

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 7a949bfe52ca2052230bda1c9e1ac4d46322d311..4f7d2ddf91c3682b5f1161abe74be7c0397235c4 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -553,9 +553,8 @@ immediately, and @emph{all} downloaded content will be written there.
 
 For this reason, @samp{-N} (for timestamp-checking) is not supported
 in combination with @samp{-O}: since @var{file} is always newly
-created, it will always have a very new timestamp. Contrary to some
-users' expectations, the combination has never worked, and as of
-version 1.11, it results in an error.
+created, it will always have a very new timestamp. A warning will be
+issued if this combination is used.
 
 Similarly, using @samp{-r} or @samp{-p} with @samp{-O} may not work as
 you expect: Wget won't just download the first file to @var{file} and
@@ -990,12 +989,16 @@ Specify the username @var{user} and password @var{password} for both
 using the @samp{--ftp-user} and @samp{--ftp-password} options for 
 @sc{ftp} connections and the @samp{--http-user} and @samp{--http-password} 
 options for @sc{http} connections.
+
+@item --ask-password
+Prompt for a password for each connection established. Cannot be specified
+when @samp{--password} is being used, because they are mutually exclusive.
 @end table
 
 @node Directory Options
 @section Directory Options
 
-@table @samp
+@table @samp       
 @item -nd
 @itemx --no-directories
 Do not create a hierarchy of directories when retrieving recursively.