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

[georg.brandl]

http://hg.python.org/cpython/rev/64ad86875446
changeset:   86160:64ad86875446
parent:      86157:a376ce037b60
parent:      86159:c4d74ec932a1
user:        Georg Brandl <georg at python.org>
date:        Tue Oct 08 21:47:35 2013 +0200
summary:
  merge with 3.3

files:
  Doc/reference/expressions.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -912,7 +912,7 @@
 
 The ``/`` (division) and ``//`` (floor division) operators yield the quotient of
 their arguments.  The numeric arguments are first converted to a common type.
-Integer division yields a float, while floor division of integers results in an
+Division of integers yields a float, while floor division of integers results in an
 integer; the result is that of mathematical division with the 'floor' function
 applied to the result.  Division by zero raises the :exc:`ZeroDivisionError`
 exception.
@@ -972,8 +972,8 @@
 
 .. index:: exception: ValueError
 
-A right shift by *n* bits is defined as division by ``pow(2,n)``.  A left shift
-by *n* bits is defined as multiplication with ``pow(2,n)``.
+A right shift by *n* bits is defined as floor division by ``pow(2,n)``.  A left
+shift by *n* bits is defined as multiplication with ``pow(2,n)``.
 
 .. note::
 

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