Just testing merge

[m6w6/libmemcached] / docs / conf.py.in

diff --git a/docs/conf.py.in b/docs/conf.py.in
index 44f3f4200d85186e2e134028999fbc99707c9912..a8adeaa0a593b19549a7737b79ee0fb3b5342af7 100644 (file)
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -22,6 +22,7 @@ import sys, os
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
+# comment left to test merge
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
@@ -239,7 +240,6 @@ man_pages = [
   ('libmemcached_configuration', 'memcached', 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),
-  ('memaslap', 'memaslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('memcached_analyze', 'memcached_analyze', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_append', 'memcached_append', u'Appending to or Prepending to data on the server', [u'Brian Aker'], 3),
   ('memcached_append', 'memcached_append_by_key', u'Appending to or Prepending to data on the server', [u'Brian Aker'], 3),
@@ -345,6 +345,7 @@ man_pages = [
   ('bin/memerror', 'memerror', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memflush', 'memflush', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memrm', 'memrm', u'libmemcached Documentation', [u'Brian Aker'], 1),
+  ('bin/memaslap', 'memaslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memslap', 'memslap', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ('bin/memstat', 'memstat', u'libmemcached Documentation', [u'Brian Aker'], 1),
   ]