- fix some RST whitespace syntactical issues in toctrees

- have the topmost toctree only include page names
- add glossary to toctree, remove search by itself

(cherry picked from commit 87a1af4efe5bb515d9e687e2f7dfc84dfb8ee522)

Conflicts:
	doc/build/changelog/index.rst

diff --git a/doc/build/changelog/index.rst b/doc/build/changelog/index.rst
index f3542d5420926bdf4272b6c2ab986080d4f2b527..2d5c8f0ed19d337d3e2f03eb795daad96520908a 100644 (file)
--- a/doc/build/changelog/index.rst
+++ b/doc/build/changelog/index.rst
@@ -10,15 +10,15 @@ Current Migration Guide
 ------------------------
 
 .. toctree::
-       :maxdepth: 1
+   :titlesonly:
 
-       migration_09
+   migration_09
 
 Change logs
 -----------
 
 .. toctree::
-   :maxdepth: 2
+   :titlesonly:
 
    changelog_09
    changelog_08
@@ -35,7 +35,7 @@ Older Migration Guides
 ----------------------
 
 .. toctree::
-   :maxdepth: 1
+   :titlesonly:
 
    migration_08
    migration_07

diff --git a/doc/build/contents.rst b/doc/build/contents.rst
index 95b5e9a19afbd112a833a8816060d2c4d1d06ef5..a7277cf90a7851e83e6fc82db1fe387a82fd54ba 100644 (file)
--- a/doc/build/contents.rst
+++ b/doc/build/contents.rst
@@ -7,17 +7,18 @@ Full table of contents.  For a high level overview of all
 documentation, see :ref:`index_toplevel`.
 
 .. toctree::
-    :maxdepth: 3
+   :titlesonly:
+   :includehidden:
 
-    intro
-    orm/index
-    core/index
-    dialects/index
-    faq/index
-    changelog/index
+   intro
+   orm/index
+   core/index
+   dialects/index
+   faq/index
+   changelog/index
 
 Indices and tables
 ------------------
 
+* :ref:`glossary`
 * :ref:`genindex`
-* :ref:`search`