summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-11-17 20:26:58 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-11-17 20:26:58 +0000
commit9057450af00e34e4e9d33fb2d76b83fcc1d47802 (patch)
treee3953f0b4a24cf2a70723cb5349d640d3df87074
parent030fdcc7c8e36f4a1c780dd974cbefe83ce202e8 (diff)
[1.2.X] Added a hidden toctree pointing at the index file in the docs to silence a sphinx warning. Backport of [14605].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/conf.py6
-rw-r--r--docs/contents.txt31
2 files changed, 21 insertions, 16 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 606ee6b5ad..ac6aed1fb9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -87,9 +87,9 @@ show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'trac'
-# Sphinx will recurse into subversion configuration folders and try to read
-# any document file within. These should be ignored.
-# Note: exclude_dirnames is new in Sphinx 0.5
+# Sphinx will recurse into subversion configuration folders and try to read
+# any document file within. These should be ignored.
+# Note: exclude_dirnames is new in Sphinx 0.5
exclude_dirnames = ['.svn']
# -- Options for HTML output ---------------------------------------------------
diff --git a/docs/contents.txt b/docs/contents.txt
index e41b77055e..14fe007df8 100644
--- a/docs/contents.txt
+++ b/docs/contents.txt
@@ -5,17 +5,22 @@ Django documentation contents
=============================
.. toctree::
- :maxdepth: 2
-
- intro/index
- topics/index
- howto/index
- faq/index
- ref/index
- misc/index
- glossary
- releases/index
- internals/index
+ :hidden:
+
+ index
+
+.. toctree::
+ :maxdepth: 2
+
+ intro/index
+ topics/index
+ howto/index
+ faq/index
+ ref/index
+ misc/index
+ glossary
+ releases/index
+ internals/index
Indices, glossary and tables
============================
@@ -32,5 +37,5 @@ have been replaced in newer versions of Django.
.. toctree::
:maxdepth: 2
-
- obsolete/index \ No newline at end of file
+
+ obsolete/index