merge from origin/master

public/docs/ts/latest/glossary.jade

@@ -250,13 +250,13 @@ include _util-fns
     数据绑定是第二种方法。Angular有一个非常强大的数据绑定框架工具，具有多种用来数据绑定操作，支持声明语法规则。
 
      The many forms of binding include:
-     * [Interpolation](template-syntax.html#interpolation)
-     * [Property Binding](template-syntax.html#property-binding)
-     * [Event Binding](template-syntax.html#event-binding)
-     * [Attribute Binding](template-syntax.html#attribute-binding)
-     * [Class Binding](template-syntax.html#class-binding)
-     * [Style Binding](template-syntax.html#style-binding)
-     * [Two-way data binding with ngModel](template-syntax.html#ng-model)
+     * [Interpolation](guide/template-syntax.html#interpolation)
+     * [Property Binding](guide/template-syntax.html#property-binding)
+     * [Event Binding](guide/template-syntax.html#event-binding)
+     * [Attribute Binding](guide/template-syntax.html#attribute-binding)
+     * [Class Binding](guide/template-syntax.html#class-binding)
+     * [Style Binding](guide/template-syntax.html#style-binding)
+     * [Two-way data binding with ngModel](guide/template-syntax.html#ng-model)
 
      绑定模式包括：
      * [插补Interpolation](template-syntax.html#interpolation)
@@ -268,8 +268,8 @@ include _util-fns
      * [使用ngModel进行双向数据绑定Two-way data binding with ngModel](template-syntax.html#ng-model)
      
     Learn more about data binding in the
-    [Template Syntax](template-syntax.html#data-binding) chapter.
-    到[模板语法Template Syntax](template-syntax.html#data-binding)章节获取更多关于数据绑定的知识。
+    [Template Syntax](guide/template-syntax.html#data-binding) chapter.
+    到[模板语法Template Syntax](guide/template-syntax.html#data-binding)章节获取更多关于数据绑定的知识。
 
 // #enddocregion d1
 <a id="decorator"></a> <a id="decoration"></a>
@@ -360,7 +360,7 @@ include _util-fns
     is when we [bootstrap](#bootstrap) the application.
     There are other opportunities to register as well.
 
-    Learn more in the [Dependency Injection](dependency-injection.html) chapter.
+    Learn more in the [Dependency Injection](guide/dependency-injection.html) chapter.
 :marked
   ## Directive
 .l-sub-section
@@ -461,11 +461,11 @@ include _util-fns
 .l-sub-section
   :marked
     A directive property that can be the ***target*** of a
-    [Property Binding](template-syntax.html#property-binding).
+    [Property Binding](guide/template-syntax.html#property-binding).
     Data values flow *into* this property from the data source identified
     in the template expression to the right of the equal sign.
 
-    See the [Template Syntax](template-syntax.html#inputs-outputs) chapter.
+    See the [Template Syntax](guide/template-syntax.html#inputs-outputs) chapter.
 
 :marked
   ## Interpolation
@@ -482,7 +482,7 @@ include _util-fns
 
   :marked
     Learn more about interpolation in the
-    [Template Syntax](template-syntax.html#interpolation) chapter.
+    [Template Syntax](guide/template-syntax.html#interpolation) chapter.
 
 
 <a id="J"></a>
@@ -524,7 +524,7 @@ include _util-fns
     * `ngAfterViewChecked` - after every check of a component's view(s)
     * `ngOnDestroy` - just before the directive is destroyed.
 
-    Learn more in the [Lifecycle Hooks](lifecycle-hooks.html) chapter.
+    Learn more in the [Lifecycle Hooks](guide/lifecycle-hooks.html) chapter.
 // #enddocregion f-l
 
 // #docregion m1
@@ -580,11 +580,11 @@ include _util-fns
 .l-sub-section
   :marked
     A directive property that can be the ***target*** of an
-    [Event Binding](template-syntax.html#property-binding).
+    [Event Binding](guide/template-syntax.html#property-binding).
     Events stream *out* of this property to the receiver identified
     in the template expression to the right of the equal sign.
 
-    See the [Template Syntax](template-syntax.html#inputs-outputs) chapter.
+    See the [Template Syntax](guide/template-syntax.html#inputs-outputs) chapter.
 
 .l-main-section
 <a id="P"></a>
@@ -613,7 +613,7 @@ include _util-fns
   code-example(language="html" escape="html").
     <label>Price: </label>{{product.price | currency}}
   :marked
-    Learn more in the chapter on [pipes](pipes.html) .
+    Learn more in the chapter on [pipes](guide/pipes.html) .
 
 :marked
   ## Provider
@@ -640,7 +640,7 @@ include _util-fns
     and taking other similar actions that cause the application to
     replace one view with another.
 
-    The Angular [Component Router](router.html) is a richly featured mechanism for configuring
+    The Angular [Component Router](guide/router.html) is a richly featured mechanism for configuring
     and managing the entire view navigation process including the creation and destruction
     of views.
 :marked
@@ -681,7 +681,7 @@ include _util-fns
     the support and continuing guidance of an Angular [Directive](#directive),
     most notably a [Component](#component).
 
-    We write templates in a special [Template Syntax](template-syntax.html).
+    We write templates in a special [Template Syntax](guide/template-syntax.html).
 
 :marked
   ## Template Expression
@@ -689,7 +689,7 @@ include _util-fns
   :marked
     An expression in a JavaScript-like syntax that Angular evaluates within
     a [data binding](#data-binding).  Learn how to write template expressions
-    in the [Template Syntax](template-syntax.html#template-expressions) chapter.
+    in the [Template Syntax](guide/template-syntax.html#template-expressions) chapter.
 
 // #enddocregion t1
 // #docregion t2