summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2019-04-16 19:22:33 +0300
committerGitHub <noreply@github.com>2019-04-16 19:22:33 +0300
commit4c977804b4eaadf5ac1b4eb1024f8167657e976d (patch)
treea7580d0a32e27b103cf619fdc7e8ebe1940e1361 /doc
parent500b5d9b039ae1cac60280f195be1fa773e676c9 (diff)
parent46d01eac68a09e9fd4b09c50b8c3b36dd85907f0 (diff)
downloadnumpy-4c977804b4eaadf5ac1b4eb1024f8167657e976d.tar.gz
Merge pull request #13337 from kritisingh1/conj
DOC: Add docstrings for consistency in aliases
Diffstat (limited to 'doc')
-rw-r--r--doc/source/reference/routines.math.rst1
-rw-r--r--doc/source/reference/ufuncs.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/source/reference/routines.math.rst b/doc/source/reference/routines.math.rst
index 821363987..3c2f96830 100644
--- a/doc/source/reference/routines.math.rst
+++ b/doc/source/reference/routines.math.rst
@@ -141,6 +141,7 @@ Handling complex numbers
real
imag
conj
+ conjugate
Miscellaneous
diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst
index e2981b40e..c71c8c9a7 100644
--- a/doc/source/reference/ufuncs.rst
+++ b/doc/source/reference/ufuncs.rst
@@ -586,6 +586,7 @@ Math operations
sign
heaviside
conj
+ conjugate
exp
exp2
log