Automated merge with file:/home/micah/devel/wget/eleven

diff --combined doc/ChangeLog
index 0989f76e815feb67023ba02bb948b90f17ed1159,b2f017c25bdff8128f713e9958cdc9effb1f75ae..42ae9897388ca1a7578dffc7d52c6c6f17981def
--- 1/doc/ChangeLog
--- 2/doc/ChangeLog
+++ b/doc/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2007-10-10  Micah Cowan  <micah@cowan.name>
+ 
+       * wget.texi <Wgetrc Commands>: Fixed "doewnloads" typo.
+ 
 +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.
 +      * Makefile.am: Converted from Makefile.in.
 +
  2007-10-03  Micah Cowan  <micah@cowan.name>
  
        * wget.texi <Wgetrc Commands>: Cleaned up alphabetization,

diff --combined doc/wget.texi
index 0f66f17beebabfa85ceed56290fb8f1da6f9672d,9b48917bac75333c9615a507df029c3759baf942..32f5980726b0728b7ddad35fd265adbe3c11a3dd
--- 1/doc/wget.texi
--- 2/doc/wget.texi
+++ b/doc/wget.texi
@@@ -2659,7 -2659,7 +2659,7 @@@ This command used to be named @code{log
  Turn globbing on/off---the same as @samp{--glob} and @samp{--no-glob}.
  
  @item header = @var{string}
- Define a header for HTTP doewnloads, like using
+ Define a header for HTTP downloads, like using
  @samp{--header=@var{string}}.
  
  @item html_extension = on/off
@@@ -3674,10 -3674,6 +3674,10 @@@ Christopher G.@: Lewis---Maintenance o
  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

diff --combined src/ChangeLog
index 765585344f105bf72df6feb2bacc8cd392347c5e,fb336cebf2a1815e9375b88daa29fbb16db93886..fc900a8cd7ce1fb577784278d80d92f35bf9eb69
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,13 +1,24 @@@
+ 2007-10-10  Micah Cowan  <micah@cowan.name>
+ 
+       * http-ntlm.c: Include openssl/opensslv.h explicitly, instead of
+       hoping it'll be included by accident in openssl/des.h.
+ 
  2007-10-09  Gisle Vanem  <gvanem@broadpark.no>
  
        * mswindows.c: 'argc' and 'argv' in 'windows_main()' are no longer
        needed.  Hence simply the prototype. Free 'exec_name' at exit.
  
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +      * gettext.h: Imported from /usr/share/gettext, fuller handling
 +      of --disable-nls.
 +      * wget.h: Remove logic for handling lack of NLS (now in
 +      gettext.h).
 +      * main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS.
 +      * Makefile.am: added @LIBINTL@ to LIBS (though it probably
 +      belongs in LDADD, along with everything else currently assigned
 +      to LIBS).
 +
  2007-10-08  Micah Cowan  <micah@cowan.name>
  
        * http.c (http_loop): Add send_head_first conditional back
@@@ -27,8 -21,6 +32,8 @@@
        * http.c (http_loop): We've got_name if content_disposition
        support isn't on; make sure we continue properly in that case,
        even though we're not sending HEAD.
 +      * Makefile.in: Removed, replaced by Makefile.am.
 +      * Makefile.am: Converted from Makefile.in.
  
  2007-10-02  Gisle Vanem  <gvanem@broadpark.no>