Further refinement of -O description; .hignore <- doc products

diff --git a/.hgignore b/.hgignore
index 5243e1c7553213a2eb9eede365bbb96a885b04d8..d535de6ab8a3e00bc606f229f5ccb17780e7f420 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -19,6 +19,19 @@ doc/wget.1
 doc/wget.pod
 doc/wget.info
 doc/sample.wgetrc.munged_for_texi_inclusion
 doc/wget.pod
 doc/wget.info
 doc/sample.wgetrc.munged_for_texi_inclusion

+doc/wget.aux
+doc/wget.cp
+doc/wget.cps
+doc/wget.dvi
+doc/wget.fn
+doc/wget.ky
+doc/wget.log
+doc/wget.pg
+doc/wget.toc
+doc/wget.tp
+doc/wget.vr
+doc/wget_a4.ps
+doc/wget_us.ps

 po/Makefile.in
 po/POTFILES
 po/*.gmo
 po/Makefile.in
 po/POTFILES
 po/*.gmo

diff --git a/doc/wget.texi b/doc/wget.texi
index 0563dc727db0dc9ca7bcc9145789f876b8c1d4b5..6d3ae4932fd8f844a5715e060f8a2e8b5f1e7b39 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -550,13 +550,14 @@ literally named @samp{-}.)
 
 Use of @samp{-O} is @emph{not} intended to mean simply ``use the name
 @var{file} instead of the one in the URL;'' rather, it is
 
 Use of @samp{-O} is @emph{not} intended to mean simply ``use the name
 @var{file} instead of the one in the URL;'' rather, it is

-analogous to shell redirection.
+analogous to shell redirection:

 @samp{wget -O file http://foo} is intended to work like
 @samp{wget -O file http://foo} is intended to work like

-@samp{wget -O - http://foo > file}. @file{file} will be truncated
-immediately, and don't expect timestamping to work with it.
+@samp{wget -O - http://foo > file}; @file{file} will be truncated
+immediately, and @emph{all} downloaded content will be written there.

 
 

-Note that a combination with @samp{-k} is only well-defined for
-downloading a single document.
+Note that a combination with @samp{-k} is only permitted when
+downloading a single document, and combination with any of @samp{-r},
+@samp{-p}, or @samp{-N} is not allowed.

 
 @cindex clobbering, file
 @cindex downloading multiple times
 
 @cindex clobbering, file
 @cindex downloading multiple times