Merge Trunk

[awesomized/libmemcached] / docs / include.am

diff --git a/docs/include.am b/docs/include.am
index 3d6871c8cec9c04294e0bd4936f519e63825d71a..022b218bf8315ccb334870c5c351c8175f4390c9 100644 (file)
--- a/docs/include.am
+++ b/docs/include.am
@@ -2,56 +2,10 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-EXTRA_DIST+= \
-            docs/conf.py \
-            docs/hashkit_create.rst \
-            docs/hashkit_functions.rst \
-            docs/hashkit_value.rst \
-            docs/index.rst \
-            docs/libhashkit.rst \
-            docs/libmemcached.rst \
-            docs/libmemcached_configuration.rst \
-            docs/libmemcached_examples.rst \
-            docs/libmemcachedutil.rst \
-            docs/memaslap.rst \
-            docs/memcached_analyze.rst \
-            docs/memcached_auto.rst \
-            docs/memcached_behavior.rst \
-            docs/memcached_callback.rst \
-            docs/memcached_create.rst \
-            docs/memcached_delete.rst \
-            docs/memcached_dump.rst \
-            docs/memcached_flush.rst \
-            docs/memcached_flush_buffers.rst \
-            docs/memcached_generate_hash_value.rst \
-            docs/memcached_get.rst \
-            docs/memcached_memory_allocators.rst \
-            docs/memcached_pool.rst \
-            docs/memcached_quit.rst \
-            docs/memcached_result_st.rst \
-            docs/memcached_sasl.rst \
-            docs/memcached_server_st.rst \
-            docs/memcached_servers.rst \
-            docs/memcached_set.rst \
-            docs/memcached_stats.rst \
-            docs/memcached_strerror.rst \
-            docs/memcached_user_data.rst \
-            docs/memcached_verbosity.rst \
-            docs/memcached_version.rst \
-            docs/memcapable.rst \
-            docs/memcat.rst \
-            docs/memcp.rst \
-            docs/memdump.rst \
-            docs/memerror.rst \
-            docs/memflush.rst \
-            docs/memrm.rst \
-            docs/memslap.rst \
-            docs/memstat.rst
-
 # Makefile for Sphinx documentation
 #
 
-SPHINXOPTS    = ${SPHINX_WARNINGS} -D release=${PANDORA_RELEASE_VERSION}
+SPHINXOPTS    = ${SPHINX_WARNINGS}
 PAPER         =
 SPHINX_BUILDDIR      = ${top_builddir}/docs
 
@@ -110,7 +64,7 @@ man_MANS+= \
           docs/man/memcached_generate_hash.3 \
           docs/man/libmemcached_check_configuration.3 \
           docs/man/libmemcached_configuration.3 \
-          docs/man/memcached_create_with_options.3 \
+          docs/man/memcached.3 \
           docs/man/memcached_generate_hash_value.3 \
           docs/man/memcached_get.3 \
           docs/man/memcached_get_by_key.3 \
@@ -282,4 +236,5 @@ doctest:
        PYTHONPATH=${top_srcdir}/docs  $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(SPHINX_BUILDDIR)/doctest
        @echo "Testing of doctests in the sources finished, look at the " \
              "results in $(SPHINX_BUILDDIR)/doctest/output.txt."
+
 endif