aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaorye2013-09-10 09:57:45 +0200
committerPete Bacon Darwin2013-09-10 22:09:01 +0100
commitae2fd55575af2a195f59c3c63224e7be9c0b3c40 (patch)
tree917f2a8f3cb62b107c1bb1a73f68425f3f6ff936
parentf102fb75b6d83085bd4832d9c8bb02475cc22875 (diff)
downloadangular.js-ae2fd55575af2a195f59c3c63224e7be9c0b3c40.tar.bz2
docs($q): clarify what happens when rejected
Closes #3943
-rw-r--r--src/ng/q.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ng/q.js b/src/ng/q.js
index bf235640..f145b0d4 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -377,8 +377,8 @@ function qFactory(nextTick, exceptionHandler) {
* @param {Array.<Promise>} promises An array of promises.
* @returns {Promise} Returns a single promise that will be resolved with an array of values,
* each value corresponding to the promise at the same index in the `promises` array. If any of
- * the promises is resolved with a rejection, this resulting promise will be resolved with the
- * same rejection.
+ * the promises is resolved with a rejection, this resulting promise will be rejected with the
+ * same rejection value.
*/
function all(promises) {
var deferred = defer(),