aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/controller.js
diff options
context:
space:
mode:
authorDavid Bennett2013-09-23 21:45:48 -0400
committerBrian Ford2013-09-27 16:10:43 -0700
commit5bb9ba2c54b341aa9d6a26934831f5b72f24ddac (patch)
treef79a5027089db8743136481cdedcd8a6157c9e3d /src/ng/controller.js
parente5eeb2e825873977fe3a850f16a658b3783300a2 (diff)
downloadangular.js-5bb9ba2c54b341aa9d6a26934831f5b72f24ddac.tar.bz2
docs(angular.Module): fix controller and directive method parameters
Diffstat (limited to 'src/ng/controller.js')
-rw-r--r--src/ng/controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ng/controller.js b/src/ng/controller.js
index 2078eef8..2203c698 100644
--- a/src/ng/controller.js
+++ b/src/ng/controller.js
@@ -19,7 +19,8 @@ function $ControllerProvider() {
* @ngdoc function
* @name ng.$controllerProvider#register
* @methodOf ng.$controllerProvider
- * @param {string} name Controller name
+ * @param {string|Object} name Controller name, or an object map of controllers where the keys are
+ * the names and the values are the constructors.
* @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI
* annotations in the array notation).
*/