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

[benjamin.peterson]

http://hg.python.org/cpython/rev/e17a28b631a8
changeset:   74620:e17a28b631a8
parent:      74614:fec45282dc28
parent:      74617:2790c3ff475b
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 25 16:31:56 2012 -0500
summary:
  merge 3.2

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


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -383,12 +383,12 @@
 
 .. _bitstring-ops:
 
-Bit-string Operations on Integer Types
+Bitwise Operations on Integer Types
 --------------------------------------
 
 .. index::
    triple: operations on; integer; types
-   pair: bit-string; operations
+   pair: bitwise; operations
    pair: shifting; operations
    pair: masking; operations
    operator: ^
@@ -396,15 +396,15 @@
    operator: <<
    operator: >>
 
-Integers support additional operations that make sense only for bit-strings.
-Negative numbers are treated as their 2's complement value (this assumes a
-sufficiently large number of bits that no overflow occurs during the operation).
+Bitwise operations only make sense for integers.  Negative numbers are treated
+as their 2's complement value (this assumes a sufficiently large number of bits
+that no overflow occurs during the operation).
 
 The priorities of the binary bitwise operations are all lower than the numeric
 operations and higher than the comparisons; the unary operation ``~`` has the
 same priority as the other unary numeric operations (``+`` and ``-``).
 
-This table lists the bit-string operations sorted in ascending priority
+This table lists the bitwise operations sorted in ascending priority
 (operations in the same box have the same priority):
 
 +------------+--------------------------------+----------+

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