[svn] * wget.texi (Logging and Input File Options): -B / --base was not documented as

a separate item, and the .wgetrc version was misleading.

* wget.texi (Wgetrc Commands): Changed all instances of ", the same as" to the
  more grammatical " -- the same as".

doc/ChangeLog

@@ -3,6 +3,12 @@
 	* wget.texi (Download Options): Using -c on a file that's already fully
 	downloaded results in an unchanged file and no second ".1" copy.
 
+	* wget.texi (Logging and Input File Options): -B / --base was not
+	documented as a separate item, and the .wgetrc version was misleading.
+
+	* wget.texi (Wgetrc Commands): Changed all instances of 
+	", the same as" to the more grammatical " -- the same as".
+
 2000-08-22  Dan Harkless  <dan-wget@dilvish.speed.net>
 
 	* wget.texi (Download Options): --no-clobber's documentation was

doc/wget.info

@@ -26,8 +26,8 @@ notice identical to this one.
 
 Indirect:
 wget.info-1: 961
-wget.info-2: 50094
+wget.info-2: 50225
-wget.info-3: 93566
+wget.info-3: 93801
 
 Tag Table:
 (Indirect)
@@ -38,51 +38,51 @@ Node: URL Format5833
 Node: Option Syntax8163
 Node: Basic Startup Options9587
 Node: Logging and Input File Options10287
-Node: Download Options12681
+Node: Download Options12812
-Node: Directory Options20528
+Node: Directory Options20659
-Node: HTTP Options23006
+Node: HTTP Options23137
-Node: FTP Options26911
+Node: FTP Options27042
-Node: Recursive Retrieval Options28104
+Node: Recursive Retrieval Options28235
-Node: Recursive Accept/Reject Options30068
+Node: Recursive Accept/Reject Options30199
-Node: Recursive Retrieval32966
+Node: Recursive Retrieval33097
-Node: Following Links35264
+Node: Following Links35395
-Node: Relative Links36292
+Node: Relative Links36423
-Node: Host Checking36806
+Node: Host Checking36937
-Node: Domain Acceptance38831
+Node: Domain Acceptance38962
-Node: All Hosts40501
+Node: All Hosts40632
-Node: Types of Files40928
+Node: Types of Files41059
-Node: Directory-Based Limits43378
+Node: Directory-Based Limits43509
-Node: FTP Links46018
+Node: FTP Links46149
-Node: Time-Stamping46888
+Node: Time-Stamping47019
-Node: Time-Stamping Usage48525
+Node: Time-Stamping Usage48656
-Node: HTTP Time-Stamping Internals50094
+Node: HTTP Time-Stamping Internals50225
-Node: FTP Time-Stamping Internals51564
+Node: FTP Time-Stamping Internals51695
-Node: Startup File52772
+Node: Startup File52903
-Node: Wgetrc Location53645
+Node: Wgetrc Location53776
-Node: Wgetrc Syntax54460
+Node: Wgetrc Syntax54591
-Node: Wgetrc Commands55175
+Node: Wgetrc Commands55306
-Node: Sample Wgetrc62457
+Node: Sample Wgetrc62692
-Node: Examples67476
+Node: Examples67711
-Node: Simple Usage68083
+Node: Simple Usage68318
-Node: Advanced Usage70477
+Node: Advanced Usage70712
-Node: Guru Usage73228
+Node: Guru Usage73463
-Node: Various74890
+Node: Various75125
-Node: Proxies75414
+Node: Proxies75649
-Node: Distribution78179
+Node: Distribution78414
-Node: Mailing List78530
+Node: Mailing List78765
-Node: Reporting Bugs79229
+Node: Reporting Bugs79464
-Node: Portability81014
+Node: Portability81249
-Node: Signals82389
+Node: Signals82624
-Node: Appendices83043
+Node: Appendices83278
-Node: Robots83458
+Node: Robots83693
-Node: Introduction to RES84605
+Node: Introduction to RES84840
-Node: RES Format86498
+Node: RES Format86733
-Node: User-Agent Field87602
+Node: User-Agent Field87837
-Node: Disallow Field88366
+Node: Disallow Field88601
-Node: Norobots Examples88977
+Node: Norobots Examples89212
-Node: Security Considerations89931
+Node: Security Considerations90166
-Node: Contributors90927
+Node: Contributors91162
-Node: Copying93566
+Node: Copying93801
-Node: Concept Index112729
+Node: Concept Index112964
 
 End Tag Table

doc/wget.info-1

@@ -336,6 +336,11 @@ Logging and Input File Options
      HTML files on your local disk, by adding `<base href="URL">' to
      HTML, or using the `--base' command-line option.
 
