Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[m6w6/libmemcached] / docs / index.rst

diff --git a/docs/index.rst b/docs/index.rst
index d9d3e033008a527e700490e3e2743dfe9bf7f2e5..9dcc7aa25e3cf905e3f4d5cc64ffbcb560b54d30 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -16,11 +16,11 @@ Basics
    :maxdepth: 1
 
    libmemcached
+   versioning
    memcached_create
    libmemcached_examples
    libmemcached_configuration
-   error_messages
-
+   libmemcached/memcached_last_error_message
 
 #################
 Working with data
@@ -31,11 +31,14 @@ Working with data
 
    memcached_auto
    memcached_delete
+   libmemcached/memcached_exist
    memcached_flush_buffers
    memcached_flush
    memcached_get
    memcached_result_st
    memcached_set
+   memcached_append
+   memcached_cas
 
 
 ###############
@@ -51,13 +54,35 @@ Advanced Topics
    memcached_generate_hash_value
    memcached_memory_allocators
    memcached_quit
+   libmemcached/memcached_return_t
    memcached_sasl
    memcached_server_st
    memcached_servers
    memcached_strerror
+   error_messages
    memcached_user_data
-   memcached_verbosity
-   memcached_version
+   memcached_verbosity 
+   memcached_version 
+   libmemcached/defaults
+
+##################
+Interface Versions
+##################
+
+.. toctree::
+   :titlesonly:
+
+   libmemcached-1.0/index
+   libmemcached-1.1/index
+
+####################
+Deprecated Functions
+####################
+
+.. toctree::
+   :titlesonly:
+
+   libmemcached/memcached_fetch
 
 #################
 Platform Specific
@@ -67,6 +92,7 @@ Platform Specific
    :maxdepth: 1
 
    tap
+   types
 
 #################################
 Deriving statistics from a server
@@ -95,16 +121,20 @@ Client Applications
 .. toctree::
    :maxdepth: 1
 
-   memcapable
-   memcat
-   memcp
-   memdump
-   memerror
-   memflush
-   memrm
-   memslap
-   memaslap
-   memstat
+   bin/memcapable
+   bin/memcat
+   bin/memcp
+   bin/memdump
+   bin/memerror
+   bin/memflush
+   bin/memrm
+   bin/memslap
+   bin/memaslap
+   bin/memstat
+   bin/memexist.rst
+   bin/memparse.rst
+   bin/memping.rst
+   bin/memtouch.rst
 
 ----------
 Libhashkit