Merge with mainline.

diff --git a/AUTHORS b/AUTHORS
index 49a48ca6c5b1e431aa3355b0f854085c506b67c9..219877e9a4fb65bad0661875c0f5d7ef8376215b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,3 +42,6 @@ Daniel Stenberg.  NTLM authentication in http-ntlm.c and http-ntlm.h
 originally written for curl donated for use in GNU Wget.
 
 Micah Cowan.  Current Wget maintainer, from mid-2007.
+
+Ralf Wildenhues.  Contributed patches to convert Wget to use Automake as
+part of its build process, and various bugfixes.

diff --git a/ChangeLog b/ChangeLog
index 3105fee9535dce5127d99a367e0d769f962618d1..72da9a52ad22e31b2401f52562659beaed7116eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,9 @@
        * po/quot.sed: New file, from gettext-0.16.1.
        * po/remove-potcdate.sin: New file, from gettext-0.16.1.
 
+2007-10-08  Micah Cowan  <micah@cowan.name>
+
+       * AUTHORS: Credit to Ralf Wildenhues for automakifying patches.
 
 2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 176e435be1a93b6f9d98767a460806a6a1bf81d8..0989f76e815feb67023ba02bb948b90f17ed1159 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-08  Micah Cowan  <micah@cowan.name>
+
+       * wget.texi: Credit to Ralf Wildenhues for automakifying patches.
+
 2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.in: Removed, replaced by Makefile.am.

diff --git a/doc/wget.texi b/doc/wget.texi
index a8ca8406d5f12c8ceb58d970a77e4f9883b2851a..0f66f17beebabfa85ceed56290fb8f1da6f9672d 100644 (file)
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -3674,6 +3674,10 @@ Christopher G.@: Lewis---Maintenance of the Windows version of GNU WGet.
 Gisle Vanem---Many helpful patches and improvements, especially for
 Windows and MS-DOS support.
 
+@item
+Ralf Wildenhues---Contributed patches to convert Wget to use Automake as
+part of its build process, and various bugfixes.
+
 @item
 People who provided donations for development---including Brian Gough.
 @end itemize