summaryrefslogtreecommitdiff
path: root/doc/markup/code.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-02-23 19:24:02 +0100
committerGeorg Brandl <georg@python.org>2009-02-23 19:24:02 +0100
commit2f13231fbd0ba903bf9750c164159ab90d235abf (patch)
treeebc82048ec18a2b95530ef0f20d660176e374a29 /doc/markup/code.rst
parent9618b0c78a0bc3b195f44983af63ab494d7e7945 (diff)
parentcadb5af9f1e5742b6a9e14cdc1b13ce33fbcd546 (diff)
downloadsphinx-git-2f13231fbd0ba903bf9750c164159ab90d235abf.tar.gz
merge with 0.5
Diffstat (limited to 'doc/markup/code.rst')
-rw-r--r--doc/markup/code.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/markup/code.rst b/doc/markup/code.rst
index 4872d6a46..28f752365 100644
--- a/doc/markup/code.rst
+++ b/doc/markup/code.rst
@@ -30,7 +30,10 @@ installed) and handled in a smart way:
config value.
* Within Python highlighting mode, interactive sessions are recognized
- automatically and highlighted appropriately.
+ automatically and highlighted appropriately. Normal Python code is only
+ highlighted if it is parseable (so you can use Python as the default, but
+ interspersed snippets of shell commands or other code blocks will not be
+ highlighted as Python).
* The highlighting language can be changed using the ``highlight`` directive,
used as follows::