diff options
| author | Georg Brandl <georg@python.org> | 2011-01-09 00:47:48 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-01-09 00:47:48 +0100 |
| commit | ee17d27928890f20a3d2163156007fe77a7f9918 (patch) | |
| tree | 334ef36d47c0173d6e7fb808313346f799888f7c /doc/ext | |
| parent | 8b63a39b1387bd27b9761f026f14b6f61c469c0b (diff) | |
| parent | 9718becbe3025a32d5d82509118f15b77116f147 (diff) | |
| download | sphinx-ee17d27928890f20a3d2163156007fe77a7f9918.tar.gz | |
merge with 1.0
Diffstat (limited to 'doc/ext')
| -rw-r--r-- | doc/ext/autodoc.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ext/autodoc.rst b/doc/ext/autodoc.rst index 6c4a147a..c5c90d73 100644 --- a/doc/ext/autodoc.rst +++ b/doc/ext/autodoc.rst @@ -121,8 +121,8 @@ inserting them into the page source under a suitable :rst:dir:`py:module`, .. versionadded:: 1.1 * For classes and exceptions, members inherited from base classes will be - left out, unless you give the ``inherited-members`` flag option, in - addition to ``members``:: + left out when documenting all members, unless you give the + ``inherited-members`` flag option, in addition to ``members``:: .. autoclass:: Noodle :members: |