From: Micah Cowan <micah@cowan.name>
Date: Thu, 24 Jan 2008 04:45:59 +0000 (-0800)
Subject: Automated merge.
X-Git-Tag: v1.13~477
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=33f86b17c84aff12bfde4b554a3bd7b2176e491d;hp=0734d8dd3744825c4db56ef0f50bcff111efa18e

Automated merge.
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e49a67c3..43dd4cd3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Micah Cowan  <micah@cowan.name>
+
+	* wget.texi: Document the --content-disposition option (and not
+	just the .wgetrc setting).
+
 2007-12-06  Micah Cowan  <micah@cowan.name>
 
 	* wget.texi: "the the" -> "the"
diff --git a/src/ChangeLog b/src/ChangeLog
index 9313ff46..774680ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-10  Micah Cowan  <micah@cowan.name>
+
+	* main.c: The option is --content-disposition, not
+	--no-content-disposition (at the moment).
+
 2007-12-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* ftp.c (ftp_retrieve_glob): Print both arguments of fnmatch in