summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorseberg <sebastian@sipsolutions.net>2013-05-11 08:42:13 -0700
committerseberg <sebastian@sipsolutions.net>2013-05-11 08:42:13 -0700
commit4a1736a79f35be43deb50ac678504b2342e6b9f8 (patch)
treec845c34f20f9755fd98ec72fedca36b605d170c4 /doc
parentc6fc9a2d916797f1867d5ed49964be25e026736d (diff)
parentf9c95555c23cf5429a795ef73f8fb2b3941d434c (diff)
downloadnumpy-4a1736a79f35be43deb50ac678504b2342e6b9f8.tar.gz
Merge pull request #2701 from seberg/indexing
Fancy Indexing enhancements and bug fixes
Diffstat (limited to 'doc')
-rw-r--r--doc/release/1.8.0-notes.rst6
-rw-r--r--doc/source/reference/arrays.indexing.rst4
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/release/1.8.0-notes.rst b/doc/release/1.8.0-notes.rst
index e65658ad3..7a203bf6d 100644
--- a/doc/release/1.8.0-notes.rst
+++ b/doc/release/1.8.0-notes.rst
@@ -110,6 +110,12 @@ New `invert` argument to `in1d`
The function `in1d` now accepts a `invert` argument which, when `True`,
causes the returned array to be inverted.
+Advanced indexing using `np.newaxis`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+It is now possible to use `np.newaxis`/`None` together with index
+arrays instead of only in simple indices. This means that
+``array[np.newaxis, [0, 1]]`` will now work as expected.
+
C-API
~~~~~
diff --git a/doc/source/reference/arrays.indexing.rst b/doc/source/reference/arrays.indexing.rst
index f8966f5c1..e759b6ff8 100644
--- a/doc/source/reference/arrays.indexing.rst
+++ b/doc/source/reference/arrays.indexing.rst
@@ -170,8 +170,8 @@ concepts to remember include:
.. data:: newaxis
- The :const:`newaxis` object can be used in the basic slicing syntax
- discussed above. :const:`None` can also be used instead of
+ The :const:`newaxis` object can be used in all slicing operations
+ as discussed above. :const:`None` can also be used instead of
:const:`newaxis`.