summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJay Bourque <jay.bourque@continuum.io>2013-07-13 16:39:27 -0500
committerJay Bourque <jay.bourque@continuum.io>2013-08-16 16:39:32 -0500
commitb4409294b227dec3813f1e06a76f43753b7fb5c7 (patch)
treedd83004e78bd5280a478bff676e68a28a111f961 /doc
parent2c37d3b6ec81ee6a86e4ae8f5713d48b6405cfb3 (diff)
downloadnumpy-b4409294b227dec3813f1e06a76f43753b7fb5c7.tar.gz
Update docs
Diffstat (limited to 'doc')
-rw-r--r--doc/release/1.8.0-notes.rst6
-rw-r--r--doc/source/reference/ufuncs.rst7
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/release/1.8.0-notes.rst b/doc/release/1.8.0-notes.rst
index c8d3b264b..1e7d00a74 100644
--- a/doc/release/1.8.0-notes.rst
+++ b/doc/release/1.8.0-notes.rst
@@ -188,9 +188,9 @@ computations.
In place fancy indexing for ufuncs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The function ``at`` has been added to ufunc objects to allow in place
-ufuncs using fancy indexing with no buffering. For example, the following
-will increment the first and second items in the array, and will increment
-the third item twice:
+ufuncs with no buffering when fancy indexing is used. For example, the
+following will increment the first and second items in the array, and will
+increment the third item twice:
numpy.add.at(array, [0, 1, 2, 2], 1)
This is similar to doing array[[0, 1, 2, 2]] += 1
diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst
index df301d0cf..acf9bf330 100644
--- a/doc/source/reference/ufuncs.rst
+++ b/doc/source/reference/ufuncs.rst
@@ -418,9 +418,10 @@ an integer (or Boolean) data-type and smaller than the size of the
(or :class:`uint`) data-type.
Ufuncs also have a fifth method that allows in place operations to be
-performed using fancy indexing. No buffering is used, so the fancy index
-can list an item more than once and the operation will be performed on the
-result of the previous operation for that item.
+performed using fancy indexing. No buffering is used on the dimensions where
+fancy indexing is used, so the fancy index can list an item more than once and
+the operation will be performed on the result of the previous operation for
+that item.
.. index::
pair: ufunc; methods