From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 1 Jul 2010 16:16:24 +0000 (+0000)
Subject: Merged revisions 82415 via svnmerge from
X-Git-Tag: v2.6.6rc1~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=988064e36d858fdf868cb18f1f64a437326cf952;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index c85862a866ae..e6a921686f7d 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -57,9 +57,6 @@ Number-theoretic and representation functions
    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 @@ Number-theoretic and representation functions
 .. 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