summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index 7591a7952..8b1a5a3db 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -793,6 +793,13 @@ add_newdoc('numpy.core.umath', 'conjugate',
The complex conjugate of `x`, with same dtype as `y`.
$OUT_SCALAR_1
+ Notes
+ -----
+ `conj` is an alias for `conjugate`:
+
+ >>> np.conj is np.conjugate
+ True
+
Examples
--------
>>> np.conjugate(1+2j)
@@ -3079,6 +3086,7 @@ add_newdoc('numpy.core.umath', 'remainder',
-----
Returns 0 when `x2` is 0 and both `x1` and `x2` are (arrays of)
integers.
+ ``mod`` is an alias of ``remainder``.
Examples
--------