diff --git a/doc/ChangeLog b/doc/ChangeLog index c7e30ab8..43646bb2 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2000-03-01 Dan Harkless + + * wget.texi (HTTP Time-Stamping Internals): Added a note about my + newly-implemented interaction between -K and -N. + 2000-02-29 Dan Harkless * wget.texi: Updated version to 1.5.3+dev, updated copyrights to diff --git a/doc/wget.info b/doc/wget.info index 2810ea72..2657f55c 100644 --- a/doc/wget.info +++ b/doc/wget.info @@ -26,8 +26,8 @@ notice identical to this one.  Indirect: wget.info-1: 961 -wget.info-2: 50948 -wget.info-3: 88756 +wget.info-2: 50395 +wget.info-3: 89018  Tag Table: (Indirect) @@ -56,33 +56,33 @@ Node: FTP Links42768 Node: Time-Stamping43638 Node: Time-Stamping Usage45275 Node: HTTP Time-Stamping Internals46844 -Node: FTP Time-Stamping Internals48052 -Node: Startup File49260 -Node: Wgetrc Location50133 -Node: Wgetrc Syntax50948 -Node: Wgetrc Commands51663 -Node: Sample Wgetrc58501 -Node: Examples62793 -Node: Simple Usage63400 -Node: Advanced Usage65794 -Node: Guru Usage68545 -Node: Various70207 -Node: Proxies70731 -Node: Distribution73496 -Node: Mailing List73846 -Node: Reporting Bugs74545 -Node: Portability76330 -Node: Signals77705 -Node: Appendices78359 -Node: Robots78774 -Node: Introduction to RES79921 -Node: RES Format81814 -Node: User-Agent Field82918 -Node: Disallow Field83682 -Node: Norobots Examples84293 -Node: Security Considerations85247 -Node: Contributors86243 -Node: Copying88756 -Node: Concept Index107919 +Node: FTP Time-Stamping Internals48314 +Node: Startup File49522 +Node: Wgetrc Location50395 +Node: Wgetrc Syntax51210 +Node: Wgetrc Commands51925 +Node: Sample Wgetrc58763 +Node: Examples63055 +Node: Simple Usage63662 +Node: Advanced Usage66056 +Node: Guru Usage68807 +Node: Various70469 +Node: Proxies70993 +Node: Distribution73758 +Node: Mailing List74108 +Node: Reporting Bugs74807 +Node: Portability76592 +Node: Signals77967 +Node: Appendices78621 +Node: Robots79036 +Node: Introduction to RES80183 +Node: RES Format82076 +Node: User-Agent Field83180 +Node: Disallow Field83944 +Node: Norobots Examples84555 +Node: Security Considerations85509 +Node: Contributors86505 +Node: Copying89018 +Node: Concept Index108181  End Tag Table diff --git a/doc/wget.info-1 b/doc/wget.info-1 index 9de1c8f3..b4b2ad8b 100644 --- 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. - -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 41b590b0..47d8de4b 100644 --- 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. + +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! +  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 8acff6f4..b5107c37 100644 --- 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.