Merging heads.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index af44b39e02ef40140b67823d59062b58332b9f54..94b230c0b298d8315c538e4b403b6039368e67be 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,18 @@
+2008-05-12  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi (Download Options): -N with -O downgraded to a
+       warning.
+
+2008-04-30  Steven Schubiger  <stsc@members.fsf.org>
+
+       * wget.texi <Download Options>: Document the --ask-password
+       option.
+
+2008-04-27  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi (Download Options) <-O>: Elaborate on why certain
+       options make poor combinations with -O.
+
 2008-04-22  Mike Frysinger  <vapier@gentoo.org>
 
        * sample.wgetrc: Added prefer_family example. Resolves bug