refreshed

diff --git a/lib/README.multi_socket b/lib/README.multi_socket
index c8eabf64c173d7b3dbf26c71cd131afe26f17812..953209810c32271e586cd6c8e50016306c0fc277 100644 (file)
--- a/lib/README.multi_socket
+++ b/lib/README.multi_socket
@@ -12,14 +12,14 @@ Implementation of the curl_multi_socket API
        any other transfers. (The previous API always had to scan through all
        the existing transfers.)
 
-  The idea is that curl_multi_socket() calls a given callback with information
-  about what socket to wait for what action on, and the callback only gets
-  called if the status of that socket has changed.
+  The idea is that curl_multi_socket_action() calls a given callback with
+  information about what socket to wait for what action on, and the callback
+  only gets called if the status of that socket has changed.
 
   In the API draft from before, we have a timeout argument on a per socket
-  basis and we also allowed curl_multi_socket() to pass in an 'easy handle'
-  instead of socket to allow libcurl to shortcut a lookup and work on the
-  affected easy handle right away. Both these turned out to be bad ideas.
+  basis and we also allowed curl_multi_socket_action() to pass in an 'easy
+  handle' instead of socket to allow libcurl to shortcut a lookup and work on
+  the affected easy handle right away. Both these turned out to be bad ideas.
 
   The timeout argument was removed from the socket callback since after much
   thinking I came to the conclusion that we really don't want to handle
@@ -54,20 +54,13 @@ Implementation of the curl_multi_socket API
   included in the c-ares 1.3.1 release.
 
   We have done a test runs with up to 9000 connections (with a single active
-  one). The curl_multi_socket() invoke then takes less than 10 microseconds in
-  average (using the read-only-1-byte-at-a-time hack).  We are now below the
-  60 microseconds "per socket action" goal (the extra 50 is the time libevent
-  needs).
+  one). The curl_multi_socket_action() invoke then takes less than 10
+  microseconds in average (using the read-only-1-byte-at-a-time hack).  We are
+  now below the 60 microseconds "per socket action" goal (the extra 50 is the
+  time libevent needs).
 
-Status Right Now
+Documentation
 
-  The curl_multi_socket() API is implemented according to how it is
-  documented. We deem it ready to use.
-
-    http://curl.haxx.se/libcurl/c/curl_multi_socket.html
+    http://curl.haxx.se/libcurl/c/curl_multi_socket_action.html
     http://curl.haxx.se/libcurl/c/curl_multi_timeout.html
     http://curl.haxx.se/libcurl/c/curl_multi_setopt.html
-
-What is Left for the curl_multi_socket API
-
-  Real world usage!