From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 10 Aug 2010 21:18:16 +0000 (+0200)
Subject: multi_socket_action: clarify how to kickstart it
X-Git-Tag: curl-7_21_1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=625932d39814fdc3ed4c9f64c1db23328d788cbc;p=thirdparty%2Fcurl.git

multi_socket_action: clarify how to kickstart it

The callbacks are called when curl_multi_socket_action() is called, not
when handles are added. This is now mentioned in the "TYPICAL USAGE"
section.
---

diff --git a/docs/libcurl/curl_multi_socket_action.3 b/docs/libcurl/curl_multi_socket_action.3
index ff86e3f261..94e6f10a52 100644
--- a/docs/libcurl/curl_multi_socket_action.3
+++ b/docs/libcurl/curl_multi_socket_action.3
@@ -112,14 +112,15 @@ timeout value to use when waiting for socket activities.
 them for activity. This can be done through your application code, or by way
 of an external library such as libevent or glib.
 
-6. Wait for activity on any of libcurl's sockets, use the timeout value your
+6. Call curl_multi_socket_action() to kickstart everything. To get one or more
+callbacks called.
+
+7. Wait for activity on any of libcurl's sockets, use the timeout value your
 callback has been told
 
-7, When activity is detected, call curl_multi_socket_action() for the
+8, When activity is detected, call curl_multi_socket_action() for the
 socket(s) that got action. If no activity is detected and the timeout expires,
 call \fIcurl_multi_socket_action(3)\fP with \fICURL_SOCKET_TIMEOUT\fP
-
-8. Go back to step 6.
 .SH AVAILABILITY
 This function was added in libcurl 7.15.4, and is deemed stable since 7.16.0.
 .SH "SEE ALSO"