[Python-checkins] devguide (merge default -> default): merge

[giampaolo.rodola]

http://hg.python.org/devguide/rev/139eea239f32
changeset:   593:139eea239f32
parent:      592:f0b3f96aa79b
parent:      591:3628a1aed4cd
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Mon Jan 21 12:43:11 2013 +0100
summary:
  merge

files:
  documenting.rst |  11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/documenting.rst b/documenting.rst
--- a/documenting.rst
+++ b/documenting.rst
@@ -825,6 +825,17 @@
   This language is used until the next ``highlightlang`` directive is
   encountered.
 
+* The ``code-block`` directive can be used to specify the highlight language
+  of a single code block, e.g.::
+
+     .. code-block:: c
+
+        #include <stdio.h>
+
+        void main() {
+            printf("Hello world!\n");
+        }
+
 * The values normally used for the highlighting language are:
 
   * ``python`` (the default)

-- 
Repository URL: http://hg.python.org/devguide