Merging content-disposition documentation fixes from 1.11.

diff --git a/ChangeLog b/ChangeLog
index 188b858334da8d69abbe599be1111db8c0a512f7..39a41954f3120bd13d1129658f80795040e6d921 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Micah Cowan  <micah@cowan.name>
+
+       * NEWS: Removed developer-only notices (Autoconf, TODO, PATCHES,
+       GNUTLS).
+
 2007-12-07  Micah Cowan  <micah@cowan.name>
 
        * lib/Makefile.am, lib/c-ctype.c, lib/c-ctype.h, lib/gettext.h,

diff --git a/NEWS b/NEWS
index d3ae59a65ef7310e9cf30e0b731fe45f3cd53670..813e8ec857ea2c0de0d8783ef671b7d30937faee 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,24 +15,9 @@ GNU Wget.
 \f
 * Changes in Wget 1.11.
 
-** The source code has been migrated to Mercurial. The repositories are
-available at http://hg.addictivecode.org/. Prior to this, the source
-code was hosted on Subversion (migrated from the original CVS); you can
-still get access to older tags and branches for Wget in the Subversion
-repository at http://addictivecode.org/svn/wget/.
-
-** PATCH file removed; see http://wget.addictivecode.org/PatchGuidelines
-for current information about producing patches for GNU Wget.
-
-** TODO file removed: we use a bugtracker now; see
-http://wget.addictivecode.org/BugTracker. Also,
-http://wget.addictivecode.org/FeatureSpecifications.
-
 ** Timestamping now uses the value from the most recent HTTP response,
 rather than the first one it got.
 
-** configure.in now requires autoconf >= 2.61, rather than 2.59.
-
 ** Authentication information is no longer sent as part of the Referer
 header in recursive fetches.
 
@@ -54,15 +39,6 @@ current implementation is inefficient, and known to have bugs. It is
 EXPERIMENTAL only, and not enabled by default. Use --content-disposition
 to enable it.
 
-** The GnuTLS library is now also experimentally supported for https
-downloads.  This is still work-in-progress.  OpenSSL is still used by
-default; use --with-ssl=gnutls to build with GnuTLS.  OpenSSL is still
-required for NTLM authorization to work, but this should eventually
-change. NOTE: Certificate verification is _not_ currently supported:
-this means that you can currently only use GnuTLS to encrypt
-connections, but _not_ to verify that a host is who it claims to be. Use
-of OpenSSL is suggested until this missing feature is implemented.
-
 ** The new option `--ignore-case' makes Wget ignore case when
 matching files, directories, and wildcards.  This affects the -X, -I,
 -A, and -R options, as well as globbing in FTP URLs.
@@ -76,6 +52,12 @@ was only used by the passive_ftp .wgetrc setting.  If you're running
 broken scripts or Perl modules that unconditionally specify
 `--passive-ftp' and your firewall disallows it, you can override them
 by replacing wget with a script that execs wget "$@" --no-passive-ftp.
+
+** The source code has been migrated to Mercurial. The repositories are
+available at http://hg.addictivecode.org/. Prior to this, the source
+code was hosted on Subversion (migrated from the original CVS); you can
+still get access to older tags and branches for Wget in the Subversion
+repository at http://addictivecode.org/svn/wget/.
 \f
 * Changes in Wget 1.10.
 

diff --git a/doc/wget.texi b/doc/wget.texi
index ee55fa8439e883678a434742a32fe63d886191e2..1ae7af69526d9051ae8bcef84fed11d64f8fa4d4 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -1354,6 +1354,19 @@ the above will not work because @samp{--save-cookies} will not save
 them (and neither will browsers) and the @file{cookies.txt} file will
 be empty.  In that case use @samp{--keep-session-cookies} along with
 @samp{--save-cookies} to force saving of session cookies.
+
+@cindex Content-Disposition
+@item --content-disposition
+
+If this is set to on, experimental (not fully-functional) support for
+@code{Content-Disposition} headers is enabled. This can currently result in
+extra round-trips to the server for a @code{HEAD} request, and is known
+to suffer from a few bugs, which is why it is not currently enabled by default.
+
+This option is useful for some file-downloading CGI programs that use
+@code{Content-Disposition} headers to describe what the name of a
+downloaded file should be.
+
 @end table
 
 @node HTTPS (SSL/TLS) Options
@@ -2552,14 +2565,8 @@ the specified client authorities.  The default is ``on''.  The same as
 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, and is known
-to suffer from a few bugs, 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.
+Turn on recognition of the (non-standard) @samp{Content-Disposition}
+HTTP header---if set to @samp{on}, the same as @samp{--content-disposition}.
 
 @item continue = on/off
 If set to on, force continuation of preexistent partially retrieved

diff --git a/src/main.c b/src/main.c
index d2a55c51cb1e82a8fad90e46f3d95a7890f4eef7..d4f8dc04834cef0c00a84499803e4acc46a6d315 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -532,7 +532,8 @@ HTTP options:\n"),
     N_("\
        --post-file=FILE        use the POST method; send contents of FILE.\n"),
     N_("\
-       --no-content-disposition  don't honor Content-Disposition header.\n"),
+       --content-disposition   honor the Content-Disposition header when\n\
+                               choosing local file names (EXPERIMENTAL).\n"),
     "\n",
 
 #ifdef HAVE_SSL