diff options
author | Jeppe Pihl <jpihl08@gmail.com> | 2014-10-06 10:35:33 +0200 |
---|---|---|
committer | Jeppe Pihl <jpihl08@gmail.com> | 2014-10-06 10:35:33 +0200 |
commit | bd0b5f19426148f0ead0c70e564d1b301da7fc53 (patch) | |
tree | 2ce09422e261f3e9b2e466cd0df97b298bca3a34 /doc | |
parent | a05d4b0f6f9928c5760130dfdf52b3e59cc50e76 (diff) | |
parent | 376f62970ff7b9276c77ef74e915bced88f5a212 (diff) | |
download | sphinx-bd0b5f19426148f0ead0c70e564d1b301da7fc53.tar.gz |
merge
Diffstat (limited to 'doc')
-rw-r--r-- | doc/markup/code.rst | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/markup/code.rst b/doc/markup/code.rst index b948dc38..9a503519 100644 --- a/doc/markup/code.rst +++ b/doc/markup/code.rst @@ -184,6 +184,10 @@ Includes string option, only lines that precede the first lines containing that string are included. + When specifying particular parts of a file to display, it can be useful to + display exactly which lines are being presented. + This can be done using the ``lineno-match`` option. + You can prepend and/or append a line to the included code, using the ``prepend`` and ``append`` option, respectively. This is useful e.g. for highlighting PHP code that doesn't include the ``<?php``/``?>`` markers. @@ -195,8 +199,8 @@ Includes .. literalinclude:: example.py :diff: example.py.orig - This shows the diff between example.py and example.py.orig with unified diff format. - + This shows the diff between example.py and example.py.orig with unified diff + format. .. versionadded:: 0.4.3 The ``encoding`` option. @@ -207,6 +211,7 @@ Includes The ``prepend`` and ``append`` options, as well as ``tab-width``. .. versionadded:: 1.3 The ``diff`` option. + The ``lineno-match`` option. Showing a file name |