From: Micah Cowan <micah@cowan.name>
Date: Thu, 11 Oct 2007 04:35:03 +0000 (-0700)
Subject: Automated merge with file:/home/micah/devel/wget/eleven
X-Git-Tag: v1.13~515
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=fbe701ce28278fd58f67464518ece3f26882a2fa;hp=61533a5ebcb778a2a0b574b862ea8a10395c053d

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

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0989f76e..42ae9897 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/doc/wget.texi b/doc/wget.texi
index 0f66f17b..32f59807 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2659,7 +2659,7 @@ This command used to be named @code{login} prior to Wget 1.10.
 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
diff --git a/src/ChangeLog b/src/ChangeLog
index 76558534..fc900a8c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/src/http-ntlm.c b/src/http-ntlm.c
index 054c8a95..32bb3c59 100644
--- a/src/http-ntlm.c
+++ b/src/http-ntlm.c
@@ -42,6 +42,7 @@ so, delete this exception statement from your version.  */
 
 #include <openssl/des.h>
 #include <openssl/md4.h>
+#include <openssl/opensslv.h>
 
 #include "wget.h"
 #include "utils.h"