[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

Sun Dec 25 19:04:01 CET 2011

http://hg.python.org/cpython/rev/47f48553dd6b
changeset: 74179:47f48553dd6b
parent: 74177:e58c67d58d14
parent: 74178:f0197f1d158e
user: Georg Brandl <georg at python.org>
date: Sun Dec 25 19:03:22 2011 +0100
summary:
 merge with 3.2
files:
 Doc/tutorial/introduction.rst | 14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -593,13 +593,13 @@
 and ``!=`` (not equal to).
 
 * The *body* of the loop is *indented*: indentation is Python's way of grouping
- statements. Python does not (yet!) provide an intelligent input line editing
- facility, so you have to type a tab or space(s) for each indented line. In
- practice you will prepare more complicated input for Python with a text editor;
- most text editors have an auto-indent facility. When a compound statement is
- entered interactively, it must be followed by a blank line to indicate
- completion (since the parser cannot guess when you have typed the last line).
- Note that each line within a basic block must be indented by the same amount.
+ statements. At the interactive prompt, you have to type a tab or space(s) for
+ each indented line. In practice you will prepare more complicated input
+ for Python with a text editor; all decent text editors have an auto-indent
+ facility. When a compound statement is entered interactively, it must be
+ followed by a blank line to indicate completion (since the parser cannot
+ guess when you have typed the last line). Note that each line within a basic
+ block must be indented by the same amount.
 
 * The :func:`print` function writes the value of the expression(s) it is
 given. It differs from just writing the expression you want to write (as we did
-- 
Repository URL: http://hg.python.org/cpython
