cleanup-commitpre-header-change

3 files changed, 14 insertions, 8 deletions

diff --git a/docs/FAQ b/docs/FAQ
index 8b15f5c57..687257452 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1,4 +1,4 @@
-Updated: December 30, 2000 (http://curl.haxx.se/docs/faq.shtml)
+Updated: January 2, 2001 (http://curl.haxx.se/docs/faq.shtml)
                                   _   _ ____  _     
                               ___| | | |  _ \| |    
                              / __| | | | |_) | |    
@@ -75,6 +75,8 @@ FAQ
   Curl supports a range of common internet protocols, currently including
   HTTP, HTTPS, FTP, GOPHER, LDAP, DICT and FILE.
 
+  Please spell it cURL or just curl.
+
   1.2 What is libcurl?
 
   libcurl is the engine inside curl that does all the work. curl is more or
@@ -222,7 +224,7 @@ FAQ
 
   Curl supports resume both ways on FTP, download ways on HTTP.
 
-  Try the -c and -C options.
+  Try the -C option.
 
   3.3. Why doesn't my posting using -F work?
 
@@ -359,9 +361,9 @@ FAQ
   4.6. Can you tell me what error code 142 means?
 
   All error codes that are larger than the highest documented error code means
-  that curl has existed due to a timeout. There is currently no nice way for
-  curl to abort from such a condition and that's why it gets this undocumented
-  error. This should be changed in releases after 7.4.1.
+  that curl has existed due to a timeout. There was no nice way for curl to
+  abort from such a condition and that's why it got this undocumented
+  error. This should not occur in releases after 7.4.1.
 
   4.7. How do I keep usernames and passwords secret in Curl command lines?
 
@@ -377,6 +379,10 @@ FAQ
   at least hide them from being read by human eyes, but that is not what
   anyone would call security.
 
+  Also note that regular HTTP and FTP passwords are sent in clear across the
+  network. All it takes for anyone to fetch them is to listen on the network.
+  Evesdropping is very easy.
+
   4.8 I found a bug!
 
   It is not a bug if the behaviour is documented. Read the docs first.
diff --git a/include/curl/curl.h b/include/curl/curl.h
index ba25254c4..f744e2117 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -471,8 +471,8 @@ char *curl_getenv(char *variable);
 char *curl_version(void);
 
 /* This is the version number */
-#define LIBCURL_VERSION "7.5.1"
-#define LIBCURL_VERSION_NUM 0x070501
+#define LIBCURL_VERSION "7.5.2-pre1"
+#define LIBCURL_VERSION_NUM 0x070502
 
 /* linked-list structure for the CURLOPT_QUOTE option (and other) */
 struct curl_slist {
diff --git a/src/version.h b/src/version.h
index 57dca0df4..f3a9fa1be 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 #define CURL_NAME "curl"
-#define CURL_VERSION "7.5"
+#define CURL_VERSION "7.5.2-pre1"
 #define CURL_ID CURL_NAME " " CURL_VERSION " (" OS ") "