diff options
| author | rgommers <ralf.gommers@googlemail.com> | 2011-03-07 12:25:37 +0800 |
|---|---|---|
| committer | rgommers <ralf.gommers@googlemail.com> | 2011-03-07 12:25:37 +0800 |
| commit | 51b5c585890967283aa6ddcdbb9ff624f0ee4866 (patch) | |
| tree | e81b008e45b0da7813c2b2fabfdc2356c6e3306e /numpy/core/fromnumeric.py | |
| parent | 898e6bdc625cdd3c97865ef99f8d51c5f43eafff (diff) | |
| download | numpy-51b5c585890967283aa6ddcdbb9ff624f0ee4866.tar.gz | |
DOC: add a few more wiki edits, and move umath docs to correct place.
Diffstat (limited to 'numpy/core/fromnumeric.py')
| -rw-r--r-- | numpy/core/fromnumeric.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index d66e5cb68..602c0ebc5 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -1788,8 +1788,10 @@ def amax(a, axis=None, out=None): Returns ------- - amax : ndarray - A new array or scalar array with the result. + amax : ndarray or scalar + Maximum of `a`. If `axis` is None, the result is a scalar value. + If `axis` is given, the result is an array of dimension + ``a.ndim - 1``. See Also -------- |