X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=docs%2Fconf.py.in;h=9f0b2a32b49744832b2fb67bcf7684cf7e0896e5;hb=f5b5250c862c98dadbe30cebc1f92962c76125c3;hp=08b6f639eeb064e0edfd7fc050b3f8177b3e6a34;hpb=0ce534a791d671a2988e6835f5675e35a8c80636;p=awesomized%2Flibmemcached

diff --git a/docs/conf.py.in b/docs/conf.py.in
index 08b6f639..9f0b2a32 100644
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -27,11 +27,11 @@ import sys, os
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []
 
-extensions = ['sphinxcontrib.googleanalytics']
+#extensions = ['sphinxcontrib.googleanalytics']
 
 # Google 
-googleanalytics_id = 'UA-15307604-2'
-googleanalytics_enabled = 'True'
+#googleanalytics_id = 'UA-15307604-2'
+#googleanalytics_enabled = 'True'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,7 +47,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'libmemcached'
-copyright = u'2011, Brian Aker DataDifferential, http://datadifferential.com/'
+copyright = u'2011-2012, Brian Aker DataDifferential, http://datadifferential.com/'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -298,6 +298,7 @@ man_pages = [
   ('memcached_pool', 'memcached_pool_release', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_pool', 'memcached_pool_st', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_quit', 'memcached_quit', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('libmemcached-1.0/memcached_set_encoding_key', 'memcached_set_encoding_key', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_result_st', 'memcached_result_cas', u'Working with result sets', [u'Brian Aker'], 3),
   ('memcached_result_st', 'memcached_result_create', u'Working with result sets', [u'Brian Aker'], 3),
   ('memcached_result_st', 'memcached_result_flags', u'Working with result sets', [u'Brian Aker'], 3),