summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-12 23:16:20 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-05-12 23:16:20 (GMT)
commit276e9c841d6b0a8aa0caf727fd54763fcc8d13f7 (patch)
tree21c1bff9696c3c8ae1576ee6e3be97a0abc8809d
parentf0b5015edb59bc92bd67b849ec3681629c0d1955 (diff)
parent19a3f17cb31a294e46ba82a34c887e3f16807505 (diff)
downloadcpython-276e9c841d6b0a8aa0caf727fd54763fcc8d13f7.zip
cpython-276e9c841d6b0a8aa0caf727fd54763fcc8d13f7.tar.gz
cpython-276e9c841d6b0a8aa0caf727fd54763fcc8d13f7.tar.bz2
merge 3.4
-rw-r--r--Doc/library/math.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 52bf3df..a88d1ac 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -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
--------------------