Merge with mainline.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 094055621378ce700f4768d75193cd7e16c5148f..898e3c6e5822d689c4067c824428e8cb968774a0 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-20  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi (Contributors): Added Jay Krell.
+
 2009-06-14  Micah Cowan  <micah@cowan.name>
 
        * Makefile.am (wget.pod): $(srcdir)/version.texi -> version.texi
@@ -66,6 +70,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.