7 files changed, 17 insertions, 18 deletions
diff --git a/docs/content/guide/concepts.ngdoc b/docs/content/guide/concepts.ngdoc
index 105af400..5b4c8217 100644
--- a/docs/content/guide/concepts.ngdoc
+++ b/docs/content/guide/concepts.ngdoc
@@ -86,7 +86,7 @@ in the rest of the documentation.
 Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
 and multiply them together".
 
-The example above also contains a <a name="filter">"{@link filter filter}"</a>.
+The example above also contains a <a name="filter">"{@link guide/filter filter}"</a>.
 A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
diff --git a/docs/content/guide/controller.ngdoc b/docs/content/guide/controller.ngdoc
index cdcd3752..6a75f090 100644
--- a/docs/content/guide/controller.ngdoc
+++ b/docs/content/guide/controller.ngdoc
@@ -109,7 +109,7 @@ logic. Angular offers {@link databinding databinding} for automatic DOM manipula
 you have to perform your own manual DOM manipulation, encapsulate the presentation logic in
 {@link guide/directive directives}.
 - Input formatting — Use {@link forms angular form controls} instead.
-- Output filtering — Use {@link filter angular filters} instead.
+- Output filtering — Use {@link guide/filter angular filters} instead.
 - Sharing stateless or stateful code across Controllers — Use {@link dev_guide.services angular
 services} instead.
 - Managing the life-cycle of other components (for example, to create service instances).
diff --git a/docs/content/guide/dev_guide.e2e-testing.ngdoc b/docs/content/guide/dev_guide.e2e-testing.ngdoc
index da2dc48a..74280db3 100644
--- a/docs/content/guide/dev_guide.e2e-testing.ngdoc
+++ b/docs/content/guide/dev_guide.e2e-testing.ngdoc
@@ -4,7 +4,7 @@
 @description
 
 **Angular Scenario Runner is in maintenance mode - If you're starting a new Angular project,
