Merge build info with head.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 94b230c0b298d8315c538e4b403b6039368e67be..e028ad40380246dfeb1531cd8366cc6f2136cd8e 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-13  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi (Mailing List): The wget-notify mailing list no longer
+       receives commit notifications from the source repository.
+       (Internet Relay Chat): Activity isn't quite so low any more,
+       remove notice to that effect.
+
+2008-05-17  Steven Schubiger  <stsc@members.fsf.org>
+
+       * wget.texi (Download Options): Change documentation to reflect
+       the new default value for --prefer-family.
+       (Wgetrc Commands): Same, for prefer_family wgetrc command.
+
 2008-05-12  Micah Cowan  <micah@cowan.name>
 
        * wget.texi (Download Options): -N with -O downgraded to a