diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-05-20 08:11:00 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-05-20 08:11:00 -0700 |
| commit | de166d31c083bbb2c288ada15900f98a4245d596 (patch) | |
| tree | 28dd898d9a4910c3870100cdab6e83eb7da92480 /doc | |
| parent | 7d188bf1c9ac5bf7ee41e0794d59771802b345bf (diff) | |
| parent | 0a079b01f29919a66d4ea89767663bd875c6c1cc (diff) | |
| download | numpy-de166d31c083bbb2c288ada15900f98a4245d596.tar.gz | |
Merge pull request #3339 from endolith/min_max_docstrings
DOC: Min max docstrings
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/reference/routines.math.rst | 2 | ||||
| -rw-r--r-- | doc/source/reference/ufuncs.rst | 4 |
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 ------------------ |