say bitwise (because I have no idea what a bit-string is)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index f309868c8de2896ad02785f95c15c4c44c436def..29be5950a0426fa0024eb1f4aeafa3c42caeee54 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -401,12 +401,12 @@ All :class:`numbers.Real` types (:class:`int`, :class:`long`, and
 
 .. _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 @@ Bit-string Operations on Integer Types
    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    |