Fixing Makefile.am to reflect the document move and adding of cluster merger

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/Makefile.am b/Makefile.am
index 9d2c7f7..daea6a2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,7 +171,7 @@ docrst = \
        doc/design-2.0.rst \
        doc/design-2.1.rst \
        doc/design-2.2.rst \
-       doc/design-cluster-merger.rst \
+       doc/cluster-merge.rst \
        doc/devnotes.rst \
        doc/glossary.rst \
        doc/hooks.rst \

diff --git a/doc/index.rst b/doc/index.rst
index be64523..668c945 100644 (file)
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -17,7 +17,7 @@ Contents:
    design-2.0.rst
    design-2.1.rst
    design-2.2.rst
-   design-cluster-merger.rst
+   cluster-merge.rst
    locking.rst
    hooks.rst
    iallocator.rst