summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-07-29 01:49:37 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-07-29 01:49:37 (GMT)
commit6a09315ff098224da138ff708e470ebc1c0ba8ac (patch)
treee21713f5da3e25fa00aaf284c51273d2acde2884 /Doc/tutorial
parent10ea19f69c0bdb2c47aaa29c62dcb1f41825a3dc (diff)
parent1050d2d0c7730c6c533246bb2404937739a7775c (diff)
downloadcpython-6a09315ff098224da138ff708e470ebc1c0ba8ac.zip
cpython-6a09315ff098224da138ff708e470ebc1c0ba8ac.tar.gz
cpython-6a09315ff098224da138ff708e470ebc1c0ba8ac.tar.bz2
Issue #26462: Merge code block fixes from 3.5
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/controlflow.rst4
-rw-r--r--Doc/tutorial/interpreter.rst4
-rw-r--r--Doc/tutorial/modules.rst4
3 files changed, 9 insertions, 3 deletions
diff --git a/Doc/tutorial/controlflow.rst b/Doc/tutorial/controlflow.rst
index b03b553..d434618 100644
--- a/Doc/tutorial/controlflow.rst
+++ b/Doc/tutorial/controlflow.rst
@@ -504,7 +504,9 @@ It could be called like this::
client="John Cleese",
sketch="Cheese Shop Sketch")
-and of course it would print::
+and of course it would print:
+
+.. code-block:: none
-- Do you have any Limburger ?
-- I'm sorry, we're all out of Limburger
diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst
index c89fae3..faf57a3 100644
--- a/Doc/tutorial/interpreter.rst
+++ b/Doc/tutorial/interpreter.rst
@@ -94,7 +94,9 @@ mode*. In this mode it prompts for the next command with the *primary prompt*,
usually three greater-than signs (``>>>``); for continuation lines it prompts
with the *secondary prompt*, by default three dots (``...``). The interpreter
prints a welcome message stating its version number and a copyright notice
-before printing the first prompt::
+before printing the first prompt:
+
+.. code-block:: shell-session
$ python3.6
Python 3.6 (default, Sep 16 2015, 09:25:04)
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index 261a3f3..35db305 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -140,7 +140,9 @@ the end of your module::
you can make the file usable as a script as well as an importable module,
because the code that parses the command line only runs if the module is
-executed as the "main" file::
+executed as the "main" file:
+
+.. code-block:: shell-session
$ python fibo.py 50
1 1 2 3 5 8 13 21 34