diff options
| author | Frederic Bastien <nouiz@nouiz.org> | 2016-10-12 13:21:31 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-10-17 16:58:50 -0600 |
| commit | 811c90567c136bc77cc1343f3ec61b4534d22be5 (patch) | |
| tree | 2c0bd98825db07312c1ca70d6b6a9a8d8fa881e5 /doc/source/reference/c-api.array.rst | |
| parent | 9569e504bd1363e2e9dba693a29d30ee3dd55056 (diff) | |
| download | numpy-811c90567c136bc77cc1343f3ec61b4534d22be5.tar.gz | |
DOC: Small c api doc fix for PyArray_Max.
[ci skip]
Diffstat (limited to 'doc/source/reference/c-api.array.rst')
| -rw-r--r-- | doc/source/reference/c-api.array.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst index 45de1896c..12841a312 100644 --- a/doc/source/reference/c-api.array.rst +++ b/doc/source/reference/c-api.array.rst @@ -1921,6 +1921,7 @@ Calculation Equivalent to :meth:`ndarray.max` (*self*, *axis*). Return the largest element of *self* along the given *axis*. + If it return only 1 element, return a numpy scalar, not an ndarray. .. c:function:: PyObject* PyArray_Min(PyArrayObject* self, int axis, PyArrayObject* out) @@ -2098,7 +2099,7 @@ Array Functions second-to-last dimension of *obj2*. For 2-d arrays this is a matrix-product. Neither array is conjugated. -.. c:function:: PyObject* PyArray_MatrixProduct2(PyObject* obj1, PyObject* obj, PyObject* out) +.. c:function:: PyObject* PyArray_MatrixProduct2(PyObject* obj1, PyObject* obj, PyArrayObject* out) .. versionadded:: 1.6 |