Merge with mainline.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index cc6f2aa9148e403f70b0fe6cb4badec3f4e8156f..02eb44e5f35e8d7187ff9e506314b4e14e118714 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,20 @@
+2008-11-10  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (EXTRA_DIST): Removed no-longer-present
+       README.maint (shouldn't have been there in the first place).
+
+       * wget.texi (Mailing Lists): Added information aboug Gmane portal,
+       added subsection headings.
+
+       Update node pointers.
+       
+2008-11-05  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi: Move --no-http-keep-alive from FTP Options to HTTP
+       Options.
+       (Mailing List): Mention moderation for unsubscribed posts, and
+       archive location.
+
 2008-11-04  Micah Cowan  <micah@cowan.name>
 
        * wget.texi, fdl.texi: Updated to FDL version 1.3.
@@ -17,6 +34,15 @@
        * wget.texi (Robot Exclusion): Fixed typo "downloads" ->
        "download"
 
+2008-08-03  Xavier Saint  <wget@sxav.eu>
+
+       * wget.texi : Add option descriptions for the three new
+       options --iri, --locale and --remote-encoding related to
+       IRI support.
+
+       * sample.wgetrc : Add commented lines for the three new
+       command iri, locale and encoding related to IRI support.
+
 2008-08-03  Micah Cowan  <micah@cowan.name>
 
        * wget.texi: Don't set UPDATED; already set by version.texi.