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

[benjamin.peterson]

http://hg.python.org/cpython/rev/75b9e1a6b7f5
changeset:   81616:75b9e1a6b7f5
parent:      81614:81b2a30da853
parent:      81615:add66b51b890
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Jan 20 10:05:28 2013 -0500
summary:
  merge 3.3

files:
  Doc/tutorial/introduction.rst |  12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)


diff --git a/Doc/tutorial/introduction.rst b/Doc/tutorial/introduction.rst
--- a/Doc/tutorial/introduction.rst
+++ b/Doc/tutorial/introduction.rst
@@ -600,12 +600,12 @@
   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
-  earlier in the calculator examples) in the way it handles multiple
-  expressions, floating point quantities,
-  and strings.  Strings are printed without quotes, and a space is inserted
-  between items, so you can format things nicely, like this::
+* The :func:`print` function writes the value of the argument(s) it is given.
+  It differs from just writing the expression you want to write (as we did
+  earlier in the calculator examples) in the way it handles multiple arguments,
+  floating point quantities, and strings.  Strings are printed without quotes,
+  and a space is inserted between items, so you can format things nicely, like
+  this::
 
      >>> i = 256*256
      >>> print('The value of i is', i)

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