merge 3.2

This commit is contained in:
Benjamin Peterson 2011-03-12 11:59:10 -06:00
commit 32b0127007
1 changed files with 1 additions and 1 deletions

View File

@ -45,7 +45,7 @@ The numeric tower
To :class:`Complex`, :class:`Real` adds the operations that work on real
numbers.
In short, those are: a conversion to :class:`float`, :func:`trunc`,
In short, those are: a conversion to :class:`float`, :func:`math.trunc`,
:func:`round`, :func:`math.floor`, :func:`math.ceil`, :func:`divmod`, ``//``,
``%``, ``<``, ``<=``, ``>``, and ``>=``.