From 5bb9ba2c54b341aa9d6a26934831f5b72f24ddac Mon Sep 17 00:00:00 2001
From: David Bennett
Date: Mon, 23 Sep 2013 21:45:48 -0400
Subject: docs(angular.Module): fix controller and directive method parameters

---
 src/loader.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/loader.js')

diff --git a/src/loader.js b/src/loader.js
index 86fb4aa5..0edb7b87 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -216,7 +216,8 @@ function setupModuleLoader(window) {
            * @ngdoc method
            * @name angular.Module#controller
            * @methodOf angular.Module
-           * @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} constructor Controller constructor function.
            * @description
            * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
@@ -227,7 +228,8 @@ function setupModuleLoader(window) {
            * @ngdoc method
            * @name angular.Module#directive
            * @methodOf angular.Module
-           * @param {string} name directive name
+           * @param {string|Object} name Directive name, or an object map of directives where the
+           *    keys are the names and the values are the factories.
            * @param {Function} directiveFactory Factory function for creating new instance of
            * directives.
            * @description
-- 
cgit v1.2.3