[Python-checkins] cpython (merge 3.4 -> default): Issue #21092: Merge from 3.4.

[mark.dickinson]

https://hg.python.org/cpython/rev/36099a05d76a
changeset:   94110:36099a05d76a
parent:      94107:cf4bf577749c
parent:      94109:5edfc6c929f9
user:        Mark Dickinson <dickinsm at gmail.com>
date:        Sun Jan 11 13:22:44 2015 +0000
summary:
  Issue #21092: Merge from 3.4.

files:
  Doc/library/cmath.rst          |  8 ++++----
  Modules/clinic/cmathmodule.c.h |  6 +++---
  Modules/cmathmodule.c          |  6 +++---
  Modules/mathmodule.c           |  6 +++---
  4 files changed, 13 insertions(+), 13 deletions(-)


diff --git a/Doc/library/cmath.rst b/Doc/library/cmath.rst
--- a/Doc/library/cmath.rst
+++ b/Doc/library/cmath.rst
@@ -149,13 +149,13 @@
 
 .. function:: acosh(x)
 
-   Return the hyperbolic arc cosine of *x*. There is one branch cut, extending left
-   from 1 along the real axis to -∞, continuous from above.
+   Return the inverse hyperbolic cosine of *x*. There is one branch cut,
+   extending left from 1 along the real axis to -∞, continuous from above.
 
 
 .. function:: asinh(x)
 
-   Return the hyperbolic arc sine of *x*. There are two branch cuts:
+   Return the inverse hyperbolic sine of *x*. There are two branch cuts:
    One extends from ``1j`` along the imaginary axis to ``∞j``,
    continuous from the right.  The other extends from ``-1j`` along
    the imaginary axis to ``-∞j``, continuous from the left.
@@ -163,7 +163,7 @@
 
 .. function:: atanh(x)
 
-   Return the hyperbolic arc tangent of *x*. There are two branch cuts: One
+   Return the inverse hyperbolic tangent of *x*. There are two branch cuts: One
    extends from ``1`` along the real axis to ``∞``, continuous from below. The
    other extends from ``-1`` along the real axis to ``-∞``, continuous from
    above.
diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h
--- a/Modules/clinic/cmathmodule.c.h
+++ b/Modules/clinic/cmathmodule.c.h
@@ -49,7 +49,7 @@
 "acosh($module, z, /)\n"
 "--\n"
 "\n"
-"Return the hyperbolic arccosine of z.");
+"Return the inverse hyperbolic cosine of z.");
 
 #define CMATH_ACOSH_METHODDEF    \
     {"acosh", (PyCFunction)cmath_acosh, METH_VARARGS, cmath_acosh__doc__},
@@ -135,7 +135,7 @@
 "asinh($module, z, /)\n"
 "--\n"
 "\n"
-"Return the hyperbolic arc sine of z.");
+"Return the inverse hyperbolic sine of z.");
 
 #define CMATH_ASINH_METHODDEF    \
     {"asinh", (PyCFunction)cmath_asinh, METH_VARARGS, cmath_asinh__doc__},
@@ -221,7 +221,7 @@
 "atanh($module, z, /)\n"
 "--\n"
 "\n"
-"Return the hyperbolic arc tangent of z.");
+"Return the inverse hyperbolic tangent of z.");
 
 #define CMATH_ATANH_METHODDEF    \
     {"atanh", (PyCFunction)cmath_atanh, METH_VARARGS, cmath_atanh__doc__},
diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c
--- a/Modules/cmathmodule.c
+++ b/Modules/cmathmodule.c
@@ -207,7 +207,7 @@
 /*[clinic input]
 cmath.acosh = cmath.acos
 
-Return the hyperbolic arccosine of z.
+Return the inverse hyperbolic cosine of z.
 [clinic start generated code]*/
 
 static Py_complex
@@ -262,7 +262,7 @@
 /*[clinic input]
 cmath.asinh = cmath.acos
 
-Return the hyperbolic arc sine of z.
+Return the inverse hyperbolic sine of z.
 [clinic start generated code]*/
 
 static Py_complex
@@ -353,7 +353,7 @@
 /*[clinic input]
 cmath.atanh = cmath.acos
 
-Return the hyperbolic arc tangent of z.
+Return the inverse hyperbolic tangent of z.
 [clinic start generated code]*/
 
 static Py_complex
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -902,18 +902,18 @@
 FUNC1(acos, acos, 0,
       "acos(x)\n\nReturn the arc cosine (measured in radians) of x.")
 FUNC1(acosh, m_acosh, 0,
-      "acosh(x)\n\nReturn the hyperbolic arc cosine (measured in radians) of x.")
+      "acosh(x)\n\nReturn the inverse hyperbolic cosine of x.")
 FUNC1(asin, asin, 0,
       "asin(x)\n\nReturn the arc sine (measured in radians) of x.")
 FUNC1(asinh, m_asinh, 0,
-      "asinh(x)\n\nReturn the hyperbolic arc sine (measured in radians) of x.")
+      "asinh(x)\n\nReturn the inverse hyperbolic sine of x.")
 FUNC1(atan, atan, 0,
       "atan(x)\n\nReturn the arc tangent (measured in radians) of x.")
 FUNC2(atan2, m_atan2,
       "atan2(y, x)\n\nReturn the arc tangent (measured in radians) of y/x.\n"
       "Unlike atan(y/x), the signs of both x and y are considered.")
 FUNC1(atanh, m_atanh, 0,
-      "atanh(x)\n\nReturn the hyperbolic arc tangent (measured in radians) of x.")
+      "atanh(x)\n\nReturn the inverse hyperbolic tangent of x.")
 
 static PyObject * math_ceil(PyObject *self, PyObject *number) {
     _Py_IDENTIFIER(__ceil__);

-- 
Repository URL: https://hg.python.org/cpython