[svn] Added a note about my newly-implemented interaction between -K and -N.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c7e30ab8879a177d376fead101dea2951e2d0e95..43646bb254c0948e3f57070119ee04f891e1d480 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-01  Dan Harkless  <dan-wget@dilvish.speed.net>
+
+       * wget.texi (HTTP Time-Stamping Internals): Added a note about my
+       newly-implemented interaction between -K and -N.
+
 2000-02-29  Dan Harkless  <dan-wget@dilvish.speed.net>
 
        * wget.texi: Updated version to 1.5.3+dev, updated copyrights to

diff --git a/doc/wget.info b/doc/wget.info
index 2810ea726237d853510e1f94911c07b018e22eca..2657f55ce74eec90cdd2f2ad44e5baf835c81dc7 100644 (file)
--- a/doc/wget.info
+++ b/doc/wget.info
@@ -26,8 +26,8 @@ notice identical to this one.
 \1f
 Indirect:
 wget.info-1: 961
-wget.info-2: 50948
-wget.info-3: 88756
+wget.info-2: 50395
+wget.info-3: 89018
 \1f
 Tag Table:
 (Indirect)
@@ -56,33 +56,33 @@ Node: FTP Links\7f42768
 Node: Time-Stamping\7f43638
 Node: Time-Stamping Usage\7f45275
 Node: HTTP Time-Stamping Internals\7f46844
-Node: FTP Time-Stamping Internals\7f48052
-Node: Startup File\7f49260
-Node: Wgetrc Location\7f50133
-Node: Wgetrc Syntax\7f50948
-Node: Wgetrc Commands\7f51663
-Node: Sample Wgetrc\7f58501
-Node: Examples\7f62793
-Node: Simple Usage\7f63400
-Node: Advanced Usage\7f65794
-Node: Guru Usage\7f68545
-Node: Various\7f70207
-Node: Proxies\7f70731
-Node: Distribution\7f73496
-Node: Mailing List\7f73846
-Node: Reporting Bugs\7f74545
-Node: Portability\7f76330
-Node: Signals\7f77705
-Node: Appendices\7f78359
-Node: Robots\7f78774
-Node: Introduction to RES\7f79921
-Node: RES Format\7f81814
-Node: User-Agent Field\7f82918
-Node: Disallow Field\7f83682
-Node: Norobots Examples\7f84293
-Node: Security Considerations\7f85247
-Node: Contributors\7f86243
-Node: Copying\7f88756
-Node: Concept Index\7f107919
+Node: FTP Time-Stamping Internals\7f48314
+Node: Startup File\7f49522
+Node: Wgetrc Location\7f50395
+Node: Wgetrc Syntax\7f51210
+Node: Wgetrc Commands\7f51925
+Node: Sample Wgetrc\7f58763
+Node: Examples\7f63055
+Node: Simple Usage\7f63662
+Node: Advanced Usage\7f66056
+Node: Guru Usage\7f68807
+Node: Various\7f70469
+Node: Proxies\7f70993
+Node: Distribution\7f73758
+Node: Mailing List\7f74108
+Node: Reporting Bugs\7f74807
+Node: Portability\7f76592
+Node: Signals\7f77967
+Node: Appendices\7f78621
+Node: Robots\7f79036
+Node: Introduction to RES\7f80183
+Node: RES Format\7f82076
+Node: User-Agent Field\7f83180
+Node: Disallow Field\7f83944
+Node: Norobots Examples\7f84555
+Node: Security Considerations\7f85509
+Node: Contributors\7f86505
+Node: Copying\7f89018
+Node: Concept Index\7f108181
 \1f
 End Tag Table

diff --git a/doc/wget.info-1 b/doc/wget.info-1
index 9de1c8f3c5cadaa599c4eb4963b9c512920962f0..b4b2ad8b69d9abe33ff2796206c8264fc084a049 100644 (file)
--- a/doc/wget.info-1
+++ b/doc/wget.info-1
@@ -1203,6 +1203,11 @@ remote file.
 modified more recently (which makes it "newer").  If the remote file is
 newer, it will be downloaded; if it is older, Wget will give up.(1)
 
