If -nc and -k are used at the same time, use only the latter

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index c1bae6c1cb7d5ec06320db5fc7915aa2555456bc..ca6d8219efa69ef795f1efd4d090f0fa8d0c3299 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-08  Reza Snowdon <vivi@mage.me.uk>
+       * wget.texi: Added information about the config option to the
+       'Overview' section and a description of the option in
+       'Logging and Input File Options'.
+
+2010-10-26  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * wget.texi (Download Options): Remove unclear statement about the
+       --waitretry option.
+       Reported by: Manfred Koizar <mkoi-pg@aon.at>.
+
 2010-09-25  Merinov Nikolay  <kim.roader@gmail.com>
 
        * wget.texi (Download Options): Document --unlink option.