[svn] Merge of fix for bugs 20341 and 20410.

[wget] / doc / ChangeLog

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5bb39021ef389d6fb02e180a3d5fcc7a7b5ae59b..0ac5628a76c06fc73300690f05139a993994611d 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,26 @@
+2007-07-05  Micah Cowan  <micah@cowan.name>
+
+       * fdl.texi:
+       Changed to match the version in gnulib.
+
+       * Makefile.in:
+       * texi2pod.pl:
+       * texinfo.tex:
+       Updated GPL reference to version 3 or later, removed FSF
+       address.
+
+       * wget.texi:
+       Slightly reworded the FDL license invocation. Replaced the
+       maintainer reference. Removed the GPL text from the manual.
+
+       * gpl.texi:
+       Removed due to discontinuation of reference in Wget manual.
+
+2006-07-10  Mauro Tortonesi  <mauro@ferrara.linux.it>
+
+       * wget.texi: Fixed rendering of --no-proxy description in the man
+       page. Added information about current maintainer.
+
 2006-06-28  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * wget.texi: Removed invariant status to the GPL and GFDL sections.