diff options
author | Mark Dickinson <dickinsm@gmail.com> | 2015-01-11 13:22:44 (GMT) |
---|---|---|
committer | Mark Dickinson <dickinsm@gmail.com> | 2015-01-11 13:22:44 (GMT) |
commit | cc8617b93a34f8dfcff9e686ee91d8fb1802bc2b (patch) | |
tree | 625272f5ee43e7d8dc05cae4e5512128412b58c3 /Modules | |
parent | a5d0c7c2fdd638d684acdb5391e0987b1e37f56a (diff) | |
parent | dfe0b2326b9700f5f5f5af566488dfe913348ab9 (diff) | |
download | cpython-cc8617b93a34f8dfcff9e686ee91d8fb1802bc2b.zip cpython-cc8617b93a34f8dfcff9e686ee91d8fb1802bc2b.tar.gz cpython-cc8617b93a34f8dfcff9e686ee91d8fb1802bc2b.tar.bz2 |
Issue #21092: Merge from 3.4.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/clinic/cmathmodule.c.h | 6 | ||||
-rw-r--r-- | Modules/cmathmodule.c | 6 | ||||
-rw-r--r-- | Modules/mathmodule.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Modules/clinic/cmathmodule.c.h b/Modules/clinic/cmathmodule.c.h index 7d6e04b..83de518 100644 --- a/Modules/clinic/cmathmodule.c.h +++ b/Modules/clinic/cmathmodule.c.h @@ -49,7 +49,7 @@ PyDoc_STRVAR(cmath_acosh__doc__, "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 @@ PyDoc_STRVAR(cmath_asinh__doc__, "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 @@ PyDoc_STRVAR(cmath_atanh__doc__, "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 index 6d9b2ed..5746db1 100644 --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -207,7 +207,7 @@ static Py_complex acosh_special_values[7][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 @@ static Py_complex asinh_special_values[7][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 @@ static Py_complex atanh_special_values[7][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 index 0c991cd..9c97a2a 100644 --- a/Modules/mathmodule.c +++ b/Modules/mathmodule.c @@ -902,18 +902,18 @@ math_2(PyObject *args, double (*func) (double, double), char *funcname) 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__); |