persistant updates

diff --git a/docs/LIBCURL b/docs/LIBCURL
index d2b85bc78106ad1afae99109c0f9fe7eb1466361..97884b48121931fd7d6f9b7b57a62fb1feddcee6 100644 (file)
--- a/docs/LIBCURL
+++ b/docs/LIBCURL
@@ -58,9 +58,16 @@ Portability
  you to init the winsock stuff before you use the libcurl functions. Details
  on this are noted on the curl_easy_init() man page.
 
- (*) = it appears users of the cygwin environment gets this done
+ (*) = it appears as if users of the cygwin environment get this done
        automatically.
 
+Threads
+
+ Never *ever* call curl-functions simultaneously using the same handle from
+ several threads. libcurl is thread-safe and can be used in any number of
+ threads, but you must use separate curl handles if you want to use libcurl in
+ more than one thread simultaneously.
+
 Persistant Connections
 
  With libcurl 7.7, persistant connections were added. Persistant connections

diff --git a/docs/curl_easy_setopt.3 b/docs/curl_easy_setopt.3
index 23cd0b4151ebb650064292a7a8935e2407b804d4..ef91d2d3d4adec04630d89063968125c43f89208 100644 (file)
--- a/docs/curl_easy_setopt.3
+++ b/docs/curl_easy_setopt.3
@@ -2,7 +2,7 @@
 .\" nroff -man [file]
 .\" Written by daniel@haxx.se
 .\"
-.TH curl_easy_setopt 3 "6 March 2001" "libcurl 7.5" "libcurl Manual"
+.TH curl_easy_setopt 3 "12 March 2001" "libcurl 7.7" "libcurl Manual"
 .SH NAME
 curl_easy_setopt - Set curl easy-session options
 .SH SYNOPSIS
@@ -26,6 +26,13 @@ NOTE: strings passed to libcurl as 'char *' arguments, will not be copied by
 the library. Instead you should keep them available until libcurl no longer
 needs them. Failing to do so will cause very odd behaviour or even crashes.
 
+More note: the options set with this function call are valid for the
+forthcoming data transfers that are performed when you invoke
+.I curl_easy_perform .
+The options are not in any way reset between transfers, so if you want
+subsequent transfers with different options, you must change them between the
+transfers.
+
 The
 .I "handle"
 is the return code from the