docs(guide/*): fix typos and links

gkalpak · caitp · commit df3d7396544d · 2014-10-27T12:32:30.000-04:00
Fix some typos and link-errors introduced in angular@d1ccf17. Related to angular#9786 Closes angular#9800
diff --git a/docs/content/guide/bootstrap.ngdoc b/docs/content/guide/bootstrap.ngdoc
@@ -73,7 +73,7 @@ If the {@link ng.directive:ngApp `ng-app`} directive is found then Angular will:
 </html>
 ```
 
-As a best practice, consider consider adding an `ng-strict-di` directive on the same element as
+As a best practice, consider adding an `ng-strict-di` directive on the same element as
 `ng-app`:
 
 
diff --git a/docs/content/guide/di.ngdoc b/docs/content/guide/di.ngdoc
@@ -29,7 +29,7 @@ and "value" components as dependencies, but they can also be provided with speci
 components as dependencies. Note that you cannot inject "providers" into `run` blocks.
 
 - The `config` method accepts a function, which can be injected with "provider" and "constant"
-components as dependencies.  Note that you cannot inject "service" or "value" components into
+components as dependencies. Note that you cannot inject "service" or "value" components into
 configuration.
 
 See {@link module#module-loading-dependencies Modules} for more details about `run` and `config`
@@ -56,8 +56,8 @@ angular.module('myModule', [])
 
 ### Module Methods
 
-We can specify functions to run at configuration and run time for a module by calling the `run` and
-`config` methods. These functions are injectable with dependencies just like the factory functions
+We can specify functions to run at configuration and run time for a module by calling the `config`
+and `run` methods. These functions are injectable with dependencies just like the factory functions
 above.
 
 ```js
@@ -93,8 +93,9 @@ Moreover, additional dependencies are made available to Controllers:
 * {@link scope `$scope`}: Controllers are associated with an element in the DOM and so are
   provided with access to the {@link scope scope}. Other components (like services) only have
   access to the {@link $rootScope `$rootScope`} service.
-* {@link `$route`} resolves: If a controller is instantiated as part of a route, then any values that
-  are resolved as part of the route are made available for injection into the controller.
+* {@link ngRoute.$routeProvider#when resolves}: If a controller is instantiated as part of a route,
+  then any values that are resolved as part of the route are made available for injection into the
+  controller.
 
 
 ## Dependency Annotation
@@ -128,8 +129,6 @@ parameters in the function declaration.
 
 ### `$inject` Property Annotation
 
-Rather than pass an array to the `controller
-
 To allow the minifiers to rename the function parameters and still be able to inject the right services,
 the function needs to be annotated with the `$inject` property. The `$inject` property is an array
 of service names to inject.
@@ -175,7 +174,7 @@ However this method will not work with JavaScript minifiers/obfuscators because
 rename parameters.
 
 Tools like [ng-annotate](https://github.com/olov/ng-annotate) let you use implicit dependency
-annotations in your app and automatically add annotations array notation prior to minifying.
+annotations in your app and automatically add inline array annotations prior to minifying.
 If you decide to take this approach, you probably want to use `ng-strict-di`.
 
 Because of these caveats, we recommend avoiding this style of annotation.
