diff options
| author | Jaime <jaime.frio@gmail.com> | 2015-02-17 07:09:40 -0800 |
|---|---|---|
| committer | Jaime <jaime.frio@gmail.com> | 2015-02-17 07:09:40 -0800 |
| commit | 4065adbcc4e9d320f41b78922a906f16c6add7cc (patch) | |
| tree | bf6e594bff28ce065cfb6d33e16afdcabf26f47f /numpy | |
| parent | 564a5a294de4c96bf1a3e0a91eeac780f7f3ffb6 (diff) | |
| parent | 6acf2969b5b35551dc3363881f4067c18052777a (diff) | |
| download | numpy-4065adbcc4e9d320f41b78922a906f16c6add7cc.tar.gz | |
Merge pull request #5576 from levitsky/master
MAINT: Fix an error in fmax docstring
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/ufunc_docstrings.py | 2 |
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 |