summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorkritisingh1 <kritisingh1.ks@gmail.com>2019-04-15 19:39:35 +0530
committerkritisingh1 <kritisingh1.ks@gmail.com>2019-04-16 12:19:17 +0530
commit46d01eac68a09e9fd4b09c50b8c3b36dd85907f0 (patch)
tree8e238ef906de5c40746411c4085c65aebc21d9fb /doc
parentdea1239b6dcaf072fc9b70e6af0c0a100cead69e (diff)
downloadnumpy-46d01eac68a09e9fd4b09c50b8c3b36dd85907f0.tar.gz
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