Update documentation so that is is updated correctly.

diff --git a/.bzrignore b/.bzrignore
index 4a94ff95a735f6445236da6105ca662ef9da5e2d..d21b160fe13e477289ecbe736ee8bf92f5ce7277 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -50,109 +50,7 @@ docs/*.[13]
 docs/*.html
 docs/doctest/
 docs/doctrees/
-docs/hashkit_clone.rst
-docs/hashkit_crc32.rst
-docs/hashkit_fnv1_32.rst
-docs/hashkit_fnv1_64.rst
-docs/hashkit_fnv1a_32.rst
-docs/hashkit_fnv1a_64.rst
-docs/hashkit_free.rst
-docs/hashkit_hsieh.rst
-docs/hashkit_is_allocated.rst
-docs/hashkit_jenkins.rst
-docs/hashkit_md5.rst
-docs/hashkit_murmur.rst
-docs/html/
-docs/linkcheck
-docs/man/
-docs/memcached_add.rst
-docs/memcached_add_by_key.rst
-docs/memcached_append.rst
-docs/memcached_append_by_key.rst
-docs/memcached_behavior_get.rst
-docs/memcached_behavior_set.rst
-docs/memcached_callback_get.rst
-docs/memcached_callback_set.rst
-docs/memcached_cas.rst
-docs/memcached_cas_by_key.rst
-docs/memcached_clone.rst
-docs/memcached_decrement.rst
-docs/memcached_decrement_with_initial.rst
-docs/memcached_delete_by_key.rst
-docs/memcached_destroy_sasl_auth_data.rst
-docs/memcached_fetch.rst
-docs/memcached_fetch_execute.rst
-docs/memcached_fetch_result.rst
-docs/memcached_free.rst
-docs/memcached_get_by_key.rst
-docs/memcached_get_memory_allocators.rst
-docs/memcached_get_sasl_callbacks.rst
-docs/memcached_get_user_data.rst
-docs/memcached_increment.rst
-docs/memcached_increment_with_initial.rst
-docs/memcached_lib_version.rst
-docs/memcached_mget.rst
-docs/memcached_mget_by_key.rst
-docs/memcached_mget_execute.rst
-docs/memcached_mget_execute_by_key.rst
-docs/memcached_pool_behavior_get.rst
-docs/memcached_pool_behavior_set.rst
-docs/memcached_pool_create.rst
-docs/memcached_pool_destroy.rst
-docs/memcached_pool_push.rst
-docs/memcached_pool_rst.rst
-docs/memcached_prepend.rst
-docs/memcached_prepend_by_key.rst
-docs/memcached_replace.rst
-docs/memcached_replace_by_key.rst
-docs/memcached_result_cas.rst
-docs/memcached_result_create.rst
-docs/memcached_result_flags.rst
-docs/memcached_result_free.rst
-docs/memcached_result_key_length.rst
-docs/memcached_result_key_value.rst
-docs/memcached_result_length.rst
-docs/memcached_result_value.rst
-docs/memcached_sasl_set_auth_data.rst
-docs/memcached_server_add.rst
-docs/memcached_server_add_unix_socket.rst
-docs/memcached_server_count.rst
-docs/memcached_server_cursor.rst
-docs/memcached_server_list.rst
-docs/memcached_server_list_append.rst
-docs/memcached_server_list_count.rst
-docs/memcached_server_list_free.rst
-docs/memcached_server_push.rst
-docs/memcached_servers_parse.rst
-docs/memcached_servers_reset.rst
-docs/memcached_set_by_key.rst
-docs/memcached_set_memory_allocators.rst
-docs/memcached_set_memory_allocators_context.rst
-docs/memcached_set_sasl_callbacks.rst
-docs/memcached_set_user_data.rst
-docs/memcached_stat.rst
-docs/memcached_stat_execute.rst
-docs/memcached_stat_get_keys.rst
-docs/memcached_stat_get_value.rst
-docs/memcached_stat_servername.rst
-docs/pod2htmd.tmp
-docs/pod2htmi.tmp
 example/memcached_light
-hashkit_clone.pop
-hashkit_crc32.pop
-hashkit_create.pop
-hashkit_fnv1_32.pop
-hashkit_fnv1_64.pop
-hashkit_fnv1a_32.pop
-hashkit_fnv1a_64.pop
-hashkit_free.pop
-hashkit_functions.pop
-hashkit_hsieh.pop
-hashkit_is_allocated.pop
-hashkit_jenkins.pop
-hashkit_md5.pop
-hashkit_murmur.pop
-hashkit_value.pop
 libhashkit/configure.h
 libmemcached-*.tar.gz
 libmemcached-0.30-1.src.rpm
@@ -162,104 +60,16 @@ libmemcached-0.31-1.x86_64.rpm
 libmemcached-0.37-1.src.rpm
 libmemcached-0.37-1.x86_64.rpm
 libmemcached-?.??/
-libmemcached.pop
 libmemcached/configure.h
 libmemcached/dtrace_probes.h
 libmemcached/generated_probes.h
 libmemcached/memcached_configure.h
-libmemcached_examples.pop
-libmemcachedutil.pop
 libtool
 libtool.m4
 ltoptions.m4
 ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
-memcached_add.pop
-memcached_add_by_key.pop
-memcached_analyze.pop
-memcached_append.pop
-memcached_append_by_key.pop
-memcached_behavior_get.pop
-memcached_behavior_set.pop
-memcached_callback_get.pop
-memcached_callback_set.pop
-memcached_cas.pop
-memcached_cas_by_key.pop
-memcached_clone.pop
-memcached_create.pop
-memcached_decrement.pop
-memcached_decrement_with_initial.pop
-memcached_delete.pop
-memcached_delete_by_key.pop
-memcached_dump.pop
-memcached_fetch.pop
-memcached_fetch_execute.pop
-memcached_fetch_result.pop
-memcached_flush.pop
-memcached_flush_buffers.pop
-memcached_free.pop
-memcached_generate_hash_value.pop
-memcached_get.pop
-memcached_get_by_key.pop
-memcached_get_memory_allocators.pop
-memcached_get_user_data.pop
-memcached_increment.pop
-memcached_increment_with_initial.pop
-memcached_lib_version.pop
-memcached_mget.pop
-memcached_mget_by_key.pop
-memcached_mget_execute.pop
-memcached_mget_execute_by_key.pop
-memcached_pool_behavior_get.pop
-memcached_pool_behavior_set.pop
-memcached_pool_create.pop
-memcached_pool_destroy.pop
-memcached_pool_pop.pop
-memcached_pool_push.pop
-memcached_prepend.pop
-memcached_prepend_by_key.pop
-memcached_quit.pop
-memcached_replace.pop
-memcached_replace_by_key.pop
-memcached_result_cas.pop
-memcached_result_create.pop
-memcached_result_flags.pop
-memcached_result_free.pop
-memcached_result_key_length.pop
-memcached_result_key_value.pop
-memcached_result_length.pop
-memcached_result_st.pop
-memcached_result_value.pop
-memcached_server_add.pop
-memcached_server_add_unix_socket.pop
-memcached_server_count.pop
-memcached_server_list.pop
-memcached_server_list_append.pop
-memcached_server_list_count.pop
-memcached_server_list_free.pop
-memcached_server_push.pop
-memcached_servers_parse.pop
-memcached_set.pop
-memcached_set_by_key.pop
-memcached_set_memory_allocators.pop
-memcached_set_user_data.pop
-memcached_stat.pop
-memcached_stat_get_keys.pop
-memcached_stat_get_value.pop
-memcached_stat_servername.pop
-memcached_strerror.pop
-memcached_verbosity.pop
-memcached_version.pop
-memcapable.pop
-memcat.pop
-memcp.pop
-memdump.pop
-memerror.pop
-memflush.pop
-memrm.pop
-memslap.pop
-memstat.pop
 patch
 patch2
 stamp-h1

diff --git a/docs/conf.py b/docs/conf.py
index 0b49f5175132057e9fa7e7b8bd2b773e477be98d..c13fee6305dd941afd2b8a00dbcb1bb16e019024 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -211,117 +211,117 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-  ('hashkit_clone', 'hashkit_clone', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_crc32', 'hashkit_crc32', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_create', 'hashkit_clone', u'libhashkit Documentation', [u'Brian Aker'], 3),
   ('hashkit_create', 'hashkit_create', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_fnv1_32', 'hashkit_fnv1_32', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_fnv1_64', 'hashkit_fnv1_64', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_fnv1a_32', 'hashkit_fnv1a_32', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_fnv1a_64', 'hashkit_fnv1a_64', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_free', 'hashkit_free', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_create', 'hashkit_free', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_create', 'hashkit_is_allocated', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_crc32', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_fnv1_32', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_fnv1_64', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_fnv1a_32', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_fnv1a_64', u'libhashkit Documentation', [u'Brian Aker'], 3),
   ('hashkit_functions', 'hashkit_functions', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_jenkins', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_md5', u'libhashkit Documentation', [u'Brian Aker'], 3),
+  ('hashkit_functions', 'hashkit_murmur', u'libhashkit Documentation', [u'Brian Aker'], 3),
   ('hashkit_hsieh', 'hashkit_hsieh', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_is_allocated', 'hashkit_is_allocated', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_jenkins', 'hashkit_jenkins', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_md5', 'hashkit_md5', u'libhashkit Documentation', [u'Brian Aker'], 3),
-  ('hashkit_murmur', 'hashkit_murmur', u'libhashkit Documentation', [u'Brian Aker'], 3),
   ('hashkit_value', 'hashkit_value', u'libhashkit Documentation', [u'Brian Aker'], 3),
   ('libmemcached', 'libmemcached', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('libmemcached_examples', 'libmemcached_examples', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('libmemcachedutil', 'libmemcachedutil', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_add', 'memcached_add', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_add_by_key', 'memcached_add_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_analyze', 'memcached_analyze', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_append', 'memcached_append', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_append_by_key', 'memcached_append_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_auto', 'memcached_auto', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_auto', 'memcached_decrement', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_auto', 'memcached_decrement_with_initial', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_auto', 'memcached_increment', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_auto', 'memcached_increment_with_initial', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_behavior', 'memcached_behavior', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_behavior_get', 'memcached_behavior_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_behavior_set', 'memcached_behavior_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_behavior', 'memcached_behavior_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_behavior', 'memcached_behavior_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_callback', 'memcached_callback', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_callback_get', 'memcached_callback_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_callback_set', 'memcached_callback_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_cas', 'memcached_cas', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_cas_by_key', 'memcached_cas_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_clone', 'memcached_clone', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_callback', 'memcached_callback_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_callback', 'memcached_callback_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_create', 'memcached_clone', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_create', 'memcached_create', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_decrement', 'memcached_decrement', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_decrement_with_initial', 'memcached_decrement_with_initial', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_create', 'memcached_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_create', 'memcached_servers_reset', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_delete', 'memcached_delete', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_delete_by_key', 'memcached_delete_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_destroy_sasl_auth_data', 'memcached_destroy_sasl_auth_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_delete', 'memcached_delete_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_dump', 'memcached_dump', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_fetch', 'memcached_fetch', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_fetch_execute', 'memcached_fetch_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_fetch_result', 'memcached_fetch_result', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_flush', 'memcached_flush', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_flush_buffers', 'memcached_flush_buffers', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_free', 'memcached_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_generate_hash_value', 'memcached_generate_hash_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_fetch', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_fetch_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_fetch_result', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_get', 'memcached_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_get_by_key', 'memcached_get_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_get_memory_allocators', 'memcached_get_memory_allocators', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_get_sasl_callbacks', 'memcached_get_sasl_callbacks', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_get_user_data', 'memcached_get_user_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_increment', 'memcached_increment', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_increment_with_initial', 'memcached_increment_with_initial', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_lib_version', 'memcached_lib_version', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_get_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_mget', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_mget_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_mget_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_get', 'memcached_mget_execute_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_memory_allocators', 'memcached_get_memory_allocators', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_memory_allocators', 'memcached_memory_allocators', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_mget', 'memcached_mget', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_mget_by_key', 'memcached_mget_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_mget_execute', 'memcached_mget_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_mget_execute_by_key', 'memcached_mget_execute_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_memory_allocators', 'memcached_set_memory_allocators', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_memory_allocators', 'memcached_set_memory_allocators_context', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_pool', 'memcached_pool', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_behavior_get', 'memcached_pool_behavior_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_behavior_set', 'memcached_pool_behavior_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_create', 'memcached_pool_create', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_destroy', 'memcached_pool_destroy', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_push', 'memcached_pool_push', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_pool_rst', 'memcached_pool_rst', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_prepend', 'memcached_prepend', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_prepend_by_key', 'memcached_prepend_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_behavior_get', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_behavior_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_create', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_destroy', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_push', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_rst', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_quit', 'memcached_quit', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_replace', 'memcached_replace', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_replace_by_key', 'memcached_replace_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_cas', 'memcached_result_cas', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_create', 'memcached_result_create', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_flags', 'memcached_result_flags', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_free', 'memcached_result_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_key_length', 'memcached_result_key_length', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_key_value', 'memcached_result_key_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_length', 'memcached_result_length', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_cas', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_create', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_flags', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_key_length', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_key_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_length', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_result_st', 'memcached_result_st', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_result_value', 'memcached_result_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_result_st', 'memcached_result_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_sasl', 'memcached_destroy_sasl_auth_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_sasl', 'memcached_get_sasl_callbacks', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_sasl', 'memcached_sasl', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_sasl_set_auth_data', 'memcached_sasl_set_auth_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_add', 'memcached_server_add', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_add_unix_socket', 'memcached_server_add_unix_socket', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_count', 'memcached_server_count', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_cursor', 'memcached_server_cursor', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_list', 'memcached_server_list', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_list_append', 'memcached_server_list_append', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_list_count', 'memcached_server_list_count', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_list_free', 'memcached_server_list_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_push', 'memcached_server_push', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_server_st', 'memcached_server_st', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_sasl', 'memcached_set_sasl_callbacks', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_sasl', 'memcached_sasl_set_auth_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_server_st', 'memcached_server_list_append', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_server_st', 'memcached_server_list_count', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_server_st', 'memcached_server_list_free', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_server_st', 'memcached_servers_parse', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_add', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_add_unix_socket', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_count', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_cursor', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_list', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_push', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_servers', 'memcached_server_st', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_servers', 'memcached_servers', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_servers_parse', 'memcached_servers_parse', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_servers_reset', 'memcached_servers_reset', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_add', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_add_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_append', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_append_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_cas', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_cas_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_prepend', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_prepend_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_replace', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_replace_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_set', 'memcached_set', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_set_by_key', 'memcached_set_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_set_memory_allocators', 'memcached_set_memory_allocators', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_set_memory_allocators_context', 'memcached_set_memory_allocators_context', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_set_sasl_callbacks', 'memcached_set_sasl_callbacks', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_set_user_data', 'memcached_set_user_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_stat', 'memcached_stat', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_stat_execute', 'memcached_stat_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_stat_get_keys', 'memcached_stat_get_keys', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_stat_get_value', 'memcached_stat_get_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
-  ('memcached_stat_servername', 'memcached_stat_servername', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_set', 'memcached_set_by_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_stats', 'memcached_stat', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_stats', 'memcached_stat_execute', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_stats', 'memcached_stat_get_keys', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_stats', 'memcached_stat_get_value', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_stats', 'memcached_stat_servername', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_stats', 'memcached_stats', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_strerror', 'memcached_strerror', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_user_data', 'memcached_get_user_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_user_data', 'memcached_set_user_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_user_data', 'memcached_user_data', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_verbosity', 'memcached_verbosity', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_version', 'memcached_lib_version', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_version', 'memcached_version', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcapable', 'memcapable', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('memcat', 'memcat', u'libmemcached Documentation', [u'Brian Aker'], 1),

diff --git a/docs/include.am b/docs/include.am
index dad7b57f5f8d061b0bf49a93fe5794a0aadac297..d6997fe94c896b62c3438a1a55706e8aff53d926 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -29,152 +29,6 @@ EXTRA_DIST+= \
             docs/memslap.rst \
             docs/memstat.rst
 
-AUTO_PAGES= \
-           memcached_increment.rst \
-           memcached_increment_with_initial.rst \
-           memcached_decrement.rst \
-           memcached_decrement_with_initial.rst
-BUILT_SOURCES += ${AUTO_PAGES}
-
-BEHAVIOR_PAGES= \
-               memcached_behavior_get.rst \
-               memcached_behavior_set.rst
-BUILT_SOURCES += ${BEHAVIOR_PAGES}
-
-CALLBACK_PAGES= \
-               memcached_callback_get.rst \
-               memcached_callback_set.rst
-BUILT_SOURCES += ${CALLBACK_PAGES}
-
-CREATE_PAGES= \
-             memcached_clone.rst \
-             memcached_free.rst \
-             memcached_servers_reset.rst
-BUILT_SOURCES += ${CREATE_PAGES}
-
-DELETE_PAGES= \
-             memcached_delete_by_key.rst
-BUILT_SOURCES += ${DELETE_PAGES}
-
-GET_PAGES= \
-          memcached_get_by_key.rst \
-          memcached_fetch_result.rst \
-          memcached_fetch_execute.rst \
-          memcached_mget.rst \
-          memcached_mget_by_key.rst \
-          memcached_mget_execute.rst \
-          memcached_mget_execute_by_key.rst \
-          memcached_fetch.rst
-BUILT_SOURCES += ${GET_PAGES}
-
-MEMORY_ALLOCATORS_PAGES= \
-                        memcached_get_memory_allocators.rst \
-                        memcached_set_memory_allocators.rst \
-                        memcached_set_memory_allocators_context.rst
-BUILT_SOURCES += ${MEMORY_ALLOCATORS_PAGES}
-
-POOL_PAGES= \
-           memcached_pool_behavior_get.rst \
-           memcached_pool_behavior_set.rst \
-           memcached_pool_create.rst \
-           memcached_pool_destroy.rst \
-           memcached_pool_rst.rst \
-           memcached_pool_push.rst
-BUILT_SOURCES += ${POOL_PAGES}
-
-RESULT_PAGES= \
-             memcached_result_cas.rst \
-             memcached_result_create.rst \
-             memcached_result_flags.rst \
-             memcached_result_free.rst \
-             memcached_result_key_length.rst \
-             memcached_result_key_value.rst \
-             memcached_result_length.rst \
-             memcached_result_value.rst
-BUILT_SOURCES += ${RESULT_PAGES}
-
-
-SERVER_PAGES= \
-             memcached_server_count.rst \
-             memcached_server_cursor.rst \
-             memcached_server_list.rst \
-             memcached_server_add.rst \
-             memcached_server_add_unix_socket.rst \
-             memcached_server_push.rst
-BUILT_SOURCES += ${SERVER_PAGES}
-
-SERVER_ST_PAGES= \
-                memcached_server_list_free.rst \
-                memcached_server_list_count.rst \
-                memcached_server_list_append.rst \
-                memcached_servers_parse.rst
-BUILT_SOURCES += ${SERVER_ST_PAGES}
-
-SET_PAGES= \
-          memcached_set_by_key.rst \
-          memcached_cas.rst \
-          memcached_cas_by_key.rst \
-          memcached_replace.rst \
-          memcached_replace_by_key.rst \
-          memcached_add.rst \
-          memcached_add_by_key.rst \
-          memcached_prepend.rst \
-          memcached_prepend_by_key.rst \
-          memcached_append.rst \
-          memcached_append_by_key.rst
-BUILT_SOURCES += ${SET_PAGES}
-
-STATS_PAGES= \
-            memcached_stat.rst \
-            memcached_stat_execute.rst\
-            memcached_stat_get_keys.rst\
-            memcached_stat_get_value.rst \
-            memcached_stat_servername.rst
-BUILT_SOURCES += ${STATS_PAGES}
-
-USER_DATA_PAGES= \
-                memcached_get_user_data.rst \
-                memcached_set_user_data.rst
-BUILT_SOURCES += ${USER_DATA_PAGES}
-
-VERSION_PAGES= \
-              memcached_lib_version.rst
-BUILT_SOURCES += ${VERSION_PAGES}
-
-
-#
-# These are for libhashkit
-#
-HASHKIT_CREATE_PAGES= \
-                     hashkit_is_allocated.rst \
-                     hashkit_clone.rst \
-                     hashkit_free.rst
-BUILT_SOURCES += ${HASHKIT_CREATE_PAGES}
-
-HASHKIT_FUNCTIONS_PAGES= \
-                        hashkit_crc32.rst \
-                        hashkit_fnv1_32.rst \
-                        hashkit_fnv1_64.rst \
-                        hashkit_fnv1a_32.rst \
-                        hashkit_fnv1a_64.rst \
-                        hashkit_hsieh.rst \
-                        hashkit_jenkins.rst \
-                        hashkit_md5.rst \
-                        hashkit_murmur.rst
-BUILT_SOURCES += ${HASHKIT_FUNCTIONS_PAGES}
-
-HASHKIT_ST_PAGES= \
-                 docs/hashkit_value.rst
-BUILT_SOURCES += ${HASHKIT_ST_PAGES}
-
-SASL_PAGES= \
-           memcached_destroy_sasl_auth_data.rst \
-           memcached_get_sasl_callbacks.rst \
-           memcached_sasl_set_auth_data.rst \
-           memcached_set_sasl_callbacks.rst
-BUILT_SOURCES += ${SASL_PAGES}
-
-
 # Makefile for Sphinx documentation
 #
 
@@ -286,98 +140,7 @@ man_MANS+= \
           docs/man/memstat.1
 
 DISTCLEANFILES+= \
-                docs/man/hashkit_clone.3 \
-                docs/man/hashkit_crc32.3 \
-                docs/man/hashkit_create.3 \
-                docs/man/hashkit_fnv1_32.3 \
-                docs/man/hashkit_fnv1_64.3 \
-                docs/man/hashkit_fnv1a_32.3 \
-                docs/man/hashkit_fnv1a_64.3 \
-                docs/man/hashkit_free.3 \
-                docs/man/hashkit_functions.3 \
-                docs/man/hashkit_hsieh.3 \
-                docs/man/hashkit_is_allocated.3 \
-                docs/man/hashkit_jenkins.3 \
-                docs/man/hashkit_md5.3 \
-                docs/man/hashkit_murmur.3 \
-                docs/man/hashkit_value.3 \
-                docs/man/libmemcached.3 \
-                docs/man/libmemcached_examples.3 \
-                docs/man/memaslap.1 \
-                docs/man/memcached_add.3 \
-                docs/man/memcached_add_by_key.3 \
-                docs/man/memcached_analyze.3 \
-                docs/man/memcached_append.3 \
-                docs/man/memcached_append_by_key.3 \
-                docs/man/memcached_behavior_get.3 \
-                docs/man/memcached_behavior_set.3 \
-                docs/man/memcached_callback_get.3 \
-                docs/man/memcached_callback_set.3 \
-                docs/man/memcached_cas.3 \
-                docs/man/memcached_cas_by_key.3 \
-                docs/man/memcached_clone.3 \
-                docs/man/memcached_create.3 \
-                docs/man/memcached_decrement.3 \
-                docs/man/memcached_decrement_with_initial.3 \
-                docs/man/memcached_delete.3 \
-                docs/man/memcached_delete_by_key.3 \
-                docs/man/memcached_destroy_sasl_auth_data.3 \
-                docs/man/memcached_dump.3 \
-                docs/man/memcached_fetch.3 \
-                docs/man/memcached_fetch_execute.3 \
-                docs/man/memcached_fetch_result.3 \
-                docs/man/memcached_flush_buffers.3 \
-                docs/man/memcached_free.3 \
-                docs/man/memcached_generate_hash_value.3 \
-                docs/man/memcached_get.3 \
-                docs/man/memcached_get_by_key.3 \
-                docs/man/memcached_get_memory_allocators.3 \
-                docs/man/memcached_get_sasl_callbacks.3 \
-                docs/man/memcached_get_user_data.3 \
-                docs/man/memcached_increment.3 \
-                docs/man/memcached_increment_with_initial.3 \
-                docs/man/memcached_lib_version.3 \
-                docs/man/memcached_mget.3 \
-                docs/man/memcached_mget_by_key.3 \
-                docs/man/memcached_mget_execute.3  \
-                docs/man/memcached_mget_execute_by_key.3  \
-                docs/man/memcached_prepend.3 \
-                docs/man/memcached_prepend_by_key.3 \
-                docs/man/memcached_quit.3 \
-                docs/man/memcached_replace.3 \
-                docs/man/memcached_replace_by_key.3 \
-                docs/man/memcached_sasl_set_auth_data.3 \
-                docs/man/memcached_server_add.3 \
-                docs/man/memcached_server_count.3 \
-                docs/man/memcached_server_cursor.3 \
-                docs/man/memcached_server_list.3 \
-                docs/man/memcached_server_list_append.3 \
-                docs/man/memcached_server_list_count.3 \
-                docs/man/memcached_server_list_free.3 \
-                docs/man/memcached_server_push.3 \
-                docs/man/memcached_servers_parse.3 \
-                docs/man/memcached_set.3 \
-                docs/man/memcached_set_by_key.3 \
-                docs/man/memcached_set_memory_allocators.3 \
-                docs/man/memcached_set_sasl_callbacks.3 \
-                docs/man/memcached_set_user_data.3 \
-                docs/man/memcached_stat.3 \
-                docs/man/memcached_stat_execute.3 \
-                docs/man/memcached_stat_get_keys.3 \
-                docs/man/memcached_stat_get_value.3 \
-                docs/man/memcached_stat_servername.3 \
-                docs/man/memcached_strerror.3 \
-                docs/man/memcached_verbosity.3 \
-                docs/man/memcached_version.3 \
-                docs/man/memcapable.1 \
-                docs/man/memcat.1 \
-                docs/man/memcp.1 \
-                docs/man/memdump.1 \
-                docs/man/memerror.1 \
-                docs/man/memflush.1 \
-                docs/man/memrm.1 \
-                docs/man/memslap.1 \
-                docs/man/memstat.1
+                docs/man/*
 
 DISTCLEANFILES+= \
                 docs/hashkit_clone.rst \
@@ -416,8 +179,6 @@ DISTCLEANFILES+= \
                 docs/memcached_get_memory_allocators.rst \
                 docs/memcached_get_sasl_callbacks.rst \
                 docs/memcached_get_user_data.rst \
-                docs/memcached_increment.rst \
-                docs/memcached_increment_with_initial.rst \
                 docs/memcached_lib_version.rst \
                 docs/memcached_mget.rst \
                 docs/memcached_mget_by_key.rst \
@@ -673,81 +434,3 @@ doctest:
        @echo "Testing of doctests in the sources finished, look at the " \
              "results in $(SPHINX_BUILDDIR)/doctest/output.txt."
 endif
-
-${CREATE_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_create.rst $@
-
-${SET_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_set.rst $@
-
-${DELETE_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_delete.rst $@
-
-${AUTO_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_auto.rst $@
-
-${GET_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_get.rst $@
-
-${SERVER_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_servers.rst $@
-
-${SERVER_ST_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_server_st.rst $@
-
-${BEHAVIOR_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_behavior.rst $@
-
-${CALLBACK_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_callback.rst $@
-
-${STATS_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_stats.rst $@
-
-${RESULT_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_result_st.rst $@
-
-${VERSION_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_version.rst $@
-
-${MEMORY_ALLOCATORS_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_memory_allocators.rst $@
-
-${USER_DATA_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_user_data.rst $@
-
-${POOL_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_pool.rst $@
-
-${HASHKIT_CREATE_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp hashkit_create.rst $@
-
-${HASHKIT_FUNCTIONS_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp hashkit_functions.rst $@
-
-${HASHKIT_ST_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp hashkit_value.rst $@
-
-${SASL_PAGES}:
-       @cd docs && rm -f $@
-       @cd docs && cp memcached_sasl.rst $@
-
-