diff --git a/docs/content/api/angular.directive.ngdoc b/docs/content/api/angular.directive.ngdoc
index 9a08e4c7..277830b9 100644
--- a/docs/content/api/angular.directive.ngdoc
+++ b/docs/content/api/angular.directive.ngdoc
@@ -32,8 +32,8 @@ attribute. So why have two different ways to do the same thing? The answer is th
 matters, but we have no control over the order in which attributes are read. To solve this
 we apply attribute widget before the directive.
 
-For example, consider this piece of HTML, which uses the directives `ng:repeat`, `ng:init`,
-and `ng:bind`:
+For example, consider this piece of HTML, which uses the `ng:repeat`, `ng:init`,
+and `ng:bind` widget and directives:
 <pre>
   <ul ng:init="people=['mike', 'mary']">
     <li ng:repeat="person in people" ng:init="a=a+1" ng:bind="person"></li>
@@ -41,7 +41,7 @@ and `ng:bind`:
 </pre>
 
 Notice that the order of execution matters here. We need to execute
-{@link angular.directive.ng:repeat ng:repeat} before we run the
+{@link angular.widget.@ng:repeat ng:repeat} before we run the
 {@link angular.directive.ng:init ng:init} and `ng:bind` on the `<li/>;`. This is because we
 want to run the `ng:init="a=a+1` and `ng:bind="person"` once for each person in people. We
 could not have used directive to create this template because attributes are read in an
diff --git a/docs/content/cookbook/form.ngdoc b/docs/content/cookbook/form.ngdoc
index c9fd9e9a..9ccad1c2 100644
--- a/docs/content/cookbook/form.ngdoc
+++ b/docs/content/cookbook/form.ngdoc
@@ -91,7 +91,7 @@ allow a user to enter data.
 
 # Things to notice
 
-* The user data model is initialized {@link angular.ng:controller controller} and is available in
+* The user data model is initialized {@link angular.directive.@ng:controller controller} and is available in
   the {@link angular.scope scope} with the initial data.
 * For debugging purposes we have included a debug view of the model to better understand what
   is going on.
diff --git a/docs/content/cookbook/mvc.ngdoc b/docs/content/cookbook/mvc.ngdoc
index 94688547..470794b8 100644
--- a/docs/content/cookbook/mvc.ngdoc
+++ b/docs/content/cookbook/mvc.ngdoc
@@ -122,4 +122,4 @@ no connection between the controller and the view.
 * The view can call any controller function.
 * In this example, the `setUrl()` and `readUrl()` functions copy the game state to/from the URL's
   hash so the browser's back button will undo game steps. See deep-linking. This example calls
-  {@link angular.Scope.$watch $watch()} to set up a listener that invokes `readUrl()` when needed.
+  {@link angular.scope.$watch $watch()} to set up a listener that invokes `readUrl()` when needed.
diff --git a/docs/content/guide/guide.compiler.ngdoc b/docs/content/guide/compiler.ngdoc
similarity index 100%
rename from docs/content/guide/guide.compiler.ngdoc
rename to docs/content/guide/compiler.ngdoc
diff --git a/docs/content/guide/guide.css.ngdoc b/docs/content/guide/css.ngdoc
similarity index 93%
rename from docs/content/guide/guide.css.ngdoc
rename to docs/content/guide/css.ngdoc
index 6e028f30..435186c9 100644
--- a/docs/content/guide/guide.css.ngdoc
+++ b/docs/content/guide/css.ngdoc
@@ -20,7 +20,7 @@ by a solid red border, for example:
 
 
 
-You can try to evaluate malformed expressions in {@link angualr.expression expression} to see the
+You can try to evaluate malformed expressions in {@link guide.expression expression} to see the
 `ng-exception` class' styling.
 
 ## `ng-validation-error`
diff --git a/docs/content/guide/guide.di.ngdoc b/docs/content/guide/di.ngdoc
similarity index 99%
rename from docs/content/guide/guide.di.ngdoc
rename to docs/content/guide/di.ngdoc
index 2d1f92eb..6d9a746f 100644
--- a/docs/content/guide/guide.di.ngdoc
+++ b/docs/content/guide/di.ngdoc
@@ -125,7 +125,7 @@ dependency injection since the caller is still responsible for retrieving the de
 dependency injection is like Chuck Norris. Chuck does not ask for dependencies; he declares them.*
 
 The most common place to use dependency injection in angular applications is in
