the next release is now called 7.19.0

8 files changed, 20 insertions, 17 deletions

diff --git a/CHANGES b/CHANGES
index 66af119f4..e43a8887b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@
 
 
 Daniel Stenberg (8 Jun 2008)
+- Due to the three new libcurl changes and the massive command line option
+  change I decided we'll mark it by bumping the next release number to 7.19.0!
+
 - curl the tool now deals with its command line options somewhat differently!
   All boolean options (such as -O, -I, -v etc), both short and long versions,
   now always switch on/enable the option named. Using the same option multiple
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 62fafedb3..1b46d0b63 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-Curl and libcurl 7.18.3
+Curl and libcurl 7.19.0
 
  Public curl releases:         106
  Command line options:         127
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 3fa2f0aff..a2081332b 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,4 +1,4 @@
-To be addressed before 7.18.3 (planned release: August 2008)
+To be addressed before 7.19.0 (planned release: August 2008)
 =============================
 
 139 - Christopher Palow's CURLM_EASY_HANDLE_EXISTS patch
diff --git a/docs/curl.1 b/docs/curl.1
index 5c0a5a084..15a338666 100644
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH curl 1 "5 June 2008" "Curl 7.18.3" "Curl Manual"
+.TH curl 1 "5 June 2008" "Curl 7.19.0" "Curl Manual"
 .SH NAME
 curl \- transfer a URL
 .SH SYNOPSIS
@@ -103,7 +103,7 @@ In general, all boolean options are enabled with --option and yet again
 disabled with --\fBno-\fPoption. That is, you use the exact same option name
 but prefix it with "no-". However, in this list we mostly only list and show
 the --option version of them. (This concept with --no options was added in
-7.18.3. Previously most options were toggled on/off on repeated use of the
+7.19.0. Previously most options were toggled on/off on repeated use of the
 same command line option.)
 .IP "-a/--append"
 (FTP) When used in an FTP upload, this will tell curl to append to the target
@@ -289,14 +289,14 @@ away. EPRT and LPRT are extensions to the original FTP protocol, may not work
 on all servers but enable more functionality in a better way than the
 traditional PORT command.
 
-Since curl 7.18.3, \fB--eprt\fP can be used to explicitly enable EPRT again
+Since curl 7.19.0, \fB--eprt\fP can be used to explicitly enable EPRT again
 and \fB--no-eprt\fP is an alias for \fB--disable-eprt\fP.
 .IP "--disable-epsv"
 (FTP) Tell curl to disable the use of the EPSV command when doing passive FTP
 transfers. Curl will normally always first attempt to use EPSV before PASV,
 but with this option, it will not try using EPSV.
 
-Since curl 7.18.3, \fB--epsv\fP can be used to explicitly enable EPRT again
+Since curl 7.19.0, \fB--epsv\fP can be used to explicitly enable EPRT again
 and \fB--no-epsv\fP is an alias for \fB--disable-epsv\fP.
 .IP "-D/--dump-header <file>"
 Write the protocol headers to the specified file.
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index 6e7ce3ec7..fe77c4494 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -1458,7 +1458,7 @@ considered as failure.
 A specific error code (CURLE_SSL_ISSUER_ERROR) is defined with the option,
 which is returned if the setup of the SSL/TLS session has failed due to a
 mismatch with the issuer of peer certificate (\fICURLOPT_SSL_VERIFYPEER\fP has
-to be set too for the check to fail). (Added in 7.18.3)
+to be set too for the check to fail). (Added in 7.19.0)
 .IP CURLOPT_CAPATH
 Pass a char * to a zero terminated string naming a directory holding multiple
 CA certificates to verify the peer with. The certificate directory must be
@@ -1485,7 +1485,7 @@ This option makes sense only when used in combination with the
 A specific error code (CURLE_SSL_CRL_BADFILE) is defined with the option. It
 is returned when the SSL exchange fails because the CRL file cannot be loaded.
 Note that a failure in certificate verification due to a revocation information
-found in the CRL does not trigger this specific error. (Added in 7.18.3)
+found in the CRL does not trigger this specific error. (Added in 7.19.0)
 .IP CURLOPT_RANDOM_FILE
 Pass a char * to a zero terminated file name. The file will be used to read
 from to seed the random engine for SSL. The more random the specified file is,
diff --git a/docs/libcurl/libcurl-errors.3 b/docs/libcurl/libcurl-errors.3
index c1ab31237..4fb87ad56 100644
--- a/docs/libcurl/libcurl-errors.3
+++ b/docs/libcurl/libcurl-errors.3
@@ -21,7 +21,7 @@
 .\" * $Id$
 .\" **************************************************************************
 .\"
-.TH libcurl-errors 3 "30 Aug 2007" "libcurl 7.17.0" "libcurl errors"
+.TH libcurl-errors 3 "8 Jun 2008" "libcurl 7.19.0" "libcurl errors"
 .SH NAME
 libcurl-errors \- error codes in libcurl
 .SH DESCRIPTION
@@ -213,9 +213,9 @@ Socket is not ready for send/recv wait till it's ready and try again. This
 return code is only returned from \fIcurl_easy_recv(3)\fP and
 \fIcurl_easy_send(3)\fP (Added in 7.18.2)
 .IP "CURLE_SSL_CRL_BADFILE (82)"
-Failed to load CRL file (Added in 7.18.3)
+Failed to load CRL file (Added in 7.19.0)
 .IP "CURLE_SSL_ISSUER_ERROR (83)"
-Issuer check failed (Added in 7.18.3)
+Issuer check failed (Added in 7.19.0)
 .IP "CURLE_OBSOLETE*"
 These error codes will never be returned. They used to be used in an old libcurl
 version and are currently unused.
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 556c2226a..7b9bff3e1 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -455,9 +455,9 @@ typedef enum {
                                     wait till it's ready and try again (Added
                                     in 7.18.2) */
   CURLE_SSL_CRL_BADFILE,         /* 82 - could not load CRL file, missing or
-                                    wrong format (Added in 7.18.3) */
+                                    wrong format (Added in 7.19.0) */
   CURLE_SSL_ISSUER_ERROR,        /* 83 - Issuer check failed.  (Added in
-                                    7.18.3) */
+                                    7.19.0) */
   CURL_LAST /* never use! */
 } CURLcode;
 
diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 54652bfb0..6c4def01f 100644
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -31,13 +31,13 @@
 
 /* This is the version number of the libcurl package from which this header
    file origins: */
-#define LIBCURL_VERSION "7.18.3-CVS"
+#define LIBCURL_VERSION "7.19.0-CVS"
 
 /* The numeric version number is also available "in parts" by using these
    defines: */
 #define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 18
-#define LIBCURL_VERSION_PATCH 3
+#define LIBCURL_VERSION_MINOR 19
+#define LIBCURL_VERSION_PATCH 0
 
 /* This is the numeric version of the libcurl version number, meant for easier
    parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
@@ -54,7 +54,7 @@
    and it is always a greater number in a more recent release. It makes
    comparisons with greater than and less than work.
 */
-#define LIBCURL_VERSION_NUM 0x071203
+#define LIBCURL_VERSION_NUM 0x071300
 
 /*
  * This is the date and time when the full source package was created. The