+`-B URL'
+`--base=URL'
+     When used in conjunction with `-F', prepends URL to relative links
+     in the file specified by `-i'.
+
 
 File: wget.info,  Node: Download Options,  Next: Directory Options,  Prev: Logging and Input File Options,  Up: Invoking
 

doc/wget.info-2

@@ -178,19 +178,20 @@ add_hostdir = on/off
      Enable/disable host-prefixed file names.  `-nH' disables it.
 
 continue = on/off
-     Enable/disable continuation of the retrieval, the same as `-c'
+     Enable/disable continuation of the retrieval - the same as `-c'
      (which enables it).
 
 background = on/off
-     Enable/disable going to background, the same as `-b' (which enables
+     Enable/disable going to background - the same as `-b' (which
-     it).
+     enables it).
 
 backup_converted = on/off
      Enable/disable saving pre-converted files with the suffix `.orig'
      - the same as `-K' (which enables it).
 
 base = STRING
-     Set base for relative URLs, the same as `-B'.
+     Consider relative URLs in URL input files forced to be interpreted
+     as HTML as being relative to STRING - the same as `-B'.
 
 cache = on/off
      When set to off, disallow server-caching.  See the `-C' option.
@@ -205,13 +206,13 @@ debug = on/off
      Debug mode, same as `-d'.
 
 delete_after = on/off
-     Delete after download, the same as `--delete-after'.
+     Delete after download - the same as `--delete-after'.
 
 dir_prefix = STRING
-     Top of directory tree, the same as `-P'.
+     Top of directory tree - the same as `-P'.
 
 dirstruct = on/off
-     Turning dirstruct on or off, the same as `-x' or `-nd',
+     Turning dirstruct on or off - the same as `-x' or `-nd',
      respectively.
 
 domains = STRING
@@ -237,13 +238,13 @@ dot_style = STRING
 
 exclude_directories = STRING
      Specify a comma-separated list of directories you wish to exclude
-     from download, the same as `-X' (*Note Directory-Based Limits::).
+     from download - the same as `-X' (*Note Directory-Based Limits::).
 
 exclude_domains = STRING
      Same as `--exclude-domains' (*Note Domain Acceptance::).
 
 follow_ftp = on/off
-     Follow FTP links from HTML documents, the same as `-f'.
+     Follow FTP links from HTML documents - the same as `-f'.
 
 follow_tags = STRING
      Only follow certain HTML tags when doing a recursive retrieval,
@@ -251,14 +252,14 @@ follow_tags = STRING
 
 force_html = on/off
      If set to on, force the input filename to be regarded as an HTML
-     document, the same as `-F'.
+     document - the same as `-F'.
 
 ftp_proxy = STRING
      Use STRING as FTP proxy, instead of the one specified in
      environment.
 
 glob = on/off
-     Turn globbing on/off, the same as `-g'.
+     Turn globbing on/off - the same as `-g'.
 
 header = STRING
      Define an additional header, like `--header'.
@@ -283,7 +284,7 @@ ignore_tags = STRING
 
 include_directories = STRING
      Specify a comma-separated list of directories you wish to follow
-     when downloading, the same as `-I'.
+     when downloading - the same as `-I'.
 
 input = STRING
      Read the URLs from STRING, like `-i'.
@@ -295,7 +296,7 @@ kill_longer = on/off
      the value in `Content-Length'.
 
 logfile = STRING
-     Set logfile, the same as `-o'.
+     Set logfile - the same as `-o'.
 
 login = STRING
      Your user name on the remote machine, for FTP.  Defaults to
@@ -319,10 +320,10 @@ no_proxy = STRING
      proxy loading, instead of the one specified in environment.
 
 output_document = STRING
-     Set the output filename, the same as `-O'.
+     Set the output filename - the same as `-O'.
 
 passive_ftp = on/off
-     Set passive FTP, the same as `--passive-ftp'.
+     Set passive FTP - the same as `--passive-ftp'.
 
 passwd = STRING
      Set your FTP password to PASSWORD.  Without this setting, the
@@ -335,7 +336,7 @@ proxy_passwd = STRING
      Set proxy authentication password to STRING, like `--proxy-passwd'.
 
 quiet = on/off
-     Quiet mode, the same as `-q'.
+     Quiet mode - the same as `-q'.
 
 quota = QUOTA
      Specify the download quota, which is useful to put in the global
@@ -347,13 +348,13 @@ quota = QUOTA
      system settings.
 
 reclevel = N
-     Recursion level, the same as `-l'.
+     Recursion level - the same as `-l'.
 
 recursive = on/off
-     Recursive on/off, the same as `-r'.
+     Recursive on/off - the same as `-r'.
 
 relative_only = on/off
-     Follow only relative links, the same as `-L' (*Note Relative
+     Follow only relative links - the same as `-L' (*Note Relative
      Links::).
 
 remove_listing = on/off
@@ -369,7 +370,7 @@ robots = on/off
      what you are doing before changing the default (which is `on').
 
 server_response = on/off
