From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 15 Jul 2014 01:05:33 +0000 (-0400)
Subject: Flatten doc navigation
X-Git-Tag: v4.0.0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4ecbf96f3fac075089f414af45cff4ff0ec7777;p=thirdparty%2Ftornado.git

Flatten doc navigation

sphinx_rtd_theme's sidebar will not go deeper than two levels
in the table of contents, so remove the extra index->documentation
indirection.
---

diff --git a/docs/documentation.rst b/docs/documentation.rst
deleted file mode 100644
index 678e081be..000000000
--- a/docs/documentation.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-Tornado Documentation
-=====================
-
-.. toctree::
-   :titlesonly:
-
-   guide
-   webframework
-   networking
-   integration
-   utilities
-   releases
-
-This documentation is also available in `PDF and Epub formats
-<https://readthedocs.org/projects/tornado/downloads/>`_.
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/docs/index.rst b/docs/index.rst
index 3f6381578..0fb87aaf5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -28,7 +28,6 @@ installed automatically when using ``pip`` or ``easy_install``.
 Quick links
 -----------
 
-* :doc:`Documentation <documentation>`
 * |Download current version|: :current_tarball:`z` (:doc:`release notes <releases>`)
 * `Source (github) <https://github.com/tornadoweb/tornado>`_
 * Mailing lists: `discussion <http://groups.google.com/group/python-tornado>`_ and `announcements <http://groups.google.com/group/python-tornado-announce>`_
@@ -122,6 +121,26 @@ development use).  Tornado will also run on Windows, although this
 configuration is not officially supported and is recommended only for
 development use.
 
+Documentation
+-------------
+
+This documentation is also available in `PDF and Epub formats
+<https://readthedocs.org/projects/tornado/downloads/>`_.
+
+.. toctree::
+   :titlesonly:
+
+   guide
+   webframework
+   networking
+   integration
+   utilities
+   releases
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
 Discussion and support
 ----------------------
 
@@ -141,8 +160,3 @@ the `Apache License, Version 2.0
 
 This web site and all documentation is licensed under `Creative
 Commons 3.0 <http://creativecommons.org/licenses/by/3.0/>`_.
-
-.. toctree::
-   :hidden:
-
-   documentation