[Python-checkins] cpython (2.7): say bitwise (because I have no idea what a bit-string is)

[benjamin.peterson]

http://hg.python.org/cpython/rev/6af7eb71cd49
changeset:   74618:6af7eb71cd49
branch:      2.7
parent:      74610:e8a525de2bac
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Jan 25 16:29:03 2012 -0500
summary:
  say bitwise (because I have no idea what a bit-string is)

files:
  Doc/library/stdtypes.rst |  16 ++++++++++------
  1 files changed, 10 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
@@ -401,12 +401,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: ^
@@ -414,16 +414,20 @@
    operator: <<
    operator: >>
 
-Plain and long integer types support additional operations that make sense only
-for bit-strings.  Negative numbers are treated as their 2's complement value
-(for long integers, this assumes a sufficiently large number of bits that no
-overflow occurs during the operation).
+Bitwise operations only make sense only 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 ``-``).
 
+<<<<<<< local
 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):
+>>>>>>> other
 
 +------------+--------------------------------+----------+
 | Operation  | Result                         | Notes    |

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