Merge from 3.3

This commit is contained in:
Andrew Kuchling 2014-02-16 11:15:13 -05:00
commit 87a113b807
2 changed files with 10 additions and 3 deletions

View file

@ -36,9 +36,12 @@ Number-theoretic and representation functions
.. function:: copysign(x, y)
Return *x* with the sign of *y*. On a platform that supports
signed zeros, ``copysign(1.0, -0.0)`` returns *-1.0*.
Return a float with the magnitude (absolute value) of *x* but the sign of
*y*. On platforms that support signed zeros, ``copysign(1.0, -0.0)``
returns *-1.0*.
If *x* is NaN, *y* is ignored and NaN is returned. If *y* is NaN,
it is treated as positive: ``copysign(-1.0, NaN)`` returns 1.0.
.. function:: fabs(x)