-{@link angular.ng:controller controllers}. Here’s a simple example:
+{@link angular.directive.@ng:controller controllers}. Here’s a simple example:
 
 <pre>
 function MyController($route){
diff --git a/docs/content/guide/index.ngdoc b/docs/content/guide/index.ngdoc
index 2798210d..1a9d2555 100644
--- a/docs/content/guide/index.ngdoc
+++ b/docs/content/guide/index.ngdoc
@@ -31,7 +31,4 @@
 * {@link angular.service Service} - Objects that are wired through dependency injection and then
   injected into the root scope.
 * {@link guide.testing Testing}
-  * service:$browser(mock)
-* {@link downloading Downloading} - How to download, compile, and host the angular
-  environment on your own server.
-* {@link guide.contribute Contributing} - How to contribute to angular project.
+  * service:$browser(mock)
\ No newline at end of file
diff --git a/docs/content/guide/overview.ngdoc b/docs/content/guide/overview.ngdoc
index 61c58435..8723e839 100644
--- a/docs/content/guide/overview.ngdoc
+++ b/docs/content/guide/overview.ngdoc
@@ -112,7 +112,7 @@ These input widgets look normal enough, but consider these points:
 of the input widgets (`qty` and `cost`) to variables of the same name.  Think of those variables as
 the "Model" part of the Model-View-Controller design pattern.
 * Note the angular directives, {@link angular.widget.@ng:validate ng:validate} and {@link
-ngular.widget.@ng:required ng:required}. You may have noticed that when you enter invalid data or
+angular.widget.@ng:required ng:required}. You may have noticed that when you enter invalid data or
 leave the the input fields blank, the borders turn a plainly irritated red color, and the display
 value disappears.  These `ng:` directives make it easier to implement field validators than coding
 them in JavaScript, no?  Yes.
diff --git a/docs/content/intro/faq.ngdoc b/docs/content/intro/faq.ngdoc
index dd06d961..2030dfbb 100644
--- a/docs/content/intro/faq.ngdoc
+++ b/docs/content/intro/faq.ngdoc
@@ -29,7 +29,7 @@ attacks. angular does round-trip escaping on all strings for you.
 
 ### Can I download the source, build, and host the angular environment locally?
 
-Yes. See instructions in {@link downloading downloading}.
+Yes. See instructions in {@link intro.downloading downloading}.
 
 ### Is angular a templating system?
 
diff --git a/docs/content/tutorial/step_02.ngdoc b/docs/content/tutorial/step_02.ngdoc
index 04b7b3e0..faad7f0e 100755
--- a/docs/content/tutorial/step_02.ngdoc
+++ b/docs/content/tutorial/step_02.ngdoc
@@ -133,7 +133,7 @@ data, and logic components:
 
 
     * The name of our controller function (in the JavaScript file `controllers.js`) matches the
-{@link angular.directive.ng:controller ng:controller} directive in the `<body>` tag
+{@link angular.directive.@ng:controller ng:controller} directive in the `<body>` tag
 (`PhoneListCtrl`).
     * We instantiated our data within the scope of our controller function, and our template
 binding points are located within the block bounded by the `<body ng:controller="PhoneListCtrl">`
@@ -145,7 +145,7 @@ the template, model and controller all work together. Angular uses scopes, along
 information contained in the template, data model, and controller, to keep the model and view
 separated but in sync. Any changes to the model are reflected in the view; any changes that occur
 in the view are reflected in the model. To learn more about angular scopes, see the {@link
-angular.scopes angular scope documentation}.
+angular.scope angular scope documentation}.
 
 
 
diff --git a/docs/content/tutorial/step_08.ngdoc b/docs/content/tutorial/step_08.ngdoc
index cdedef12..bec7bf6c 100755
--- a/docs/content/tutorial/step_08.ngdoc
+++ b/docs/content/tutorial/step_08.ngdoc
@@ -37,7 +37,7 @@ Now when you click on a
 phone on the list, the phone details page with phone-specific information is displayed.
 
 
-To implement the phone details view we will use {@link angular.services.$xhr $xhr} to fetch our
+To implement the phone details view we will use {@link angular.service.$xhr $xhr} to fetch our
 data, and we'll flesh out the `phone-details.html` view template.
 
 
diff --git a/docs/content/tutorial/the_end.ngdoc b/docs/content/tutorial/the_end.ngdoc
index 5c6bc1ac..8e307998 100644
--- a/docs/content/tutorial/the_end.ngdoc
+++ b/docs/content/tutorial/the_end.ngdoc
@@ -15,7 +15,7 @@ your development with the {@link https://github.com/angular/angular-seed angular
 
 We hope this tutorial was useful to you and that you learned enough about angular to make you want
 to learn more. We especially hope you are inspired to go out and develop angular web apps of your
-own, and that you might be interested in {@link contribute contributing} to angular.
+own, and that you might be interested in {@link intro.contribute contributing} to angular.
 
 If you have questions or feedback or just want to say "hi", please post a message at {@link
 https://groups.google.com/forum/#!forum/angular}.
diff --git a/src/directives.js b/src/directives.js
index bd02dd17..7f597823 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -34,7 +34,7 @@ angularDirective("ng:init", function(expression){
 /**
  * @workInProgress
  * @ngdoc directive
- * @name angular.directive.ng:controller
+ * @name angular.directive.@ng:controller
  *
  * @description
  * The `ng:controller` directive assigns behavior to a scope. This is a key aspect of how angular