IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add changelog entry and docs for #594.

Browse Source
This commit is contained in:
Georg Brandl
2011-01-09 21:43:22 +01:00
parent ca6a5b53c9
commit 6e2324ab2c
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -95,6 +95,9 @@ Release 1.1 (in development)
* Section headings in :rst:dir:`only` directives are now correctly * Section headings in :rst:dir:`only` directives are now correctly
handled. handled.
* #594: :confval:`trim_doctest_flags` now also removes ``<BLANKLINE>``
indicators.
* C++ domain now supports array definitions. * C++ domain now supports array definitions.

9
doc/config.rst
View File

@@ -334,11 +334,14 @@ Project information
.. confval:: trim_doctest_flags .. confval:: trim_doctest_flags
If true, doctest flags (comments looking like ``# doctest: FLAG, ...``) at If true, doctest flags (comments looking like ``# doctest: FLAG, ...``) at
the ends of lines are removed for all code blocks showing interactive Python the ends of lines and ``<BLANKLINE>`` markers are removed for all code
sessions (i.e. doctests). Default is true. See the extension blocks showing interactive Python sessions (i.e. doctests). Default is
:mod:`~sphinx.ext.doctest` for more possibilities of including doctests. true. See the extension :mod:`~sphinx.ext.doctest` for more possibilities
of including doctests.
.. versionadded:: 1.0 .. versionadded:: 1.0
.. versionchanged:: 1.1
Now also removes ``<BLANKLINE>``.
.. _intl-options: .. _intl-options:

2
doc/ext/doctest.rst
View File

@@ -237,4 +237,4 @@ There are also these config values for customizing the doctest extension:
will be interpreted as one block ending and another one starting. Also, will be interpreted as one block ending and another one starting. Also,
removal of ``<BLANKLINE>`` and ``# doctest:`` options only works in removal of ``<BLANKLINE>`` and ``# doctest:`` options only works in
:rst:dir:`doctest` blocks, though you may set :confval:`trim_doctest_flags` to :rst:dir:`doctest` blocks, though you may set :confval:`trim_doctest_flags` to
achieve the latter in all code blocks with Python console content. achieve that in all code blocks with Python console content.