aboutsummaryrefslogtreecommitdiffstats
path: root/docs/content/guide
diff options
context:
space:
mode:
Diffstat (limited to 'docs/content/guide')
-rw-r--r--docs/content/guide/bootstrap.ngdoc2
-rw-r--r--docs/content/guide/controller.ngdoc138
-rw-r--r--docs/content/guide/dev_guide.e2e-testing.ngdoc6
-rw-r--r--docs/content/guide/dev_guide.services.$location.ngdoc18
-rw-r--r--docs/content/guide/dev_guide.services.injecting_controllers.ngdoc2
-rw-r--r--docs/content/guide/dev_guide.services.understanding_services.ngdoc2
-rw-r--r--docs/content/guide/dev_guide.unit-testing.ngdoc7
-rw-r--r--docs/content/guide/di.ngdoc14
-rw-r--r--docs/content/guide/directive.ngdoc6
-rw-r--r--docs/content/guide/filter.ngdoc2
-rw-r--r--docs/content/guide/i18n.ngdoc26
-rw-r--r--docs/content/guide/introduction.ngdoc4
12 files changed, 111 insertions, 116 deletions
diff --git a/docs/content/guide/bootstrap.ngdoc b/docs/content/guide/bootstrap.ngdoc
index 5b83f9b3..058ae46d 100644
--- a/docs/content/guide/bootstrap.ngdoc
+++ b/docs/content/guide/bootstrap.ngdoc
@@ -25,7 +25,7 @@ initialization.
* Place the `script` tag at the bottom of the page. Placing script tags at the end of the page
improves app load time because the HTML loading is not blocked by loading of the `angular.js`
- script. You can get the latest bits from {@link http://code.angularjs.org}. Please don't link
+ script. You can get the latest bits from http://code.angularjs.org. Please don't link
your production code to this URL, as it will expose a security hole on your site. For
experimental development linking to our site is fine.
* Choose: `angular-[version].js` for a human-readable file, suitable for development and
diff --git a/docs/content/guide/controller.ngdoc b/docs/content/guide/controller.ngdoc
index a5878fb7..77e0ac50 100644
--- a/docs/content/guide/controller.ngdoc
+++ b/docs/content/guide/controller.ngdoc
@@ -28,36 +28,36 @@ is registered.
The following example shows a very simple constructor function for a Controller, `GreetingCtrl`,
which attaches a `greeting` property containing the string `'Hola!'` to the `$scope`:
-<pre>
+```
function GreetingCtrl($scope) {
$scope.greeting = 'Hola!';
}
-</pre>
+```
Once the Controller has been attached to the DOM, the `greeting` property can be data-bound to the
template:
-<pre>
- <div ng-controller="GreetingCtrl">
- {{ greeting }}
- </div>
-</pre>
+```
+<div ng-controller="GreetingCtrl">
+ {{ greeting }}
+</div>
+```
**NOTE**: Although Angular allows you to create Controller functions in the global scope, this is
not recommended. In a real application you should use the `.controller` method of your
{@link module Angular Module} for your application as follows:
-<pre>
- var myApp = angular.module('myApp',[]);
+```
+var myApp = angular.module('myApp',[]);
- myApp.controller('GreetingCtrl', ['$scope', function($scope) {
- $scope.greeting = 'Hola!';
- }]);
-</pre>
+myApp.controller('GreetingCtrl', ['$scope', function($scope) {
+ $scope.greeting = 'Hola!';
+}]);
+```
We have used an **inline injection annotation** to explicitly specify the dependency
of the Controller on the `$scope` service provided by Angular. See the guide on
-{@link http://docs.angularjs.org/guide/di Dependency Injection} for more information.
+[Dependency Injection](http://docs.angularjs.org/guide/di) for more information.
# Adding Behavior to a Scope Object
@@ -68,22 +68,22 @@ then available to be called from the template/view.
The following example uses a Controller to add a method to the scope, which doubles a number:
-<pre>
- var myApp = angular.module('myApp',[]);
+```
+var myApp = angular.module('myApp',[]);
- myApp.controller('DoubleCtrl', ['$scope', function($scope) {
- $scope.double = function(value) { return value * 2; };
- }]);
-</pre>
+myApp.controller('DoubleCtrl', ['$scope', function($scope) {
+ $scope.double = function(value) { return value * 2; };
+}]);
+```
Once the Controller has been attached to the DOM, the `double` method can be invoked in an Angular
expression in the template:
-<pre>
- <div ng-controller="DoubleCtrl">
- Two times <input ng-model="num"> equals {{ double(num) }}
- </div>
-</pre>
+```
+<div ng-controller="DoubleCtrl">
+ Two times <input ng-model="num"> equals {{ double(num) }}
+</div>
+```
As discussed in the {@link concepts Concepts} section of this guide, any
objects (or primitives) assigned to the scope become model properties. Any methods assigned to
@@ -134,30 +134,30 @@ The message in our template contains a binding to the `spice` model, which by de
string "very". Depending on which button is clicked, the `spice` model is set to `chili` or
`jalapeño`, and the message is automatically updated by data-binding.
-<doc:example module="spicyApp1">
- <doc:source>
+<example module="spicyApp1">
+ <file name="index.html">
<div ng-app="spicyApp1" ng-controller="SpicyCtrl">
<button ng-click="chiliSpicy()">Chili</button>
<button ng-click="jalapenoSpicy()">Jalapeño</button>
<p>The food is {{spice}} spicy!</p>
</div>
- <script>
- var myApp = angular.module('spicyApp1', []);
-
- myApp.controller('SpicyCtrl', ['$scope', function($scope){
- $scope.spice = 'very';
-
- $scope.chiliSpicy = function() {
- $scope.spice = 'chili';
- };
-
- $scope.jalapenoSpicy = function() {
- $scope.spice = 'jalapeño';
- };
- }]);
- </script>
- </doc:source>
-</doc:example>
+ </file>
+ <file name="app.js">
+ var myApp = angular.module('spicyApp1', []);
+
+ myApp.controller('SpicyCtrl', ['$scope', function($scope){
+ $scope.spice = 'very';
+
+ $scope.chiliSpicy = function() {
+ $scope.spice = 'chili';
+ };
+
+ $scope.jalapenoSpicy = function() {
+ $scope.spice = 'jalapeño';
+ };
+ }]);
+ </file>
+</example>
Things to notice in the example above:
@@ -175,15 +175,16 @@ its children).
Controller methods can also take arguments, as demonstrated in the following variation of the
previous example.
-<doc:example module="spicyApp2">
- <doc:source>
+<example module="spicyApp2">
+ <file name="index.html">
<div ng-app="spicyApp2" ng-controller="SpicyCtrl">
<input ng-model="customSpice">
<button ng-click="spicy('chili')">Chili</button>
<button ng-click="spicy(customSpice)">Custom spice</button>
<p>The food is {{spice}} spicy!</p>
</div>
- <script>
+ </file>
+ <file name="app.js">
var myApp = angular.module('spicyApp2', []);
myApp.controller('SpicyCtrl', ['$scope', function($scope){
@@ -194,9 +195,8 @@ previous example.
$scope.spice = spice;
};
}]);
- </script>
-</doc:source>
-</doc:example>
+ </file>
+</example>
Notice that the `SpicyCtrl` Controller now defines just one method called `spicy`, which takes one
argument called `spice`. The template then refers to this Controller method and passes in a string
@@ -209,11 +209,11 @@ It is common to attach Controllers at different levels of the DOM hierarchy. Si
{@link api/ng.directive:ngController ng-controller} directive creates a new child scope, we get a
hierarchy of scopes that inherit from each other. The `$scope` that each Controller receives will
have access to properties and methods defined by Controllers higher up the hierarchy.
-See {@link https://github.com/angular/angular.js/wiki/Understanding-Scopes Understanding Scopes} for
+See [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes) for
more information about scope inheritance.
-<doc:example module="scopeInheritance">
- <doc:source>
+<example module="scopeInheritance">
+ <file name="index.html">
<div ng-app="scopeInheritance" class="spicy">
<div ng-controller="MainCtrl">
<p>Good {{timeOfDay}}, {{name}}!</p>
@@ -227,13 +227,14 @@ more information about scope inheritance.
</div>
</div>
</div>
- <style>
- div.spicy div {
- padding: 10px;
- border: solid 2px blue;
- }
- </style>
- <script>
+ </file>
+ <file name="app.css">
+ div.spicy div {
+ padding: 10px;
+ border: solid 2px blue;
+ }
+ </file>
+ <file name="app.js">
var myApp = angular.module('scopeInheritance', []);
myApp.controller('MainCtrl', ['$scope', function($scope){
$scope.timeOfDay = 'morning';
@@ -246,9 +247,8 @@ more information about scope inheritance.
$scope.timeOfDay = 'evening';
$scope.name = 'Gingerbreak Baby';
}]);
- </script>
- </doc:source>
-</doc:example>
+ </file>
+</example>
Notice how we nested three `ng-controller` directives in our template. This will result in four
scopes being created for our view:
@@ -270,7 +270,7 @@ Although there are many ways to test a Controller, one of the best conventions,
involves injecting the {@link api/ng.$rootScope $rootScope} and {@link api/ng.$controller $controller}:
**Controller Definition:**
-<pre>
+```
var myApp = angular.module('myApp',[]);
myApp.controller('MyController', function($scope) {
@@ -279,10 +279,10 @@ involves injecting the {@link api/ng.$rootScope $rootScope} and {@link api/ng.$c
{"name":"habanero", "spiceness":"LAVA HOT!!"}];
$scope.spice = "habanero";
});
-</pre>
+```
**Controller Test:**
-<pre>
+```
describe('myController function', function() {
describe('myController', function() {
@@ -304,13 +304,13 @@ describe('myController function', function() {
});
});
});
-</pre>
+```
If you need to test a nested Controller you need to create the same scope hierarchy
in your test that exists in the DOM:
-<pre>
+```
describe('state', function() {
var mainScope, childScope, grandChildScope;
@@ -334,7 +334,7 @@ describe('state', function() {
expect(grandChildScope.name).toBe('Gingerbreak Baby');
});
});
-</pre>
+```
diff --git a/docs/content/guide/dev_guide.e2e-testing.ngdoc b/docs/content/guide/dev_guide.e2e-testing.ngdoc
index ce4e586c..e0d3f61d 100644
--- a/docs/content/guide/dev_guide.e2e-testing.ngdoc
+++ b/docs/content/guide/dev_guide.e2e-testing.ngdoc
@@ -55,7 +55,7 @@ the only button on the page, and then it verifies that there are 10 items listed
The API section below lists the available commands and expectations for the Runner.
# API
-Source: {@link https://github.com/angular/angular.js/blob/master/src/ngScenario/dsl.js}
+Source: https://github.com/angular/angular.js/blob/master/src/ngScenario/dsl.js
## pause()
Pauses the execution of the tests until you call `resume()` in the console (or click the resume
@@ -188,7 +188,7 @@ Executes the `method` passing in `key` and `value` on the element matching the g
Matchers are used in combination with the `expect(...)` function as described above and can
be negated with `not()`. For instance: `expect(element('h1').text()).not().toEqual('Error')`.
-Source: {@link https://github.com/angular/angular.js/blob/master/src/ngScenario/matchers.js}
+Source: https://github.com/angular/angular.js/blob/master/src/ngScenario/matchers.js
<pre>
// value and Object comparison following the rules of angular.equals().
@@ -222,7 +222,7 @@ expect(value).toBeGreaterThan(expected)
</pre>
# Example
-See the {@link https://github.com/angular/angular-seed angular-seed} project for more examples.
+See the [angular-seed](https://github.com/angular/angular-seed) project for more examples.
## Conditional actions with element(...).query(fn)
diff --git a/docs/content/guide/dev_guide.services.$location.ngdoc b/docs/content/guide/dev_guide.services.$location.ngdoc
index 08fabe33..04bf23eb 100644
--- a/docs/content/guide/dev_guide.services.$location.ngdoc
+++ b/docs/content/guide/dev_guide.services.$location.ngdoc
@@ -4,8 +4,7 @@
# What does it do?
-The `$location` service parses the URL in the browser address bar (based on the {@link
-https://developer.mozilla.org/en/window.location window.location}) and makes the URL available to
+The `$location` service parses the URL in the browser address bar (based on the [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL available to
your application. Changes to the URL in the address bar are reflected into $location service and
changes to $location are reflected into the browser address bar.
@@ -145,7 +144,7 @@ unless `replace()` is called again.
### Setters and character encoding
You can pass special characters to `$location` service and it will encode them according to rules
-specified in {@link http://www.ietf.org/rfc/rfc3986.txt RFC 3986}. When you access the methods:
+specified in [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt). When you access the methods:
- All values that are passed to `$location` setter methods, `path()`, `search()`, `hash()`, are
encoded.
@@ -160,7 +159,7 @@ encoded.
`$location` service has two configuration modes which control the format of the URL in the browser
address bar: **Hashbang mode** (the default) and the **HTML5 mode** which is based on using the
-HTML5 {@link http://www.w3.org/TR/html5/browsers.html#history History API}. Applications use the same API in
+HTML5 [History API](http://www.w3.org/TR/html5/history.html). Applications use the same API in
both modes and the `$location` service will work with appropriate URL segments and browser APIs to
facilitate the browser URL change and history management.
@@ -242,8 +241,8 @@ your document:
This will cause crawler bot to request links with `_escaped_fragment_` param so that your server
can recognize the crawler and serve a HTML snapshots. For more information about this technique,
-see {@link http://code.google.com/web/ajaxcrawling/docs/specification.html Making AJAX Applications
-Crawlable}.
+see [Making AJAX Applications
+Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
## HTML5 mode
@@ -346,8 +345,8 @@ meta tag to the HEAD section of your document:
This statement causes a crawler to request links with an empty `_escaped_fragment_` parameter so that
your server can recognize the crawler and serve it HTML snapshots. For more information about this
-technique, see {@link http://code.google.com/web/ajaxcrawling/docs/specification.html Making AJAX
-Applications Crawlable}.
+technique, see [Making AJAX
+Applications Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
### Relative links
@@ -625,8 +624,7 @@ 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 {@link
-https://github.com/angular/angular.js/issues/404 issue}). If you should require two-way binding
+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 api/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
diff --git a/docs/content/guide/dev_guide.services.injecting_controllers.ngdoc b/docs/content/guide/dev_guide.services.injecting_controllers.ngdoc
index 3dce7672..b24dec6e 100644
--- a/docs/content/guide/dev_guide.services.injecting_controllers.ngdoc
+++ b/docs/content/guide/dev_guide.services.injecting_controllers.ngdoc
@@ -105,7 +105,7 @@ function myController($scope, notify) {
</doc:source>
</doc:example>
-However, if you plan to {@link http://en.wikipedia.org/wiki/Minification_(programming) minify} your
+However, if you plan to [minify](http://en.wikipedia.org/wiki/Minification_(programming)) your
code, your variable names will get renamed in which case you will still need to explicitly specify
dependencies with the `$inject` property.
diff --git a/docs/content/guide/dev_guide.services.understanding_services.ngdoc b/docs/content/guide/dev_guide.services.understanding_services.ngdoc
index aebd2fa5..bb02f541 100644
--- a/docs/content/guide/dev_guide.services.understanding_services.ngdoc
+++ b/docs/content/guide/dev_guide.services.understanding_services.ngdoc
@@ -18,7 +18,7 @@ care of the rest. The Angular injector subsystem is in charge of service instant
of dependencies, and provision of dependencies to components as requested.
Angular injects dependencies using
-{@link http://misko.hevery.com/2009/02/19/constructor-injection-vs-setter-injection/ "constructor" injection}.
+["constructor" injection](http://misko.hevery.com/2009/02/19/constructor-injection-vs-setter-injection/).
The dependency is passed to the component's factory/constructor function. Because JavaScript is a dynamically
typed language, Angular's dependency injection subsystem cannot use static types to identify service
dependencies. For this reason a component must, explicitly, define its dependencies by using one of the
diff --git a/docs/content/guide/dev_guide.unit-testing.ngdoc b/docs/content/guide/dev_guide.unit-testing.ngdoc
index e73dc2d6..16c1c99e 100644
--- a/docs/content/guide/dev_guide.unit-testing.ngdoc
+++ b/docs/content/guide/dev_guide.unit-testing.ngdoc
@@ -97,9 +97,8 @@ function MyClass() {
While no new dependency instance is created, it is fundamentally the same as `new` in
that no way exists to intercept the call to `global.xhr` for testing purposes, other then
through monkey patching. The basic issue for testing is that a global variable needs to be mutated in
-order to replace it with call to a mock method. For further explanation of why this is bad see: {@link
-http://misko.hevery.com/code-reviewers-guide/flaw-brittle-global-state-singletons/ Brittle Global
-State & Singletons}
+order to replace it with call to a mock method. For further explanation of why this is bad see: [Brittle Global
+State & Singletons](http://misko.hevery.com/code-reviewers-guide/flaw-brittle-global-state-singletons/)
The class above is hard to test since we have to change the global state:
<pre>
@@ -336,5 +335,5 @@ replaced the content and "lidless, wreathed in flame, 2 times" is present.
## Sample project
-See the {@link https://github.com/angular/angular-seed angular-seed} project for an example.
+See the [angular-seed](https://github.com/angular/angular-seed) project for an example.
diff --git a/docs/content/guide/di.ngdoc b/docs/content/guide/di.ngdoc
index b305dd6b..1714e2aa 100644
--- a/docs/content/guide/di.ngdoc
+++ b/docs/content/guide/di.ngdoc
@@ -7,10 +7,10 @@
Dependency Injection (DI) is a software design pattern that deals with how code gets hold of its
dependencies.
-For in-depth discussion about DI, see {@link http://en.wikipedia.org/wiki/Dependency_injection
-Dependency Injection} at Wikipedia, {@link http://martinfowler.com/articles/injection.html
-Inversion of Control} by Martin Fowler, or read about DI in your favorite software design pattern
-book.
+For in-depth discussion about DI, see
+[Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection) at Wikipedia,
+[Inversion of Control](http://martinfowler.com/articles/injection.html) by Martin Fowler,
+or read about DI in your favorite software design pattern book.
## DI in a nutshell
@@ -80,8 +80,7 @@ Here is an example of using the injector service:
</pre>
Asking for dependencies solves the issue of hard coding, but it also means that the injector needs
-to be passed throughout the application. Passing the injector breaks the {@link
-http://en.wikipedia.org/wiki/Law_of_Demeter Law of Demeter}. To remedy this, we turn the
+to be passed throughout the application. Passing the injector breaks the [Law of Demeter](http://en.wikipedia.org/wiki/Law_of_Demeter). To remedy this, we turn the
dependency lookup responsibility to the injector by declaring the dependencies as in this example:
<pre>
@@ -133,8 +132,7 @@ function declaration and extracting the parameter names. In the above example `$
`greeter` are two services which need to be injected into the function.
While straightforward, this method will not work with JavaScript minifiers/obfuscators as they
-rename the method parameter names. This makes this way of annotating only useful for {@link
-http://www.pretotyping.org/ pretotyping}, and demo applications.
+rename the method parameter names. This makes this way of annotating only useful for [pretotyping](http://www.pretotyping.org/), and demo applications.
### `$inject` Annotation
diff --git a/docs/content/guide/directive.ngdoc b/docs/content/guide/directive.ngdoc
index 704dd483..39ada01d 100644
--- a/docs/content/guide/directive.ngdoc
+++ b/docs/content/guide/directive.ngdoc
@@ -32,7 +32,7 @@ When Angular {@link guide/bootstrap bootstraps} your application, the
For AngularJS, "compilation" means attaching event listeners to the HTML to make it interactive.
The reason we use the term "compile" is that the recursive process of attaching directives
mirrors the process of compiling source code in
-{@link http://en.wikipedia.org/wiki/Compiled_languages compiled programming languages}.
+[compiled programming languages](http://en.wikipedia.org/wiki/Compiled_languages).
</div>
@@ -55,9 +55,9 @@ The following also **matches** `ngModel`:
Angular **normalizes** an element's tag and attribute name to determine which elements match which
directives. We typically refer to directives by their case-sensitive
-{@link http://en.wikipedia.org/wiki/CamelCase camelCase} **normalized** name (e.g. `ngModel`).
+[camelCase](http://en.wikipedia.org/wiki/CamelCase) **normalized** name (e.g. `ngModel`).
However, since HTML is case-insensitive, we refer to directives in the DOM by lower-case
-forms, typically using {@link http://en.wikipedia.org/wiki/Letter_case#Computers dash-delimited}
+forms, typically using [dash-delimited](http://en.wikipedia.org/wiki/Letter_case#Computers)
attributes on DOM elements (e.g. `ng-model`).
The **normalization** process is as follows:
diff --git a/docs/content/guide/filter.ngdoc b/docs/content/guide/filter.ngdoc
index 30e48833..d156009a 100644
--- a/docs/content/guide/filter.ngdoc
+++ b/docs/content/guide/filter.ngdoc
@@ -123,4 +123,4 @@ text upper-case.
## Testing custom filters
-See the {@link http://docs.angularjs.org/tutorial/step_09#test phonecat tutorial} for an example.
+See the [phonecat tutorial](http://docs.angularjs.org/tutorial/step_09#test) for an example.
diff --git a/docs/content/guide/i18n.ngdoc b/docs/content/guide/i18n.ngdoc
index 99245893..f8e2189d 100644
--- a/docs/content/guide/i18n.ngdoc
+++ b/docs/content/guide/i18n.ngdoc
@@ -16,10 +16,10 @@ abstracted bits.
**What level of support for i18n/l10n is currently in Angular?**
-Currently, Angular supports i18n/l10n for {@link
-http://docs.angularjs.org/#!/api/ng.filter:date datetime}, {@link
-http://docs.angularjs.org/#!/api/ng.filter:number number} and {@link
-http://docs.angularjs.org/#!/api/ng.filter:currency currency} filters.
+Currently, Angular supports i18n/l10n for
+[datetime](http://docs.angularjs.org/#!/api/ng.filter:date),
+[number](http://docs.angularjs.org/#!/api/ng.filter:number) and
+[currency](http://docs.angularjs.org/#!/api/ng.filter:currency) filters.
Additionally, Angular supports localizable pluralization support provided by the {@link
api/ng.directive:ngPluralize ngPluralize directive}.
@@ -28,8 +28,8 @@ All localizable Angular components depend on locale-specific rule sets managed b
api/ng.$locale $locale service}.
For readers who want to jump straight into examples, we have a few web pages that showcase how to
-use Angular filters with various locale rule sets. You can find these examples either on {@link
-https://github.com/angular/angular.js/tree/master/i18n/e2e Github} or in the i18n/e2e folder of
+use Angular filters with various locale rule sets. You can find these examples either on
+[Github](https://github.com/angular/angular.js/tree/master/i18n/e2e) or in the i18n/e2e folder of
Angular development package.
**What is a locale id?**
@@ -37,13 +37,13 @@ Angular development package.
A locale is a specific geographical, political, or cultural region. The most commonly used locale
ID consists of two parts: language code and country code. For example, en-US, en-AU, zh-CN are all
valid locale IDs that have both language codes and country codes. Because specifying a country code
-in locale ID is optional, locale IDs such as en, zh, and sk are also valid. See the {@link
-http://userguide.icu-project.org/locale ICU } website for more information about using locale IDs.
+in locale ID is optional, locale IDs such as en, zh, and sk are also valid. See the
+[ICU ](http://userguide.icu-project.org/locale) website for more information about using locale IDs.
**Supported locales in Angular**
Angular separates number and datetime format rule sets into different files, each file for a
-particular locale. You can find a list of currently supported locales {@link
-https://github.com/angular/angular.js/tree/master/src/ngLocale here}
+particular locale. You can find a list of currently supported locales
+[here](https://github.com/angular/angular.js/tree/master/src/ngLocale)
# Providing locale rules to Angular
There are two approaches to providing locale rules to Angular:
@@ -90,7 +90,7 @@ because an extra script needs to be loaded.
**Currency symbol "gotcha"**
-Angular's {@link http://docs.angularjs.org/#!/api/ng.filter:currency currency filter} allows
+Angular's [currency filter](http://docs.angularjs.org/#!/api/ng.filter:currency) allows
you to use the default currency symbol from the {@link api/ng.$locale locale service},
or you can provide the filter with a custom currency symbol. If your app will be used only in one
locale, it is fine to rely on the default currency symbol. However, if you anticipate that viewers
@@ -103,8 +103,8 @@ containing currency filter: `{{ 1000 | currency }}`, and your app is currently i
browser will specify the locale as ja, and the balance of '¥1000.00' will be shown instead. This
will really upset your client.
-In this case, you need to override the default currency symbol by providing the {@link
-http://docs.angularjs.org/#!/api/ng.filter:currency currency filter} with a currency symbol as
+In this case, you need to override the default currency symbol by providing the
+[currency filter](http://docs.angularjs.org/#!/api/ng.filter:currency) with a currency symbol as
a parameter when you configure the filter, for example, {{ 1000 | currency:"USD$"}}. This way,
Angular will always show a balance of 'USD$1000' and disregard any locale changes.
diff --git a/docs/content/guide/introduction.ngdoc b/docs/content/guide/introduction.ngdoc
index 92b9b20f..2e83890d 100644
--- a/docs/content/guide/introduction.ngdoc
+++ b/docs/content/guide/introduction.ngdoc
@@ -101,8 +101,8 @@ Angular frees you from the following pains:
overall flow of the application rather than all of the implementation details.
* **Writing tons of initialization code just to get started:** Typically you need to write a lot
of plumbing just to get a basic "Hello World" AJAX app working. With Angular you can bootstrap
- your app easily using services, which are auto-injected into your application in a {@link
- http://code.google.com/p/google-guice/ Guice}-like dependency-injection style. This allows you
+ your app easily using services, which are auto-injected into your application in a
+ [Guice](http://code.google.com/p/google-guice/)-like dependency-injection style. This allows you
to get started developing features quickly. As a bonus, you get full control over the
initialization process in automated tests.