diff --git a/doc/ChangeLog b/doc/ChangeLog
index 543deee6..5f83d6e9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,10 +1,24 @@
+2000-04-13 Dan Harkless <dan-wget@dilvish.speed.net>
+
+ * Makefile.in (sample.wgetrc.munged_for_texi_inclusion): Added
+ build, dependencies, and distclean cleanup of this new file.
+
+ * sample.wgetrc: Uncommented waitretry and set it to 10, clarified
+ some wording, and re-wrapped some text to 71 columns due to
+ @sample indentation in wget.texi.
+
+ * wget.texi: Herold further expounded on the behavior of waitretry
+ -- reworded docs again. Changed note saying _all_ lines in
+ sample.wgetrc are commented out. Don't have an entire hand-
+ cut-and-pasted copy of sample.wgetrc in this file -- use @include.
+
2000-04-12 Dan Harkless <dan-wget@dilvish.speed.net>
- * Makefile (install.wgetrc): I completely missed the message that
- the new wgetrc wasn't being installed the first couple of times I
- ran `make install' after changing sample.wgetrc. Added blank
- lines around the message and a "<Hit RETURN to acknowledge>", and
- reworded the message to be a bit more clear.
+ * Makefile.in (install.wgetrc): I completely missed the message
+ that the new wgetrc wasn't being installed the first couple of
+ times I ran `make install' after changing sample.wgetrc. Added
+ blank lines around the message and a "<Hit RETURN to
+ acknowledge>", and reworded the message to be a bit more clear.
* sample.wgetrc: Added entries for backup_converted and waitretry.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 55b3ba4b..51469fd6 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -55,7 +55,10 @@ all: wget.info # wget.cat
everything: all wget_us.ps wget_a4.ps wget_toc.html
-wget.info: wget.texi
+sample.wgetrc.munged_for_texi_inclusion: sample.wgetrc
+ sed s/@/@@/g sample.wgetrc > sample.wgetrc.munged_for_texi_inclusion
+
+wget.info: sample.wgetrc.munged_for_texi_inclusion wget.texi
-$(MAKEINFO)
#wget.cat: $(MAN)
@@ -136,7 +139,7 @@ clean:
$(RM) *.dvi *.aux *.cp *.cps *.fn *.toc *.tp *.vr *.ps *.ky *.pg *.log
distclean: clean
- $(RM) Makefile
+ $(RM) Makefile sample.wgetrc.munged_for_texi_inclusion
realclean: distclean
$(RM) wget.info*
diff --git a/doc/sample.wgetrc b/doc/sample.wgetrc
index 4ef63a7c..6cadbe06 100644
--- a/doc/sample.wgetrc
+++ b/doc/sample.wgetrc
@@ -10,8 +10,9 @@
## Wget initialization file can reside in /usr/local/etc/wgetrc
## (global, for all users) or $HOME/.wgetrc (for a single user).
##
-## To use any of the settings in this file, you will have to uncomment
-## them (and probably change them).
+## To use the settings in this file, you will have to uncomment them,
+## as well as change them, in most cases, as the values on the
+## commented-out lines are the default values (e.g. "off").
##
@@ -82,9 +83,12 @@
# the number of seconds you want Wget to wait.
#wait = 0
-# If you don't want Wget to wait between every connection, but only between
-# retries of failed downloads, set this to the number of seconds to wait:
-#waitretry = 0
+# The "wait" command above makes Wget wait between every connection.
+# If, instead, you want Wget to wait only between retries of failed
+# downloads, set this variable to maximum number of seconds to wait
+# (Wget will use "linear backoff", waiting 1 second after the first
+# failure on a file, up to this max).
+waitretry = 10
# You can force creating directory structure, even if a single is being
# retrieved, by setting this to on.
@@ -94,8 +98,9 @@
# you are not sure you know what it means) by setting this to on.
#recursive = off
-# To always back up file X as X.orig before converting its links (due to -k /
-# --convert-links / convert_links = on), set this variable to on:
+# To always back up file X as X.orig before converting its links (due
+# to -k / --convert-links / convert_links = on having been specified),
+# set this variable to on:
#backup_converted = off
# To have Wget follow FTP links from HTML files by default, set this
diff --git a/doc/wget.info b/doc/wget.info
index 59af2bb1..30b2544d 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: 50731
-wget.info-3: 90713
+wget.info-2: 50943
+wget.info-3: 91700
Tag Table:
(Indirect)
@@ -39,50 +39,50 @@ Node: Option Syntax8163
Node: Basic Startup Options9587
Node: Logging and Input File Options10287
Node: Download Options12681
-Node: Directory Options18831
-Node: HTTP Options21309
-Node: FTP Options24905
-Node: Recursive Retrieval Options26098
-Node: Recursive Accept/Reject Options28062
-Node: Recursive Retrieval30925
-Node: Following Links33223
-Node: Relative Links34251
-Node: Host Checking34765
-Node: Domain Acceptance36790
-Node: All Hosts38460
-Node: Types of Files38887
-Node: Directory-Based Limits41337
-Node: FTP Links43977
-Node: Time-Stamping44847
-Node: Time-Stamping Usage46484
-Node: HTTP Time-Stamping Internals48053
-Node: FTP Time-Stamping Internals49523
-Node: Startup File50731
-Node: Wgetrc Location51604
-Node: Wgetrc Syntax52419
-Node: Wgetrc Commands53134
-Node: Sample Wgetrc60331
-Node: Examples64623
-Node: Simple Usage65230
-Node: Advanced Usage67624
-Node: Guru Usage70375
-Node: Various72037
-Node: Proxies72561
-Node: Distribution75326
-Node: Mailing List75677
-Node: Reporting Bugs76376
-Node: Portability78161
-Node: Signals79536
-Node: Appendices80190
-Node: Robots80605
-Node: Introduction to RES81752
-Node: RES Format83645
-Node: User-Agent Field84749
-Node: Disallow Field85513
-Node: Norobots Examples86124
-Node: Security Considerations87078
-Node: Contributors88074
-Node: Copying90713
-Node: Concept Index109876
+Node: Directory Options19043
+Node: HTTP Options21521
+Node: FTP Options25117
+Node: Recursive Retrieval Options26310
+Node: Recursive Accept/Reject Options28274
+Node: Recursive Retrieval31137
+Node: Following Links33435
+Node: Relative Links34463
+Node: Host Checking34977
+Node: Domain Acceptance37002
+Node: All Hosts38672
+Node: Types of Files39099
+Node: Directory-Based Limits41549
+Node: FTP Links44189
+Node: Time-Stamping45059
+Node: Time-Stamping Usage46696
+Node: HTTP Time-Stamping Internals48265
+Node: FTP Time-Stamping Internals49735
+Node: Startup File50943
+Node: Wgetrc Location51816
+Node: Wgetrc Syntax52631
+Node: Wgetrc Commands53346
+Node: Sample Wgetrc60628
+Node: Examples65610
+Node: Simple Usage66217
+Node: Advanced Usage68611
+Node: Guru Usage71362
+Node: Various73024
+Node: Proxies73548
+Node: Distribution76313
+Node: Mailing List76664
+Node: Reporting Bugs77363
+Node: Portability79148
+Node: Signals80523
+Node: Appendices81177
+Node: Robots81592
+Node: Introduction to RES82739
+Node: RES Format84632
+Node: User-Agent Field85736
+Node: Disallow Field86500
+Node: Norobots Examples87111
+Node: Security Considerations88065
+Node: Contributors89061
+Node: Copying91700
+Node: Concept Index110863
End Tag Table
diff --git a/doc/wget.info-1 b/doc/wget.info-1
index e6e42686..28f9c640 100644
--- a/doc/wget.info-1
+++ b/doc/wget.info-1
@@ -452,10 +452,15 @@ Download Options
`--waitretry=SECONDS'
If you don't want Wget to wait between *every* retrieval, but only
- between retries of failed downloads, you can use this option. If
- you want to make sure you never "hammer" remote sites with rapid
- retries, you can leave it set all the time to some non-zero value
- using the waitretry variable in your `.wgetrc' file.
+ between retries of failed downloads, you can use this option.
+ Wget will use "linear backoff", waiting 1 second after the first
+ failure on a given file, then waiting 2 seconds after the second
+ failure on that file, up to the maximum number of SECONDS you
+ specify. Therefore, a value of 10 will actually make Wget wait up
+ to (1 + 2 + ... + 10) = 55 seconds per file.
+
+ Note that this option is turned on by default in the global
+ `wgetrc' file.
`-Y on/off'
`--proxy=on/off'
diff --git a/doc/wget.info-2 b/doc/wget.info-2
index 3651877f..e59ff86b 100644
--- a/doc/wget.info-2
+++ b/doc/wget.info-2
@@ -277,12 +277,13 @@ quiet = on/off
Quiet mode, the same as `-q'.
quota = QUOTA
- Specify the download quota, which is useful to put in global
- wgetrc. When download quota is specified, Wget will stop retrieving
- after the download sum has become greater than quota. The quota
- can be specified in bytes (default), kbytes `k' appended) or mbytes
- (`m' appended). Thus `quota = 5m' will set the quota to 5 mbytes.
- Note that the user's startup file overrides system settings.
+ Specify the download quota, which is useful to put in the global
+ `wgetrc'. When download quota is specified, Wget will stop
+ retrieving after the download sum has become greater than quota.
+ The quota can be specified in bytes (default), kbytes `k'
+ appended) or mbytes (`m' appended). Thus `quota = 5m' will set
+ the quota to 5 mbytes. Note that the user's startup file overrides
+ system settings.
reclevel = N
Recursion level, the same as `-l'.
@@ -335,8 +336,9 @@ wait = N
Wait N seconds between retrievals, the same as `-w'.
waitretry = N
- Wait N seconds between retries of failed retrievals only - the
- same as `--waitretry'.
+ Wait up to N seconds between retries of failed retrievals only -
+ the same as `--waitretry'. Note that this is turned on by default
+ in the global `wgetrc'.
File: wget.info, Node: Sample Wgetrc, Prev: Wgetrc Commands, Up: Startup File
@@ -349,8 +351,9 @@ It is divided in two section--one for global usage (suitable for global
startup file), and one for local usage (suitable for `$HOME/.wgetrc').
Be careful about the things you change.
- Note that all the lines are commented out. For any line to have
-effect, you must remove the `#' prefix at the beginning of line.
+ Note that almost all the lines are commented out. For a command to
+have any effect, you must remove the `#' character at the beginning of
+its line.
###
### Sample Wget initialization file .wgetrc
@@ -364,8 +367,9 @@ effect, you must remove the `#' prefix at the beginning of line.
## Wget initialization file can reside in /usr/local/etc/wgetrc
## (global, for all users) or $HOME/.wgetrc (for a single user).
##
- ## To use any of the settings in this file, you will have to uncomment
- ## them (and probably change them).
+ ## To use the settings in this file, you will have to uncomment them,
+ ## as well as change them, in most cases, as the values on the
+ ## commented-out lines are the default values (e.g. "off").
##
@@ -436,6 +440,13 @@ effect, you must remove the `#' prefix at the beginning of line.
# the number of seconds you want Wget to wait.
#wait = 0
+ # The "wait" command above makes Wget wait between every connection.
+ # If, instead, you want Wget to wait only between retries of failed
+ # downloads, set this variable to maximum number of seconds to wait
+ # (Wget will use "linear backoff", waiting 1 second after the first
+ # failure on a file, up to this max).
+ waitretry = 10
+
# You can force creating directory structure, even if a single is being
# retrieved, by setting this to on.
#dirstruct = off
@@ -444,6 +455,11 @@ effect, you must remove the `#' prefix at the beginning of line.
# you are not sure you know what it means) by setting this to on.
#recursive = off
+ # To always back up file X as X.orig before converting its links (due
+ # to -k / --convert-links / convert_links = on having been specified),
+ # set this variable to on:
+ #backup_converted = off
+
# To have Wget follow FTP links from HTML files by default, set this
# to on:
#follow_ftp = off
diff --git a/doc/wget.texi b/doc/wget.texi
index 6bb0dded..aba10bd3 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -564,10 +564,15 @@ reasonably expect the network error to be fixed before the retry.
@cindex waiting between retries
@item --waitretry=@var{seconds}
If you don't want Wget to wait between @emph{every} retrieval, but only
-between retries of failed downloads, you can use this option. If you
-want to make sure you never "hammer" remote sites with rapid retries,
-you can leave it set all the time to some non-zero value using the
-waitretry variable in your @file{.wgetrc} file.
+between retries of failed downloads, you can use this option. Wget will
+use "linear backoff", waiting 1 second after the first failure on a
+given file, then waiting 2 seconds after the second failure on that
+file, up to the maximum number of @var{seconds} you specify. Therefore,
+a value of 10 will actually make Wget wait up to (1 + 2 + ... + 10) = 55
+seconds per file.
+
+Note that this option is turned on by default in the global
+@file{wgetrc} file.
@cindex proxy
@item -Y on/off
@@ -1711,8 +1716,8 @@ Set proxy authentication password to @var{string}, like
Quiet mode, the same as @samp{-q}.
@item quota = @var{quota}
-Specify the download quota, which is useful to put in global
-wgetrc. When download quota is specified, Wget will stop retrieving
+Specify the download quota, which is useful to put in the global
+@file{wgetrc}. When download quota is specified, Wget will stop retrieving
after the download sum has become greater than quota. The quota can be
specified in bytes (default), kbytes @samp{k} appended) or mbytes
(@samp{m} appended). Thus @samp{quota = 5m} will set the quota to 5
@@ -1769,8 +1774,9 @@ Turn verbose on/off, the same as @samp{-v}/@samp{-nv}.
Wait @var{n} seconds between retrievals, the same as @samp{-w}.
@item waitretry = @var{n}
-Wait @var{n} seconds between retries of failed retrievals only -- the same as
-@samp{--waitretry}.
+Wait up to @var{n} seconds between retries of failed retrievals only --
+the same as @samp{--waitretry}. Note that this is turned on by default
+in the global @file{wgetrc}.
@end table
@node Sample Wgetrc, , Wgetrc Commands, Startup File
@@ -1782,105 +1788,12 @@ It is divided in two section---one for global usage (suitable for global
startup file), and one for local usage (suitable for
@file{$HOME/.wgetrc}). Be careful about the things you change.
-Note that all the lines are commented out. For any line to have effect,
-you must remove the @samp{#} prefix at the beginning of line.
+Note that almost all the lines are commented out. For a command to have
+any effect, you must remove the @samp{#} character at the beginning of
+its line.
@example
-###
-### Sample Wget initialization file .wgetrc
-###
-
-## You can use this file to change the default behaviour of wget or to
-## avoid having to type many many command-line options. This file does
-## not contain a comprehensive list of commands -- look at the manual
-## to find out what you can put into this file.
-##
-## Wget initialization file can reside in /usr/local/etc/wgetrc
-## (global, for all users) or $HOME/.wgetrc (for a single user).
-##
-## To use any of the settings in this file, you will have to uncomment
-## them (and probably change them).
-
-
-##
-## Global settings (useful for setting up in /usr/local/etc/wgetrc).
-## Think well before you change them, since they may reduce wget's
-## functionality, and make it behave contrary to the documentation:
-##
-
-# You can set retrieve quota for beginners by specifying a value
-# optionally followed by 'K' (kilobytes) or 'M' (megabytes). The
-# default quota is unlimited.
-#quota = inf
-
-# You can lower (or raise) the default number of retries when
-# downloading a file (default is 20).
-#tries = 20
-
-# Lowering the maximum depth of the recursive retrieval is handy to
-# prevent newbies from going too "deep" when they unwittingly start
-# the recursive retrieval. The default is 5.
-#reclevel = 5
-
-# Many sites are behind firewalls that do not allow initiation of
-# connections from the outside. On these sites you have to use the
-# `passive' feature of FTP. If you are behind such a firewall, you
-# can turn this on to make Wget use passive FTP by default.
-#passive_ftp = off
-
-
-##
-## Local settings (for a user to set in his $HOME/.wgetrc). It is
-## *highly* undesirable to put these settings in the global file, since
-## they are potentially dangerous to "normal" users.
-##
-## Even when setting up your own ~/.wgetrc, you should know what you
-## are doing before doing so.
-##
-
-# Set this to on to use timestamping by default:
-#timestamping = off
-
-# It is a good idea to make Wget send your email address in a `From:'
-# header with your request (so that server administrators can contact
-# you in case of errors). Wget does *not* send `From:' by default.
-#header = From: Your Name <username@@site.domain>
-
-# You can set up other headers, like Accept-Language. Accept-Language
-# is *not* sent by default.
-#header = Accept-Language: en
-
-# You can set the default proxy for Wget to use. It will override the
-# value in the environment.
-#http_proxy = http://proxy.yoyodyne.com:18023/
-
-# If you do not want to use proxy at all, set this to off.
-#use_proxy = on
-
-# You can customize the retrieval outlook. Valid options are default,
-# binary, mega and micro.
-#dot_style = default
-
-# Setting this to off makes Wget not download /robots.txt. Be sure to
-# know *exactly* what /robots.txt is and how it is used before changing
-# the default!
-#robots = on
-
-# It can be useful to make Wget wait between connections. Set this to
-# the number of seconds you want Wget to wait.
-#wait = 0
-
-# You can force creating directory structure, even if a single is being
-# retrieved, by setting this to on.
-#dirstruct = off
-
-# You can turn on recursive retrieving by default (don't do this if
-# you are not sure you know what it means) by setting this to on.
-#recursive = off
-
-# To have Wget follow FTP links from HTML files by default, set this
-# to on:
-#follow_ftp = off
+@include sample.wgetrc.munged_for_texi_inclusion
@end example
@node Examples, Various, Startup File, Top