aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng
diff options
context:
space:
mode:
authornaorye2013-09-10 09:57:45 +0200
committerPete Bacon Darwin2013-09-10 22:06:04 +0100
commitd63a50c3c306377b3b1afd3e36ff821b6e23bfeb (patch)
treea1fe1f78fa929a584c95dbb0e45899f2d663e497 /src/ng
parentce351e69b15c3f55287a976e027e0e75b94aa89f (diff)
downloadangular.js-d63a50c3c306377b3b1afd3e36ff821b6e23bfeb.tar.bz2
docs($q): clarify what happens when rejected
Closes #3943
Diffstat (limited to 'src/ng')
-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 a9eed738..be5bd6f4 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -480,8 +480,8 @@ function qFactory(nextTick, exceptionHandler) {
* @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
* @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
* each value corresponding to the promise at the same index/key in the `promises` array/hash. 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(),