summaryrefslogtreecommitdiff
path: root/Doc/contents.rst
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-03-15 21:13:56 -0700
committerLarry Hastings <larry@hastings.org>2014-03-15 21:13:56 -0700
commit3732ed24145c1ac77e99bcf85bccda3af095e696 (patch)
tree432a243f5f4d9720ec0cc202ee969f6175e450b7 /Doc/contents.rst
parentb6b6a6d587d267cbad490232d08faebd30fdb7e2 (diff)
downloadcpython-git-3732ed24145c1ac77e99bcf85bccda3af095e696.tar.gz
Merge in all documentation changes since branching 3.4.0rc1.
Diffstat (limited to 'Doc/contents.rst')
-rw-r--r--Doc/contents.rst12
1 files changed, 10 insertions, 2 deletions
diff --git a/Doc/contents.rst b/Doc/contents.rst
index c0c6af34d9..29b07db401 100644
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -11,8 +11,8 @@
library/index.rst
extending/index.rst
c-api/index.rst
- distutils/index.rst
- install/index.rst
+ distributing/index.rst
+ installing/index.rst
howto/index.rst
faq/index.rst
glossary.rst
@@ -21,3 +21,11 @@
bugs.rst
copyright.rst
license.rst
+
+.. include legacy packaging docs in build
+
+.. toctree::
+ :hidden:
+
+ distutils/index.rst
+ install/index.rst