[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/9e70e818d434
changeset:   68402:9e70e818d434
parent:      68399:ee259a4f3eee
parent:      68401:45d76bb9fbcd
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Mar 12 11:59:10 2011 -0600
summary:
  merge 3.2

files:
  

diff --git a/Doc/library/numbers.rst b/Doc/library/numbers.rst
--- a/Doc/library/numbers.rst
+++ b/Doc/library/numbers.rst
@@ -45,7 +45,7 @@
    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 ``>=``.
 

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