Automated merge.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 02eb44e5f35e8d7187ff9e506314b4e14e118714..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