summaryrefslogtreecommitdiff
path: root/doc/neps
diff options
context:
space:
mode:
authorPeter Andreas Entschev <peter@entschev.com>2020-08-19 18:56:35 +0200
committerGitHub <noreply@github.com>2020-08-19 18:56:35 +0200
commitf1d156219ea154a469d6d2b0d0cc4883c53ceba9 (patch)
tree26b9bb0138a36c0191392c0dc6810dd1ef8a4957 /doc/neps
parent17620c2ecb3dc6c2ab3164fa946c373a120d5619 (diff)
downloadnumpy-f1d156219ea154a469d6d2b0d0cc4883c53ceba9.tar.gz
Update doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Diffstat (limited to 'doc/neps')
-rw-r--r--doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst b/doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst
index c1edfa750..e31f975e7 100644
--- a/doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst
+++ b/doc/neps/nep-0035-array-creation-dispatch-with-array-function.rst
@@ -124,7 +124,7 @@ strictly on arrays, which are the objects we can use ``__array_function__``
with.
Dask uses a graph computing model, meaning it breaks down a large problem in
-many smaller problems and merge their results to reach the final result. To
+many smaller problems and merges their results to reach the final result. To
break the problem down into smaller ones, Dask also breaks arrays into smaller
arrays, that it calls "chunks". A Dask array can thus consist of one or more
chunks and they may be of different types. However, in the context of