summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
authorLev Levitsky <lev.levitsky@phystech.edu>2015-02-17 17:13:19 +0300
committerLev Levitsky <lev.levitsky@phystech.edu>2015-02-17 17:13:19 +0300
commit6acf2969b5b35551dc3363881f4067c18052777a (patch)
treebf6e594bff28ce065cfb6d33e16afdcabf26f47f /numpy/core
parent564a5a294de4c96bf1a3e0a91eeac780f7f3ffb6 (diff)
downloadnumpy-6acf2969b5b35551dc3363881f4067c18052777a.tar.gz
Fix an error in fmax docstring
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/code_generators/ufunc_docstrings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py
index 328e43ca6..bfa3ad221 100644
--- a/numpy/core/code_generators/ufunc_docstrings.py
+++ b/numpy/core/code_generators/ufunc_docstrings.py
@@ -2310,7 +2310,7 @@ add_newdoc('numpy.core.umath', 'fmax',
Returns
-------
y : ndarray or scalar
- The minimum of `x1` and `x2`, element-wise. Returns scalar if
+ The maximum of `x1` and `x2`, element-wise. Returns scalar if
both `x1` and `x2` are scalars.
See Also