summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/f2py/f2py.12
-rw-r--r--doc/numpybook/capi.lyx2
-rw-r--r--doc/source/f2py/usage.rst2
-rw-r--r--doc/source/reference/c-api.array.rst14
4 files changed, 16 insertions, 4 deletions
diff --git a/doc/f2py/f2py.1 b/doc/f2py/f2py.1
index 279647424..7f51ea29d 100644
--- a/doc/f2py/f2py.1
+++ b/doc/f2py/f2py.1
@@ -53,7 +53,7 @@ Do [not] lower the cases in <fortran files>. By default, \-\-lower is
assumed with \-h key, and \-\-no\-lower without \-h key.
.TP
.B \-\-build\-dir <dirname>
-All f2py generated files are created in <dirname>. Default is tempfile.mktemp().
+All f2py generated files are created in <dirname>. Default is tempfile.mkdtemp().
.TP
.B \-\-overwrite\-signature
Overwrite existing signature file.
diff --git a/doc/numpybook/capi.lyx b/doc/numpybook/capi.lyx
index a5c835523..b14d5c4f5 100644
--- a/doc/numpybook/capi.lyx
+++ b/doc/numpybook/capi.lyx
@@ -13529,7 +13529,7 @@ PyArray_Descr*
\end_layout
\begin_layout Description
-PyArrayDescr_Check (
+PyArray_DescrCheck (
\family typewriter
int
\family default
diff --git a/doc/source/f2py/usage.rst b/doc/source/f2py/usage.rst
index 2f9017faa..a6f093154 100644
--- a/doc/source/f2py/usage.rst
+++ b/doc/source/f2py/usage.rst
@@ -183,7 +183,7 @@ Other options:
without the ``-h`` switch.
``--build-dir <dirname>``
All F2PY generated files are created in ``<dirname>``. Default is
- ``tempfile.mktemp()``.
+ ``tempfile.mkdtemp()``.
``--quiet``
Run quietly.
``--verbose``
diff --git a/doc/source/reference/c-api.array.rst b/doc/source/reference/c-api.array.rst
index 323ca0655..351b4238e 100644
--- a/doc/source/reference/c-api.array.rst
+++ b/doc/source/reference/c-api.array.rst
@@ -1877,6 +1877,18 @@ Calculation
Equivalent to :meth:`ndarray.argmin` (*self*, *axis*). Return the index of
the smallest element of *self* along *axis*.
+
+
+
+.. note::
+
+ The out argument specifies where to place the result. If out is
+ NULL, then the output array is created, otherwise the output is
+ placed in out which must be the correct size and type. A new
+ reference to the ouput array is always returned even when out
+ is not NULL. The caller of the routine has the responsability
+ to ``DECREF`` out if not NULL or a memory-leak will occur.
+
.. cfunction:: PyObject* PyArray_Max(PyArrayObject* self, int axis, PyArrayObject* out)
Equivalent to :meth:`ndarray.max` (*self*, *axis*). Return the largest
@@ -2583,7 +2595,7 @@ Data-type descriptors
unless otherwise noted. Therefore, you must own a reference to any
data-type object used as input to such a function.
-.. cfunction:: int PyArrayDescr_Check(PyObject* obj)
+.. cfunction:: int PyArray_DescrCheck(PyObject* obj)
Evaluates as true if *obj* is a data-type object ( :ctype:`PyArray_Descr *` ).