-consider using {@link https://github.com/angular/protractor Protractor}.**
+consider using [Protractor](https://github.com/angular/protractor).**
 
 
 
diff --git a/docs/content/guide/dev_guide.services.$location.ngdoc b/docs/content/guide/dev_guide.services.$location.ngdoc
index 57739f9f..87d90ebd 100644
--- a/docs/content/guide/dev_guide.services.$location.ngdoc
+++ b/docs/content/guide/dev_guide.services.$location.ngdoc
@@ -635,10 +635,9 @@ then uses the information it obtains to compose hashbang URLs (such as
 ## Two-way binding to $location
 
 The Angular's compiler currently does not support two-way binding for methods (see [issue](https://github.com/angular/angular.js/issues/404)).  If you should require two-way binding
-to the $location object (using {@link ng.directive:input.text
-ngModel} directive on an input field), you will need to specify an extra model property
-(e.g. `locationPath`) with two watchers which push $location updates in both directions. For
-example:
+to the $location object (using {@link input[text] ngModel} directive on an input
+field), you will need to specify an extra model property (e.g. `locationPath`) with two watchers
+which push $location updates in both directions. For example:
 <example>
 <file name="index.html">
 <div ng-controller="LocationController">
diff --git a/docs/content/guide/expression.ngdoc b/docs/content/guide/expression.ngdoc
index 583fa5fd..eda2f4b7 100644
--- a/docs/content/guide/expression.ngdoc
+++ b/docs/content/guide/expression.ngdoc
@@ -4,7 +4,7 @@
 
 Expressions are JavaScript-like code snippets that are usually placed in bindings such as `{{
 expression }}`. Expressions are processed by the {@link ng.$parse $parse}
-service. Expressions are often post processed using {@link filter filters} to create a more user-friendly format.
+service. Expressions are often post processed using {@link guide/filter filters} to create a more user-friendly format.
 
 For example, these are all valid expressions in angular:
 
diff --git a/docs/content/guide/forms.ngdoc b/docs/content/guide/forms.ngdoc
index d5f59d18..2ef5e218 100644
--- a/docs/content/guide/forms.ngdoc
+++ b/docs/content/guide/forms.ngdoc
@@ -14,7 +14,7 @@ Server-side validation is still necessary for a secure application.
 # Simple form
 The key directive in understanding two-way data-binding is {@link ng.directive:ngModel ngModel}.
 The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view, as well as view to the model.
-In addition it provides an {@link ng.directive:ngModel.NgModelController API} for other directives to augment its behavior.
+In addition it provides an {@link ngModel.NgModelController API} for other directives to augment its behavior.
 
 <doc:example>
 <doc:source>
@@ -113,11 +113,11 @@ This ensures that the user is not distracted with an error until after interacti
 
 # Binding to form and control state
 
-A form is an instance of {@link ng.directive:form.FormController FormController}.
+A form is an instance of {@link form.FormController FormController}.
 The form instance can optionally be published into the scope using the `name` attribute.
 
 Similarly, an input control that has the {@link ng.directive:ngModel ngModel} directive holds an
-instance of {@link ng.directive:ngModel.NgModelController NgModelController}.
+instance of {@link ngModel.NgModelController NgModelController}.
 Such a control instance can be published as a property of the form instance using the `name` attribute
 on the input control.  The name attribute specifies the name of the property on the form instance.
 
@@ -184,18 +184,18 @@ This allows us to extend the above example with these features:
 # Custom Validation
 
 Angular provides basic implementation for most common html5 {@link ng.directive:input input}
-types: ({@link ng.directive:input.text text}, {@link ng.directive:input.number number}, {@link ng.directive:input.url url}, {@link ng.directive:input.email email}, {@link ng.directive:input.radio radio}, {@link ng.directive:input.checkbox checkbox}), as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`, `min`, `max`).
+types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url}, {@link input[email] email}, {@link input[radio] radio}, {@link input[checkbox] checkbox}), as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`, `min`, `max`).
 
-Defining your own validator can be done by defining your own directive which adds a custom validation function to the `ngModel` {@link ng.directive:ngModel.NgModelController controller}.
+Defining your own validator can be done by defining your own directive which adds a custom validation function to the `ngModel` {@link ngModel.NgModelController controller}.
 To get a hold of the controller the directive specifies a dependency as shown in the example below.
 The validation can occur in two places:
 
   * **Model to View update** -
-    Whenever the bound model changes, all functions in {@link ng.directive:ngModel.NgModelController#properties_$formatters NgModelController#$formatters} array are pipe-lined, so that each of these functions has an opportunity to format the value and change validity state of the form control through {@link ng.directive:ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}.
+    Whenever the bound model changes, all functions in {@link ngModel.NgModelController#properties_$formatters NgModelController#$formatters} array are pipe-lined, so that each of these functions has an opportunity to format the value and change validity state of the form control through {@link ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}.
 
   * **View to Model update** -
-    In a similar way, whenever a user interacts with a control it calls {@link ng.directive:ngModel.NgModelController#methods_$setViewValue NgModelController#$setViewValue}.
-This in turn pipelines all functions in the {@link ng.directive:ngModel.NgModelController#properties_$parsers NgModelController#$parsers} array, so that each of these functions has an opportunity to convert the value and change validity state of the form control through {@link ng.directive:ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}.
+    In a similar way, whenever a user interacts with a control it calls {@link ngModel.NgModelController#methods_$setViewValue NgModelController#$setViewValue}.
+This in turn pipelines all functions in the {@link ngModel.NgModelController#properties_$parsers NgModelController#$parsers} array, so that each of these functions has an opportunity to convert the value and change validity state of the form control through {@link ngModel.NgModelController#methods_$setValidity NgModelController#$setValidity}.
 
 In the following example we create two directives.
 
diff --git a/docs/content/guide/templates.ngdoc b/docs/content/guide/templates.ngdoc
index bd8bfd89..92aee6ee 100644
--- a/docs/content/guide/templates.ngdoc
+++ b/docs/content/guide/templates.ngdoc
@@ -14,7 +14,7 @@ These are the types of Angular elements and element attributes you can use in a
   augments an existing DOM element or represents a reusable DOM component - a widget.
 * {@link ng.$interpolate Markup} — The double
 curly brace notation `{{ }}` to bind expressions to elements is built-in angular markup.
-* {@link filter Filter} — Formats your data for display to the user.
+* {@link guide/filter Filter} — Formats your data for display to the user.
 * {@link forms Form controls} — Lets you validate user input.
 
 Note:  In addition to declaring the elements above in templates, you can also access these elements
@@ -49,7 +49,7 @@ eight.
 
 ## Related Topics
 
-* {@link filter Angular Filters}
+* {@link guide/filter Angular Filters}
 * {@link forms Angular Forms}
 
 ## Related API