[Python-checkins] r82431 - in python/branches/release26-maint: Doc/library/math.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jul  2 01:41:09 2010
New Revision: 82431

Log:
Merged revisions 82429 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82429 | benjamin.peterson | 2010-07-01 18:35:37 -0500 (Thu, 01 Jul 2010) | 1 line
  
  trunc does use the special method, though
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/math.rst

Modified: python/branches/release26-maint/Doc/library/math.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/math.rst	(original)
+++ python/branches/release26-maint/Doc/library/math.rst	Fri Jul  2 01:41:09 2010
@@ -134,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer).
+   a long integer).  Uses the ``__trunc__`` method.
 
    .. versionadded:: 2.6