update to current state

4 files changed, 15 insertions, 12 deletions

diff --git a/lib/README.ares b/lib/README.ares
index cf6a1206a..48d9cc29e 100644
--- a/lib/README.ares
+++ b/lib/README.ares
@@ -1,4 +1,3 @@
-$Id$
                                   _   _ ____  _
                               ___| | | |  _ \| |
                              / __| | | | |_) | |
@@ -28,10 +27,13 @@ Build c-ares
 Build libcurl to use c-ares in the curl source tree
 ===================================================
 
-1. name the c-ares source directory 'ares' in the curl source directory
-   (if you have checked out the curl sources from CVS, you will already have
-   c-ares in a directory named ares).
+1. name or symlink the c-ares source directory 'ares' in the curl source
+   directory
 2. ./configure --enable-ares
+
+  Optionally, you can point out the c-ares install tree root with the the
+  --enable-ares option.
+
 3. make
 
 Build libcurl to use an installed c-ares
diff --git a/lib/README.cmake b/lib/README.cmake
index 5c75e1d0b..c43516086 100644
--- a/lib/README.cmake
+++ b/lib/README.cmake
@@ -14,9 +14,12 @@ that you can with the autotools version of the build, and there have already
 been bugs filed against the CMake build system that haven't been addressed -
 due to lack of maintainers.
 
-We keep the files included in release archives and CVS for now in the hope
+We keep the files included in release archives and git for now in the hope
 that people will appreciate it and help us keep them in shape, and even
-improve them to become on par with the main build system. If not, we might
-remove them again in a future version.
+improve them to become on par with the main build system.
 
 Daniel, November 2009 just before the 7.19.7 release
+
+March 2010: The cmake build support is now completely broken and unless
+someone steps forward to help improving it, we will remove the cmake build
+support before the next release.
diff --git a/lib/README.multi_socket b/lib/README.multi_socket
index 953209810..606638670 100644
--- a/lib/README.multi_socket
+++ b/lib/README.multi_socket
@@ -49,9 +49,8 @@ Implementation of the curl_multi_socket API
   conversion from sockets to fd_sets for that function is only done in the
   last step before the data is returned. I also had to extend c-ares to get a
   function that can return plain sockets, as that library too returned only
-  fd_sets and that is no longer good enough. The changes done to c-ares have
-  been committed and are available in the c-ares CVS repository destined to be
-  included in the c-ares 1.3.1 release.
+  fd_sets and that is no longer good enough. The changes done to c-ares are
+  available in c-ares 1.3.1 and later.
 
   We have done a test runs with up to 9000 connections (with a single active
   one). The curl_multi_socket_action() invoke then takes less than 10
diff --git a/lib/makefile.dj b/lib/makefile.dj
index 594fff0fb..90faf3371 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -2,7 +2,6 @@
 #  Adapted for djgpp2 / Watt-32 / DOS by
 #  Gisle Vanem <giva@bgnett.no>
 #
-# $Id$
 
 DEPEND_PREREQ = curl_config.h
 TOPDIR = ..
@@ -15,7 +14,7 @@ OBJECTS := $(patsubst %.c,$(OBJ_DIR)/%.o,$(strip $(CSOURCES)))
 CURL_LIB = libcurl.a
 
 # NOTE: if ../include/curl/curlbuild.h is missing, you're probably building
-# this from a CVS checkout and then you need to run buildconf.bat first.
+# this from a git checkout and then you need to run buildconf.bat first.
 
 all: $(OBJ_DIR) curl_config.h $(CURL_LIB)