Automated merge.

[wget] / doc / wget.texi

diff --git a/doc/wget.texi b/doc/wget.texi
index 73259cfda5c9cd431b8c7ec155ced3fb3fdc4c68..967604c4b064f7a4642e477d4a9e3d0b4709a5f1 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2551,6 +2551,16 @@ the specified client authorities.  The default is ``on''.  The same as
 @item connect_timeout = @var{n}
 Set the connect timeout---the same as @samp{--connect-timeout}.
 
+@item content_disposition = on/off
+If this is set to on, experimental (not fully-functional) support for
+@samp{Content-Disposition} headers is enabled. This can currently result in
+extra round-trips to the server for a @samp{HEAD} request, which is why
+it is not currently enabled by default.
+
+This option is useful for some file-downloading CGI programs that use
+@samp{Content-Disposition} headers to describe what the name of a
+downloaded file should be.
+
 @item continue = on/off
 If set to on, force continuation of preexistent partially retrieved
 files.  See @samp{-c} before setting it.
@@ -2649,7 +2659,7 @@ This command used to be named @code{login} prior to Wget 1.10.
 Turn globbing on/off---the same as @samp{--glob} and @samp{--no-glob}.
 
 @item header = @var{string}
-Define a header for HTTP doewnloads, like using
+Define a header for HTTP downloads, like using
 @samp{--header=@var{string}}.
 
 @item html_extension = on/off
@@ -2716,6 +2726,10 @@ Load cookies from @var{file}.  See @samp{--load-cookies @var{file}}.
 @item logfile = @var{file}
 Set logfile to @var{file}, the same as @samp{-o @var{file}}.
 
+@item max_redirect = @var{number}
+Specifies the maximum number of redirections to follow for a resource.
+See @samp{--max-redirect=@var{number}}.
+
 @item mirror = on/off
 Turn mirroring on/off.  The same as @samp{-m}.
 
@@ -3301,7 +3315,8 @@ and follow the instructions.  Unsubscribe by mailing to
 Another mailing list is at @email{wget-patches@@sunsite.dk}, and is
 used to submit patches for review by Wget developers.  A ``patch'' is
 a textual representation of change to source code, readable by both
-humans and programs.  The file @file{PATCHES} that comes with Wget
+humans and programs.  The
+@url{http://wget.addictivecode.org/PatchGuidelines} page
 covers the creation and submitting of patches in detail.  Please don't
 send general suggestions or bug reports to @samp{wget-patches}; use it
 only for patch submissions.
@@ -3660,6 +3675,10 @@ Christopher G.@: Lewis---Maintenance of the Windows version of GNU WGet.
 Gisle Vanem---Many helpful patches and improvements, especially for
 Windows and MS-DOS support.
 
+@item
+Ralf Wildenhues---Contributed patches to convert Wget to use Automake as
+part of its build process, and various bugfixes.
+
 @item
 People who provided donations for development---including Brian Gough.
 @end itemize