diff --git a/documenting.rst b/documenting.rst
--- a/documenting.rst
+++ b/documenting.rst
@@ -1,7 +1,8 @@
 .. _documenting:
 
+##################
 Documenting Python
-==================
+##################
 
 The Python language has a substantial body of documentation, much of it
 contributed by various authors. The markup used for the Python documentation is
diff --git a/index.rst b/index.rst
--- a/index.rst
+++ b/index.rst
@@ -1,38 +1,7 @@
+========================
 Python Developer's Guide
 ========================
 
-.. toctree::
-   :hidden:
-
-   setup
-   help
-   patch
-   runtests
-   coverage
-   docquality
-   documenting
-   silencewarnings
-   fixingissues
-   tracker
-   triaging
-   communication
-   coredev
-   developers
-   committing
-   devcycle
-   buildbots
-
-   stdlibchanges
-   langchanges
-
-   experts
-   emacs
-   gdb
-   grammar
-   compiler
-   faq
-
-
 This guide is a comprehensive resource for :ref:`contributing <contributing>`
 to Python_ -- for both new and experienced contributors.  It is
 :ref:`maintained <helping-with-the-developers-guide>` by the same community
@@ -197,6 +166,42 @@
 
 * :ref:`Search this guide <search>`
 
+.. _contents:
+
+Full Table of Contents
+----------------------
+
+.. toctree::
+   :numbered:
+
+   setup
+   help
+   patch
+   runtests
+   coverage
+   docquality
+   documenting
+   silencewarnings
+   fixingissues
+   tracker
+   triaging
+   communication
+   coredev
+   developers
+   committing
+   devcycle
+   buildbots
+
+   stdlibchanges
+   langchanges
+
+   experts
+   emacs
+   gdb
+   grammar
+   compiler
+   faq
+
 .. _Buildbot status: http://python.org/dev/buildbot/
 .. _Firefox search engine plug-in: http://www.python.org/dev/searchplugin/
 .. _Misc directory: http://hg.python.org/cpython/file/default/Misc
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -1,15 +1,16 @@
-.. _setup:
-
-Getting Set Up
-==============
+###############
+Getting Started
+###############
 
 These instructions cover how to get a working copy of the source code and a
 compiled version of the CPython interpreter (CPython is the version of Python
 available from http://www.python.org/). It also gives an overview of the
 directory structure of the CPython source code.
 
-.. contents::
+.. _setup:
 
+Getting Set Up
+==============
 
 Version Control Setup
 ---------------------
diff --git a/tracker.rst b/tracker.rst
--- a/tracker.rst
+++ b/tracker.rst
@@ -1,3 +1,7 @@
+##############
+Issue Tracking
+##############
+
 .. _tracker:
 
 Using the Issue Tracker