[Python-3000-checkins] r59789 - python/branches/py3k/Doc/library/stdtypes.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Jan  6 18:39:49 2008
New Revision: 59789

Modified:
   python/branches/py3k/Doc/library/stdtypes.rst
Log:
Use consistent note numbers.


Modified: python/branches/py3k/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/py3k/Doc/library/stdtypes.rst	(original)
+++ python/branches/py3k/Doc/library/stdtypes.rst	Sun Jan  6 18:39:49 2008
@@ -303,7 +303,7 @@
 +---------------------+---------------------------------+-------+--------------------+
 | ``int(x)``          | *x* converted to integer        | \(3)  | :func:`int`        |
 +---------------------+---------------------------------+-------+--------------------+
-| ``float(x)``        | *x* converted to floating point | \(6)  | :func:`float`      |
+| ``float(x)``        | *x* converted to floating point | \(4)  | :func:`float`      |
 +---------------------+---------------------------------+-------+--------------------+
 | ``complex(re, im)`` | a complex number with real part |       | :func:`complex`    |
 |                     | *re*, imaginary part *im*.      |       |                    |
@@ -314,9 +314,9 @@
 +---------------------+---------------------------------+-------+--------------------+
 | ``divmod(x, y)``    | the pair ``(x // y, x % y)``    | \(2)  | :func:`divmod`     |
 +---------------------+---------------------------------+-------+--------------------+
-| ``pow(x, y)``       | *x* to the power *y*            | (7)   | :func:`pow`        |
+| ``pow(x, y)``       | *x* to the power *y*            | (5)   | :func:`pow`        |
 +---------------------+---------------------------------+-------+--------------------+
-| ``x ** y``          | *x* to the power *y*            | (7)   |                    |
+| ``x ** y``          | *x* to the power *y*            | (5)   |                    |
 +---------------------+---------------------------------+-------+--------------------+
 
 .. index::
@@ -347,11 +347,11 @@
    as in C; see functions :func:`floor` and :func:`ceil` in the :mod:`math` module
    for well-defined conversions.
 
-(6)
+(4)
    float also accepts the strings "nan" and "inf" with an optional prefix "+" 
    or "-" for Not a Number (NaN) and positive or negative infinity.
 
-(7)
+(5)
    Python defines ``pow(0, 0)`` and ``0 ** 0`` to be ``1``, as is common for
    programming languages.