Commits

Georg Brandl committed 721b390

Add changelog entry and docs for #594.

  • Participants
  • Parent commits 799899b

Comments (0)

Files changed (3)

 * 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.
 
 

File doc/config.rst

 .. 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:

File doc/ext/doctest.rst

    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.