Automated merge.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index a879fcb830a29bb96fe9cefe37b7ce195d50c1c3..dc1d408467421c0779403deb7acfbf1850ed0787 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-15  Steven Schubiger  <stsc@members.fsf.org>
+
+       * sample.wgetrc: Comment the waitretry "default" value, 
+       because there is a global one now.
+
+       * wget.texi (Download Options): Mention the global 
+       default value.
+
 2008-11-10  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am (EXTRA_DIST): Removed no-longer-present
@@ -34,6 +42,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.