Merge working tree with build tree.

[awesomized/libmemcached] / docs / memcached_servers.rst

diff --git a/docs/memcached_servers.rst b/docs/memcached_servers.rst
index 72da276496b5db9be99e7b3500d11066e27c4c95..6ec518148cd300ac8e41cb2b6ea1481ffb98962a 100644 (file)
--- a/docs/memcached_servers.rst
+++ b/docs/memcached_servers.rst
@@ -20,7 +20,7 @@ SYNOPSIS
 
 .. c:function:: memcached_return_t memcached_server_push (memcached_st *ptr, const memcached_server_st *list) 
 
-.. c:function:: memcached_server_instance_st memcached_server_by_key (const memcached_st *ptr, const char *key, size_t key_length, memcached_return_t *error)
+.. c:function:: memcached_server_instance_st memcached_server_by_key (memcached_st *ptr, const char *key, size_t key_length, memcached_return_t *error)
 
 .. c:function:: memcached_server_instance_st memcached_server_get_last_disconnect (const memcached_st *ptr)
 
@@ -60,10 +60,7 @@ copy is made of structure so the list provided (and any operations on
 the list) are not saved.
 
 :c:func:`memcached_server_by_key()` allows you to provide a key and retrieve the
-server which would be used for assignment. This structure is cloned
-from its original structure and must be freed. If NULL is returned you
-should consult \*error. The returning structure should be freed with
-:c:func:`memcached_server_free()`.
+server which would be used for assignment.
 
 :c:func:`memcached_server_get_last_disconnect()` returns a pointer to the last 
 server for which there was a connection problem. It does not mean this