Update CHANGES and docs for PR#3413

This commit is contained in:
jfbu committed 2017-02-17 23:30:01 +01:00
1 parent 32817f9efa
commit 651827946a
2 files changed
+9 -5

No files matched your search

+2
View File
@@ -14,6 +14,8 @@ Incompatible changes
flushed left (no text flow around table.) The position now defaults to center in
both cases, and it will obey Docutils 0.13 ``:align:`` option (refs #3415, #3377)
* option directive also allows all punctuations for the option name (refs: #3366)
* #3413: if :rst:dir:`literalinclude`'s ``:start-after:`` is used, make ``:lines:``
relative (refs #3412)
Features removed
----------------
+7 -5
View File
@@ -184,12 +184,12 @@ Includes
string option, only lines that precede the first lines containing that string
are included.
With lines selected this way it is still possible to use ``lines``, the
numbers being now interpreted relative to the already selected lines.
With lines selected using ``start-after`` it is still possible to use
``lines``, the first allowed line having by convention the line number ``1``.
When lines have been selected in any of the ways described above, the
line numbers in ``emphasize-lines`` refer to the selection, with the
line count starting at ``1``.
line numbers in ``emphasize-lines`` also refer to the selection, with the
first selected line having number ``1``.
When specifying particular parts of a file to display, it can be useful to
display the original line numbers. This can be done using the
@@ -220,7 +220,9 @@ Includes
.. versionadded:: 1.3
The ``diff`` option.
The ``lineno-match`` option.
.. versionchanged:: 1.6
With both ``start-after`` and ``lines`` in use, the first line as per
``start-after`` is considered to be with line number ``1`` for ``lines``.
Caption and name
^^^^^^^^^^^^^^^^