Merge getpass with quote, plus my NEWS entry.

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 09111f25b5ecffe1b44adbd3b146398657fc1d02..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