minor changespre-host-cache

3 files changed, 11 insertions, 4 deletions

diff --git a/CHANGES b/CHANGES
index 70173abe8..871e7242e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,15 @@
 
                                History of Changes
 
+Daniel (3 January 2002)
+- As the test case uses --include and then --head, I had to modify src/main.c
+  to deal with this situation slightly better than previously. When done, we
+  have 100% good tests again in the main branch.
+
 Daniel (2 January 2002)
+- Made test case 25 run again in the multi-dev branch. But it seems that the
+  changes done on dec-20 made test case 104 cease to work (in both branches).
+
 - Philip Gladstone pointed out a few portability problems in the source code
   that didn't compile on 64-bit sparcs using Sun's native compiler...
 
diff --git a/docs/curl.1 b/docs/curl.1
index 10b7a3466..7281b63e7 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -4,8 +4,7 @@
 .\"
 .TH curl 1 "30 Nov 2001" "Curl 7.9.2" "Curl Manual"
 .SH NAME
-curl \- get a URL with FTP, TELNET, LDAP, GOPHER, DICT, FILE, HTTP or
-HTTPS syntax.
+curl \- transfer a URL
 .SH SYNOPSIS
 .B curl [options]
 .I [URL...]
diff --git a/lib/urldata.h b/lib/urldata.h
index 3f57f1fc8..00ef3b355 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -570,8 +570,8 @@ struct UserDefined {
   bool http_fail_on_error;
   bool http_follow_location;
 
-  bool http_include_header;
-#define include_header http_include_header
+  bool include_header;
+#define http_include_header include_header /* former name */
 
   bool http_set_referer;
   bool http_auto_referer; /* set "correct" referer when following location: */