-     Choose whether or not to print the HTTP and FTP server responses,
+     Choose whether or not to print the HTTP and FTP server responses -
      the same as `-S'.
 
 simple_host_check = on/off
@@ -379,22 +380,22 @@ span_hosts = on/off
      Same as `-H'.
 
 timeout = N
-     Set timeout value, the same as `-T'.
+     Set timeout value - the same as `-T'.
 
 timestamping = on/off
      Turn timestamping on/off. The same as `-N' (*Note Time-Stamping::).
 
 tries = N
-     Set number of retries per URL, the same as `-t'.
+     Set number of retries per URL - the same as `-t'.
 
 use_proxy = on/off
      Turn proxy support on/off. The same as `-Y'.
 
 verbose = on/off
-     Turn verbose on/off, the same as `-v'/`-nv'.
+     Turn verbose on/off - the same as `-v'/`-nv'.
 
 wait = N
-     Wait N seconds between retrievals, the same as `-w'.
+     Wait N seconds between retrievals - the same as `-w'.
 
 waitretry = N
      Wait up to N seconds between retries of failed retrievals only -

doc/wget.info-3

@@ -405,6 +405,7 @@ Concept Index
 * arguments:                             Invoking.
 * authentication:                        HTTP Options.
 * backing up converted files:            Recursive Retrieval Options.
+* base for relative links in input file: Logging and Input File Options.
 * bug reports:                           Reporting Bugs.
 * bugs:                                  Reporting Bugs.
 * cache:                                 HTTP Options.

doc/wget.texi

@@ -431,6 +431,12 @@ file.  This enables you to retrieve relative links from existing
 @sc{html} files on your local disk, by adding @code{<base
 href="@var{url}">} to @sc{html}, or using the @samp{--base} command-line
 option.
+
+@cindex base for relative links in input file
+@item -B @var{URL}
+@itemx --base=@var{URL}
+When used in conjunction with @samp{-F}, prepends @var{URL} to relative
+links in the file specified by @samp{-i}.
 @end table
 
 @node Download Options, Directory Options, Logging and Input File Options, Invoking
@@ -1592,11 +1598,11 @@ Same as @samp{-A}/@samp{-R} (@xref{Types of Files}).
 Enable/disable host-prefixed file names.  @samp{-nH} disables it.
 
 @item continue = on/off
-Enable/disable continuation of the retrieval, the same as @samp{-c}
+Enable/disable continuation of the retrieval -- the same as @samp{-c}
 (which enables it).
 
 @item background = on/off
