Merge in docs.

[m6w6/libmemcached] / docs / memcached_server_st.rst

diff --git a/docs/memcached_server_st.rst b/docs/memcached_server_st.rst
index f39c478b720ea47be93cb32322f431715a1bdadf..9a8c8fc2d1d1a27bc2f9f62c41586e5473779fc2 100644 (file)
--- a/docs/memcached_server_st.rst
+++ b/docs/memcached_server_st.rst
@@ -3,8 +3,6 @@ Managing lists of servers
 =========================
 
 
-.. index:: object: memcached_server_instance_st
-
 --------
 SYNOPSIS
 --------
@@ -12,18 +10,21 @@ SYNOPSIS
 
 
 #include <libmemcached/memcached.h>
- 
-.. c:function:: const memcached_server_instance_st memcached_server_list (memcached_st *ptr);
 
-.. c:function:: void memcached_server_list_free (memcached_server_list_st list);
+.. c:type:: memcached_server_instance_st
+
+.. c:function:: const memcached_server_instance_st memcached_server_list (memcached_st *ptr)
+
+.. c:function:: void memcached_server_list_free (memcached_server_list_st list)
  
-.. c:function:: memcached_server_list_st memcached_server_list_append (memcached_server_list_st list, const char *hostname, unsigned int port, memcached_return_t *error);
+.. c:function:: memcached_server_list_st memcached_server_list_append (memcached_server_list_st list, const char *hostname, unsigned int port, memcached_return_t *error)
  
-.. c:function:: uint32_t memcached_server_list_count (memcached_server_list_st list);
+.. c:function:: uint32_t memcached_server_list_count (memcached_server_list_st list)
  
-.. c:function:: const char *memcached_server_error (memcached_server_instance_st instance);
+.. c:function:: const char *memcached_server_error (memcached_server_instance_st instance)
  
-.. c:function:: void memcached_server_error_reset (memcached_server_instance_st list); DEPRECATED 
+.. c:function:: void memcached_server_error_reset (memcached_server_instance_st list)
+.. deprecated:: 0.39
    
 
 Compile and link with -lmemcached
@@ -48,7 +49,7 @@ added, just ask!).
 :c:type:`memcached_return_t` pointer you passed into the function will be set with the appropriate error. If the value of port is zero, it is set to the default
 port of a memcached server.
 
-DEPRECATED :c:func:`memcached_servers_parse()`, please see :manpage:`memcached(3)`
+DEPRECATED :c:func:`memcached_servers_parse()`, please see :c:func:`memcached()`
 
 :c:func:`memcached_server_error()` can be used to look at the text of the last error message sent by the server to to the client.