reality sync

3 files changed, 15 insertions, 6 deletions

diff --git a/CHANGES b/CHANGES
index 19a9d072c..9a6d470b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,12 @@ Daniel (18 January 2006)
   automake version that is used and that is gonna be painful and I don't even
   want to think about that now...!
 
+Daniel (17 January 2006)
+- David Shaw: Here is the latest libcurl.m4 autoconf tests. It is updated with
+  the latest features and protocols that libcurl supports and has a minor fix
+  to better deal with the obscure case where someone has more than one libcurl
+  installed at the same time.
+
 Daniel (16 January 2006)
 - David Shaw finally removed all traces of Gopher and we are now officially
   not supporting it. It hasn't been functioning for years anyway, so this is
diff --git a/README b/README
index 9043dceaa..cfd07a84b 100644
--- a/README
+++ b/README
@@ -37,28 +37,30 @@ WEB SITE
         Austria      http://curl.gds.tuwien.ac.at/
         Denmark      http://curl.cofman.dk/
         France       http://curl.fastmirror.net/
-        Germany      http://curl.miscellaneousmirror.org/
+        Germany      http://curl.freemirror.de/
+        Germany      http://curl.mirror-server.net/
         Germany      http://curl.mirror.at.stealer.net/
         Germany      http://curl.mirroring.de/
+        Germany      http://curl.miscellaneousmirror.org/
         Germany      http://curl.mons-new-media.de/
+        Germany      http://curl.storemypix.com/
         Germany      http://curl.triplemind.com/
-        Germany      http://curl.freemirror.de/
+        Hong Kong    http://curl.hkmirror.org/
+        Japan        http://curl.s-lines.net/
         Netherlands  http://curl.nedmirror.nl/
         Russia       http://curl.tsuren.net/
         Taiwan       http://curl.cs.pu.edu.tw/
         Thailand     http://curl.siamu.ac.th/
         US (AZ)      http://curl.islandofpoker.com/
+        US (CA)      http://curl.meulie.net/
         US (CA)      http://curl.mirror.redwire.net/
         US (CA)      http://curl.mirrormonster.com/
         US (CA)      http://curl.signal42.com/
-        US (CA)      http://curl.tolix.org/
-        US (CA)      http://curl.webhosting76.com/
-        US (CA)      http://curl.meulie.net/
         US (FL)      http://curl.hoxt.com/
         US (TX)      http://curl.109k.com/
+        US (TX)      http://curl.hostingzero.com/
         US (TX)      http://curl.mirrors.cyberservers.net/
         US (TX)      http://curl.seekmeup.com/
-        US (TX)      http://curl.hostingzero.com/
 
 CVS
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6b7c45af8..7ced46c7c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,6 +18,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o libcurl.m4 was updated
  o configure no longer warns if the current path contains a space
  o test suite kill race condition
  o FTP_SKIP_PASV_IP and FTP_USE_EPSV when doing FTP over HTTP proxy