-Enable/disable going to background, the same as @samp{-b} (which enables
+Enable/disable going to background -- the same as @samp{-b} (which enables
 it).
 
 @item backup_converted = on/off
@@ -1605,8 +1611,11 @@ Enable/disable saving pre-converted files with the suffix @samp{.orig}
 
 @c @item backups = @var{number}
 @c #### Document me!
+@c
 @item base = @var{string}
-Set base for relative @sc{url}s, the same as @samp{-B}.
+Consider relative @sc{url}s in @sc{url} input files forced to be
+interpreted as @sc{html} as being relative to @var{string} -- the same
+as @samp{-B}.
 
 @item cache = on/off
 When set to off, disallow server-caching.  See the @samp{-C} option.
@@ -1621,13 +1630,13 @@ Ignore @var{n} remote directory components.
 Debug mode, same as @samp{-d}.
 
 @item delete_after = on/off
-Delete after download, the same as @samp{--delete-after}.
+Delete after download -- the same as @samp{--delete-after}.
 
 @item dir_prefix = @var{string}
-Top of directory tree, the same as @samp{-P}.
+Top of directory tree -- the same as @samp{-P}.
 
 @item dirstruct = on/off
-Turning dirstruct on or off, the same as @samp{-x} or @samp{-nd},
+Turning dirstruct on or off -- the same as @samp{-x} or @samp{-nd},
 respectively.
 
 @item domains = @var{string}
@@ -1653,13 +1662,13 @@ Specify the dot retrieval @dfn{style}, as with @samp{--dot-style}.
 
 @item exclude_directories = @var{string}
 Specify a comma-separated list of directories you wish to exclude from
-download, the same as @samp{-X} (@xref{Directory-Based Limits}).
+download -- the same as @samp{-X} (@xref{Directory-Based Limits}).
 
 @item exclude_domains = @var{string}
 Same as @samp{--exclude-domains} (@xref{Domain Acceptance}).
 
 @item follow_ftp = on/off
-Follow @sc{ftp} links from @sc{html} documents, the same as @samp{-f}.
+Follow @sc{ftp} links from @sc{html} documents -- the same as @samp{-f}.
 
 @item follow_tags = @var{string}
 Only follow certain HTML tags when doing a recursive retrieval, just like
@@ -1667,14 +1676,14 @@ Only follow certain HTML tags when doing a recursive retrieval, just like
 
 @item force_html = on/off
 If set to on, force the input filename to be regarded as an @sc{html}
-document, the same as @samp{-F}.
+document -- the same as @samp{-F}.
 
 @item ftp_proxy = @var{string}
 Use @var{string} as @sc{ftp} proxy, instead of the one specified in
 environment.
 
 @item glob = on/off
-Turn globbing on/off, the same as @samp{-g}.
+Turn globbing on/off -- the same as @samp{-g}.
 
 @item header = @var{string}
 Define an additional header, like @samp{--header}.
@@ -1699,7 +1708,7 @@ Ignore certain HTML tags when doing a recursive retrieval, just like
 
 @item include_directories = @var{string}
 Specify a comma-separated list of directories you wish to follow when
-downloading, the same as @samp{-I}.
+downloading -- the same as @samp{-I}.
 
 @item input = @var{string}
 Read the @sc{url}s from @var{string}, like @samp{-i}.
@@ -1711,7 +1720,7 @@ as much data as there is, provided there is more than or equal
 to the value in @code{Content-Length}.
 
 @item logfile = @var{string}
-Set logfile, the same as @samp{-o}.
+Set logfile -- the same as @samp{-o}.
 
 @item login = @var{string}
 Your user name on the remote machine, for @sc{ftp}.  Defaults to
@@ -1735,10 +1744,10 @@ Use @var{string} as the comma-separated list of domains to avoid in
 proxy loading, instead of the one specified in environment.
 
 @item output_document = @var{string}
-Set the output filename, the same as @samp{-O}.
+Set the output filename -- the same as @samp{-O}.
 
 @item passive_ftp = on/off
-Set passive @sc{ftp}, the same as @samp{--passive-ftp}.
+Set passive @sc{ftp} -- the same as @samp{--passive-ftp}.
 
 @item passwd = @var{string}
 Set your @sc{ftp} password to @var{password}.  Without this setting, the
@@ -1753,7 +1762,7 @@ Set proxy authentication password to @var{string}, like
 @samp{--proxy-passwd}.
 
 @item quiet = on/off
-Quiet mode, the same as @samp{-q}.
+Quiet mode -- the same as @samp{-q}.
 
 @item quota = @var{quota}
 Specify the download quota, which is useful to put in the global
@@ -1764,13 +1773,13 @@ specified in bytes (default), kbytes @samp{k} appended) or mbytes
 mbytes. Note that the user's startup file overrides system settings.
 
 @item reclevel = @var{n}
-Recursion level, the same as @samp{-l}.
+Recursion level -- the same as @samp{-l}.
 
 @item recursive = on/off
-Recursive on/off, the same as @samp{-r}.
+Recursive on/off -- the same as @samp{-r}.
 
 @item relative_only = on/off
-Follow only relative links, the same as @samp{-L} (@xref{Relative
+Follow only relative links -- the same as @samp{-L} (@xref{Relative
 Links}).
 
 @item remove_listing = on/off
@@ -1787,7 +1796,7 @@ what you are doing before changing the default (which is @samp{on}).
 
 @item server_response = on/off
 Choose whether or not to print the @sc{http} and @sc{ftp} server
-responses, the same as @samp{-S}.
+responses -- the same as @samp{-S}.
 
 @item simple_host_check = on/off
 Same as @samp{-nh} (@xref{Host Checking}).
@@ -1796,22 +1805,22 @@ Same as @samp{-nh} (@xref{Host Checking}).
 Same as @samp{-H}.
 
 @item timeout = @var{n}
-Set timeout value, the same as @samp{-T}.
+Set timeout value -- the same as @samp{-T}.
 
 @item timestamping = on/off
 Turn timestamping on/off. The same as @samp{-N} (@xref{Time-Stamping}).
 
 @item tries = @var{n}
-Set number of retries per @sc{url}, the same as @samp{-t}.
+Set number of retries per @sc{url} -- the same as @samp{-t}.
 
 @item use_proxy = on/off
 Turn proxy support on/off. The same as @samp{-Y}.
 
 @item verbose = on/off
-Turn verbose on/off, the same as @samp{-v}/@samp{-nv}.
+Turn verbose on/off -- the same as @samp{-v}/@samp{-nv}.
 
 @item wait = @var{n}
-Wait @var{n} seconds between retrievals, the same as @samp{-w}.
+Wait @var{n} seconds between retrievals -- the same as @samp{-w}.
 
 @item waitretry = @var{n}
 Wait up to @var{n} seconds between retries of failed retrievals only --