merge with 0.6

This commit is contained in:
Georg Brandl 2010-03-16 08:53:12 +01:00
commit a5a08531ee
2 changed files with 8 additions and 3 deletions

View File

@ -86,9 +86,13 @@ Release 1.0 (in development)
* Added ``htmltitle`` block in layout template.
Release 0.6.5 (in development)
Release 0.6.6 (in development)
==============================
Release 0.6.5 (Mar 01, 2010)
============================
* In autodoc, fix the omission of some module members explicitly
documented using documentation comments.

View File

@ -377,5 +377,6 @@ are in HTML form), these variables are also available:
.. data:: toctree
A callable yielding the global TOC tree containing the current page, rendered
as HTML bullet lists. If the optional keyword argument ``collapse`` is true,
all TOC entries that are not ancestors of the current page are collapsed.
as HTML bullet lists. If the optional keyword argument ``collapse`` is true
(the default), all TOC entries that are not ancestors of the current page are
collapsed.