summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2015-11-12 09:51:42 -0700
committerCharles Harris <charlesr.harris@gmail.com>2015-11-12 09:51:42 -0700
commit76a75953e35b2916dfd88eaadf748c3333d0afd7 (patch)
treeb82ecc9bce3d1bcac7054c7145f9bb07cf0125a2
parent1d511429ac04d137c3d9ec7da9160bec7baa2829 (diff)
parent296b0b78fd381116b0e26c14ed5caaf1c07575a8 (diff)
downloadnumpy-76a75953e35b2916dfd88eaadf748c3333d0afd7.tar.gz
Merge pull request #6671 from floatingpointstack/maint6670
MAINT: Typo in arrays.indexing.rst Issue#6670
-rw-r--r--doc/source/reference/arrays.indexing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/reference/arrays.indexing.rst b/doc/source/reference/arrays.indexing.rst
index 228e9a8d4..50b2492d2 100644
--- a/doc/source/reference/arrays.indexing.rst
+++ b/doc/source/reference/arrays.indexing.rst
@@ -193,7 +193,7 @@ basic slicing that returns a :term:`view`).
fundamentally different than ``x[(1,2,3)]``. The latter is
equivalent to ``x[1,2,3]`` which will trigger basic selection while
the former will trigger advanced indexing. Be sure to understand
- why this is occurs.
+ why this occurs.
Also recognize that ``x[[1,2,3]]`` will trigger advanced indexing,
whereas ``x[[1,2,slice(None)]]`` will trigger basic slicing.