aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/q.js
diff options
context:
space:
mode:
authorFrancesc Rosàs2013-04-15 18:27:36 +0300
committerPete Bacon Darwin2013-04-16 13:37:07 +0100
commitb8f0b432fd320f42da7c0c927ea7b9ccf87db210 (patch)
tree221f59b93e71b1d5b7b1a2653dfa5c0c39b0d5f9 /src/ng/q.js
parent0ac969a5ee1687cfd4517821943f34fe948bb3fc (diff)
downloadangular.js-b8f0b432fd320f42da7c0c927ea7b9ccf87db210.tar.bz2
docs($q): fix incorrect @returns tag for $q.when()
Diffstat (limited to 'src/ng/q.js')
-rw-r--r--src/ng/q.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ng/q.js b/src/ng/q.js
index 6cb92102..33ca663a 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -316,10 +316,7 @@ function qFactory(nextTick, exceptionHandler) {
* the promise comes from a source that can't be trusted.
*
* @param {*} value Value or a promise
- * @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.
+ * @returns {Promise} Returns a promise of the passed value or promise
*/
var when = function(value, callback, errback) {
var result = defer(),