summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authornazomikan <nazomikan@gmail.com>2014-05-24 05:03:21 +0900
committernazomikan <nazomikan@gmail.com>2014-05-24 05:03:21 +0900
commit2bcb2f1a9bedffd2aee718e2f86de54a3ce9f08a (patch)
treebbcee09ca29d1840462708caf0594b424e7397d1 /README.md
parent4cb992f7887ec1b414e356db1fe3a8de882ab70e (diff)
parent66ca10e52795707ca436154bddc38c560864e91c (diff)
downloadasync-2bcb2f1a9bedffd2aee718e2f86de54a3ce9f08a.tar.gz
Merge branch 'master' into patch
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 0bea531..8f4e98c 100644
--- a/README.md
+++ b/README.md
@@ -182,7 +182,7 @@ __Arguments__
* `arr` - An array to iterate over.
* `iterator(item, callback)` - A function to apply to each item in `arr`.
The iterator is passed a `callback(err)` which must be called once it has
- completed. If no error has occured, the `callback` should be run without
+ completed. If no error has occurred, the `callback` should be run without
arguments or with an explicit `null` argument.
* `callback(err)` - A callback which is called when all `iterator` functions
have finished, or an error occurs.
@@ -256,7 +256,7 @@ __Arguments__
* `limit` - The maximum number of `iterator`s to run at any time.
* `iterator(item, callback)` - A function to apply to each item in `arr`.
The iterator is passed a `callback(err)` which must be called once it has
- completed. If no error has occured, the callback should be run without
+ completed. If no error has occurred, the callback should be run without
arguments or with an explicit `null` argument.
* `callback(err)` - A callback which is called when all `iterator` functions
have finished, or an error occurs.
@@ -280,7 +280,7 @@ async.eachLimit(documents, 20, requestApi, function(err){
Produces a new array of values by mapping each value in `arr` through
the `iterator` function. The `iterator` is called with an item from `arr` and a
callback for when it has finished processing. Each of these callback takes 2 arguments:
-an `error`, and the transformed item from `arr`. If `iterator` passes an error to this
+an `error`, and the transformed item from `arr`. If `iterator` passes an error to his
callback, the main `callback` (for the `map` function) is immediately called with the error.
Note, that since this function applies the `iterator` to each item in parallel,