resolving merge conflict

kapunahelewong · kapunahelewong · commit f405f403fd1a · 2016-09-08T16:11:08.000-04:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -1212,7 +1212,7 @@ function filterOutExcludedPatterns(fileNames, excludeMatchers) {
 }
 
 function apiSourceWatch(postBuildAction) {
-  var srcPattern = [path.join(ANGULAR_PROJECT_PATH, 'modules/@angular/src/**/*.*')];
+  var srcPattern = [path.join(ANGULAR_PROJECT_PATH, 'modules/@angular/**/*.*')];
   gulp.watch(srcPattern, {readDelay: 500}, function (event, done) {
     gutil.log('API source changed');
     gutil.log('Event type: ' + event.event); // added, changed, or deleted
diff --git a/public/docs/_examples/architecture/dart/pubspec.yaml b/public/docs/_examples/architecture/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/attribute-directives/dart/pubspec.yaml b/public/docs/_examples/attribute-directives/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/component-styles/dart/pubspec.yaml b/public/docs/_examples/component-styles/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/dependency-injection/dart/pubspec.yaml b/public/docs/_examples/dependency-injection/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/displaying-data/dart/pubspec.yaml b/public/docs/_examples/displaying-data/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/forms/dart/pubspec.yaml b/public/docs/_examples/forms/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/hierarchical-dependency-injection/dart/pubspec.yaml b/public/docs/_examples/hierarchical-dependency-injection/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/lifecycle-hooks/dart/pubspec.yaml b/public/docs/_examples/lifecycle-hooks/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/pipes/dart/pubspec.yaml b/public/docs/_examples/pipes/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/quickstart/dart/pubspec.yaml b/public/docs/_examples/quickstart/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/server-communication/dart/pubspec.yaml b/public/docs/_examples/server-communication/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
   http: ^0.11.3+3
diff --git a/public/docs/_examples/structural-directives/dart/pubspec.yaml b/public/docs/_examples/structural-directives/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/template-syntax/dart/pubspec.yaml b/public/docs/_examples/template-syntax/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-1/dart/pubspec.yaml b/public/docs/_examples/toh-1/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-2/dart/pubspec.yaml b/public/docs/_examples/toh-2/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-3/dart/pubspec.yaml b/public/docs/_examples/toh-3/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-4/dart/pubspec.yaml b/public/docs/_examples/toh-4/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-5/dart/pubspec.yaml b/public/docs/_examples/toh-5/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/_examples/toh-6/dart/pubspec.yaml b/public/docs/_examples/toh-6/dart/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: '>=1.13.0 <2.0.0'
   # #docregion additions
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   # #enddocregion additions
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
diff --git a/public/docs/_examples/user-input/dart/pubspec.yaml b/public/docs/_examples/user-input/dart/pubspec.yaml
@@ -5,7 +5,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:
diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json
@@ -3,7 +3,7 @@
     "icon": "home",
     "title": "Angular Docs",
     "menuTitle": "Docs Home",
-    "banner": "Welcome to <b>angular.io/dart</b>! The current Angular 2 Dart release is <b>beta.20</b>. Consult the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>Change Log</a> about recent enhancements, fixes, and breaking changes."
+    "banner": "Welcome to <b>angular.io/dart</b>! The current Angular 2 Dart release is <b>beta.21</b>. Consult the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>Change Log</a> about recent enhancements, fixes, and breaking changes."
   },
 
   "quickstart": {
diff --git a/public/docs/dart/latest/quickstart.jade b/public/docs/dart/latest/quickstart.jade
@@ -30,7 +30,7 @@ block package-and-config-files
     packages as dependencies, as well as the `angular2` transformer.
     It can also specify other packages and transformers for the app to use,
     such as [dart_to_js_script_rewriter](https://pub.dartlang.org/packages/dart_to_js_script_rewriter).
-    Angular 2 is still changing, so provide an exact version: **2.0.0-beta.20**.
+    Angular 2 is still changing, so provide an exact version: **2.0.0-beta.21**.
 
     [pubspec]: https://www.dartlang.org/tools/pub/pubspec.html
 
diff --git a/public/docs/ts/latest/glossary.jade b/public/docs/ts/latest/glossary.jade
@@ -347,17 +347,17 @@ block includes
   ## ES2015
 .l-sub-section
   :marked
-    Short hand for "[ECMAScript 2015](#ecmascript=2015)".
+    Short hand for [ECMAScript](#ecmascript) 2015.
 :marked
   ## ES6
 .l-sub-section
   :marked
-    Short hand for "[ECMAScript 2015](#ecmascript=2015)".
+    Short hand for [ECMAScript](#ecmascript) 2015.
 :marked
   ## ES5
 .l-sub-section
   :marked
-    Short hand for "ECMAScript 5", the version of JavaScript run by most modern browsers.
+    Short hand for [ECMAScript](#ecmascript) 5, the version of JavaScript run by most modern browsers.
     See [ECMAScript](#ecmascript).
 
 a#F
@@ -711,8 +711,14 @@ a#snake-case
   ## TypeScript
 .l-sub-section
   :marked
+<<<<<<< HEAD
     A version of JavaScript that supports most [ECMAScript 2015](#ecmascript=2015)
     language features such as [Decorators](#decorator).
+=======
+    A version of JavaScript that supports most [ECMAScript](#ecmascript) 2015
+    language features and many features that may arrive in future versions
+    of JavaScript such as [Decorators](#decorator).
+>>>>>>> 51bcce6b1ccb188257200e6becb62f684895f30a
 
     TypeScript is also noteable for its optional typing system, which gives
     us compile-time type checking and strong tooling support (for example, "intellisense",
diff --git a/public/docs/ts/latest/guide/router-deprecated.jade b/public/docs/ts/latest/guide/router-deprecated.jade
@@ -1380,9 +1380,8 @@ code-example(format="." language="bash").
   We too can call that `ngOnInit` method in our tests if we wish ... after taking control of the injected
   `HeroService` and (perhaps) mocking it.
 
-<a name="browser-url-styles"></a>
-<a id="location-strategy"></a>
-.l-main-section
+a#browser-url-styles
+.l-main-section#location-strategy
 :marked
   ## Appendix: *LocationStrategy* and browser URL styles
 
diff --git a/public/docs/ts/latest/guide/router.jade b/public/docs/ts/latest/guide/router.jade
@@ -1941,9 +1941,8 @@ a#fragment
   We too can call that `ngOnInit` method in our tests if we wish ... after taking control of the injected
   `HeroService` and (perhaps) mocking it.
 
-<a name="browser-url-styles"></a>
-<a id="location-strategy"></a>
-.l-main-section
+a#browser-url-styles
+.l-main-section#location-strategy
 :marked
   ## Appendix: *LocationStrategy* and browser URL styles
 
diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade
@@ -215,7 +215,7 @@ block install-packages
     application, you'd likely import [`FormsModule`](../latest/api/forms/index/FormsModule-class
     .html) as well as [`RouterModule`](../latest/api/router/index/RouterModule-class.html) and
     [`HttpModule`](../latest/api/http/index/HttpModule-class.html). These are introduced in the
-    [Tour of Heroes Tutorial](../tutorial/).
+    [Tour of Heroes Tutorial](./tutorial/).
 
 
 .l-main-section
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 environment:
   sdk: '>=1.13.0 <2.0.0'
 dependencies:
-  angular2: 2.0.0-beta.20
+  angular2: 2.0.0-beta.21
   browser: ^0.10.0
   dart_to_js_script_rewriter: ^1.0.1
 transformers:

Original file line number	Diff line number	Diff line change
`@@ -1212,7 +1212,7 @@ function filterOutExcludedPatterns(fileNames, excludeMatchers) {`
`1212`	`1212`	`}`
`1213`	`1213`
`1214`	`1214`	`function apiSourceWatch(postBuildAction) {`
`1215`		`- var srcPattern = [path.join(ANGULAR_PROJECT_PATH, 'modules/@angular/src/*/.*')];`
	`1215`	`+ var srcPattern = [path.join(ANGULAR_PROJECT_PATH, 'modules/@angular/*/.*')];`
`1216`	`1216`	`gulp.watch(srcPattern, {readDelay: 500}, function (event, done) {`
`1217`	`1217`	`gutil.log('API source changed');`
`1218`	`1218`	`gutil.log('Event type: ' + event.event); // added, changed, or deleted`