diff options
| author | Georg Brandl <georg@python.org> | 2014-01-11 14:53:07 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-11 14:53:07 +0100 |
| commit | 1d564ace28020e88df45edb290aebb57135c8ed1 (patch) | |
| tree | 73da62c89f34034606519b880ee852fca7148a73 /doc/markup/code.rst | |
| parent | fd977391cf022ea2566f35b89915f535b6e4894f (diff) | |
| parent | 1f83f01adfd3709dbce0059469b01d5078715a31 (diff) | |
| download | sphinx-git-1d564ace28020e88df45edb290aebb57135c8ed1.tar.gz | |
merge stable into default
Diffstat (limited to 'doc/markup/code.rst')
| -rw-r--r-- | doc/markup/code.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/markup/code.rst b/doc/markup/code.rst index 7b958bc9d..6e707e007 100644 --- a/doc/markup/code.rst +++ b/doc/markup/code.rst @@ -62,8 +62,8 @@ installed) and handled in a smart way: * ``c`` * ... and any other lexer name that Pygments supports. -* If highlighting with the selected language fails, the block is not highlighted - in any way. +* If highlighting with the selected language fails (i.e. Pygments emits an + "Error" token), the block is not highlighted in any way. Line numbers ^^^^^^^^^^^^ |