IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge stable into default

Browse Source
This commit is contained in:
Georg Brandl
2014-01-11 14:53:07 +01:00
parent fd977391cf 1f83f01adf
commit 1d564ace28
19 changed files with 161 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/markup/code.rst
View File

@@ -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
^^^^^^^^^^^^