# HG changeset patch
# User Benjamin Peterson
# Date 1327527116 18000
# Node ID e17a28b631a837a07968f73884da135a83345a36
# Parent fec45282dc28cf6a44c8c4ab38af86d9b924204c
# Parent 2790c3ff475b916c14ecb645eb167e7b57615b74
merge 3.2
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):
+------------+--------------------------------+----------+