+   When `--backup-converted' (`-K') is specified in conjunction with
+`-N', server file `X' is compared to local file `X.orig', if extant,
+rather than being compared to local file `X', which will always differ
+if it's been converted by `--convert-links' (`-k').
+
    Arguably, HTTP time-stamping should be implemented using the
 `If-Modified-Since' request.
 
@@ -1265,25 +1270,3 @@ commands.
 * Wgetrc Commands::   List of available commands.
 * Sample Wgetrc::     A wgetrc example.
 
-\1f
-File: wget.info,  Node: Wgetrc Location,  Next: Wgetrc Syntax,  Prev: Startup File,  Up: Startup File
-
-Wgetrc Location
-===============
-
-   When initializing, Wget will look for a "global" startup file,
-`/usr/local/etc/wgetrc' by default (or some prefix other than
-`/usr/local', if Wget was not installed there) and read commands from
-there, if it exists.
-
-   Then it will look for the user's file.  If the environmental variable
-`WGETRC' is set, Wget will try to load that file.  Failing that, no
-further attempts will be made.
-
-   If `WGETRC' is not set, Wget will try to load `$HOME/.wgetrc'.
-
-   The fact that user's settings are loaded after the system-wide ones
-means that in case of collision user's wgetrc *overrides* the
-system-wide wgetrc (in `/usr/local/etc/wgetrc' by default).  Fascist
-admins, away!
-

diff --git a/doc/wget.info-2 b/doc/wget.info-2
index 41b590b0a70eb94591300e15818df07abd3f5572..47d8de4bbf72982c01778811057f28eaf4a586d2 100644 (file)
--- a/doc/wget.info-2
+++ b/doc/wget.info-2
@@ -23,6 +23,28 @@ are included exactly as in the original, and provided that the entire
 resulting derived work is distributed under the terms of a permission
 notice identical to this one.
 
+\1f
+File: wget.info,  Node: Wgetrc Location,  Next: Wgetrc Syntax,  Prev: Startup File,  Up: Startup File
+
+Wgetrc Location
+===============
+
+   When initializing, Wget will look for a "global" startup file,
+`/usr/local/etc/wgetrc' by default (or some prefix other than
+`/usr/local', if Wget was not installed there) and read commands from
+there, if it exists.
+
+   Then it will look for the user's file.  If the environmental variable
+`WGETRC' is set, Wget will try to load that file.  Failing that, no
+further attempts will be made.
+
+   If `WGETRC' is not set, Wget will try to load `$HOME/.wgetrc'.
+
+   The fact that user's settings are loaded after the system-wide ones
+means that in case of collision user's wgetrc *overrides* the
+system-wide wgetrc (in `/usr/local/etc/wgetrc' by default).  Fascist
+admins, away!
+
 \1f
 File: wget.info,  Node: Wgetrc Syntax,  Next: Wgetrc Commands,  Prev: Wgetrc Location,  Up: Startup File
 

diff --git a/doc/wget.texi b/doc/wget.texi
index 8acff6f40383ff15db637e45c982767216bf34ec..b5107c37531b2f422739a026dd6aa1283b34492d 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -1382,6 +1382,12 @@ up.@footnote{As an additional check, Wget will look at the
 same, the remote file will be downloaded no matter what the time-stamp
 says.}
 
+When @samp{--backup-converted} (@samp{-K}) is specified in conjunction
+with @samp{-N}, server file @samp{@var{X}} is compared to local file
+@samp{@var{X}.orig}, if extant, rather than being compared to local file
+@samp{@var{X}}, which will always differ if it's been converted by
+@samp{--convert-links} (@samp{-k}).
+
 Arguably, @sc{http} time-stamping should be implemented using the
 @code{If-Modified-Since} request.