Merge in fixes for rpm.

diff --git a/docs/conf.py b/docs/conf.py
index c13fee6305dd941afd2b8a00dbcb1bb16e019024..6a483c16457d274b542545671ba282ff69b2c60a 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -270,7 +270,8 @@ man_pages = [
   ('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_pool', 'memcached_pool_pop', u'libmemcached Documentation', [u'Brian Aker'], 3),
+  ('memcached_pool', 'memcached_pool_push', u'libmemcached Documentation', [u'Brian Aker'], 3),
   ('memcached_quit', 'memcached_quit', 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),

diff --git a/docs/include.am b/docs/include.am
index b2fd8e91ba4485d0ea45129f580851e689bbcc08..0e93ee7d3b25ec4c107d50fe5e6888ab13376bd0 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -167,6 +167,7 @@ if HAVE_RECENT_SPHINX
 
 man_MANS+= \
           docs/man/hashkit_crc32.3 \
+          docs/man/hashkit_clone.3 \
           docs/man/hashkit_create.3 \
           docs/man/hashkit_fnv1_32.3 \
           docs/man/hashkit_fnv1_64.3 \

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 035725a30b559568a3a04f3d4cdca75ae83c18ea..b10f05afba8869e7b439342b1cdaa67f8765cd43 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -15,6 +15,7 @@ noinst_HEADERS+= \
                 libmemcached/byteorder.h \
                 libmemcached/common.h \
                 libmemcached/do.h \
+                libmemcached/initialize_query.h \
                 libmemcached/internal.h \
                 libmemcached/io.h \
                 libmemcached/is.h \
@@ -43,7 +44,6 @@ nobase_include_HEADERS+= \
                         libmemcached/flush_buffers.h \
                         libmemcached/get.h \
                         libmemcached/hash.h \
-                        libmemcached/initialize_query.h \
                         libmemcached/memcached.h \
                         libmemcached/memcached.hpp \
                         libmemcached/memcached/protocol_binary.h \