Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-286

[awesomized/libmemcached] / docs / memcached_behavior.rst

diff --git a/docs/memcached_behavior.rst b/docs/memcached_behavior.rst
index ee1bb234d22aca29ee8f7b45320c7d4e01907d66..7c63d35d2ed2190bb1388be0ad047612003188ed 100644 (file)
--- a/docs/memcached_behavior.rst
+++ b/docs/memcached_behavior.rst
@@ -143,7 +143,7 @@ Sets the compatibility mode. The value can be set to either MEMCACHED_KETAMA_COM
 
 .. c:type:: MEMCACHED_BEHAVIOR_POLL_TIMEOUT
 
 
 .. c:type:: MEMCACHED_BEHAVIOR_POLL_TIMEOUT
 

-Modify the timeout value that is used by poll. The default value is -1. An signed int pointer must be passed to memcached_behavior_set to change this value. For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.
+Modify the timeout value that is used by poll. The default value is -1. An signed int must be passed to memcached_behavior_set to change this value (this requires casting). For memcached_behavior_get a signed int value will be cast and returned as the unsigned long long.

 
 .. c:type:: MEMCACHED_BEHAVIOR_USER_DATA
 .. deprecated:: < 0.30
 
 .. c:type:: MEMCACHED_BEHAVIOR_USER_DATA
 .. deprecated:: < 0.30


@@ -164,11 +164,9 @@ Enabling this will cause :manpage:`libmemcached(3)` to test all keys to verify t
 Enabling this will cause hosts that are added to be placed in the host list in sorted order. This will defeat consisten hashing.
 
 
 Enabling this will cause hosts that are added to be placed in the host list in sorted order. This will defeat consisten hashing.
 
 

-

 .. c:type:: MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 
 .. c:type:: MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT
 

-In non-blocking mode this changes the value of the timeout during socket connection.
-
+In non-blocking mode this changes the value of the timeout during socket connection in milliseconds. Specifying -1 means an infinite time‐out.

 
 
 .. c:type:: MEMCACHED_BEHAVIOR_BINARY_PROTOCOL
 
 
 .. c:type:: MEMCACHED_BEHAVIOR_BINARY_PROTOCOL