docs: add changelog for 5.2.7

.circleci/bazel.rc

@@ -15,16 +15,11 @@ build --experimental_remote_spawn_cache --remote_rest_cache=http://localhost:764
 # Prevent unstable environment variables from tainting cache keys
 build --experimental_strict_action_env
 
-# Save downloaded repositories such as the go toolchain
-# This directory can then be included in the CircleCI cache
-# It should save time running the first build
-build --experimental_repository_cache=/home/circleci/bazel_repository_cache
-
 # Workaround https://github.com/bazelbuild/bazel/issues/3645
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
-# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
+# Limit Bazel to consuming resources that fit in CircleCI "medium" class which is the default:
 # https://circleci.com/docs/2.0/configuration-reference/#resource_class
-build --local_resources=14336,8.0,1.0
+build --local_resources=3072,2.0,1.0
 
 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
 test --flaky_test_attempts=2

.circleci/config.yml

@@ -13,7 +13,7 @@
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
 var_1: &docker_image angular/ngcontainer:0.1.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0
+var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0
 
 # See remote cache documentation in /docs/BAZEL.md
 var_3: &setup-bazel-remote-cache
@@ -41,14 +41,14 @@ jobs:
     steps:
       - checkout:
           <<: *post_checkout
+      # See remote cache documentation in /docs/BAZEL.md
+      - run: .circleci/setup_cache.sh
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - *setup-bazel-remote-cache
 
