From f2d713c577734ba2f9209955b7d815cfb455baef Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Fri, 14 Mar 2008 23:35:08 +0000
Subject: [PATCH] Add documentation for autodoc.

---
 doc/conf.py         |  4 +-
 doc/ext/autodoc.rst | 93 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/doc/conf.py b/doc/conf.py
index 5ccd12738..151b6d185 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -21,7 +21,7 @@ sys.path.append('.')
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.addons.*') or your custom ones.
-extensions = ['ext']
+extensions = ['ext', 'sphinx.ext.autodoc']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['.templates']
@@ -123,3 +123,5 @@ latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',
 
 # Documents to append as an appendix to all manuals.
 #latex_appendices = []
+
+automodule_skip_lines = 4
diff --git a/doc/ext/autodoc.rst b/doc/ext/autodoc.rst
index 6ab4345d4..4af04555c 100644
--- a/doc/ext/autodoc.rst
+++ b/doc/ext/autodoc.rst
@@ -1,5 +1,98 @@
+.. highlight:: rest
+
 :mod:`sphinx.ext.autodoc` -- Include documentation from docstrings
 ==================================================================
 
 .. module:: sphinx.ext.autodoc
    :synopsis: Include documentation from docstrings.
+
+.. index:: pair: automatic; documentation
+           single: docstring
+
+This extension can import the modules you are documenting, and pull in
+documentation from docstrings in a semi-automatic way.
+
+For this to work, the docstrings must of course be written in correct
+reStructuredText.  You can then use all of the usual Sphinx markup in the
+docstrings, and it will end up correctly in the documentation.  Together with
+hand-written documentation, this technique eases the pain of having to maintain
+two locations for documentation, while at the same time avoiding
+auto-generated-looking pure API documentation.
+
+:mod:`autodoc` provides several directives that are versions of the usual
+:dir:`module`, :dir:`class` and so forth.  On parsing time, they import the
+corresponding module and extract the docstring of the given objects, inserting
+them into the page source under a suitable :dir:`module`, :dir:`class` etc.
+directive.
+
+.. note::
+
+   Just as :dir:`class` respects the current :dir:`module`, :dir:`autoclass`
+   will also do so, and likewise with :dir:`method` and :dir:`class`.
+
+
+.. directive:: automodule
+               autoclass
+               autoexception
+
+   Document a module, class or exception.  All three directives will by default
+   only insert the docstring of the object itself::
+
+      .. autoclass:: Noodle
+
+   will produce source like this::
+
+      .. class:: Noodle
+
+         Noodle's docstring.
+
+   If you want to automatically document members, there's a ``members``
+   option::
+
+      .. autoclass:: Noodle
+         :members:
+
+   will document all non-private member functions and properties (that is, those
+   whose name doesn't start with ``_``), while ::
+
+      .. autoclass:: Noodle
+         :members: eat, slurp
+
+   will document exactly the specified members.
+
+   Members without docstrings will be left out, unless you give the
+   ``undoc-members`` flag option.
+
+   The "auto" directives can also contain content of their own, it will be
+   inserted into the resulting non-auto directive source after the docstring
+   (but before any automatic member documentation).
+
+   Therefore, you can also mix automatic and non-automatic member documentation,
+   like so::
+
+      .. autoclass:: Noodle
+         :members: eat, slurp
+
+         .. method:: boil(time=10)
+
+            Boil the noodle *time* minutes.
+
+
+.. directive:: autofunction
+               automethod
+               autoattribute
+
+   These work exactly like :dir:`autoclass` etc., but do not offer the options
+   used for automatic member documentation.
+
+
+There's also one new config value that you can set:
+
+.. confval:: automodule_skip_lines
+
+   This value (whose default is ``0``) can be used to skip an amount of lines in
+   every module docstring that is processed by an :dir:`automodule` directive.
+   This is provided because some projects like to put headings in the module
+   docstring, which would then interfere with your sectioning, or automatic
+   fields with version control tags, that you don't want to put in the generated
+   documentation.