diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | doc/config.rst | 9 | ||||
| -rw-r--r-- | doc/ext/doctest.rst | 2 |
3 files changed, 10 insertions, 4 deletions
@@ -95,6 +95,9 @@ Release 1.1 (in development) * Section headings in :rst:dir:`only` directives are now correctly handled. +* #594: :confval:`trim_doctest_flags` now also removes ``<BLANKLINE>`` + indicators. + * C++ domain now supports array definitions. diff --git a/doc/config.rst b/doc/config.rst index b4d7662e..f032bcc1 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -334,11 +334,14 @@ Project information .. confval:: trim_doctest_flags If true, doctest flags (comments looking like ``# doctest: FLAG, ...``) at - the ends of lines are removed for all code blocks showing interactive Python - sessions (i.e. doctests). Default is true. See the extension - :mod:`~sphinx.ext.doctest` for more possibilities of including doctests. + the ends of lines and ``<BLANKLINE>`` markers are removed for all code + blocks showing interactive Python sessions (i.e. doctests). Default is + true. See the extension :mod:`~sphinx.ext.doctest` for more possibilities + of including doctests. .. versionadded:: 1.0 + .. versionchanged:: 1.1 + Now also removes ``<BLANKLINE>``. .. _intl-options: diff --git a/doc/ext/doctest.rst b/doc/ext/doctest.rst index c884a10d..554987ee 100644 --- a/doc/ext/doctest.rst +++ b/doc/ext/doctest.rst @@ -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, removal of ``<BLANKLINE>`` and ``# doctest:`` options only works in :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. |