-      # Check BUILD.bazel formatting before we have a node_modules directory
-      # Then we don't need any exclude pattern to avoid checking those files
-      - run: 'buildifier -mode=check $(find . -type f \( -name BUILD.bazel -or -name BUILD \)) ||
-              (echo "BUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
-      # Run the skylark linter to check our Bazel rules
-      - run: 'find . -type f -name "*.bzl" |
-              xargs java -jar /usr/local/bin/Skylint_deploy.jar ||
+      - run: 'yarn buildifier -mode=check ||
+              (echo -e "\nBUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
+      - run: 'yarn skylint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn skylint''"; exit 1)'
 
       - restore_cache:
@@ -59,7 +59,7 @@ jobs:
 
   build:
     <<: *job_defaults
-    resource_class: xlarge
+    resource_class: large
     steps:
       - checkout:
           <<: *post_checkout
@@ -71,7 +71,6 @@ jobs:
       - restore_cache:
           key: *cache_key
 
-      - run: ls /home/circleci/bazel_repository_cache || true
       - run: bazel info release
       - run: bazel run @yarn//:yarn
       # Use bazel query so that we explicitly ask for all buildable targets to be built as well
@@ -83,16 +82,6 @@ jobs:
           key: *cache_key
           paths:
             - "node_modules"
-            - "~/bazel_repository_cache"
-
-  aio_monitoring:
-    <<: *job_defaults
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - run: xvfb-run --auto-servernum ./aio/scripts/test-production.sh
 
 workflows:
   version: 2
@@ -100,13 +89,3 @@ workflows:
     jobs:
       - lint
       - build
-  aio_monitoring:
-    jobs:
-      - aio_monitoring
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - master

CHANGELOG.md

@@ -1,60 +1,3 @@
-<a name="5.2.11"></a>
-## [5.2.11](https://github.com/angular/angular/compare/5.2.10...5.2.11) (2018-05-16)
-
-
-### Bug Fixes
-
-* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([bc27d4a](https://github.com/angular/angular/commit/bc27d4a)), closes [#23526](https://github.com/angular/angular/issues/23526)
-
-
-
-<a name="5.2.10"></a>
-## [5.2.10](https://github.com/angular/angular/compare/5.2.9...5.2.10) (2018-04-16)
-
-
-### Bug Fixes
-
-* **animations:** avoid animation insertions during router back/refresh ([#21977](https://github.com/angular/angular/issues/21977)) ([641cc49](https://github.com/angular/angular/commit/641cc49)), closes [#19712](https://github.com/angular/angular/issues/19712)
-* **common:** properly take className changes into account ([#21937](https://github.com/angular/angular/issues/21937)) ([54e9108](https://github.com/angular/angular/commit/54e9108)), closes [#21932](https://github.com/angular/angular/issues/21932)
-* **compiler:** fix support for html-like text in translatable attributes ([#23053](https://github.com/angular/angular/issues/23053)) ([4f7c369](https://github.com/angular/angular/commit/4f7c369))
-* **compiler-cli:** emit correct css string escape sequences ([#22776](https://github.com/angular/angular/issues/22776)) ([db0afa9](https://github.com/angular/angular/commit/db0afa9))
-* **forms:** improve error message for invalid value accessors ([#22731](https://github.com/angular/angular/issues/22731)) ([dd61595](https://github.com/angular/angular/commit/dd61595))
-* **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([7b23983](https://github.com/angular/angular/commit/7b23983)), closes [#23196](https://github.com/angular/angular/issues/23196)
-* **service-worker:** do not enter degraded mode when offline ([#22883](https://github.com/angular/angular/issues/22883)) ([ae9c25f](https://github.com/angular/angular/commit/ae9c25f)), closes [#21636](https://github.com/angular/angular/issues/21636)
-* **service-worker:** fix LruList bugs ([#22769](https://github.com/angular/angular/issues/22769)) ([65f8943](https://github.com/angular/angular/commit/65f8943)), closes [#22218](https://github.com/angular/angular/issues/22218) [#22768](https://github.com/angular/angular/issues/22768)
-* **service-worker:** ignore invalid `only-if-cached` requests ([#22883](https://github.com/angular/angular/issues/22883)) ([0d4fe38](https://github.com/angular/angular/commit/0d4fe38)), closes [#22362](https://github.com/angular/angular/issues/22362)
-* **upgrade:** correctly handle downgraded `OnPush` components ([#22209](https://github.com/angular/angular/issues/22209)) ([f43fba6](https://github.com/angular/angular/commit/f43fba6)), closes [#14286](https://github.com/angular/angular/issues/14286)
-* **upgrade:** propagate return value of resumeBootstrap ([#22754](https://github.com/angular/angular/issues/22754)) ([ae76eec](https://github.com/angular/angular/commit/ae76eec)), closes [#22723](https://github.com/angular/angular/issues/22723)
-* **upgrade:** two-way binding and listening for event ([#22772](https://github.com/angular/angular/issues/22772)) ([5391f96](https://github.com/angular/angular/commit/5391f96)), closes [#22734](https://github.com/angular/angular/issues/22734)
-
-
-
-<a name="5.2.9"></a>
-## [5.2.9](https://github.com/angular/angular/compare/5.2.8...5.2.9) (2018-03-14)
-
-
-### Bug Fixes
-
-* **platform-server:** add styles to elements correctly ([#22527](https://github.com/angular/angular/issues/22527)) ([fc6dfc2](https://github.com/angular/angular/commit/fc6dfc2))
-* **router:** correct over-encoding of URL fragment ([#22687](https://github.com/angular/angular/issues/22687)) ([86517f2](https://github.com/angular/angular/commit/86517f2))
-
-
-
-<a name="5.2.8"></a>
-## [5.2.8](https://github.com/angular/angular/compare/5.2.7...5.2.8) (2018-03-07)
-
-
-### Bug Fixes
-
-* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([de02a7a](https://github.com/angular/angular/commit/de02a7a)), closes [#19235](https://github.com/angular/angular/issues/19235)
-* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([8f0a064](https://github.com/angular/angular/commit/8f0a064)), closes [#22203](https://github.com/angular/angular/issues/22203)
-* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([789a47e](https://github.com/angular/angular/commit/789a47e)), closes [#10280](https://github.com/angular/angular/issues/10280)
-* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([4aef9de](https://github.com/angular/angular/commit/4aef9de)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
-* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)
-
-
-
 <a name="5.2.7"></a>
 ## [5.2.7](https://github.com/angular/angular/compare/5.2.6...5.2.7) (2018-02-28)
 

WORKSPACE

@@ -1,10 +1,14 @@
 workspace(name = "angular")
 
+# Using a pre-release snapshot to pick up a commit that makes all nodejs_binary
+# programs produce source-mapped stack traces.
+RULES_NODEJS_VERSION = "926349cea4cd360afcd5647ccdd09d2d2fb471aa"
+
 http_archive(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.5.0.zip",
-    strip_prefix = "rules_nodejs-0.5.0",
-    sha256 = "06aabb253c3867d51724386ac5622a0a238bbd82e2c70ce1d09ee3ceac4c31d6",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/%s.zip" % RULES_NODEJS_VERSION,
+    strip_prefix = "rules_nodejs-%s" % RULES_NODEJS_VERSION,
+    sha256 = "5ba3c8c209078c2e3f0c6aa4abd01a1a561f92a5bfda04e25604af5f4734d69d",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
@@ -12,11 +16,13 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_reposi
 check_bazel_version("0.9.0")
 node_repositories(package_json = ["//:package.json"])
 
+RULES_TYPESCRIPT_VERSION = "d3cc5cd72d89aee0e4c2553ae1b99c707ecbef4e"
+
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.11.0.zip",
-    strip_prefix = "rules_typescript-0.11.0",
-    sha256 = "ce7bac7b5287d5162fcbe4f7c14ff507ae7d506ceb44626ad09f6b7e27d3260b",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/%s.zip" % RULES_TYPESCRIPT_VERSION,
+    strip_prefix = "rules_typescript-%s" % RULES_TYPESCRIPT_VERSION,
+    sha256 = "a233fcca41c3e59f639ac71c396edb30e9e9716cf8ed5fb20b51ff8910d5d895",
 )
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")

aio/.gitignore

@@ -30,7 +30,6 @@
 /connect.lock
 /coverage
 /libpeerconnection.log
-debug.log
 npm-debug.log
 testem.log
 /typings
@@ -46,4 +45,4 @@ protractor-results*.txt
 Thumbs.db
 
 # copied dependencies
-src/assets/js/lunr*
+src/assets/js/lunr*

aio/aio-builds-setup/dockerbuild/Dockerfile

@@ -19,8 +19,8 @@ ARG      AIO_DOMAIN_NAME=ngbuilds.io
 ARG TEST_AIO_DOMAIN_NAME=$AIO_DOMAIN_NAME.localhost
 ARG      AIO_GITHUB_ORGANIZATION=angular
 ARG TEST_AIO_GITHUB_ORGANIZATION=angular
-ARG      AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
-ARG TEST_AIO_GITHUB_TEAM_SLUGS=team,aio-contributors
+ARG      AIO_GITHUB_TEAM_SLUGS=angular-core,aio-contributors
+ARG TEST_AIO_GITHUB_TEAM_SLUGS=angular-core,aio-contributors
 ARG      AIO_NGINX_HOSTNAME=$AIO_DOMAIN_NAME
 ARG TEST_AIO_NGINX_HOSTNAME=$TEST_AIO_DOMAIN_NAME
 ARG      AIO_NGINX_PORT_HTTP=80

aio/aio-builds-setup/docs/vm-setup--set-up-secrets.md

@@ -9,7 +9,7 @@ Necessary secrets:
    - Used for:
      - Retrieving open PRs without rate-limiting.
      - Retrieving PR author.
-     - Retrieving members of the trusted GitHub teams.
+     - Retrieving members of the `angular-core` team.
      - Posting comments with preview links on PRs.
 
 2. `PREVIEW_DEPLOYMENT_TOKEN`

aio/content/examples/architecture/src/app/backend.service.ts

@@ -15,7 +15,7 @@ export class BackendService {
 
   getAll(type: Type<any>): PromiseLike<any[]> {
     if (type === Hero) {
-      // TODO: get from the database
+      // TODO get from the database
       return Promise.resolve<Hero[]>(HEROES);
     }
     let err = new Error('Cannot get object of this type');

aio/content/examples/cli-quickstart/src/app/app.component.html

@@ -1,19 +1,20 @@
 <!--The content below is only a placeholder and can be replaced.-->
 <div style="text-align:center">
   <h1>
-    Welcome to {{ title }}!
+    Welcome to {{title}}!!
   </h1>
-  <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
+  <img width="300" alt="Angular logo" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo=">
 </div>
 <h2>Here are some links to help you start: </h2>
 <ul>
   <li>
-    <h2><a target="_blank" rel="noopener" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
+    <h2><a target="_blank" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
   </li>
   <li>
-    <h2><a target="_blank" rel="noopener" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
+    <h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
   </li>
   <li>
-    <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular blog</a></h2>
+    <h2><a target="_blank" href="http://angularjs.blogspot.ca/">Angular blog</a></h2>
   </li>
 </ul>
+

aio/content/examples/cli-quickstart/src/app/app.component.spec.ts

@@ -1,5 +1,7 @@
 import { TestBed, async } from '@angular/core/testing';
+
 import { AppComponent } from './app.component';
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -18,13 +20,13 @@ describe('AppComponent', () => {
   it(`should have as title 'app'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toMatch(/app/i);
+    expect(app.title).toEqual('app');
   }));
 
   it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toMatch(/app/i);
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!');
   }));
 });

aio/content/examples/cli-quickstart/src/app/app.component.ts

@@ -11,6 +11,6 @@ import { Component } from '@angular/core';
 // #enddocregion metadata
 // #docregion title, class
 export class AppComponent {
-  title = 'My First Angular App!';
+  title = 'My First Angular App';
 }
 // #enddocregion title, class

aio/content/examples/dependency-injection-in-action/src/app/hero-of-the-month.component.1.ts

@@ -8,7 +8,7 @@ import { MinimalLogger }       from './minimal-logger.service';
 @Component({
   selector: 'app-hero-of-the-month',
   templateUrl: './hero-of-the-month.component.html',
-  // TODO: move this aliasing, `useExisting` provider to the AppModule
+  // Todo: move this aliasing, `useExisting` provider to the AppModule
   providers: [{ provide: MinimalLogger, useExisting: LoggerService }]
 })
 export class HeroOfTheMonthComponent {

aio/content/examples/dependency-injection-in-action/src/app/hero.service.ts

@@ -5,7 +5,7 @@ import { Hero }       from './hero';
 @Injectable()
 export class HeroService {
 
-  // TODO: move to database
+  // TODO move to database
   private heroes: Array<Hero> = [
     new Hero(1, 'RubberMan', 'Hero of many talents', '123-456-7899'),
     new Hero(2, 'Magma', 'Hero of all trades', '555-555-5555'),

aio/content/examples/dependency-injection-in-action/src/app/parent-finder.component.ts

@@ -151,7 +151,7 @@ export class BethComponent implements Parent {
 // #docregion alex-1
 })
 // #enddocregion alex-1
-// TODO: Add `... implements Parent` to class signature
+// Todo: Add `... implements Parent` to class signature
 // #docregion alex-1
 // #docregion alex-class-signature
 export class AlexComponent extends Base

aio/content/examples/dependency-injection/src/app/user.service.ts

@@ -7,7 +7,7 @@ export class User {
     public isAuthorized = false) { }
 }
 
-// TODO: get the user; don't 'new' it.
+// Todo: get the user; don't 'new' it.
 let alice = new User('Alice', true);
 let bob = new User('Bob', false);
 

aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts

@@ -1,12 +1,12 @@
 // #docregion
-import { Component, Input, OnInit, ViewChild, ComponentFactoryResolver, OnDestroy } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild, ComponentFactoryResolver, OnDestroy } from '@angular/core';
 
 import { AdDirective } from './ad.directive';
 import { AdItem }      from './ad-item';
 import { AdComponent } from './ad.component';
 
 @Component({
-  selector: 'app-ad-banner',
+  selector: 'app-add-banner',
   // #docregion ad-host
   template: `
               <div class="ad-banner">
@@ -17,15 +17,16 @@ import { AdComponent } from './ad.component';
   // #enddocregion ad-host
 })
 // #docregion class
-export class AdBannerComponent implements OnInit, OnDestroy {
+export class AdBannerComponent implements AfterViewInit, OnDestroy {
   @Input() ads: AdItem[];
-  currentAdIndex: number = -1;
+  currentAddIndex: number = -1;
   @ViewChild(AdDirective) adHost: AdDirective;
+  subscription: any;
   interval: any;
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver) { }
 
-  ngOnInit() {
+  ngAfterViewInit() {
     this.loadComponent();
     this.getAds();
   }
@@ -35,8 +36,8 @@ export class AdBannerComponent implements OnInit, OnDestroy {
   }
 
   loadComponent() {
-    this.currentAdIndex = (this.currentAdIndex + 1) % this.ads.length;
-    let adItem = this.ads[this.currentAdIndex];
+    this.currentAddIndex = (this.currentAddIndex + 1) % this.ads.length;
+    let adItem = this.ads[this.currentAddIndex];
 
     let componentFactory = this.componentFactoryResolver.resolveComponentFactory(adItem.component);
 

aio/content/examples/dynamic-component-loader/src/app/app.component.ts

@@ -8,7 +8,7 @@ import { AdItem }            from './ad-item';
   selector: 'app-root',
   template: `
     <div>
-      <app-ad-banner [ads]="ads"></app-ad-banner>
+      <app-add-banner [ads]="ads"></app-add-banner>
     </div>
   `
 })

aio/content/examples/dynamic-form/src/app/question.service.ts

@@ -8,8 +8,8 @@ import { TextboxQuestion }  from './question-textbox';
 @Injectable()
 export class QuestionService {
 
-  // TODO: get from a remote source of question metadata
-  // TODO: make asynchronous
+  // Todo: get from a remote source of question metadata
+  // Todo: make asynchronous
   getQuestions() {
 
     let questions: QuestionBase<any>[] = [

aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts

@@ -15,7 +15,7 @@ export class UploadInterceptor implements HttpInterceptor {
     if (req.url.indexOf('/upload/file') === -1) {
       return next.handle(req);
     }
-    const delay = 300; // TODO: inject delay?
+    const delay = 300; // Todo: inject delay?
     return createUploadEvents(delay);
   }
 }

aio/content/examples/lifecycle-hooks/src/app/peek-a-boo-parent.component.ts

@@ -43,7 +43,6 @@ export class PeekABooParentComponent {
       this.heroName = 'Windstorm';
       this.logger.clear(); // clear log on create
     }
-    this.hookLog = this.logger.logs;
     this.logger.tick();
   }
 

aio/content/examples/reactive-forms/src/app/app.module.ts

@@ -6,38 +6,32 @@ import { BrowserModule }       from '@angular/platform-browser';
 import { ReactiveFormsModule } from '@angular/forms';  // <-- #1 import module
 
 import { AppComponent }        from './app.component';
-import { HeroDetailComponent } from './hero-detail/hero-detail.component';
+import { HeroDetailComponent } from './hero-detail/hero-detail.component'; // <-- #1 import component
 // #enddocregion v1
-// #docregion hero-service-list
-// add JavaScript imports
 import { HeroListComponent }   from './hero-list/hero-list.component';
-import { HeroService }         from './hero.service';
+
+import { HeroService }         from './hero.service'; //  <-- #1 import service
 // #docregion v1
 
 @NgModule({
-  declarations: [
-    AppComponent,
-    HeroDetailComponent,
-// #enddocregion v1
-    HeroListComponent // <--declare HeroListComponent
-// #docregion v1
-  ],
- // #enddocregion hero-service-list
   imports: [
     BrowserModule,
     ReactiveFormsModule // <-- #2 add to @NgModule imports
   ],
-  // #enddocregion v1
-  // export for the DemoModule
-  // #docregion hero-service-list
-  // ...
-  exports: [
+  declarations: [
     AppComponent,
     HeroDetailComponent,
-    HeroListComponent // <-- export HeroListComponent
+// #enddocregion v1
+    HeroListComponent
+// #docregion v1
   ],
-  providers: [ HeroService ], // <-- provide HeroService
-// #enddocregion hero-service-list
+// #enddocregion v1
+  exports: [ // export for the DemoModule
+    AppComponent,
+    HeroDetailComponent,
+    HeroListComponent
+  ],
+  providers: [ HeroService ], // <-- #4 provide HeroService
 // #docregion v1
   bootstrap: [ AppComponent ]
 })

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion basic-form-->
 <h2>Hero Detail</h2>
 <h3><i>FormControl in a FormGroup</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion basic-form-->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with a single FormControl using FormBuilder</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">
@@ -13,4 +13,4 @@
 <!-- #docregion form-value-json -->
 <p>Form value: {{ heroForm.value | json }}</p>
 <p>Form status: {{ heroForm.status | json }}</p>
-<!-- #enddocregion form-value-json -->
+<!-- #enddocregion form-value-json  -->

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html

@@ -1,5 +1,5 @@
 
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
     <div class="form-group">
       <label class="center-block">Name:
         <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>PatchValue to initialize a value</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts

@@ -44,13 +44,7 @@ export class HeroDetailComponent6 implements OnChanges {
   }
 
   // #docregion patch-value-on-changes
-  ngOnChanges() { // <-- call rebuildForm in ngOnChanges
-    this.rebuildForm();
-  }
-  // #enddocregion patch-value-on-changes
-
-  // #docregion patch-value-rebuildform
-  rebuildForm() { // <-- wrap patchValue in rebuildForm
+  ngOnChanges() { // <-- wrap patchValue in ngOnChanges
     this.heroForm.reset();
     // #docregion patch-value
     this.heroForm.patchValue({
@@ -58,9 +52,7 @@ export class HeroDetailComponent6 implements OnChanges {
     });
     // #enddocregion patch-value
   }
-  // #enddocregion patch-value-rebuildform
+  // #enddocregion patch-value-on-changes
 }
 
-
-
 // #enddocregion v6

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts

@@ -38,31 +38,32 @@ export class HeroDetailComponent7 implements OnChanges {
 
   // #docregion ngOnChanges
   ngOnChanges() {
-    this.rebuildForm();
-  }
-   // #enddocregion ngOnChanges
-
-    // #docregion rebuildForm
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name,
+      address: this.hero.addresses[0] || new Address()
+    });
+  }
+  // #enddocregion ngOnChanges
+
+  /* First version of ngOnChanges
+  // #docregion ngOnChanges-1
+  ngOnChanges()
+  // #enddocregion ngOnChanges-1
+  */
+  ngOnChanges1() {
+    // #docregion reset
+    this.heroForm.reset();
+    // #enddocregion reset
+    // #docregion ngOnChanges-1
+    // #docregion set-value
+    this.heroForm.setValue({
+      name:    this.hero.name,
       // #docregion set-value-address
       address: this.hero.addresses[0] || new Address()
       // #enddocregion set-value-address
     });
-  }
-  // #enddocregion rebuildForm
-
-  /* First version of rebuildForm */
-  rebuildForm1() {
-    // #docregion reset
-    this.heroForm.reset();
-     // #enddocregion reset
-     // #docregion set-value
-     this.heroForm.setValue({
-      name:    this.hero.name,
-      address: this.hero.addresses[0] || new Address()
-   });
     // #enddocregion set-value
   }
+  // #enddocregion ngOnChanges-1
 }
+

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html

@@ -1,7 +1,7 @@
 <!-- #docplaster-->
 <h3><i>Using FormArray to add groups</i></h3>
 
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
     <p>Form Changed: {{ heroForm.dirty }}</p>
 
     <div class="form-group">
@@ -11,9 +11,7 @@
     </div>
     <!-- #docregion form-array-->
     <!-- #docregion form-array-skeleton -->
-    <!-- #docregion form-array-name -->
     <div formArrayName="secretLairs" class="well well-lg">
-    <!-- #enddocregion form-array-name -->
       <div *ngFor="let address of secretLairs.controls; let i=index" [formGroupName]="i" >
         <!-- The repeated address template -->
     <!-- #enddocregion form-array-skeleton -->

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts

@@ -39,18 +39,12 @@ export class HeroDetailComponent8 implements OnChanges {
 
   // #docregion onchanges
   ngOnChanges() {
-    this.rebuildForm();
-  }
-  // #enddocregion onchanges
-
-  // #docregion rebuildform
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name
     });
     this.setAddresses(this.hero.addresses);
   }
-// #enddocregion rebuildform
+  // #enddocregion onchanges
 
   // #docregion get-secret-lairs
   get secretLairs(): FormArray {

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.html

@@ -1,11 +1,11 @@
 <!-- #docplaster -->
 <!-- #docregion -->
   <!-- #docregion buttons -->
-<form [formGroup]="heroForm" (ngSubmit)="onSubmit()">
+<form [formGroup]="heroForm" (ngSubmit)="onSubmit()" novalidate>
   <div style="margin-bottom: 1em">
     <button type="submit"
             [disabled]="heroForm.pristine" class="btn btn-success">Save</button> &nbsp;
-    <button type="button" (click)="revert()"
+    <button type="reset" (click)="revert()"
             [disabled]="heroForm.pristine" class="btn btn-danger">Revert</button>
   </div>
 

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts

@@ -13,10 +13,7 @@ import { HeroService }           from '../hero.service';
   templateUrl: './hero-detail.component.html',
   styleUrls: ['./hero-detail.component.css']
 })
-
-// #docregion onchanges-implementation
 export class HeroDetailComponent implements OnChanges {
-// #enddocregion onchanges-implementation
   @Input() hero: Hero;
 
   heroForm: FormGroup;
@@ -45,10 +42,6 @@ export class HeroDetailComponent implements OnChanges {
   }
 
   ngOnChanges() {
-    this.rebuildForm();
-  }
-
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name
     });
@@ -73,7 +66,7 @@ export class HeroDetailComponent implements OnChanges {
   onSubmit() {
     this.hero = this.prepareSaveHero();
     this.heroService.updateHero(this.hero).subscribe(/* error handling */);
-    this.rebuildForm();
+    this.ngOnChanges();
   }
   // #enddocregion on-submit
 
@@ -99,7 +92,7 @@ export class HeroDetailComponent implements OnChanges {
   // #enddocregion prepare-save-hero
 
   // #docregion revert
-  revert() { this.rebuildForm(); }
+  revert() { this.ngOnChanges(); }
   // #enddocregion revert
 
   // #docregion log-name-change

aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts

@@ -23,7 +23,7 @@ export class HeroListComponent implements OnInit {
   getHeroes() {
     this.isLoading = true;
     this.heroes = this.heroService.getHeroes()
-                      // TODO: error handling
+                      // Todo: error handling
                       .finally(() => this.isLoading = false);
     this.selectedHero = undefined;
   }

aio/content/examples/router/src/app/heroes/hero-list.component.1.ts

@@ -1,6 +1,6 @@
 // #docplaster
 // #docregion
-// TODO: Feature Componetized like HeroCenter
+// TODO SOMEDAY: Feature Componetized like HeroCenter
 import { Component, OnInit }   from '@angular/core';
 import { Router }              from '@angular/router';
 import { Observable }          from 'rxjs/Observable';

aio/content/examples/router/src/app/heroes/hero-list.component.ts

@@ -1,6 +1,6 @@
 // #docplaster
 // #docregion
-// TODO: Feature Componetized like CrisisCenter
+// TODO SOMEDAY: Feature Componetized like CrisisCenter
 // #docregion rxjs-imports
 import 'rxjs/add/operator/switchMap';
 import { Observable } from 'rxjs/Observable';

aio/content/examples/rx-library/src/operators.2.ts

@@ -8,7 +8,7 @@ import { map } from 'rxjs/operators/map';
 
 const squareOdd = Observable.of(1, 2, 3, 4, 5)
   .pipe(
-    filter(n => n % 2 !== 0),
+    filter(n => n % 2),
     map(n => n * n)
   );
 

aio/content/examples/testing/src/app/demo/demo.ts

@@ -37,8 +37,8 @@ export class ValueService {
 // #docregion MasterService
 @Injectable()
 export class MasterService {
-  constructor(private valueService: ValueService) { }
-  getValue() { return this.valueService.getValue(); }
+  constructor(private masterService: ValueService) { }
+  getValue() { return this.masterService.getValue(); }
 }
 // #enddocregion MasterService
 

aio/content/examples/testing/src/app/hero/hero-detail.component.spec.ts

@@ -197,21 +197,20 @@ function heroModuleSetup() {
 
     // #docregion title-case-pipe
     it('should convert hero name to Title Case', () => {
-      // get the name's input and display elements from the DOM
-      const hostElement = fixture.nativeElement;
-      const nameInput: HTMLInputElement = hostElement.querySelector('input');
-      const nameDisplay: HTMLElement = hostElement.querySelector('span');
+      const inputName = 'quick BROWN  fox';
+      const titleCaseName = 'Quick Brown  Fox';
+      const { nameInput, nameDisplay } = page;
 
-      // simulate user entering a new name into the input box
-      nameInput.value = 'quick BROWN  fOx';
+      // simulate user entering new name into the input box
+      nameInput.value = inputName;
 
       // dispatch a DOM event so that Angular learns of input value change.
       nameInput.dispatchEvent(newEvent('input'));
 
-      // Tell Angular to update the display binding through the title pipe
+      // Tell Angular to update the output span through the title pipe
       fixture.detectChanges();
 
-      expect(nameDisplay.textContent).toBe('Quick Brown  Fox');
+      expect(nameDisplay.textContent).toBe(titleCaseName);
     });
     // #enddocregion title-case-pipe
   // #enddocregion selected-tests

aio/content/examples/testing/src/app/model/hero.service.spec.ts

@@ -15,7 +15,7 @@ describe ('HeroesService (with spies)', () => {
   let heroService: HeroService;
 
   beforeEach(() => {
-    // TODO: spy on other methods too
+    // Todo: spy on other methods too
     httpClientSpy = jasmine.createSpyObj('HttpClient', ['get']);
     heroService = new HeroService(<any> httpClientSpy);
   });

aio/content/examples/toh-pt4/src/app/hero.service.ts

@@ -25,7 +25,7 @@ export class HeroService {
   // #docregion getHeroes, getHeroes-1
   getHeroes(): Observable<Hero[]> {
     // #enddocregion getHeroes-1
-    // TODO: send the message _after_ fetching the heroes
+    // Todo: send the message _after_ fetching the heroes
     this.messageService.add('HeroService: fetched heroes');
     // #docregion getHeroes-1
     return of(HEROES);

aio/content/examples/toh-pt5/src/app/hero.service.ts

@@ -13,14 +13,14 @@ export class HeroService {
   constructor(private messageService: MessageService) { }
 
   getHeroes(): Observable<Hero[]> {
-    // TODO: send the message _after_ fetching the heroes
+    // Todo: send the message _after_ fetching the heroes
     this.messageService.add('HeroService: fetched heroes');
     return of(HEROES);
   }
 
   // #docregion getHero
   getHero(id: number): Observable<Hero> {
-    // TODO: send the message _after_ fetching the hero
+    // Todo: send the message _after_ fetching the hero
     this.messageService.add(`HeroService: fetched hero id=${id}`);
     return of(HEROES.find(hero => hero.id === id));
   }

aio/content/examples/universal/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es5",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2017",
+      "dom"
+    ]
+  }
+}

aio/content/guide/aot-compiler.md

@@ -103,7 +103,7 @@ You can control your app compilation by providing template compiler options in t
 This option tells the compiler not to produce `.metadata.json` files.
 The option is `false` by default.
 
-`.metadata.json` files contain information needed by the template compiler from a `.ts`
+`.metadata.json` files contain infomration needed by the template compiler from a `.ts`
 file that is not included in the `.d.ts` file produced by the TypeScript compiler. This information contains,
 for example, the content of annotations (such as a component's template) which TypeScript
 emits to the `.js` file but not to the `.d.ts` file.
@@ -204,7 +204,7 @@ JavaScript with [JsDoc](http://usejsdoc.org/) comments needed by the
 ### *annotationsAs*
 
 Use this option to modify how the Angular specific annotations are emitted to improve tree-shaking. Non-Angular
-annotations and decorators are unaffected. Default is `static fields`.
+annotations and decorators are unnaffected. Default is `static fields`.
 
 value           | description
 ----------------|-------------------------------------------------------------

aio/content/guide/architecture-components.md

@@ -1,180 +0,0 @@
-# Introduction to components
-
-<img src="generated/images/guide/architecture/hero-component.png" alt="Component" class="left">
-
-A _component_ controls a patch of screen called a *view*. For example, individual components define and control each of the following views from the [Tutorial](tutorial/index):
-
-* The app root with the navigation links.
-* The list of heroes.
-* The hero editor.
-
-You define a component's application logic&mdash;what it does to support the view&mdash;inside a class. The class interacts with the view through an API of properties and methods.
-
-For example, the `HeroListComponent` has a `heroes` property that returns an array of heroes that it acquires from a service. `HeroListComponent` also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list.
-
-<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (class)" region="class"></code-example>
-
-Angular creates, updates, and destroys components as the user moves through the application. Your app can take action at each moment in this lifecycle through optional [lifecycle hooks](guide/lifecycle-hooks), like `ngOnInit()`.
-
-<hr/>
-
-## Component metadata
-
-<img src="generated/images/guide/architecture/metadata.png" alt="Metadata" class="left">
-
-The `@Component` decorator identifies the class immediately below it as a component class, and specifies its metadata. In the example code below, you can see that `HeroListComponent` is just a class, with no special Angular notation or syntax at all. It's not a component until you mark it as one with the `@Component` decorator.
-
-The metadata for a component tells Angular where to get the major building blocks it needs to create and present the component and its view. In particular, it associates a _template_ with the component, either directly with inline code, or by reference. Together, the component and its template describe a _view_.
-
-In addition to containing or pointing to the template, the `@Component` metadata configures, for example, how the component can be referenced in HTML and what services it requires.
-
- Here's an example of basic metadata for `HeroListComponent`:
-
-<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (metadata)" region="metadata"></code-example>
-
- This example shows some of the most useful `@Component` configuration options:
-
-* `selector`: A CSS selector that tells Angular to create and insert an instance of this component wherever it finds the corresponding tag in template HTML. For example, if an app's  HTML contains `<app-hero-list></app-hero-list>`, then
-Angular inserts an instance of the `HeroListComponent` view between those tags.
-
-* `templateUrl`: The module-relative address of this component's HTML template. Alternatively, you can provide the HTML template inline, as the value of the `template` property. This template defines the component's _host view_.
-
-* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular that the component's constructor requires a `HeroService` instance
-in order to get the list of heroes to display.
-
-<hr/>
-
-## Templates and views
-
-<img src="generated/images/guide/architecture/template.png" alt="Template" class="left">
-
-You define a component's view with its companion template. A template is a form of HTML that tells Angular how to render the component.
-
-Views are typically arranged hierarchically, allowing you to modify or show and hide entire UI sections or pages as a unit. The template immediately associated with a component defines that component's _host view_. The component can also define a _view hierarchy_, which contains _embedded views_, hosted by other components.
-
-<figure>
-<img src="generated/images/guide/architecture/component-tree.png" alt="Component tree" class="left">
-</figure>
-
-A view hierarchy can include views from components in the same NgModule, but it also can (and often does) include views from components that are defined in different NgModules.
-
-## Template syntax
-
-A template looks like regular HTML, except that it also contains Angular [template syntax](guide/template-syntax), which alters the HTML based on your app's logic and the state of app and DOM data. Your template can use _data binding_ to coordinate the app and DOM data, _pipes_ to transform data before it is displayed, and _directives_ to apply app logic to what gets displayed.
-
-For example, here is a template for the Tutorial's `HeroListComponent`:
-
-<code-example path="architecture/src/app/hero-list.component.html" title="src/app/hero-list.component.html"></code-example>
-
-This template uses typical HTML elements like `<h2>` and  `<p>`, and also includes Angular template-syntax elements,  `*ngFor`, `{{hero.name}}`, `(click)`, `[hero]`, and `<app-hero-detail>`. The template-syntax elements tell Angular how to render the HTML to the screen, using program logic and data.
-
-* The  `*ngFor` directive tells Angular to iterate over a list.
-* The `{{hero.name}}`, `(click)`, and `[hero]` bind program data to and from the DOM, responding to user input. See more about [data binding](#data-binding) below.
-* The `<app-hero-detail>` tag in the example is an element that represents a new component, `HeroDetailComponent`.  The `HeroDetailComponent`  (code not shown) is a child component of the `HeroListComponent` that defines the Hero-detail view. Notice how custom components like this mix seamlessly with native HTML in the same layouts.
-
-### Data binding
-
-Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses into actions and value updates. Writing such push/pull logic by hand is tedious, error-prone, and a nightmare to read, as any experienced jQuery programmer can attest.
-
-Angular supports *two-way data binding*, a mechanism for coordinating parts of a template with parts of a component. Add binding markup to the template HTML to tell Angular how to connect both sides.
-
-The following diagram shows the four forms of data binding markup. Each form has a direction&mdash;to the DOM, from the DOM, or in both directions.
-
-<figure>
-<img src="generated/images/guide/architecture/databinding.png" alt="Data Binding" class="left">
-</figure>
-
-This example from the `HeroListComponent` template uses three of these forms:
-
-<code-example path="architecture/src/app/hero-list.component.1.html" linenums="false" title="src/app/hero-list.component.html (binding)" region="binding"></code-example>
-
-* The `{{hero.name}}` [*interpolation*](guide/displaying-data#interpolation)
-displays the component's `hero.name` property value within the `<li>` element.
-
-* The `[hero]` [*property binding*](guide/template-syntax#property-binding) passes the value of `selectedHero` from
-the parent `HeroListComponent` to the `hero` property of the child `HeroDetailComponent`.
-
-* The `(click)` [*event binding*](guide/user-input#binding-to-user-input-events) calls the component's `selectHero` method when the user clicks a hero's name.
-
-**Two-way data binding** is an important fourth form that combines property and event binding in a single notation. Here's an example from the `HeroDetailComponent` template that uses two-way data binding with the `ngModel` directive:
-
-<code-example path="architecture/src/app/hero-detail.component.html" linenums="false" title="src/app/hero-detail.component.html (ngModel)" region="ngModel"></code-example>
-
-In two-way binding, a data property value flows to the input box from the component as with property binding.
-The user's changes also flow back to the component, resetting the property to the latest value,
-as with event binding.
-
-Angular processes *all* data bindings once per JavaScript event cycle,
-from the root of the application component tree through all child components.
-
-<figure>
-  <img src="generated/images/guide/architecture/component-databinding.png" alt="Data Binding" class="left">
-</figure>
-
-Data binding plays an important role in communication between a template and its component, and is also important for communication between parent and child components.
-
-<figure>
-  <img src="generated/images/guide/architecture/parent-child-binding.png" alt="Parent/Child binding" class="left">
-</figure>
-
-### Pipes
-
- Angular pipes let you declare display-value transformations in your template HTML. A class with the `@Pipe` decorator defines a function that transforms input values to output values for display in a view.
-
- Angular defines various pipes, such as the [date](https://angular.io/api/common/DatePipe) pipe and [currency](https://angular.io/api/common/CurrencyPipe) pipe; for a complete list, see the [Pipes API list](https://angular.io/api?type=pipe). You can also define new pipes.
-
- To specify a value transformation in an HTML template, use the [pipe operator (|)](https://angular.io/guide/template-syntax#pipe):
-
- `{{interpolated_value | pipe_name}}`
-
- You can chain pipes, sending the output of one pipe function to be transformed by another pipe function. A pipe can also take arguments that control how it performs its transformation. For example, you can pass the desired format to the `date` pipe:
-
- ```
-  <!-- Default format: output 'Jun 15, 2015'-->
-  <p>Today is {{today | date}}</p>
-
- <!-- fullDate format: output 'Monday, June 15, 2015'-->
- <p>The date is {{today | date:'fullDate'}}</p>
-
-  <!-- shortTime format: output '9:43 AM'-->
-  <p>The time is {{today | date:'shortTime'}}</p>
-```
-
-<hr/>
-
-### Directives
-
-<img src="generated/images/guide/architecture/directive.png" alt="Directives" class="left">
-
-Angular templates are *dynamic*. When Angular renders them, it transforms the DOM according to the instructions given by *directives*. A directive is a class with a `@Directive` decorator.
-
-A component is technically a directive - but components are so distinctive and central to Angular applications that Angular defines the `@Component` decorator, which extends the `@Directive` decorator with template-oriented features.
-
-There are two kinds of directives besides components:  _structural_ and _attribute_ directives. Just as for components, the metadata for a directive associates the class with a `selector` that you use to insert it into HTML. In templates, directives typically appear within an element tag as attributes, either by name or as the target of an assignment or a binding.
-
-#### Structural directives
-
-Structural directives alter layout by adding, removing, and replacing elements in DOM. The example template uses two built-in structural directives to add application logic to how the view is rendered:
-
-<code-example path="architecture/src/app/hero-list.component.1.html" linenums="false" title="src/app/hero-list.component.html (structural)" region="structural"></code-example>
-
-  * [`*ngFor`](guide/displaying-data#ngFor) is an iterative; it tells Angular to stamp out one `<li>` per hero in the `heroes` list.
-  * [`*ngIf`](guide/displaying-data#ngIf) is a conditional; it includes the `HeroDetail` component only if a selected hero exists.
-
-#### Attribute directives
-
-Attribute directives alter the appearance or behavior of an existing element.
-In templates they look like regular HTML attributes, hence the name.
-
-The `ngModel` directive, which implements two-way data binding, is an example of an attribute directive. `ngModel` modifies the behavior of an existing element (typically an `<input>`) by setting its display value property and responding to change events.
-
-<code-example path="architecture/src/app/hero-detail.component.html" linenums="false" title="src/app/hero-detail.component.html (ngModel)" region="ngModel"></code-example>
-
-Angular has more pre-defined directives that either alter the layout structure
-(for example, [ngSwitch](guide/template-syntax#ngSwitch))
-or modify aspects of DOM elements and components
-(for example, [ngStyle](guide/template-syntax#ngStyle) and [ngClass](guide/template-syntax#ngClass)).
-
-You can also write your own directives. Components such as `HeroListComponent` are one kind of custom directive. You can also create custom structural and attribute directives.
-
-<!-- PENDING: link to where to learn more about other kinds! -->

aio/content/guide/architecture-modules.md

@@ -1,107 +0,0 @@
-# Introduction to modules
-
-<img src="generated/images/guide/architecture/module.png" alt="Module" class="left">
-
-Angular apps are modular and Angular has its own modularity system called _NgModules_. An NgModule is a container for a cohesive block of code dedicated to an application domain, a workflow, or a closely related set of capabilities. It can contain components, service providers, and other code files whose scope is defined by the containing NgModule. It can import functionality that is exported from other NgModules, and export selected functionality for use by other NgModules.
-
-Every Angular app has at least one NgModule class, [the _root module_](guide/bootstrapping), which is conventionally named `AppModule` and resides in a file named `app.module.ts`. You launch your app by *bootstrapping* the root NgModule.
-
-While a small application might have only one NgModule, most apps have many more _feature modules_. The _root_ NgModule for an app is so named because it can include child NgModules in a hierarchy of any depth.
-
-## NgModule metadata
-
-An NgModule is defined as a class decorated with `@NgModule`. The `@NgModule` decorator is a function that takes a single metadata object, whose properties describe the module. The most important properties are as follows.
-
-* `declarations`&mdash;The [components](guide/architecture-components), _directives_, and _pipes_ that belong to this NgModule.
-
-* `exports`&mdash;The subset of declarations that should be visible and usable in the _component templates_ of other NgModules.
-
-* `imports`&mdash;Other modules whose exported classes are needed by component templates declared in _this_ NgModule.
-
-* `providers`&mdash;Creators of [services](guide/architecture-services) that this NgModule contributes to the global collection of services; they become accessible in all parts of the app. (You can also specify providers at the component level, which is often preferred.)
-
-* `bootstrap`&mdash;The main application view, called the _root component_, which hosts all other app views. Only the _root NgModule_ should set this `bootstrap` property.
-
-Here's a simple root NgModule definition:
-
-<code-example path="architecture/src/app/mini-app.ts" region="module" title="src/app/app.module.ts" linenums="false"></code-example>
-
-<div class="l-sub-section">
-
-  The `export` of `AppComponent` is just to show how to export; it isn't actually necessary in this example. A root NgModule has no reason to _export_ anything because other modules don't need to _import_ the root NgModule.
-
-</div>
-
-## NgModules and components
-
-NgModules provide a _compilation context_ for their components. A root NgModule always has a root component that is created during bootstrap, but any NgModule can include any number of additional components, which can be loaded through the router or created through the template. The components that belong to an NgModule share a compilation context.
-
-<figure>
-
-<img src="generated/images/guide/architecture/compilation-context.png" alt="Component compilation context" class="left">
-
-</figure>
-
-<br class="clear">
-
-A component and its template together define a _view_. A component can contain a _view hierarchy_, which allows you to define arbitrarily complex areas of the screen that can be created, modified, and destroyed as a unit. A view hierarchy can mix views defined in components that belong to different NgModules. This is often the case, especially for UI libraries.
-
-<figure>
-
-<img src="generated/images/guide/architecture/view-hierarchy.png" alt="View hierarchy" class="left">
-
-</figure>
-
-<br class="clear">
-
-When you create a component, it is associated directly with a single view, called the _host view_. The host view can be the root of a view hierarchy, which can contain _embedded views_, which are in turn the host views of other components. Those components can be in the same NgModule, or can be imported from other NgModules. Views in the tree can be nested to any depth.
-
-<div class="l-sub-section">
-    The hierarchical structure of views is a key factor in the way Angular detects and responds to changes in the DOM and app data. 
-</div>
-
-## NgModules and JavaScript modules
-
-The NgModule system is different from and unrelated to the JavaScript (ES2015) module system for managing collections of JavaScript objects. These are two different and _complementary_ module systems. You can use them both to write your apps.
-
-In JavaScript each _file_ is a module and all objects defined in the file belong to that module.
-The module declares some objects to be public by marking them with the `export` key word.
-Other JavaScript modules use *import statements* to access public objects from other modules.
-
-<code-example path="architecture/src/app/app.module.ts" region="imports" linenums="false"></code-example>
-
-<code-example path="architecture/src/app/app.module.ts" region="export" linenums="false"></code-example>
-
-<div class="l-sub-section">
-  <a href="http://exploringjs.com/es6/ch_modules.html">Learn more about the JavaScript module system on the web.</a>
-</div>
-
-## Angular libraries
-
-<img src="generated/images/guide/architecture/library-module.png" alt="Component" class="left">
-
-Angular ships as a collection of JavaScript modules. You can think of them as library modules. Each Angular library name begins with the `@angular` prefix. Install them with the `npm` package manager and import parts of them with JavaScript `import` statements.
-
-<br class="clear">
-
-For example, import Angular's `Component` decorator from the `@angular/core` library like this:
-
-<code-example path="architecture/src/app/app.component.ts" region="import" linenums="false"></code-example>
-
-You also import NgModules from Angular _libraries_ using JavaScript import statements:
-
-<code-example path="architecture/src/app/mini-app.ts" region="import-browser-module" linenums="false"></code-example>
-
-In the example of the simple root module above, the application module needs material from within the `BrowserModule`. To access that material, add it to the `@NgModule` metadata `imports` like this.
-
-<code-example path="architecture/src/app/mini-app.ts" region="ngmodule-imports" linenums="false"></code-example>
-
-In this way you're using both the Angular and JavaScript module systems _together_. Although it's easy to confuse the two systems, which share the common vocabulary of "imports" and "exports", you will become familiar with the different contexts in which they are used.
-
-<div class="l-sub-section">
-
-  Learn more from the [NgModules](guide/ngmodules) page.
-
-</div>
-
-<hr/>

aio/content/guide/architecture-next-steps.md

@@ -1,48 +0,0 @@
-# Next steps: tools and techniques
-
-Once you have understood the basic building blocks, you can begin to learn more about the features and tools that are available to help you develop and deliver Angular applications.  Angular provides a lot more features and services that are covered in this documentation.
-
-#### Responsive programming tools
-
-   * [Lifecycle hooks](guide/lifecycle-hooks): Tap into key moments in the lifetime of a component, from its creation to its destruction, by implementing the lifecycle hook interfaces.
-
-   * [Observables and event processing](guide/observables): How to use observables with components and services to publish and subscribe to messages of any type, such as user-interaction events and asynchronous operation results.
-
-#### Client-server interaction tools
-
-  * [HTTP](guide/http): Communicate with a server to get data, save data, and invoke server-side actions with an HTTP client.
-
-  * [Server-side Rendering](guide/universal): Angular Universal generates static application pages on the server through server-side rendering (SSR). This allows you to run your Angular app on the server in order to improve performance and show the first page quickly on mobile and low-powered devices, and also facilitate web crawlers.
-
-  * [Service Workers](guide/service-worker-intro): A service worker is a script that runs in the web browser and manages caching for an application. Service workers function as a network proxy. They intercept outgoing HTTP requests and can, for example, deliver a cached response if one is available. You can significantly improve the user experience by using a service worker to reduce dependency on the network.
-
-#### Domain-specific libraries
-
-   * [Animations](guide/animations): Animate component behavior
-without deep knowledge of animation techniques or CSS with Angular's animation library.
-
-   * [Forms](guide/forms): Support complex data entry scenarios with HTML-based validation and dirty checking.
-
-#### Support for the development cycle
-
-   * [Testing Platform](guide/testing): Run unit tests on your application parts as they interact with the Angular framework.
-
-   * [Internationalization](guide/i18n):  Angular's internationalization (i18n) tools can help you make your app available in multiple languages.
-
-   * [Compilation](guide/aot-compiler): Angular provides just-in-time (JIT) compilation for the development environment, and ahead-of-time (AOT) compilation for the production environment.
-
-   * [Security guidelines](guide/security): Learn about Angular's built-in protections against common web-app vulnerabilities and attacks such as cross-site scripting attacks.
-
-#### Setup and deployment tools
-
-   * [Setup for local development](guide/setup): Learn how to set up a new project for development with QuickStart.
-
-   * [Installation](guide/npm-packages): The [Angular CLI](https://cli.angular.io/), Angular applications, and Angular itself depend on features and functionality provided by libraries that are available as [npm](https://docs.npmjs.com/) packages.
-
-   * [Typescript Configuration](guide/typescript-configuration): TypeScript is the primary language for Angular application development.
-
-   * [Browser support](guide/browser-support): Learn how to make your apps compatible across a wide range of browsers.
-
-   * [Deployment](guide/deployment): Learn techniques for deploying your Angular application to a remote server.
-
-<hr/>

aio/content/guide/architecture-services.md

@@ -1,76 +0,0 @@
-# Introduction to services and dependency injection
-
-<img src="generated/images/guide/architecture/service.png" alt="Service" class="left">
-
-_Service_ is a broad category encompassing any value, function, or feature that an app needs. A service is typically a class with a narrow, well-defined purpose. It should do something specific and do it well.
-<br class="clear">
-
-Angular distinguishes components from services in order to increase modularity and reusability.
-
-* By separating a component's view-related functionality from other kinds of processing, you can make your component classes lean and efficient. Ideally, a component's job is to enable the user experience and nothing more.  It should present properties and methods for data binding, in order to mediate between the view (rendered by the template) and the application logic (which often includes some notion of a _model_).
-
-* A component should not need to define things like how to fetch data from the server, validate user input, or log directly to the console. Instead, it can delegate such tasks to services. By defining that kind of processing task in an injectable service class, you make it available to any component. You can also make your app more adaptable by injecting different providers of the same kind of service, as appropriate in different circumstances.
-
-Angular doesn't *enforce* these principles. Angular does help you *follow* these principles by making it easy to factor your
-application logic into services and make those services available to components through *dependency injection*.
-
-## Service examples
-
-Here's an example of a service class that logs to the browser console:
-
-<code-example path="architecture/src/app/logger.service.ts" linenums="false" title="src/app/logger.service.ts (class)" region="class"></code-example>
-
-Services can depend on other services. For example, here's a `HeroService` that depends on the `Logger` service, and also uses `BackendService` to get heroes. That service in turn might depend on the `HttpClient` service to fetch heroes asynchronously from a server.
-
-<code-example path="architecture/src/app/hero.service.ts" linenums="false" title="src/app/hero.service.ts (class)" region="class"></code-example>
-
-<hr/>
-
-## Dependency injection
-
-<img src="generated/images/guide/architecture/dependency-injection.png" alt="Service" class="left">
-
-Components consume services; that is, you can *inject* a service into a component, giving the component access to that service class. 
-
-To define a class as a service in Angular, use the `@Injectable` decorator to provide the metadata that allows Angular to inject it into a component as a *dependency*.  
-
-Similarly, use the `@Injectable` decorator to indicate that a component or other class (such as another service, a pipe, or an NgModule) _has_ a dependency. A dependency doesn't have to be a service&mdash;it could be a function, for example, or a value. 
-
-*Dependency injection* (often called DI) is wired into the Angular framework and used everywhere to provide new components with the services or other things they need.
-
-* The *injector* is the main mechanism. You don't have to create an Angular injector. Angular creates an application-wide injector for you during the bootstrap process.
-
-* The injector maintains a *container* of dependency instances that it has already created, and reuses them if possible.
-
-* A *provider* is a recipe for creating a dependency. For a service, this is typically the service class itself. For any dependency you need in your app, you must register a provider with the app's injector, so that the injector can use it to create new instances.
-
-When Angular creates a new instance of a component class, it determines which services or other dependencies that component needs by looking at the types of its constructor parameters. For example, the constructor of `HeroListComponent` needs a `HeroService`:
-
-<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (constructor)" region="ctor"></code-example>
-
-When Angular discovers that a component depends on a service, it first checks if the injector already has any existing instances of that service. If a requested service instance does not yet exist, the injector makes one using the registered provider, and adds it to the injector before returning the service to Angular.
-
-When all requested services have been resolved and returned, Angular can call the component's constructor with those services as arguments.
-
-The process of `HeroService` injection looks something like this:
-
-<figure>
-  <img src="generated/images/guide/architecture/injector-injects.png" alt="Service" class="left">
-</figure>
-
-### Providing services
-
-You must register at least one *provider* of any service you are going to use. You can register providers in modules or in components.
-
-* When you add providers to the [root module](guide/architecture-modules), the same instance of a service is available to all components in your app.
-
-<code-example path="architecture/src/app/app.module.ts" linenums="false" title="src/app/app.module.ts (module providers)" region="providers"></code-example>
-
-* When you register a provider at the component level, you get a new instance of the
-service with each new instance of that component. At the component level, register a service provider in the `providers` property of the `@Component` metadata:
-
-<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (component providers)" region="providers"></code-example>
-
-For more detailed information, see the [Dependency Injection](guide/dependency-injection) section.
-
-<hr/>

aio/content/guide/architecture.md

@@ -1,137 +1,533 @@
-# Architecture overview
+# Architecture Overview
 
-Angular is a platform and framework for building client applications in HTML and TypeScript.
-Angular is itself written in TypeScript. It implements core and optional functionality as a set of TypeScript libraries that you import into your apps.
+Angular is a framework for building client applications in HTML and
+either JavaScript or a language like TypeScript that compiles to JavaScript.
 
-The basic building blocks of an Angular application are _NgModules_, which provide a compilation context for _components_. NgModules collect related code into functional sets; an Angular app is defined by a set of NgModules. An app always has at least a _root module_ that enables bootstrapping, and typically has many more _feature modules_.
+The framework consists of several libraries, some of them core and some optional.
 
-* Components define *views*, which are sets of screen elements that Angular can choose among and modify according to your program logic and data. Every app has at least a root component.
+You write Angular applications by composing HTML *templates* with Angularized markup,
+writing *component* classes to manage those templates, adding application logic in *services*,
+and boxing components and services in *modules*.
 
-* Components use *services*, which provide specific functionality not directly related to views. Service providers can be *injected* into components as *dependencies*, making your code modular, reusable, and efficient.
+Then you launch the app by *bootstrapping* the _root module_.
+Angular takes over, presenting your application content in a browser and
+responding to user interactions according to the instructions you've provided.
 
-Both components and services are simply classes, with *decorators* that mark their type and provide metadata that tells Angular how to use them.
-
-* The metadata for a component class associates it with a *template* that defines a view. A template combines ordinary HTML with Angular *directives* and *binding markup* that allow Angular to modify the HTML before rendering it for display.
-
-* The metadata for a service class provides the information Angular needs to make it available to components through *Dependency Injection (DI)*.
-
-An app's components typically define many views, arranged hierarchically. Angular provides the `Router` service to help you define navigation paths among views. The router provides sophisticated in-browser navigational capabilities.
-
-## Modules
-
-Angular defines the `NgModule`, which differs from and complements the JavaScript (ES2015) module. An NgModule declares a compilation context for a set of components that is dedicated to an application domain, a workflow, or a closely related set of capabilities. An NgModule can associate its components with related code, such as services, to form functional units.
-
-Every Angular app has a _root module_, conventionally named `AppModule`, which provides the bootstrap mechanism that launches the application. An app typically contains many functional modules.
-
-Like JavaScript modules, NgModules can import functionality from other NgModules, and allow their own functionality to be exported and used by other NgModules. For example, to use the router service in your app, you import the `Router` NgModule.
-
-Organizing your code into distinct functional modules helps in managing development of complex applications, and in designing for reusability. In addition, this technique lets you take advantage of _lazy-loading_—that is, loading modules on demand—in order to minimize the amount of code that needs to be loaded at startup.
-
-<div class="l-sub-section">
-
-  For a more detailed discussion, see [Introduction to modules](guide/architecture-modules).
-
-</div>
-
-## Components
-
-Every Angular application has at least one component, the *root component* that connects a component hierarchy with the page DOM. Each component defines a class that contains application data and logic, and is associated with an HTML *template* that defines a view to be displayed in a target environment.
-
-The `@Component` decorator identifies the class immediately below it as a component, and provides the template and related component-specific metadata.
-
-<div class="l-sub-section">
-
-   Decorators are functions that modify JavaScript classes. Angular defines a number of such decorators that attach specific kinds of metadata to classes, so that it knows what those classes mean and how they should work.
-
-   <a href="https://medium.com/google-developers/exploring-es7-decorators-76ecb65fb841#.x5c2ndtx0">Learn more about decorators on the web.</a>
-
-</div>
-
-### Templates, directives, and data binding
-
-A template combines HTML with Angular markup that can modify the HTML elements before they are displayed.
-Template *directives* provide program logic, and *binding markup* connects your application data and the document object model (DOM).
-
-* *Event binding* lets your app respond to user input in the target environment by updating your application data.
-* *Property binding* lets you interpolate values that are computed from your application data into the HTML.
-
-Before a view is displayed, Angular evaluates the directives and resolves the binding syntax in the template to modify the HTML elements and the DOM, according to your program data and logic. Angular supports *two-way data binding*, meaning that changes in the DOM, such as user choices, can also be reflected back into your program data.
-
-Your templates can also use *pipes* to improve the user experience by transforming values for display. Use pipes to display, for example, dates and currency values in a way appropriate to the user's locale. Angular provides predefined pipes for common transformations, and you can also define your own.
-
-<div class="l-sub-section">
-
-  For a more detailed discussion of these concepts, see [Introduction to components](guide/architecture-components).
-
-</div>
-
-{@a dependency-injection}
-
-
-## Services and dependency injection
-
-For data or logic that is not associated with a specific view, and that you want to share across components, you create a *service* class. A service class definition is immediately preceded by the `@Injectable` decorator. The decorator provides the metadata that allows your service to be *injected* into client components as a dependency.
-
- *Dependency injection* (or DI) lets you keep your component classes lean and efficient. They don't fetch data from the server, validate user input, or log directly to the console; they delegate such tasks to services.
-
-<div class="l-sub-section">
-
-  For a more detailed discusssion, see [Introduction to services and DI](guide/architecture-services).
-
-</div>
-
-### Routing
-
-The Angular `Router` NgModule provides a service that lets you define a navigation path among the different application states and view hierarchies in your app. It is modeled on the familiar browser navigation conventions:
-
-* Enter a URL in the address bar and the browser navigates to a corresponding page.
-* Click links on the page and the browser navigates to a new page.
-* Click the browser's back and forward buttons and the browser navigates backward and forward through the history of pages you've seen.
-
-The router maps URL-like paths to views instead of pages. When a user performs an action, such as clicking a link, that would load a new page in the browser, the router intercepts the browser's behavior, and shows or hides view hierarchies.
-
-If the router determines that the current application state requires particular functionality, and the module that defines it has not been loaded, the router can _lazy-load_ the module on demand.
-
-The router interprets a link URL according to your app's view navigation rules and data state. You can navigate to new views when the user clicks a button, selects from a drop box, or in response to some other stimulus from any source. The Router logs activity in the browser's history journal, so the back and forward buttons work as well.
-
-To define navigation rules, you associate *navigation paths* with your components. A path uses a URL-like syntax that integrates your program data, in much the same way that template syntax integrates your views with your program data. You can then apply program logic to choose which views to show or to hide, in response to user input and your own access rules.
-
- <div class="l-sub-section">
-
-   For a more detailed discussion, see [Routing and navigation](guide/router).
-
- </div>
-
-<hr/>
-
-## What's next
-
-You've learned the basics about the main building blocks of an Angular application. The following diagram shows how these basic pieces are related.
+Of course, there is more to it than this.
+You'll learn the details in the pages that follow. For now, focus on the big picture.
 
 <figure>
   <img src="generated/images/guide/architecture/overview2.png" alt="overview">
 </figure>
 
-* Together, a component and template define an Angular view.
-  * A decorator on a component class adds the metadata, including a pointer to the associated template.
-  * Directives and binding markup in a component's template modify views based on program data and logic.
-* The dependency injector provides services to a component, such as the router service that lets you define navigation among views.
+<div class="l-sub-section">
 
-Each of these subjects is introduced in more detail in the following pages.
+  The code referenced on this page is available as a <live-example></live-example>.
 
-* [Modules](guide/architecture-modules)
-* [Components](guide/architecture-components)
-  * [Templates](guide/architecture-components#templates-and-views)
-  * [Metadata](guide/architecture-components#component-metadata)
-  * [Data binding](guide/architecture-components#data-binding)
-  * [Directives](guide/architecture-components#directives)
-  * [Pipes](guide/architecture-components#pipes)
-* [Services and dependency injection](guide/architecture-services)
+</div>
+
+## Modules
+
+<img src="generated/images/guide/architecture/module.png" alt="Component" class="left">
+
+
+Angular apps are modular and Angular has its own modularity system called _NgModules_.
+
+NgModules are a big deal.
+This page introduces modules; the [NgModules](guide/ngmodules) pages 
+relating to NgModules covers them in detail.
+
+<br class="clear">
+
+Every Angular app has at least one NgModule class, [the _root module_](guide/bootstrapping "Bootstrapping"),
+conventionally named `AppModule`.
+
+While the _root module_ may be the only module in a small application, most apps have many more
+_feature modules_, each a cohesive block of code dedicated to an application domain,
+a workflow, or a closely related set of capabilities.
+
+An NgModule, whether a _root_ or _feature_, is a class with an `@NgModule` decorator.
 
 <div class="l-sub-section">
 
-   Note that the code referenced on these pages is available as a <live-example></live-example>.
+  Decorators are functions that modify JavaScript classes.
+  Angular has many decorators that attach metadata to classes so that it knows
+  what those classes mean and how they should work.
+  <a href="https://medium.com/google-developers/exploring-es7-decorators-76ecb65fb841#.x5c2ndtx0">
+  Learn more</a> about decorators on the web.
+
 </div>
 
-When you are familiar with these fundamental building blocks, you can explore them in more detail in the documentation. To learn about more tools and techniques that are available to help you build and deploy Angular applications, see [Next steps](guide/architecture-next-steps).
+`NgModule` is a decorator function that takes a single metadata object whose properties describe the module.
+The most important properties are:
+* `declarations` - the _view classes_ that belong to this module.
+Angular has three kinds of view classes: [components](guide/architecture#components), [directives](guide/architecture#directives), and [pipes](guide/pipes).
+
+* `exports` - the subset of declarations that should be visible and usable in the component [templates](guide/architecture#templates) of other modules.
+
+* `imports` - other modules whose exported classes are needed by component templates declared in _this_ module.
+
+* `providers` - creators of [services](guide/architecture#services) that this module contributes to
+the global collection of services; they become accessible in all parts of the app.
+
+* `bootstrap` - the main application view, called the _root component_,
+that hosts all other app views. Only the _root module_ should set this `bootstrap` property.
+
+Here's a simple root module:
+
+<code-example path="architecture/src/app/mini-app.ts" region="module" title="src/app/app.module.ts" linenums="false"></code-example>
+
+<div class="l-sub-section">
+
+  The `export` of `AppComponent` is just to show how to use the `exports` array to export a component; it isn't actually necessary in this example. A root module has no reason to _export_ anything because other components don't need to _import_ the root module.
+
 </div>
+
+Launch an application by _bootstrapping_ its root module.
+During development you're likely to bootstrap the `AppModule` in a `main.ts` file like this one.
+
+<code-example path="architecture/src/main.ts" title="src/main.ts" linenums="false"></code-example>
+
+### NgModules vs. JavaScript modules
+
+The NgModule &mdash; a class decorated with `@NgModule` &mdash; is a fundamental feature of Angular.
+
+JavaScript also has its own module system for managing collections of JavaScript objects.
+It's completely different and unrelated to the NgModule system.
+
+In JavaScript each _file_ is a module and all objects defined in the file belong to that module.
+The module declares some objects to be public by marking them with the `export` key word.
+Other JavaScript modules use *import statements* to access public objects from other modules.
+
+<code-example path="architecture/src/app/app.module.ts" region="imports" linenums="false"></code-example>
+
+<code-example path="architecture/src/app/app.module.ts" region="export" linenums="false"></code-example>
+
+<div class="l-sub-section">
+  <a href="http://exploringjs.com/es6/ch_modules.html">Learn more about the JavaScript module system on the web.</a>
+</div>
+
+These are two different and _complementary_ module systems. Use them both to write your apps.
+
+### Angular libraries
+
+<img src="generated/images/guide/architecture/library-module.png" alt="Component" class="left">
+
+Angular ships as a collection of JavaScript modules. You can think of them as library modules.
+
+Each Angular library name begins with the `@angular` prefix.
+
+You install them with the **npm** package manager and import parts of them with JavaScript `import` statements.
+
+<br class="clear">
+
+For example, import Angular's `Component` decorator from the `@angular/core` library like this:
+
+<code-example path="architecture/src/app/app.component.ts" region="import" linenums="false"></code-example>
+
+You also import NgModules from Angular _libraries_ using JavaScript import statements:
+
+<code-example path="architecture/src/app/mini-app.ts" region="import-browser-module" linenums="false"></code-example>
+
+In the example of the simple root module above, the application module needs material from within that `BrowserModule`. To access that material, add it to the `@NgModule` metadata `imports` like this.
+
+<code-example path="architecture/src/app/mini-app.ts" region="ngmodule-imports" linenums="false"></code-example>
+
+In this way you're using both the Angular and JavaScript module systems _together_.
+
+It's easy to confuse the two systems because they share the common vocabulary of "imports" and "exports".
+Hang in there. The confusion yields to clarity with time and experience.
+
+<div class="l-sub-section">
+
+  Learn more from the [NgModules](guide/ngmodules) page.
+
+</div>
+
+<hr/>
+
+## Components
+
+<img src="generated/images/guide/architecture/hero-component.png" alt="Component" class="left">
+
+A _component_ controls a patch of screen called a *view*.
+
+For example, the following views are controlled by components:
+
+* The app root with the navigation links.
+* The list of heroes.
+* The hero editor.
+
+You define a component's application logic&mdash;what it does to support the view&mdash;inside a class.
+The class interacts with the view through an API of properties and methods.
+
+{@a component-code}
+
+For example, this `HeroListComponent` has a `heroes` property that returns an array of heroes
+that it acquires from a service.
+`HeroListComponent` also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list.
+
+<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (class)" region="class"></code-example>
+
+Angular creates, updates, and destroys components as the user moves through the application.
+Your app can take action at each moment in this lifecycle through optional [lifecycle hooks](guide/lifecycle-hooks), like `ngOnInit()` declared above.
+
+<hr/>
+
+## Templates
+
+<img src="generated/images/guide/architecture/template.png" alt="Template" class="left">
+
+You define a component's view with its companion **template**. A template is a form of HTML
+that tells Angular how to render the component.
+
+A template looks like regular HTML, except for a few differences. Here is a
+template for our `HeroListComponent`:
+
+<code-example path="architecture/src/app/hero-list.component.html" title="src/app/hero-list.component.html"></code-example>
+
+Although this template uses typical HTML elements like `<h2>` and  `<p>`, it also has some differences. Code like `*ngFor`, `{{hero.name}}`, `(click)`, `[hero]`, and `<app-hero-detail>` uses Angular's [template syntax](guide/template-syntax).
+
+In the last line of the template, the `<app-hero-detail>` tag is a custom element that represents a new component, `HeroDetailComponent`.
+
+The `HeroDetailComponent` is a *different* component than the `HeroListComponent` you've been reviewing.
+The `HeroDetailComponent` (code not shown) presents facts about a particular hero, the
+hero that the user selects from the list presented by the `HeroListComponent`.
+The `HeroDetailComponent` is a **child** of the `HeroListComponent`.
+
+<img src="generated/images/guide/architecture/component-tree.png" alt="Metadata" class="left">
+
+Notice how `<app-hero-detail>` rests comfortably among native HTML elements. Custom components mix seamlessly with native HTML in the same layouts.
+
+<hr class="clear"/>
+
+## Metadata
+
+<img src="generated/images/guide/architecture/metadata.png" alt="Metadata" class="left">
+
+Metadata tells Angular how to process a class.
+
+<br class="clear">
+
+[Looking back at the code](guide/architecture#component-code) for `HeroListComponent`, you can see that it's just a class.
+There is no evidence of a framework, no "Angular" in it at all.
+
+In fact, `HeroListComponent` really is *just a class*. It's not a component until you *tell Angular about it*.
+
+To tell Angular that `HeroListComponent` is a component, attach **metadata** to the class.
+
+In TypeScript, you attach metadata by using a **decorator**.
+Here's some metadata for `HeroListComponent`:
+
+<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (metadata)" region="metadata"></code-example>
+
+Here is the `@Component` decorator, which identifies the class
+immediately below it as a component class.
+
+The `@Component` decorator takes a required configuration object with the
+information Angular needs to create and present the component and its view.
+
+Here are a few of the most useful `@Component` configuration options:
+
+* `selector`: CSS selector that tells Angular to create and insert an instance of this component
+where it finds a `<app-hero-list>` tag in *parent* HTML.
+For example, if an app's  HTML contains `<app-hero-list></app-hero-list>`, then
+Angular inserts an instance of the `HeroListComponent` view between those tags.
+
+* `templateUrl`: module-relative address of this component's HTML template, shown [above](guide/architecture#templates).
+
+* `providers`: array of **dependency injection providers** for services that the component requires.
+This is one way to tell Angular that the component's constructor requires a `HeroService`
+so it can get the list of heroes to display.
+
+<img src="generated/images/guide/architecture/template-metadata-component.png" alt="Metadata" class="left">
+
+The metadata in the `@Component` tells Angular where to get the major building blocks you specify for the component.
+
+The template, metadata, and component together describe a view.
+
+Apply other metadata decorators in a similar fashion to guide Angular behavior.
+`@Injectable`, `@Input`, and `@Output` are a few of the more popular decorators.
+
+<br class="clear">
+
+The architectural takeaway is that you must add metadata to your code
+so that Angular knows what to do.
+
+<hr/>
+
+## Data binding
+
+Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses
+into actions and value updates. Writing such push/pull logic by hand is tedious, error-prone, and a nightmare to
+read as any experienced jQuery programmer can attest.
+
+<img src="generated/images/guide/architecture/databinding.png" alt="Data Binding" class="left">
+
+Angular supports **data binding**,
+a mechanism for coordinating parts of a template with parts of a component.
+Add binding markup to the template HTML to tell Angular how to connect both sides.
+
+As the diagram shows, there are four forms of data binding syntax. Each form has a direction &mdash; to the DOM, from the DOM, or in both directions.
+
+<br class="clear">
+
+The `HeroListComponent` [example](guide/architecture#templates) template has three forms:
+
+<code-example path="architecture/src/app/hero-list.component.1.html" linenums="false" title="src/app/hero-list.component.html (binding)" region="binding"></code-example>
+
+* The `{{hero.name}}` [*interpolation*](guide/displaying-data#interpolation)
+displays the component's `hero.name` property value within the `<li>` element.
+
+* The `[hero]` [*property binding*](guide/template-syntax#property-binding) passes the value of `selectedHero` from
+the parent `HeroListComponent` to the `hero` property of the child `HeroDetailComponent`.
+
+* The `(click)` [*event binding*](guide/user-input#click) calls the component's `selectHero` method when the user clicks a hero's name.
+
+**Two-way data binding** is an important fourth form
+that combines property and event binding in a single notation, using the `ngModel` directive.
+Here's an example from the `HeroDetailComponent` template:
+
+<code-example path="architecture/src/app/hero-detail.component.html" linenums="false" title="src/app/hero-detail.component.html (ngModel)" region="ngModel"></code-example>
+
+In two-way binding, a data property value flows to the input box from the component as with property binding.
+The user's changes also flow back to the component, resetting the property to the latest value,
+as with event binding.
+
+Angular processes *all* data bindings once per JavaScript event cycle,
+from the root of the application component tree through all child components.
+
+<figure>
+  <img src="generated/images/guide/architecture/component-databinding.png" alt="Data Binding">
+</figure>
+
+Data binding plays an important role in communication between a template and its component.
+
+<figure>
+  <img src="generated/images/guide/architecture/parent-child-binding.png" alt="Parent/Child binding">
+</figure>
+
+Data binding is also important for communication between parent and child components.
+
+<hr/>
+
+## Directives
+
+<img src="generated/images/guide/architecture/directive.png" alt="Parent child" class="left">
+
+Angular templates are *dynamic*. When Angular renders them, it transforms the DOM
+according to the instructions given by **directives**.
+
+A directive is a class with a `@Directive` decorator.
+A component is a *directive-with-a-template*;
+a `@Component` decorator is actually a `@Directive` decorator extended with template-oriented features.
+
+<div class="l-sub-section">
+
+  While **a component is technically a directive**,
+  components are so distinctive and central to Angular applications that this architectural overview separates components from directives.
+
+</div>
+
+Two *other* kinds of directives exist: _structural_ and _attribute_ directives.
+
+They tend to appear within an element tag as attributes do,
+sometimes by name but more often as the target of an assignment or a binding.
+
+**Structural** directives alter layout by adding, removing, and replacing elements in DOM.
+
+The [example template](guide/architecture#templates) uses two built-in structural directives:
+
+<code-example path="architecture/src/app/hero-list.component.1.html" linenums="false" title="src/app/hero-list.component.html (structural)" region="structural"></code-example>
+
+* [`*ngFor`](guide/displaying-data#ngFor) tells Angular to stamp out one `<li>` per hero in the `heroes` list.
+* [`*ngIf`](guide/displaying-data#ngIf) includes the `HeroDetail` component only if a selected hero exists.
+
+**Attribute** directives alter the appearance or behavior of an existing element.
+In templates they look like regular HTML attributes, hence the name.
+
+The `ngModel` directive, which implements two-way data binding, is
+an example of an attribute directive. `ngModel` modifies the behavior of
+an existing element (typically an `<input>`)
+by setting its display value property and responding to change events.
+
+<code-example path="architecture/src/app/hero-detail.component.html" linenums="false" title="src/app/hero-detail.component.html (ngModel)" region="ngModel"></code-example>
+
+Angular has a few more directives that either alter the layout structure
+(for example, [ngSwitch](guide/template-syntax#ngSwitch))
+or modify aspects of DOM elements and components
+(for example, [ngStyle](guide/template-syntax#ngStyle) and [ngClass](guide/template-syntax#ngClass)).
+
+Of course, you can also write your own directives. Components such as
+`HeroListComponent` are one kind of custom directive.
+
+<!-- PENDING: link to where to learn more about other kinds! -->
+
+<hr/>
+
+## Services
+
+<img src="generated/images/guide/architecture/service.png" alt="Service" class="left">
+
+_Service_ is a broad category encompassing any value, function, or feature that your application needs.
+
+Almost anything can be a service.
+A service is typically a class with a narrow, well-defined purpose. It should do something specific and do it well.
+<br class="clear">
+
+Examples include:
+
+* logging service
+* data service
+* message bus
+* tax calculator
+* application configuration
+
+There is nothing specifically _Angular_ about services. Angular has no definition of a service.
+There is no service base class, and no place to register a service.
+
+Yet services are fundamental to any Angular application. Components are big consumers of services.
+
+Here's an example of a service class that logs to the browser console:
+
+<code-example path="architecture/src/app/logger.service.ts" linenums="false" title="src/app/logger.service.ts (class)" region="class"></code-example>
+
+Here's a `HeroService` that uses a [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) to fetch heroes.
+The `HeroService` depends on the `Logger` service and another `BackendService` that handles the server communication grunt work.
+
+<code-example path="architecture/src/app/hero.service.ts" linenums="false" title="src/app/hero.service.ts (class)" region="class"></code-example>
+
+Services are everywhere.
+
+Component classes should be lean. They don't fetch data from the server,
+validate user input, or log directly to the console.
+They delegate such tasks to services.
+
+A component's job is to enable the user experience and nothing more. It mediates between the view (rendered by the template)
+and the application logic (which often includes some notion of a _model_).
+A good component presents properties and methods for data binding.
+It delegates everything nontrivial to services.
+
+Angular doesn't *enforce* these principles.
+It won't complain if you write a "kitchen sink" component with 3000 lines.
+
+Angular does help you *follow* these principles by making it easy to factor your
+application logic into services and make those services available to components through *dependency injection*.
+
+<hr/>
+
+## Dependency injection
+
+<img src="generated/images/guide/architecture/dependency-injection.png" alt="Service" class="left">
+
+_Dependency injection_ is a way to supply a new instance of a class
+with the fully-formed dependencies it requires. Most dependencies are services.
+Angular uses dependency injection to provide new components with the services they need.
+
+<br class="clear">
+
+Angular can tell which services a component needs by looking at the types of its constructor parameters.
+For example, the constructor of your `HeroListComponent` needs a `HeroService`:
+
+
+<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (constructor)" region="ctor"></code-example>
+
+When Angular creates a component, it first asks an **injector** for
+the services that the component requires.
+
+An injector maintains a container of service instances that it has previously created.
+If a requested service instance is not in the container, the injector makes one and adds it to the container
+before returning the service to Angular.
+When all requested services have been resolved and returned,
+Angular can call the component's constructor with those services as arguments.
+This is *dependency injection*.
+
+The process of `HeroService` injection looks a bit like this:
+
+<figure>
+  <img src="generated/images/guide/architecture/injector-injects.png" alt="Service">
+</figure>
+
+If the injector doesn't have a `HeroService`, how does it know how to make one?
+
+In brief, you must have previously registered a **provider** of the `HeroService` with the injector.
+A provider is something that can create or return a service, typically the service class itself.
+
+You can register providers in modules or in components.
+
+In general, add providers to the [root module](guide/architecture#modules) so that
+the same instance of a service is available everywhere.
+
+<code-example path="architecture/src/app/app.module.ts" linenums="false" title="src/app/app.module.ts (module providers)" region="providers"></code-example>
+
+Alternatively, register at a component level in the `providers` property of the `@Component` metadata:
+
+<code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (component providers)" region="providers"></code-example>
+
+Registering at a component level means you get a new instance of the
+service with each new instance of that component.
+
+<!-- We've vastly oversimplified dependency injection for this overview.
+The full story is in the [dependency injection](guide/dependency-injection) page. -->
+
+Points to remember about dependency injection:
+
+* Dependency injection is wired into the Angular framework and used everywhere.
+
+* The *injector* is the main mechanism.
+  * An injector maintains a *container* of service instances that it created.
+  * An injector can create a new service instance from a *provider*.
+
+* A *provider* is a recipe for creating a service.
+
+* Register *providers* with injectors.
+
+<hr/>
+
+## Wrap up
+
+You've learned the basics about the eight main building blocks of an Angular application:
+
+* [Modules](guide/architecture#modules)
+* [Components](guide/architecture#components)
+* [Templates](guide/architecture#templates)
+* [Metadata](guide/architecture#metadata)
+* [Data binding](guide/architecture#data-binding)
+* [Directives](guide/architecture#directives)
+* [Services](guide/architecture#services)
+* [Dependency injection](guide/architecture#dependency-injection)
+
+That's a foundation for everything else in an Angular application,
+and it's more than enough to get going.
+But it doesn't include everything you need to know.
+
+Here is a brief, alphabetical list of other important Angular features and services.
+Most of them are covered in this documentation (or soon will be).
+
+> [**Animations**](guide/animations): Animate component behavior
+without deep knowledge of animation techniques or CSS with Angular's animation library.
+
+> **Change detection**: The change detection documentation will cover how Angular decides that a component property value has changed,
+when to update the screen, and how it uses **zones** to intercept asynchronous activity and run its change detection strategies.
+
+> **Events**: The events documentation will cover how to use components and services to raise events with mechanisms for
+publishing and subscribing to events.
+
+> [**Forms**](guide/forms): Support complex data entry scenarios with HTML-based validation and dirty checking.
+
+> [**HTTP**](guide/http): Communicate with a server to get data, save data, and invoke server-side actions with an HTTP client.
+
+> [**Lifecycle hooks**](guide/lifecycle-hooks): Tap into key moments in the lifetime of a component, from its creation to its destruction,
+by implementing the lifecycle hook interfaces.
+
+> [**Pipes**](guide/pipes): Use pipes in your templates to improve the user experience by transforming values for display. Consider this `currency` pipe expression:
+>
+> > `price | currency:'USD':true`
+>
+> It displays a price of 42.33 as `$42.33`.
+
+> [**Router**](guide/router): Navigate from page to page within the client
+  application and never leave the browser.
+
+> [**Testing**](guide/testing): Run unit tests on your application parts as they interact with the Angular framework
+using the _Angular Testing Platform_.

aio/content/guide/cheatsheet.md

@@ -311,11 +311,11 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 </td>
 </tr><tr>
 <td><code><b>ngAfterViewInit()</b> { ... }</code></td>
-<td><p>Called after <code>ngAfterContentInit</code> when the component's views and child views / the view that a directive is in has been initialized.</p>
+<td><p>Called after <code>ngAfterContentInit</code> when the component's view has been initialized. Applies to components only.</p>
 </td>
 </tr><tr>
 <td><code><b>ngAfterViewChecked()</b> { ... }</code></td>
-<td><p>Called after every check of the component's views and child views / the view that a directive is in.</p>
+<td><p>Called after every check of the component's view. Applies to components only.</p>
 </td>
 </tr><tr>
 <td><code><b>ngOnDestroy()</b> { ... }</code></td>

aio/content/guide/comparing-observables.md

@@ -89,11 +89,11 @@ promise.then(() => {
 The following code snippets illustrate how the same kind of operation is defined using observables and promises.
 
 <table>
-  <tr>
-    <th>Operation</th>
-    <th>Observable</th>
-    <th>Promise</th>
-  </tr>
+  <th>
+    <td>Operation</td>
+    <td>Observable</td>
+    <td>Promise</td>
+  </th>
   <tr>
     <td>Creation</td>
     <td>
@@ -141,11 +141,10 @@ Using observables to handle events and asynchronous operations can have the adva
 Here are some code samples that illustrate how the same kind of operation is defined using observables and the events API.
 
 <table>
-  <tr>
-    <th></th>
-    <th>Observable</th>
-    <th>Events API</th>
-  </tr>
+  <th>
+    <td>Observable</td>
+    <td>Events API</td>
+  </th>
   <tr>
     <td>Creation & cancellation</td>
     <td>
@@ -204,11 +203,10 @@ button.removeEventListener(‘click’, handler);
 An observable produces values over time. An array is created as a static set of values. In a sense, observables are asynchronous where arrays are synchronous. In the following examples, ➞ implies asynchronous value delivery.
 
 <table>
-  <tr>
-    <th></th>
-    <th>Observable</th>
-    <th>Array</th>
-  </tr>
+  <th>
+    <td>Observable</td>
+    <td>Array</td>
+  </th>
   <tr>
     <td>Given</td>
     <td>

aio/content/guide/docs-style-guide.md

@@ -740,7 +740,7 @@ Adding `<live-example></live-example>` to the page generates the two default lin
 
 2. a link that downloads that sample.
 
-Clicking the first link opens the code sample on StackBlitz in a new browser tab.
+Clicking the first link opens the code sample in a new browser tab in the "embedded Stackblitz" style.
 
 You can change the appearance and behavior of the live example with attributes and classes.
 
@@ -810,13 +810,16 @@ You can embed the Stackblitz within the guide page itself by adding the `embedde
 
 For performance reasons, the Stackblitz does not start right away. The reader sees an image instead. Clicking the image starts the sometimes-slow process of launching the embedded Stackblitz within an iframe on the page.
 
-Here's an embedded live example for this guide.
+You usually replace the default Stackblitz image with a custom image that better represents the sample.
+Store that image in the `content/images` directory in a folder with a name matching the corresponding example folder.
+
+Here's an embedded live example for this guide. It has a custom image created from a snapshot of the running app, overlayed with `content/images/Stackblitz/unused/click-to-run.png`.
 
 ```html
-<live-example embedded></live-example>
+<live-example embedded img="guide/docs-style-guide/docs-style-guide-Stackblitz.png"></live-example>
 ```
 
-<live-example embedded></live-example>
+<live-example embedded img="guide/docs-style-guide/docs-style-guide-Stackblitz.png"></live-example>
 
 {@a anchors}
 

aio/content/guide/dynamic-component-loader.md

@@ -109,9 +109,9 @@ Take it step by step. First, it picks an ad.
 
 The `loadComponent()` method chooses an ad using some math.
 
-First, it sets the `currentAdIndex` by taking whatever it
+First, it sets the `currentAddIndex` by taking whatever it
 currently is plus one, dividing that by the length of the `AdItem` array, and
-using the _remainder_ as the new `currentAdIndex` value. Then, it uses that
+using the _remainder_ as the new `currentAddIndex` value. Then, it uses that
 value to select an `adItem` from the array.
 
 

aio/content/guide/quickstart.md

@@ -126,7 +126,7 @@ This is the _root component_ and it is named `app-root`.
 You can find it in `./src/app/app.component.ts`.
 
 
-Open the component file and change the `title` property from `'app'` to `'My First Angular App!'`.
+Open the component file and change the `title` property from _Welcome to app!!_ to _Welcome to My First Angular App!!_:
 
 
 <code-example path="cli-quickstart/src/app/app.component.ts" region="title" title="src/app/app.component.ts" linenums="false"></code-example>

aio/content/guide/testing.md

@@ -785,25 +785,6 @@ There is no harm in calling `detectChanges()` more often than is strictly necess
 
 <hr>
 
-{@a dispatch-event}
-
-#### Change an input value with _dispatchEvent()_
-
-To simulate user input, you can find the input element and set its `value` property.
-
-You will call `fixture.detectChanges()` to trigger Angular's change detection.
-But there is an essential, intermediate step.
-
-Angular doesn't know that you set the input element's `value` property.
-It won't read that property until you raise the element's `input` event by calling `dispatchEvent()`. 
-_Then_ you call `detectChanges()`.
-
-The following example demonstrates the proper sequence.
-
-<code-example path="testing/src/app/hero/hero-detail.component.spec.ts" region="title-case-pipe" title="app/hero/hero-detail.component.spec.ts (pipe test)"></code-example>
-
-<hr>
-
 ### Component with external files
 
 The `BannerComponent` above is defined with an _inline template_ and _inline css_, specified in the `@Component.template` and `@Component.styles` properties respectively.

aio/content/guide/universal.md

@@ -210,10 +210,10 @@ You can get runtime information about the current platform and the `appId` by in
 
 #### Absolute HTTP URLs
 
-The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
+The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `Http` module to fetch application data.
 These services send requests to _relative_ URLs such as `api/heroes`.
 
-In a Universal app, HTTP URLs must be _absolute_, for example, `https://my-server.com/api/heroes` 
+In a Universal app, `Http` URLs must be _absolute_ (e.g., `https://my-server.com/api/heroes`)
 even when the Universal web server is capable of handling those requests.
 
 You'll have to change the services to make requests with absolute URLs when running on the server
@@ -416,7 +416,7 @@ Create a `tsconfig.server.json` file in the project root directory to configure
 
 This config extends from the root's `tsconfig.json` file. Certain settings are noteworthy for their differences.
 
-* The `module` property must be **commonjs** which can be required into our server application.
+* The `module` property must be **commonjs** which can be require()'d into our server application.
 
 * The `angularCompilerOptions` section guides the AOT compiler:
   * `entryModule` - the root module of the server application, expressed as `path/to/file#ClassName`.

aio/content/marketing/announcements.json

@@ -1,16 +1,9 @@
 [
   {
     "startDate": "2018-02-14",
-    "endDate": "2018-04-18",
+    "endDate": "2018-04-22",
     "message": "Join us for ng-conf<br/>Apr 18th-20th, 2018",
     "imageUrl": "generated/images/marketing/home/ng-conf.png",
     "linkUrl": "http://ng-conf.org/"
-  },
-  {
-    "startDate": "2018-04-18",
-    "endDate": "2018-04-22",
-    "message": "Watch ng-conf live stream <br/>Apr 18th-20th, 2018",
-    "imageUrl": "generated/images/marketing/home/ng-conf.png",
-    "linkUrl": "https://www.ng-conf.org/livestream/"
   }
 ]

aio/content/marketing/events.html

@@ -49,12 +49,6 @@
       <td>Vienna</td>
       <td>May 16-18, 2018</td>
     </tr>
-    <!-- ngJapan-->
-    <tr>
-      <th><a href="https://ngjapan.org/en.html" title="ng-japan">ng-japan</a></th>
-      <td>Tokyo, Japan</td>
-      <td>Jun 16, 2018</td>
-    </tr>
     <!-- AngularConnect-->
     <tr>
       <th><a href="http://angularconnect.com" title="AngularConnect">AngularConnect</a></th>

aio/content/navigation.json

@@ -125,39 +125,13 @@
       "tooltip": "The fundamentals of Angular",
       "children": [
         {
+          "url": "guide/architecture",
           "title": "Architecture",
-          "tooltip": "The basic building blocks of Angular applications.",
-          "children": [
-            {
-              "url": "guide/architecture",
-              "title": "Architecture Overview",
-              "tooltip": "Basic building blocks of Angular applications."
-            },
-            {
-              "url": "guide/architecture-modules",
-              "title": "Intro to Modules",
-              "tooltip": "About NgModules."
-            },
-            {
-              "url": "guide/architecture-components",
-              "title": "Intro to Components",
-              "tooltip": "About Components, Templates, and Views."
-            },
-            {
-              "url": "guide/architecture-services",
-              "title": "Intro to Services and DI",
-              "tooltip": "About services and dependency injection."
-            },
-            {
-              "url": "guide/architecture-next-steps",
-              "title": "Next Steps",
-              "tooltip": "Beyond the basics."
-            }
-          ]
+          "tooltip": "The basic building blocks of Angular applications."
         },
         {
-          "title": "Components & Templates",
-          "tooltip": "Building dynamic views with data binding",
+          "title": "Template & Data Binding",
+          "tooltip": "Template & Data Binding",
           "children": [
             {
               "url": "guide/displaying-data",
@@ -628,10 +602,6 @@
         {
           "title": "中文版",
           "url": "https://angular.cn/"
-        },
-        {
-          "title": "日本語版",
-          "url": "https://angular.jp/"
         }
       ]
     }

aio/content/tutorial/toh-pt5.md

@@ -15,7 +15,7 @@ When you’re done, users will be able to navigate the app like this:
 
 </figure>
 
-## Add the `AppRoutingModule`
+## Add the _AppRoutingModule_
 
 An Angular best practice is to load and configure the router in a separate, top-level module
 that is dedicated to routing and imported by the root `AppModule`.
@@ -138,7 +138,7 @@ You should see the familiar heroes master/detail view.
 
 {@a routerlink}
 
-## Add a navigation link (`routerLink`)
+## Add a navigation link (_routerLink_)
 
 Users shouldn't have to paste a route URL into the address bar. 
 They should be able to click a link to navigate.
@@ -283,7 +283,7 @@ The user should be able to get to these details in three ways.
 In this section, you'll enable navigation to the `HeroDetailsComponent`
 and liberate it from the `HeroesComponent`.
 
-### Delete _hero details_ from `HeroesComponent`
+### Delete _hero details_ from _HeroesComponent_
 
 When the user clicks a hero item in the `HeroesComponent`,
 the app should navigate to the `HeroDetailComponent`,
@@ -325,7 +325,7 @@ At this point, all application routes are in place.
   title="src/app/app-routing.module.ts (all routes)">
 </code-example>
 
-### `DashboardComponent` hero links
+### _DashboardComponent_ hero links
 
 The `DashboardComponent` hero links do nothing at the moment.
 
@@ -343,7 +343,7 @@ to insert the current interation's `hero.id` into each
 [`routerLink`](#routerlink).
 
 {@a heroes-component-links}
-### `HeroesComponent` hero links
+### _HeroesComponent_ hero links
 
 The hero items in the `HeroesComponent` are `<li>` elements whose click events
 are bound to the component's `onSelect()` method.
@@ -446,7 +446,7 @@ The browser refreshes and the app crashes with a compiler error.
 `HeroService` doesn't have a `getHero()` method.
 Add it now.
 
-### Add `HeroService.getHero()`
+### Add *HeroService.getHero()*
 
 Open `HeroService` and add this `getHero()` method
 
@@ -518,7 +518,7 @@ Here are the code files discussed on this page and your app should look like thi
 
 {@a approutingmodule}
 {@a appmodule}
-#### _AppRoutingModule_, _AppModule_, and _HeroService_
+#### _AppRoutingModule_ and _AppModule_
 
 <code-tabs>
   <code-pane 
@@ -529,10 +529,6 @@ Here are the code files discussed on this page and your app should look like thi
     title="src/app/app.module.ts" 
     path="toh-pt5/src/app/app.module.ts">
   </code-pane>
-  <code-pane 
-    title="src/app/hero.service.ts" 
-    path="toh-pt5/src/app/hero.service.ts">
-  </code-pane>
 </code-tabs>
 
 {@a appcomponent}
@@ -569,7 +565,6 @@ Here are the code files discussed on this page and your app should look like thi
 
 {@a heroescomponent}
 #### _HeroesComponent_
-
 <code-tabs>
   <code-pane 
     title="src/app/heroes/heroes.component.html" path="toh-pt5/src/app/heroes/heroes.component.html">

aio/content/tutorial/toh-pt6.md

@@ -43,15 +43,13 @@ If you're _coding along_ with this tutorial, stay here and add the *In-memory We
 
 </div>
 
-Install the *In-memory Web API* package from _npm_.
-
-**Note:** This package's version is locked to `v0.5` to maintain compatibility with the current release of `@angular/cli`.
+Install the *In-memory Web API* package from _npm_
 
 <code-example language="sh" class="code-shell">
-  npm install angular-in-memory-web-api@0.5 --save
+  npm install angular-in-memory-web-api --save
 </code-example>
 
-Import the `HttpClientInMemoryWebApiModule` and the `InMemoryDataService` class, 
+Import the `InMemoryWebApiModule` and the `InMemoryDataService` class, 
 which you will create in a moment.
 
 <code-example 
@@ -60,7 +58,7 @@ which you will create in a moment.
   title="src/app/app.module.ts (In-memory Web API imports)">
 </code-example>
 
-Add the `HttpClientInMemoryWebApiModule` to the `@NgModule.imports` array&mdash;
+Add the `InMemoryWebApiModule` to the `@NgModule.imports` array&mdash;
 _after importing the `HttpClient`_,
 &mdash;while configuring it with the `InMemoryDataService`.
 

aio/e2e/app.e2e-spec.ts

@@ -162,12 +162,15 @@ describe('site App', function() {
   describe('404 page', () => {
     it('should add or remove the "noindex" meta tag depending upon the validity of the page', () => {
       page.navigateTo('');
+      expect(element(by.css('meta[name="googlebot"]')).isPresent()).toBeFalsy();
       expect(element(by.css('meta[name="robots"]')).isPresent()).toBeFalsy();
 
       page.navigateTo('does/not/exist');
+      expect(element(by.css('meta[name="googlebot"][content="noindex"]')).isPresent()).toBeTruthy();
       expect(element(by.css('meta[name="robots"][content="noindex"]')).isPresent()).toBeTruthy();
 
       page.click(page.getTopMenuLink('features'));
+      expect(element(by.css('meta[name="googlebot"]')).isPresent()).toBeFalsy();
       expect(element(by.css('meta[name="robots"]')).isPresent()).toBeFalsy();
     });
 

aio/ngsw-manifest.json

@@ -10,6 +10,7 @@
   },
   "static.ignore": [
     "\\.js\\.map$",
+    "^(?:/|\\\\)assets(?:/|\\\\)images(?:/|\\\\).*(?:/|\\\\)_unused(?:/|\\\\)",
     "^(?:/|\\\\)generated(?:/|\\\\)(?:docs(?:/|\\\\)(?!api(?:/|\\\\)api-list\\.json).*|images(?:/|\\\\)(?!marketing(?:/|\\\\)).*|live-examples|zips)(?:/|\\\\)"
   ],
   "static.versioned": [
@@ -18,7 +19,7 @@
   "routing": {
     "index": "/index.html",
     "routes": {
-      "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing/|api/|animate/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?$|.*\\.[^\/.]+$)": {
+      "^(?!/styleguide|/docs/.|(?:/guide/(?:cli-quickstart|metadata|ngmodule|service-worker-(?:getstart|comm|configref)|learning-angular)|/news)(?:\\.html|/)?$|/testing|/api/(?:.+/[^/]+-|platform-browser/AnimationDriver|testing|api/|(?:common/(?:NgModel|Control|MaxLengthValidator))|(?:[^/]+/)?(?:NgFor(?:$|-)|AnimationStateDeclarationMetadata|CORE_DIRECTIVES|PLATFORM_PIPES|DirectiveMetadata|HTTP_PROVIDERS))|.*/stackblitz(?:\\.html)?$|.*\\.[^\/.]+$)": {
         "match": "regex"
       }
     }

aio/package.json

@@ -6,8 +6,6 @@
   "author": "Angular",
   "license": "MIT",
   "scripts": {
-    "preinstall": "node ../tools/yarn/check-yarn.js",
-    "postinstall": "node tools/cli-patches/patch.js && uglifyjs node_modules/lunr/lunr.js -c -m -o src/assets/js/lunr.min.js --source-map",
     "aio-use-local": "node tools/ng-packages-installer overwrite . --debug --ignore-packages @angular/service-worker",
     "aio-use-npm": "node tools/ng-packages-installer restore .",
     "aio-check-local": "node tools/ng-packages-installer check .",
@@ -19,9 +17,10 @@
     "build-local": "yarn ~~build",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
-    "pree2e": "yarn check-env && yarn update-webdriver",
+    "pree2e": "yarn check-env && yarn ~~update-webdriver",
     "e2e": "ng e2e --no-webdriver-update",
     "e2e-prod": "yarn e2e --environment=dev --target=production",
+    "preinstall": "node ../tools/yarn/check-yarn.js",
     "presetup": "yarn install --frozen-lockfile && yarn ~~check-env && yarn boilerplate:remove",
     "setup": "yarn aio-use-npm && yarn example-use-npm",
     "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn docs",
@@ -45,7 +44,7 @@
     "docs-watch": "node tools/transforms/authors-package/watchr.js",
     "docs-lint": "eslint --ignore-path=\"tools/transforms/.eslintignore\" tools/transforms",
     "docs-test": "node tools/transforms/test.js",
-    "deployment-config-test": "jasmine-ts tests/deployment-config/unit/**/*.spec.ts",
+    "deployment-config-test": "jasmine-ts tests/deployment/**/*.spec.ts",
     "firebase-utils-test": "jasmine-ts tools/firebase-test-utils/*.spec.ts",
     "tools-lint": "tslint -c \"tools/tslint.json\" \"tools/firebase-test-utils/**/*.ts\"",
     "tools-test": "./scripts/deploy-to-firebase.test.sh && yarn docs-test && yarn boilerplate:test && jasmine tools/ng-packages-installer/index.spec.js && yarn firebase-utils-test",
@@ -58,11 +57,12 @@
     "generate-zips": "node ./tools/example-zipper/generateZips",
     "sw-manifest": "ngu-sw-manifest --dist dist --in ngsw-manifest.json --out dist/ngsw-manifest.json",
     "sw-copy": "cp node_modules/@angular/service-worker/bundles/worker-basic.min.js dist/",
+    "postinstall": "node tools/cli-patches/patch.js && uglifyjs node_modules/lunr/lunr.js -c -m -o src/assets/js/lunr.min.js --source-map",
     "build-ie-polyfills": "node node_modules/webpack/bin/webpack.js -p src/ie-polyfills.js src/generated/ie-polyfills.min.js",
-    "update-webdriver": "webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
     "~~check-env": "node scripts/check-environment",
     "~~build": "ng build --target=production --environment=stable -sm",
-    "post~~build": "yarn sw-manifest && yarn sw-copy"
+    "post~~build": "yarn sw-manifest && yarn sw-copy",
+    "~~update-webdriver": "webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG"
   },
   "engines": {
     "node": ">=8.9.1 <9.0.0",
@@ -107,7 +107,7 @@
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.25.0",
+    "dgeni-packages": "^0.24.0",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",

aio/scripts/deploy-preview.sh

@@ -30,6 +30,7 @@ readonly relevantChangedFilesCount=$(git diff --name-only $TRAVIS_COMMIT_RANGE |
     yarn build
   fi
   tar --create --gzip --directory "$INPUT_DIR" --file "$OUTPUT_FILE" .
+  yarn payload-size
 
   # Deploy to staging
   readonly output=$(
@@ -52,7 +53,4 @@ readonly relevantChangedFilesCount=$(git diff --name-only $TRAVIS_COMMIT_RANGE |
   if [[ $httpCode -ne 202 ]] && [[ "$isHidden" != "true" ]]; then
     yarn test-pwa-score "$DEPLOYED_URL" "$MIN_PWA_SCORE"
   fi
-
-  # Check the bundle sizes.
-  yarn payload-size
 )

aio/scripts/deploy-to-firebase.sh

@@ -67,7 +67,7 @@ case $deployEnv in
     readonly firebaseToken=$FIREBASE_TOKEN
     ;;
   archive)
-    readonly projectId=v${majorVersion}-angular-io
+    readonly projectId=angular-io-${majorVersion}
     readonly deployedUrl=https://v${majorVersion}.angular.io/
     readonly firebaseToken=$FIREBASE_TOKEN
     ;;

aio/scripts/deploy-to-firebase.test.sh

@@ -94,7 +94,7 @@ Deployment URL    : https://angular.io/"
   )
   expected="Git branch        : 2.4.x
 Build/deploy mode : archive
-Firebase project  : v2-angular-io
+Firebase project  : angular-io-2
 Deployment URL    : https://v2.angular.io/"
   check "$actual" "$expected"
 )

aio/scripts/payload.sh

@@ -8,8 +8,5 @@ readonly parentDir=$(dirname $thisDir)
 # Track payload size functions
 source ../scripts/ci/payload-size.sh
 
-# Provide node_modules from aio
-NODE_MODULES_BIN=$PROJECT_ROOT/aio/node_modules/.bin/
-
 trackPayloadSize "aio" "dist/*.js" true true "${thisDir}/_payload-limits.json"
 

aio/scripts/test-production.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-set +x -eu -o pipefail
-
-(
-  readonly thisDir="$(cd $(dirname ${BASH_SOURCE[0]}); pwd)"
-  readonly aioDir="$(realpath $thisDir/..)"
-
-  readonly appPtorConf="$aioDir/tests/e2e/protractor.conf.js"
-  readonly cfgPtorConf="$aioDir/tests/deployment-config/e2e/protractor.conf.js"
-  readonly minPwaScore="95"
-  readonly urls=(
-    "https://angular.io/"
-    "https://next.angular.io"
-  )
-
-  cd "$aioDir"
-
-  # Install dependencies.
-  echo -e "\nInstalling dependencies in '$aioDir'...\n-----"
-  yarn install --frozen-lockfile
-  yarn update-webdriver
-
-  # Run checks for all URLs.
-  for url in "${urls[@]}"; do
-    echo -e "\nChecking '$url'...\n-----"
-
-    # Run e2e tests.
-    yarn protractor "$appPtorConf" --baseUrl "$url"
-
-    # Run deployment config tests.
-    yarn protractor "$cfgPtorConf" --baseUrl "$url"
-
-    # Run PWA-score tests.
-    yarn test-pwa-score "$url" "$minPwaScore"
-  done
-
-  echo -e "\nAll checks passed!"
-)

aio/src/app/documents/document.service.spec.ts

@@ -69,20 +69,15 @@ describe('DocumentService', () => {
     it('should emit the not-found document if the document is not found on the server', () => {
       let currentDocument: DocumentContents|undefined;
       const notFoundDoc = { id: FILE_NOT_FOUND_ID, contents: '<h1>Page Not Found</h1>' };
-      const { docService, logger } = getServices('missing/doc');
+      const { docService } = getServices('missing/doc');
       docService.currentDocument.subscribe(doc => currentDocument = doc);
 
       // Initial request return 404.
       httpMock.expectOne({}).flush(null, {status: 404, statusText: 'NOT FOUND'});
-      expect(logger.output.error).toEqual([
-        [jasmine.any(Error)]
-      ]);
-      expect(logger.output.error[0][0].message).toEqual(`Document file not found at 'missing/doc'`);
 
       // Subsequent request for not-found document.
-      logger.output.error = [];
       httpMock.expectOne(CONTENT_URL_PREFIX + 'file-not-found.json').flush(notFoundDoc);
-      expect(logger.output.error).toEqual([]); // does not report repeate errors
+
       expect(currentDocument).toEqual(notFoundDoc);
     });
 
@@ -107,17 +102,12 @@ describe('DocumentService', () => {
       let latestDocument: DocumentContents|undefined;
       const doc1 = { contents: 'doc 1' };
       const doc2 = { contents: 'doc 2' };
-      const { docService, locationService, logger } = getServices('initial/doc');
+      const { docService, locationService } = getServices('initial/doc');
 
       docService.currentDocument.subscribe(doc => latestDocument = doc);
 
       httpMock.expectOne({}).flush(null, {status: 500, statusText: 'Server Error'});
       expect(latestDocument!.id).toEqual(FETCHING_ERROR_ID);
-      expect(logger.output.error).toEqual([
-        [jasmine.any(Error)]
-      ]);
-      expect(logger.output.error[0][0].message)
-          .toEqual(`Error fetching document 'initial/doc': (Http failure response for generated/docs/initial/doc.json: 500 Server Error)`);
 
       locationService.go('new/doc');
       httpMock.expectOne({}).flush(doc1);

aio/src/app/documents/document.service.ts

@@ -78,7 +78,7 @@ export class DocumentService {
 
   private getFileNotFoundDoc(id: string): Observable<DocumentContents> {
     if (id !== FILE_NOT_FOUND_ID) {
-      this.logger.error(new Error(`Document file not found at '${id}'`));
+      this.logger.error(`Document file not found at '${id}'`);
       // using `getDocument` means that we can fetch the 404 doc contents from the server and cache it
       return this.getDocument(FILE_NOT_FOUND_ID);
     } else {
@@ -90,7 +90,7 @@ export class DocumentService {
   }
 
   private getErrorDoc(id: string, error: HttpErrorResponse): Observable<DocumentContents> {
-    this.logger.error(new Error(`Error fetching document '${id}': (${error.message})`));
+    this.logger.error('Error fetching document', error);
     this.cache.delete(id);
     return Observable.of({
       id: FETCHING_ERROR_ID,

aio/src/app/embedded/announcement-bar/announcement-bar.component.spec.ts

@@ -66,10 +66,7 @@ describe('AnnouncementBarComponent', () => {
       const request = httpMock.expectOne('generated/announcements.json');
       request.flush('some random response');
       expect(component.announcement).toBeUndefined();
-      expect(mockLogger.output.error).toEqual([
-        [jasmine.any(Error)]
-      ]);
-      expect(mockLogger.output.error[0][0].message).toMatch(/^generated\/announcements\.json contains invalid data:/);
+      expect(mockLogger.output.error[0][0]).toContain('generated/announcements.json contains invalid data:');
     });
 
     it('should handle a failed request for `announcements.json`', () => {
@@ -77,10 +74,7 @@ describe('AnnouncementBarComponent', () => {
       const request = httpMock.expectOne('generated/announcements.json');
       request.error(new ErrorEvent('404'));
       expect(component.announcement).toBeUndefined();
-      expect(mockLogger.output.error).toEqual([
-        [jasmine.any(Error)]
-      ]);
-      expect(mockLogger.output.error[0][0].message).toMatch(/^generated\/announcements\.json request failed:/);
+      expect(mockLogger.output.error[0][0]).toContain('generated/announcements.json request failed:');
     });
   });
 

aio/src/app/embedded/announcement-bar/announcement-bar.component.ts

@@ -59,12 +59,12 @@ export class AnnouncementBarComponent implements OnInit {
   ngOnInit() {
     this.http.get<Announcement[]>(announcementsPath)
       .catch(error => {
-        this.logger.error(new Error(`${announcementsPath} request failed: ${error.message}`));
+        this.logger.error(`${announcementsPath} request failed: ${error.message}`);
         return [];
       })
       .map(announcements => this.findCurrentAnnouncement(announcements))
       .catch(error => {
-        this.logger.error(new Error(`${announcementsPath} contains invalid data: ${error.message}`));
+        this.logger.error(`${announcementsPath} contains invalid data: ${error.message}`);
         return [];
       })
       .subscribe(announcement => this.announcement = announcement);

aio/src/app/embedded/api/api-list.component.ts

@@ -81,7 +81,7 @@ export class ApiListComponent implements OnInit {
     this.initializeSearchCriteria();
   }
 
-  // TODO: may need to debounce as the original did
+  // Todo: may need to debounce as the original did
   // although there shouldn't be any perf consequences if we don't
   setQuery(query: string) {
     this.setSearchCriteria({query: (query || '').toLowerCase().trim() });

aio/src/app/embedded/api/api.service.ts

@@ -76,7 +76,7 @@ export class ApiService implements OnDestroy {
       .subscribe(
         sections => this.sectionsSubject.next(sections),
         (err: HttpErrorResponse) => {
-          // TODO: handle error
+          // Todo: handle error
           this.logger.error(err);
           throw err; // rethrow for now.
         }

aio/src/app/embedded/code/code.component.spec.ts

@@ -254,14 +254,10 @@ describe('CodeComponent', () => {
     it('should display an error when copy fails', () => {
       const snackBar: MatSnackBar = TestBed.get(MatSnackBar);
       const copierService: CopierService = TestBed.get(CopierService);
-      const logger: TestLogger = TestBed.get(Logger);
       spyOn(snackBar, 'open');
       spyOn(copierService, 'copyText').and.returnValue(false);
       getButton().click();
       expect(snackBar.open).toHaveBeenCalledWith('Copy failed. Please try again!', '', { duration: 800 });
-      expect(logger.error).toHaveBeenCalledTimes(1);
-      expect(logger.error).toHaveBeenCalledWith(jasmine.any(Error));
-      expect(logger.error.calls.mostRecent().args[0].message).toMatch(/^ERROR copying code to clipboard:/);
     });
   });
 });

aio/src/app/embedded/code/code.component.ts

@@ -148,7 +148,7 @@ export class CodeComponent implements OnChanges {
         duration: 800,
       });
     } else {
-      this.logger.error(new Error(`ERROR copying code to clipboard: "${code}"`));
+      this.logger.error('ERROR copying code to clipboard:', code);
       // failure snackbar alert
       this.snackbar.open('Copy failed. Please try again!', '', {
         duration: 800,

aio/src/app/embedded/code/pretty-printer.service.ts

@@ -33,8 +33,8 @@ export class PrettyPrinter {
         .then(
           () => (window as any)['prettyPrintOne'],
           err => {
-            const msg = `Cannot get prettify.js from server: ${err.message}`;
-            this.logger.error(new Error(msg));
+            const msg = 'Cannot get prettify.js from server';
+            this.logger.error(msg, err);
             // return a pretty print fn that always fails.
             return () => { throw new Error(msg); };
           });

aio/src/app/layout/doc-viewer/doc-viewer.component.spec.ts

@@ -1,6 +1,6 @@
 import { ComponentRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { Meta, Title } from '@angular/platform-browser';
+import { Title, Meta } from '@angular/platform-browser';
 
 import { Observable } from 'rxjs/Observable';
 import { of } from 'rxjs/observable/of';
@@ -415,18 +415,21 @@ describe('DocViewerComponent', () => {
         expect(addTitleAndTocSpy).toHaveBeenCalledTimes(4);
       });
 
-      it('should remove the "noindex" meta tag if the document is valid', async () => {
+      it('should remove "noindex" meta tags if the document is valid', async () => {
         await doRender('foo', 'bar');
+        expect(TestBed.get(Meta).removeTag).toHaveBeenCalledWith('name="googlebot"');
         expect(TestBed.get(Meta).removeTag).toHaveBeenCalledWith('name="robots"');
       });
 
-      it('should add the "noindex" meta tag if the document is 404', async () => {
+      it('should add "noindex" meta tags if the document is 404', async () => {
         await doRender('missing', FILE_NOT_FOUND_ID);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
 
-      it('should add a "noindex" meta tag if the document fetching fails', async () => {
+      it('should add "noindex" meta tags if the document fetching fails', async () => {
         await doRender('error', FETCHING_ERROR_ID);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
     });
@@ -552,9 +555,9 @@ describe('DocViewerComponent', () => {
         expect(swapViewsSpy).not.toHaveBeenCalled();
         expect(docViewer.nextViewContainer.innerHTML).toBe('');
         expect(logger.output.error).toEqual([
-          [jasmine.any(Error)]
+          [`[DocViewer] Error preparing document 'foo': ${error.stack}`],
         ]);
-        expect(logger.output.error[0][0].message).toEqual(`[DocViewer] Error preparing document 'foo': ${error.stack}`);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
 
@@ -573,9 +576,9 @@ describe('DocViewerComponent', () => {
         expect(swapViewsSpy).not.toHaveBeenCalled();
         expect(docViewer.nextViewContainer.innerHTML).toBe('');
         expect(logger.output.error).toEqual([
-          [jasmine.any(Error)]
+          [`[DocViewer] Error preparing document 'bar': ${error.stack}`],
         ]);
-        expect(logger.output.error[0][0].message).toEqual(`[DocViewer] Error preparing document 'bar': ${error.stack}`);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
 
@@ -594,9 +597,9 @@ describe('DocViewerComponent', () => {
         expect(swapViewsSpy).not.toHaveBeenCalled();
         expect(docViewer.nextViewContainer.innerHTML).toBe('');
         expect(logger.output.error).toEqual([
-          [jasmine.any(Error)]
+          [`[DocViewer] Error preparing document 'baz': ${error.stack}`],
         ]);
-        expect(logger.output.error[0][0].message).toEqual(`[DocViewer] Error preparing document 'baz': ${error.stack}`);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
 
@@ -615,9 +618,9 @@ describe('DocViewerComponent', () => {
         expect(swapViewsSpy).toHaveBeenCalledTimes(1);
         expect(docViewer.nextViewContainer.innerHTML).toBe('');
         expect(logger.output.error).toEqual([
-          [jasmine.any(Error)]
+          [`[DocViewer] Error preparing document 'qux': ${error.stack}`],
         ]);
-        expect(logger.output.error[0][0].message).toEqual(`[DocViewer] Error preparing document 'qux': ${error.stack}`);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
 
@@ -633,9 +636,9 @@ describe('DocViewerComponent', () => {
         expect(swapViewsSpy).toHaveBeenCalledTimes(1);
         expect(docViewer.nextViewContainer.innerHTML).toBe('');
         expect(logger.output.error).toEqual([
-          [jasmine.any(Error)]
+          [`[DocViewer] Error preparing document 'qux': ${error}`],
         ]);
-        expect(logger.output.error[0][0].message).toEqual(`[DocViewer] Error preparing document 'qux': ${error}`);
+        expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'googlebot', content: 'noindex' });
         expect(TestBed.get(Meta).addTag).toHaveBeenCalledWith({ name: 'robots', content: 'noindex' });
       });
     });

aio/src/app/layout/doc-viewer/doc-viewer.component.ts

@@ -157,7 +157,7 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
         .do(() => this.docRendered.emit())
         .catch(err => {
           const errorMessage = (err instanceof Error) ? err.stack : err;
-          this.logger.error(new Error(`[DocViewer] Error preparing document '${doc.id}': ${errorMessage}`));
+          this.logger.error(`[DocViewer] Error preparing document '${doc.id}': ${errorMessage}`);
           this.nextViewContainer.innerHTML = '';
           this.setNoIndex(true);
           return this.void$;
@@ -169,8 +169,10 @@ export class DocViewerComponent implements DoCheck, OnDestroy {
    */
   private setNoIndex(val: boolean) {
     if (val) {
+      this.metaService.addTag({ name: 'googlebot', content: 'noindex' });
       this.metaService.addTag({ name: 'robots', content: 'noindex' });
     } else {
+      this.metaService.removeTag('name="googlebot"');
       this.metaService.removeTag('name="robots"');
     }
   }

aio/src/app/shared/location.service.ts

@@ -36,7 +36,7 @@ export class LocationService {
     swUpdates.updateActivated.subscribe(() => this.swUpdateActivated = true);
   }
 
-  // TODO: ignore if url-without-hash-or-search matches current location?
+  // TODO?: ignore if url-without-hash-or-search matches current location?
   go(url: string|null|undefined) {
     if (!url) { return; }
     url = this.stripSlashes(url);

aio/src/app/shared/logger.service.spec.ts

@@ -34,9 +34,8 @@ describe('logger service', () => {
 
   describe('error', () => {
     it('should delegate to ErrorHandler', () => {
-      const err = new Error('some error message');
-      logger.error(err);
-      expect(errorHandler.handleError).toHaveBeenCalledWith(err);
+      logger.error('param1', 'param2', 'param3');
+      expect(errorHandler.handleError).toHaveBeenCalledWith('param1 param2 param3');
     });
   });
 });

aio/src/app/shared/logger.service.ts

@@ -13,8 +13,9 @@ export class Logger {
     }
   }
 
-  error(error: Error) {
-    this.errorHandler.handleError(error);
+  error(value: any, ...rest: any[]) {
+    const message = [value, ...rest].join(' ');
+    this.errorHandler.handleError(message);
   }
 
   warn(value: any, ...rest: any[]) {

aio/src/app/sw-updates/sw-updates.service.spec.ts

@@ -1,4 +1,4 @@
-import { ApplicationRef, ReflectiveInjector } from '@angular/core';
+import { ReflectiveInjector } from '@angular/core';
 import { fakeAsync, tick } from '@angular/core/testing';
 import { NgServiceWorker } from '@angular/service-worker';
 import { Subject } from 'rxjs/Subject';
@@ -9,26 +9,23 @@ import { SwUpdatesService } from './sw-updates.service';
 
 describe('SwUpdatesService', () => {
   let injector: ReflectiveInjector;
-  let appRef: MockApplicationRef;
   let service: SwUpdatesService;
   let sw: MockNgServiceWorker;
   let checkInterval: number;
 
   // Helpers
   // NOTE:
-  //   Because `SwUpdatesService` uses the `debounceTime` operator, it needs to be instantiated and
-  //   destroyed inside the `fakeAsync` zone (when `fakeAsync` is used for the test). Thus, we can't
-  //   run `setup()`/`tearDown()` in `beforeEach()`/`afterEach()` blocks. We use the `run()` helper
-  //   to call them inside each test's zone.
+  //   Because `SwUpdatesService` uses the `debounceTime` operator, it needs to be instantiated
+  //   inside the `fakeAsync` zone (when `fakeAsync` is used for the test). Thus, we can't run
+  //   `setup()` in a `beforeEach()` block. We use the `run()` helper to call `setup()` inside each
+  //   test's zone.
   const setup = () => {
     injector = ReflectiveInjector.resolveAndCreate([
-      { provide: ApplicationRef, useClass: MockApplicationRef },
       { provide: Logger, useClass: MockLogger },
       { provide: NgServiceWorker, useClass: MockNgServiceWorker },
       SwUpdatesService
     ]);
 
-    appRef = injector.get(ApplicationRef);
     service = injector.get(SwUpdatesService);
     sw = injector.get(NgServiceWorker);
     checkInterval = (service as any).checkInterval;
@@ -45,18 +42,11 @@ describe('SwUpdatesService', () => {
     expect(service).toBeTruthy();
   }));
 
-  it('should start checking for updates when instantiated (once the app stabilizes)', run(() => {
-    expect(sw.checkForUpdate).not.toHaveBeenCalled();
-
-    appRef.isStable.next(false);
-    expect(sw.checkForUpdate).not.toHaveBeenCalled();
-
-    appRef.isStable.next(true);
+  it('should immediately check for updates when instantiated', run(() => {
     expect(sw.checkForUpdate).toHaveBeenCalled();
   }));
 
   it('should schedule a new check if there is no update available', fakeAsync(run(() => {
-    appRef.isStable.next(true);
     sw.checkForUpdate.calls.reset();
 
     sw.$$checkForUpdateSubj.next(false);
@@ -68,7 +58,6 @@ describe('SwUpdatesService', () => {
   })));
 
   it('should activate new updates immediately', fakeAsync(run(() => {
-    appRef.isStable.next(true);
     sw.checkForUpdate.calls.reset();
 
     sw.$$checkForUpdateSubj.next(true);
@@ -80,7 +69,6 @@ describe('SwUpdatesService', () => {
   })));
 
   it('should not pass a specific version to `NgServiceWorker.activateUpdate()`', fakeAsync(run(() => {
-    appRef.isStable.next(true);
     sw.$$checkForUpdateSubj.next(true);
     tick(checkInterval);
 
@@ -88,7 +76,6 @@ describe('SwUpdatesService', () => {
   })));
 
   it('should schedule a new check after activating the update', fakeAsync(run(() => {
-    appRef.isStable.next(true);
     sw.checkForUpdate.calls.reset();
     sw.$$checkForUpdateSubj.next(true);
 
@@ -116,7 +103,6 @@ describe('SwUpdatesService', () => {
 
   describe('when destroyed', () => {
     it('should not schedule a new check for update (after current check)', fakeAsync(run(() => {
-      appRef.isStable.next(true);
       sw.checkForUpdate.calls.reset();
 
       service.ngOnDestroy();
@@ -127,7 +113,6 @@ describe('SwUpdatesService', () => {
     })));
 
     it('should not schedule a new check for update (after activating an update)', fakeAsync(run(() => {
-      appRef.isStable.next(true);
       sw.checkForUpdate.calls.reset();
 
       sw.$$checkForUpdateSubj.next(true);
@@ -156,10 +141,6 @@ describe('SwUpdatesService', () => {
 });
 
 // Mocks
-class MockApplicationRef {
-  isStable = new Subject<boolean>();
-}
-
 class MockLogger {
   log = jasmine.createSpy('MockLogger.log');
 }

aio/src/app/sw-updates/sw-updates.service.ts

@@ -1,14 +1,14 @@
-import { ApplicationRef, Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy } from '@angular/core';
 import { NgServiceWorker } from '@angular/service-worker';
+import { Observable } from 'rxjs/Observable';
 import { Subject } from 'rxjs/Subject';
+import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/concat';
 import 'rxjs/add/operator/debounceTime';
-import 'rxjs/add/operator/defaultIfEmpty';
-import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/first';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/startWith';
+import 'rxjs/add/operator/take';
 import 'rxjs/add/operator/takeUntil';
 
 import { Logger } from 'app/shared/logger.service';
@@ -29,20 +29,18 @@ import { Logger } from 'app/shared/logger.service';
 @Injectable()
 export class SwUpdatesService implements OnDestroy {
   private checkInterval = 1000 * 60 * 60 * 6;   // 6 hours
-  private onDestroy = new Subject<void>();
-  private checkForUpdateSubj = new Subject<void>();
+  private onDestroy = new Subject();
+  private checkForUpdateSubj = new Subject();
   updateActivated = this.sw.updates
       .takeUntil(this.onDestroy)
       .do(evt => this.log(`Update event: ${JSON.stringify(evt)}`))
       .filter(({type}) => type === 'activation')
       .map(({version}) => version);
 
-  constructor(appRef: ApplicationRef, private logger: Logger, private sw: NgServiceWorker) {
-    const appIsStable$ = appRef.isStable.first(v => v);
-    const checkForUpdates$ = this.checkForUpdateSubj.debounceTime(this.checkInterval).startWith<void>(undefined);
-
-    appIsStable$
-        .concat(checkForUpdates$)
+  constructor(private logger: Logger, private sw: NgServiceWorker) {
+    this.checkForUpdateSubj
+        .debounceTime(this.checkInterval)
+        .startWith(null)
         .takeUntil(this.onDestroy)
         .subscribe(() => this.checkForUpdate());
   }
@@ -62,8 +60,7 @@ export class SwUpdatesService implements OnDestroy {
     this.sw.checkForUpdate()
         // Temp workaround for https://github.com/angular/mobile-toolkit/pull/137.
         // TODO (gkalpak): Remove once #137 is fixed.
-        .defaultIfEmpty(false)
-        .first()
+        .concat(Observable.of(false)).take(1)
         .do(v => this.log(`Update available: ${v}`))
         .subscribe(v => v ? this.activateUpdate() : this.scheduleCheckForUpdate());
   }

aio/src/assets/images/backgrounds/_unused/ng-pattern-lg.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1200 1200"><defs><style>.cls-1{fill:none;}.cls-2{fill:#fff;}.cls-3{opacity:0.9;}.cls-4{isolation:isolate;}.cls-5{fill:#1976d2;}.cls-6{opacity:0.2;mix-blend-mode:soft-light;fill:url(#New_Pattern);}</style><pattern id="New_Pattern" data-name="New Pattern" width="436.95" height="469.33" patternUnits="userSpaceOnUse" viewBox="0 0 436.95 469.33"><rect class="cls-1" width="436.95" height="469.33"/><polygon class="cls-2" points="436.95 469.33 436.95 469.33 344.37 418.06 327.71 273.62 436.95 234.67 436.95 234.67 436.95 260.71 436.95 260.71 436.95 260.6 368.66 413.72 368.78 413.72 394.24 413.72 394.24 413.72 407.97 379.46 436.95 379.46 436.95 469.33"/><polygon class="cls-2" points="436.95 310.35 436.95 358.34 436.95 358.34 417 358.34 436.95 310.35"/><polygon class="cls-2" points="218.47 586.67 218.47 586.67 125.9 535.39 109.24 390.95 218.47 352 218.47 352 218.47 378.05 218.47 378.05 218.47 377.93 150.19 531.05 150.3 531.05 175.76 531.05 175.76 531.05 189.49 496.79 218.47 496.79 218.47 586.67"/><polygon class="cls-2" points="218.47 427.68 218.47 475.67 218.47 475.67 198.53 475.67 218.47 427.68"/><g class="cls-3"><polygon class="cls-2" points="218.47 586.67 218.47 586.67 311.05 535.39 327.71 390.95 218.47 352 218.47 352 218.47 378.05 218.47 378.05 218.47 377.93 286.76 531.05 286.64 531.05 261.18 531.05 261.18 531.05 247.46 496.79 218.47 496.79 218.47 586.67"/><polygon class="cls-2" points="218.47 427.68 218.47 475.67 218.47 475.67 238.42 475.67 218.47 427.68"/></g><g class="cls-3"><polygon class="cls-2" points="0 469.33 0 469.33 92.58 418.06 109.24 273.62 0 234.67 0 234.67 0 260.71 0 260.71 0 260.6 68.29 413.72 68.17 413.72 42.71 413.72 42.71 413.72 28.98 379.46 0 379.46 0 469.33"/><polygon class="cls-2" points="0 310.35 0 358.34 0 358.34 19.95 358.34 0 310.35"/></g><polygon class="cls-2" points="436.95 234.67 436.95 234.67 344.37 183.39 327.71 38.95 436.95 0 436.95 0 436.95 26.05 436.95 26.05 436.95 25.93 368.66 179.05 368.78 179.05 394.24 179.05 394.24 179.05 407.97 144.79 436.95 144.79 436.95 234.67"/><polygon class="cls-2" points="436.95 75.68 436.95 123.67 436.95 123.67 417 123.67 436.95 75.68"/><polygon class="cls-2" points="218.47 352 218.47 352 125.9 300.73 109.24 156.29 218.47 117.33 218.47 117.33 218.47 143.38 218.47 143.38 218.47 143.26 150.19 296.38 150.3 296.38 175.76 296.38 175.76 296.38 189.49 262.12 218.47 262.12 218.47 352"/><polygon class="cls-2" points="218.47 193.01 218.47 241 218.47 241 198.53 241 218.47 193.01"/><g class="cls-3"><polygon class="cls-2" points="218.47 352 218.47 352 311.05 300.73 327.71 156.29 218.47 117.33 218.47 117.33 218.47 143.38 218.47 143.38 218.47 143.26 286.76 296.38 286.64 296.38 261.18 296.38 261.18 296.38 247.46 262.12 218.47 262.12 218.47 352"/><polygon class="cls-2" points="218.47 193.01 218.47 241 218.47 241 238.42 241 218.47 193.01"/></g><g class="cls-3"><polygon class="cls-2" points="0 234.67 0 234.67 92.58 183.39 109.24 38.95 0 0 0 0 0 26.05 0 26.05 0 25.93 68.29 179.05 68.17 179.05 42.71 179.05 42.71 179.05 28.98 144.79 0 144.79 0 234.67"/><polygon class="cls-2" points="0 75.68 0 123.67 0 123.67 19.95 123.67 0 75.68"/></g><polygon class="cls-2" points="218.47 117.33 218.47 117.33 125.9 66.06 109.24 -78.38 218.47 -117.33 218.47 -117.33 218.47 -91.28 218.47 -91.28 218.47 -91.4 150.19 61.72 150.3 61.72 175.76 61.72 175.76 61.72 189.49 27.46 218.47 27.46 218.47 117.33"/><polygon class="cls-2" points="218.47 -41.65 218.47 6.34 218.47 6.34 198.53 6.34 218.47 -41.65"/><g class="cls-3"><polygon class="cls-2" points="218.47 117.33 218.47 117.33 311.05 66.06 327.71 -78.38 218.47 -117.33 218.47 -117.33 218.47 -91.28 218.47 -91.28 218.47 -91.4 286.76 61.72 286.64 61.72 261.18 61.72 261.18 61.72 247.46 27.46 218.47 27.46 218.47 117.33"/><polygon class="cls-2" points="218.47 -41.65 218.47 6.34 218.47 6.34 238.42 6.34 218.47 -41.65"/></g></pattern></defs><title>ng-pattern</title><g class="cls-4"><g id="Design"><rect class="cls-5" width="1200" height="1200"/><rect class="cls-6" width="1200" height="1200"/></g></g></svg>

aio/src/assets/images/backgrounds/_unused/ng-pattern-sm.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1200 1200"><defs><style>.cls-1{fill:none;}.cls-2{fill:#fff;}.cls-3{opacity:0.9;}.cls-4{isolation:isolate;}.cls-5{fill:#1976d2;}.cls-6{opacity:0.2;mix-blend-mode:soft-light;fill:url(#ng-pattern-md);}</style><pattern id="ng-pattern-md" data-name="ng-pattern-md" width="330" height="354.46" patternUnits="userSpaceOnUse" viewBox="0 0 330 354.46"><rect class="cls-1" width="330" height="354.46"/><polygon class="cls-2" points="330 345.69 330 345.69 267.01 310.8 255.68 212.53 330 186.02 330 186.02 330 203.75 330 203.75 330 203.67 283.54 307.85 283.62 307.85 300.94 307.85 300.94 307.85 310.28 284.54 330 284.54 330 345.69"/><polygon class="cls-2" points="330 237.52 330 270.17 330 270.17 316.43 270.17 330 237.52"/><polygon class="cls-2" points="165 434.31 165 434.31 102.01 399.42 90.68 301.14 165 274.64 165 274.64 165 292.36 165 292.36 165 292.28 118.54 396.46 118.62 396.46 135.94 396.46 135.94 396.46 145.28 373.15 165 373.15 165 434.31"/><polygon class="cls-2" points="165 326.13 165 358.78 165 358.78 151.43 358.78 165 326.13"/><g class="cls-3"><polygon class="cls-2" points="165 434.31 165 434.31 227.99 399.42 239.32 301.14 165 274.64 165 274.64 165 292.36 165 292.36 165 292.28 211.46 396.46 211.38 396.46 194.06 396.46 194.06 396.46 184.72 373.15 165 373.15 165 434.31"/><polygon class="cls-2" points="165 326.13 165 358.78 165 358.78 178.57 358.78 165 326.13"/></g><g class="cls-3"><polygon class="cls-2" points="0 345.69 0 345.69 62.99 310.8 74.33 212.53 0 186.02 0 186.02 0 203.75 0 203.75 0 203.67 46.46 307.85 46.38 307.85 29.06 307.85 29.06 307.85 19.72 284.54 0 284.54 0 345.69"/><polygon class="cls-2" points="0 237.52 0 270.17 0 270.17 13.57 270.17 0 237.52"/></g><polygon class="cls-2" points="330 168.46 330 168.46 267.01 133.57 255.68 35.3 330 8.79 330 8.79 330 26.52 330 26.52 330 26.44 283.54 130.62 283.62 130.62 300.94 130.62 300.94 130.62 310.28 107.31 330 107.31 330 168.46"/><polygon class="cls-2" points="330 60.29 330 92.94 330 92.94 316.43 92.94 330 60.29"/><polygon class="cls-2" points="165 257.08 165 257.08 102.01 222.19 90.68 123.91 165 97.41 165 97.41 165 115.13 165 115.13 165 115.05 118.54 219.24 118.62 219.24 135.94 219.24 135.94 219.24 145.28 195.92 165 195.92 165 257.08"/><polygon class="cls-2" points="165 148.9 165 181.55 165 181.55 151.43 181.55 165 148.9"/><g class="cls-3"><polygon class="cls-2" points="165 257.08 165 257.08 227.99 222.19 239.32 123.91 165 97.41 165 97.41 165 115.13 165 115.13 165 115.05 211.46 219.24 211.38 219.24 194.06 219.24 194.06 219.24 184.72 195.92 165 195.92 165 257.08"/><polygon class="cls-2" points="165 148.9 165 181.55 165 181.55 178.57 181.55 165 148.9"/></g><g class="cls-3"><polygon class="cls-2" points="0 168.46 0 168.46 62.99 133.57 74.33 35.3 0 8.79 0 8.79 0 26.52 0 26.52 0 26.44 46.46 130.62 46.38 130.62 29.06 130.62 29.06 130.62 19.72 107.31 0 107.31 0 168.46"/><polygon class="cls-2" points="0 60.29 0 92.94 0 92.94 13.57 92.94 0 60.29"/></g><polygon class="cls-2" points="165 79.85 165 79.85 102.01 44.96 90.68 -53.31 165 -79.82 165 -79.82 165 -62.1 165 -62.1 165 -62.18 118.54 42.01 118.62 42.01 135.94 42.01 135.94 42.01 145.28 18.7 165 18.7 165 79.85"/><polygon class="cls-2" points="165 -28.33 165 4.33 165 4.33 151.43 4.33 165 -28.33"/><g class="cls-3"><polygon class="cls-2" points="165 79.85 165 79.85 227.99 44.96 239.32 -53.31 165 -79.82 165 -79.82 165 -62.1 165 -62.1 165 -62.18 211.46 42.01 211.38 42.01 194.06 42.01 194.06 42.01 184.72 18.7 165 18.7 165 79.85"/><polygon class="cls-2" points="165 -28.33 165 4.33 165 4.33 178.57 4.33 165 -28.33"/></g></pattern></defs><title>ng-pattern-sm</title><g class="cls-4"><g id="Design"><rect class="cls-5" width="1200" height="1200"/><rect class="cls-6" width="1200" height="1200"/></g></g></svg>