summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 18:31:39 -0800
committerCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 18:31:39 -0800
commit54f995b7da6d17f6b4d9203781bc05450ad4ed53 (patch)
tree7abd675b11754b023fa7f3fa082449959726b90d
parentee3f97447b73d22e3e7e4ded5c976f2f6795d26c (diff)
parentda6d2cbea21cf0ba79248e7b1095648e5e53c4c8 (diff)
downloadasync-54f995b7da6d17f6b4d9203781bc05450ad4ed53.tar.gz
Merge pull request #77 from insin/auto-docs
Updated docs about async.auto results
-rw-r--r--README.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/README.md b/README.md
index f28b514..0cf7fc9 100644
--- a/README.md
+++ b/README.md
@@ -752,7 +752,7 @@ and each function is run as soon as its requirements are satisfied. If any of
the functions pass an error to their callback, that function will not complete
(so any other functions depending on it will not run) and the main callback
will be called immediately with the error. Functions also receive an object
-containing the results of functions on which they depend.
+containing the results of functions which have completed so far.
__Arguments__
@@ -760,8 +760,10 @@ __Arguments__
requirements, with the function itself the last item in the array. The key
used for each function or array is used when specifying requirements. The
syntax is easier to understand by looking at the example.
-* callback(err) - An optional callback which is called when all the tasks have
- been completed. The callback may receive an error as an argument.
+* callback(err, results) - An optional callback which is called when all the
+ tasks have been completed. The callback will receive an error as an argument
+ if any tasks pass an error to their callback. If all tasks complete
+ successfully, it will receive an object containing their results.
__Example__
@@ -802,14 +804,14 @@ series functions would look like this:
// once there is some data and the directory exists,
// write the data to a file in the directory
},
- email_link: ['write_file', function(callback){
+ email_link: function(callback){
// once the file is written let's email a link to it...
}
]);
});
For a complicated series of async tasks using the auto function makes adding
-new tasks much easier and makes the code more readable.
+new tasks much easier and makes the code more readable.
---------------------------------------