diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-07-27 13:23:17 -0500 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-07-27 13:23:17 -0500 |
| commit | 656cf247e531c1ebfb69e864e00620b10082b120 (patch) | |
| tree | da9b09ea7d81664f43f4f4160c502ed1c0c365d1 /doc/source | |
| parent | 9ae5b5fab9f0c04c31c5d4b67d00c3cc79062731 (diff) | |
| parent | 638e627c813590a91514b255aeb13a34dc2ac51e (diff) | |
| download | numpy-656cf247e531c1ebfb69e864e00620b10082b120.tar.gz | |
Merge pull request #4905 from juliantaylor/doc-update
documentation updates
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/reference/c-api.types-and-structures.rst | 2 | ||||
| -rw-r--r-- | doc/source/reference/routines.array-manipulation.rst | 2 | ||||
| -rw-r--r-- | doc/source/reference/routines.ma.rst | 3 | ||||
| -rw-r--r-- | doc/source/reference/routines.maskna.rst | 11 |
4 files changed, 6 insertions, 12 deletions
diff --git a/doc/source/reference/c-api.types-and-structures.rst b/doc/source/reference/c-api.types-and-structures.rst index 4e32ab7be..95272c151 100644 --- a/doc/source/reference/c-api.types-and-structures.rst +++ b/doc/source/reference/c-api.types-and-structures.rst @@ -244,7 +244,7 @@ PyArrayDescr_Type Indicates that items of this data-type must be reference counted (using :cfunc:`Py_INCREF` and :cfunc:`Py_DECREF` ). - .. cvar:: NPY_ITEM_LISTPICKLE + .. cvar:: NPY_LIST_PICKLE Indicates arrays of this data-type must be converted to a list before pickling. diff --git a/doc/source/reference/routines.array-manipulation.rst b/doc/source/reference/routines.array-manipulation.rst index ca97bb479..81af0a315 100644 --- a/doc/source/reference/routines.array-manipulation.rst +++ b/doc/source/reference/routines.array-manipulation.rst @@ -54,6 +54,8 @@ Changing kind of array asmatrix asfarray asfortranarray + ascontiguousarray + asarray_chkfinite asscalar require diff --git a/doc/source/reference/routines.ma.rst b/doc/source/reference/routines.ma.rst index 5cb38e83f..66bcb1f1c 100644 --- a/doc/source/reference/routines.ma.rst +++ b/doc/source/reference/routines.ma.rst @@ -65,6 +65,8 @@ Inspecting the array ma.nonzero ma.shape ma.size + ma.is_masked + ma.is_mask ma.MaskedArray.data ma.MaskedArray.mask @@ -141,6 +143,7 @@ Joining arrays ma.column_stack ma.concatenate + ma.append ma.dstack ma.hstack ma.vstack diff --git a/doc/source/reference/routines.maskna.rst b/doc/source/reference/routines.maskna.rst deleted file mode 100644 index 2910acbac..000000000 --- a/doc/source/reference/routines.maskna.rst +++ /dev/null @@ -1,11 +0,0 @@ -NA-Masked Array Routines -======================== - -.. currentmodule:: numpy - -NA Values ---------- -.. autosummary:: - :toctree: generated/ - - isna |