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

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Jul  1 18:16:24 2010
New Revision: 82418

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

........
  r82415 | benjamin.peterson | 2010-07-01 10:07:15 -0500 (Thu, 01 Jul 2010) | 1 line
  
  remove docs about delegating to special methods; it does no such thing
........


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	Thu Jul  1 18:16:24 2010
@@ -57,9 +57,6 @@
    Return the floor of *x* as a float, the largest integer value less than or equal
    to *x*.
 
-   .. versionchanged:: 2.6
-      Added :meth:`__floor__` delegation.
-
 
 .. function:: fmod(x, y)
 
@@ -137,7 +134,7 @@
 .. function:: trunc(x)
 
    Return the :class:`Real` value *x* truncated to an :class:`Integral` (usually
-   a long integer). Delegates to ``x.__trunc__()``.
+   a long integer).
 
    .. versionadded:: 2.6