merge 3.4

This commit is contained in:
Benjamin Peterson 2015-05-12 19:16:20 -04:00
commit 276e9c841d

View file

@ -290,12 +290,12 @@ Angular conversion
.. function:: degrees(x)
Converts angle *x* from radians to degrees.
Convert angle *x* from radians to degrees.
.. function:: radians(x)
Converts angle *x* from degrees to radians.
Convert angle *x* from degrees to radians.
Hyperbolic functions
--------------------