summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorendolith <endolith@gmail.com>2013-05-19 21:50:35 -0400
committerendolith <endolith@gmail.com>2013-05-19 21:50:35 -0400
commit0a079b01f29919a66d4ea89767663bd875c6c1cc (patch)
tree3ccab20c78fcdf527bced50b15d07e324757ce42 /doc
parentf40e9d53548a5033d1fd2c68c8257dddea14e9f1 (diff)
downloadnumpy-0a079b01f29919a66d4ea89767663bd875c6c1cc.tar.gz
DOC: add fmax/fmin to ufuncs list and math routines list
Diffstat (limited to 'doc')
-rw-r--r--doc/source/reference/routines.math.rst2
-rw-r--r--doc/source/reference/ufuncs.rst4
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/reference/routines.math.rst b/doc/source/reference/routines.math.rst
index 7ce77c24d..0e7a60b76 100644
--- a/doc/source/reference/routines.math.rst
+++ b/doc/source/reference/routines.math.rst
@@ -143,6 +143,8 @@ Miscellaneous
sign
maximum
minimum
+ fmax
+ fmin
nan_to_num
real_if_close
diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst
index dcd4ae6d0..2154bca37 100644
--- a/doc/source/reference/ufuncs.rst
+++ b/doc/source/reference/ufuncs.rst
@@ -604,6 +604,10 @@ Comparison functions
``a > b`` and uses it to return either `a` or `b` (as a whole). A similar
difference exists between ``minimum(a, b)`` and ``min(a, b)``.
+.. autosummary::
+
+ fmax
+ fmin
Floating functions
------------------