aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/controller.js
diff options
context:
space:
mode:
authorPeter Bacon Darwin2014-02-06 13:33:42 +0000
committerPeter Bacon Darwin2014-02-16 19:03:40 +0000
commit2e641ac49f121a6e2cc70bd3879930b44a8a7710 (patch)
tree11d52a598b7de52f7c31a1cc4405cba53f0a46ea /src/ng/controller.js
parent1ca22a3dc8a469dc81718e5f0ae28225a2b7f7b2 (diff)
downloadangular.js-2e641ac49f121a6e2cc70bd3879930b44a8a7710.tar.bz2
docs(bike-shed-migration): convert doctype and names
Diffstat (limited to 'src/ng/controller.js')
-rw-r--r--src/ng/controller.js15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/ng/controller.js b/src/ng/controller.js
index 938fbfbe..1a610b9c 100644
--- a/src/ng/controller.js
+++ b/src/ng/controller.js
@@ -1,8 +1,8 @@
'use strict';
/**
- * @ngdoc object
- * @name ng.$controllerProvider
+ * @ngdoc provider
+ * @name $controllerProvider
* @description
* The {@link ng.$controller $controller service} is used by Angular to create new
* controllers.
@@ -16,9 +16,8 @@ function $ControllerProvider() {
/**
- * @ngdoc function
- * @name ng.$controllerProvider#register
- * @methodOf ng.$controllerProvider
+ * @ngdoc method
+ * @name $controllerProvider#register
* @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
@@ -37,8 +36,8 @@ function $ControllerProvider() {
this.$get = ['$injector', '$window', function($injector, $window) {
/**
- * @ngdoc function
- * @name ng.$controller
+ * @ngdoc service
+ * @name $controller
* @requires $injector
*
* @param {Function|string} constructor If called with a function then it's considered to be the
@@ -55,7 +54,7 @@ function $ControllerProvider() {
* @description
* `$controller` service is responsible for instantiating controllers.
*
- * It's just a simple call to {@link AUTO.$injector $injector}, but extracted into
+ * It's just a simple call to {@link auto.$injector $injector}, but extracted into
* a service, so that one can override this service with {@link https://gist.github.com/1649788
* BC version}.
*/