[svn] Manually applied Rob Mayoff <mayoff@dqd.com>'s patch (vs. 1.5.3, not 1.5.3...

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 84ec1c8f59d763e303c368f318f9a564adfbdb2a..0310cf639e55e2c2a862038133e63082489bfbd1 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -443,6 +443,15 @@ links in the file specified by @samp{-i}.
 @section Download Options
 
 @table @samp
+@cindex bind() address
+@cindex client IP address
+@cindex IP address, client
+@item --bind-address=@var{ADDRESS}
+When making client TCP/IP connections, @code{bind()} to @var{ADDRESS} on
+the local machine.  @var{ADDRESS} may be specified as a hostname or IP
+address.  This option can be useful if your machine is bound to multiple
+IPs.
+
 @cindex retries
 @cindex tries
 @cindex number of retries
@@ -828,11 +837,6 @@ servers denying information to clients other than @code{Mozilla} or
 Microsoft @code{Internet Explorer}.  This option allows you to change
 the @code{User-Agent} line issued by Wget.  Use of this option is
 discouraged, unless you really know what you are doing.
-
-@strong{NOTE} that Netscape Communications Corp. has claimed that false
-transmissions of @samp{Mozilla} as the @code{User-Agent} are a copyright
-infringement, which will be prosecuted.  @strong{DO NOT} misrepresent
-Wget as Mozilla.
 @end table
 
 @node FTP Options, Recursive Retrieval Options, HTTP Options, Invoking
@@ -906,14 +910,20 @@ Retrieval}).  The default maximum depth is 5.
 @item --delete-after
 This option tells Wget to delete every single file it downloads,
 @emph{after} having done so.  It is useful for pre-fetching popular
-pages through proxy, e.g.:
+pages through a proxy, e.g.:
 
 @example
 wget -r -nd --delete-after http://whatever.com/~popular/page/
 @end example
 
-The @samp{-r} option is to retrieve recursively, and @samp{-nd} not to
-create directories.
+The @samp{-r} option is to retrieve recursively, and @samp{-nd} to not
+create directories.  
+
+Note that @samp{--delete-after} deletes files on the local machine.  It
+does not issue the @samp{DELE} command to remote FTP sites, for
+instance.  Also note that when @samp{--delete-after} is specified,
+@samp{--convert-links} is ignored, so @samp{.orig} files are simply not
+created in the first place.
 
 @cindex conversion of links
 @cindex link conversion
@@ -1706,9 +1716,10 @@ option is set to @samp{always} or @samp{never}, that value will be
 locked in for the duration of the wget invocation -- commandline options
 will not override.
 
-Some commands take pseudo-arbitrary values.  @var{string} values can be
-any non-empty string.  @var{n} can be any positive integer, or
-@samp{inf} for infinity, where appropriate.
+Some commands take pseudo-arbitrary values.  @var{address} values can be
+hostnames or dotted-quad IP addresses.  @var{n} can be any positive
+integer, or @samp{inf} for infinity, where appropriate.  @var{string}
+values can be any non-empty string.
 
 Most of these commands have commandline equivalents (@xref{Invoking}),
 though some of the more obscure or rarely used ones do not.
@@ -1740,6 +1751,9 @@ 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 bind_address = @var{address}
+Bind to @var{address}, like the @samp{--bind-address} option.
+
 @item cache = on/off
 When set to off, disallow server-caching.  See the @samp{-C} option.
 
@@ -2688,10 +2702,10 @@ me).
 @cindex contributors
 
 @iftex
-GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @email{hniksic@@iskon.hr}.
+GNU Wget was written by Hrvoje Nik@v{s}i@'{c} @email{hniksic@@arsdigita.com}.
 @end iftex
 @ifinfo
-GNU Wget was written by Hrvoje Niksic @email{hniksic@@iskon.hr}.
+GNU Wget was written by Hrvoje Niksic @email{hniksic@@arsdigita.com}.
 @end ifinfo
 However, its development could never have gone as far as it has, were it
 not for the help of many people, either with bug reports, feature