Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469

[awesomized/libmemcached] / docs / index.rst

diff --git a/docs/index.rst b/docs/index.rst
index 4f4ccfa37cc27bd715aac4600d26db98168c2356..c3cca3bee690c39889c6e1257d6c02774df58134 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -16,6 +16,7 @@ Basics
    :maxdepth: 1
 
    libmemcached
+   versioning
    memcached_create
    libmemcached_examples
    libmemcached_configuration
@@ -47,6 +48,7 @@ Advanced Topics
 .. toctree::
    :maxdepth: 1
 
+   libmemcached-1.0/memcached_set_encoding_key
    memcached_behavior
    memcached_callback
    memcached_dump
@@ -60,9 +62,19 @@ Advanced Topics
    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
@@ -81,6 +93,7 @@ Platform Specific
    :maxdepth: 1
 
    tap
+   types
 
 #################################
 Deriving statistics from a server
@@ -119,6 +132,10 @@ Client Applications
    bin/memslap
    bin/memaslap
    bin/memstat
+   bin/memexist.rst
+   bin/memparse.rst
+   bin/memping.rst
+   bin/memtouch.rst
 
 ----------
 Libhashkit