fix(core): stop reusing provider definitions across NgModuleRef instances (#25088)

Fixes #25018.

Instantiating a NgModuleRef from NgModuleFactory reuses the NgModuleDefinition if it is already present. However the NgModuleDefinition has a providers array which modified when tree shakable providers are instantiated. This corrupts the provider definitions the next time the same factory is used to create a new NgModuleRef - Two provider definitions can end up with the same index and the injector could potentially return a completely wrong object for a provider token.

This scenario is more likely on the server where the same NgModuleFactory is reused across requests.

The fix clones the cached NgModuleDefinition so that any tree shakable providers added later do not affect the cached copy.

PR Close #25022

PR Close #25088

.circleci/config.yml

@@ -12,8 +12,8 @@
 ## IMPORTANT
 # 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.3.2
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.2
+var_1: &docker_image angular/ngcontainer:0.3.3
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.3
 
 # Define common ENV vars
 var_3: &define_env_vars

.pullapprove.yml

@@ -23,7 +23,6 @@
 # petebacondarwin - Pete Bacon Darwin
 # pkozlowski-opensource - Pawel Kozlowski
 # robwormald - Rob Wormald
-# tinayuangao - Tina Gao
 # vicb - Victor Berchet
 # vikerman - Vikram Subramanian
 
@@ -218,7 +217,6 @@ groups:
         - "aio/content/examples/reactive-forms/*"
     users:
       - kara #primary
-      - tinayuangao #secondary
       - IgorMinar #fallback
       - mhevery #fallback
 

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="6.0.9"></a>
+## [6.0.9](https://github.com/angular/angular/compare/6.0.8...6.0.9) (2018-07-11)
+
+
+### Bug Fixes
+
+* **common:** format fractional seconds ([#24844](https://github.com/angular/angular/issues/24844)) ([3c93d07](https://github.com/angular/angular/commit/3c93d07)), closes [#24831](https://github.com/angular/angular/issues/24831)
+
+
+
 <a name="6.0.8"></a>
 ## [6.0.8](https://github.com/angular/angular/compare/6.0.7...6.0.8) (2018-07-11)
 

WORKSPACE

@@ -20,9 +20,9 @@ http_archive(
 
 http_archive(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
-    strip_prefix = "rules_typescript-0.15.0",
-    sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.3.zip",
+    strip_prefix = "rules_typescript-0.15.3",
+    sha256 = "a2b26ac3fc13036011196063db1bf7f1eae81334449201dc28087ebfa3708c99",
 )
 
 http_archive(
@@ -77,7 +77,7 @@ http_archive(
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.14.0")
+check_bazel_version("0.15.0")
 node_repositories(package_json = ["//:package.json"])
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

aio/content/examples/bootstrapping/src/app/app.module.ts

@@ -5,7 +5,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 // #docregion directive-import
@@ -24,7 +24,7 @@ import { ItemDirective } from './item.directive';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule
+    HttpClientModule
   ],
   providers: [],
   bootstrap: [AppComponent]

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

@@ -1,7 +1,7 @@
 // #docregion
 import { BrowserModule }                from '@angular/platform-browser';
 import { FormsModule }                  from '@angular/forms';
-import { HttpModule }                   from '@angular/http';
+import { HttpClientModule }             from '@angular/common/http';
 
 // import { AppRoutingModule }             from './app-routing.module';
 import { LocationStrategy,
@@ -54,7 +54,7 @@ const c_components = [
   imports: [
     BrowserModule,
     FormsModule,
-    HttpModule,
+    HttpClientModule,
     InMemoryWebApiModule.forRoot(HeroData)
     // AppRoutingModule TODO: add routes
   ],

aio/content/examples/elements/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,69 @@
+'use strict'; // necessary for es6 output in node
+
+import { browser, by, element } from 'protractor';
+
+/* tslint:disable:quotemark */
+describe('Elements', () => {
+  const messageInput = element(by.css('input'));
+  const popupButtons = element.all(by.css('button'));
+
+  beforeEach(() => browser.get(''));
+
+  describe('popup component', () => {
+    const popupComponentButton = popupButtons.get(0);
+    const popupComponent = element(by.css('popup-component'));
+    const closeButton = popupComponent.element(by.css('button'));
+
+    it('should be displayed on button click', () => {
+      expect(popupComponent.isPresent()).toBe(false);
+
+      popupComponentButton.click();
+      expect(popupComponent.isPresent()).toBe(true);
+    });
+
+    it('should display the specified message', () => {
+      messageInput.clear();
+      messageInput.sendKeys('Angular rocks!');
+
+      popupComponentButton.click();
+      expect(popupComponent.getText()).toContain('Popup: Angular rocks!');
+    });
+
+    it('should be closed on "close" button click', () => {
+      popupComponentButton.click();
+      expect(popupComponent.isPresent()).toBe(true);
+
+      closeButton.click();
+      expect(popupComponent.isPresent()).toBe(false);
+    });
+  });
+
+  describe('popup element', () => {
+    const popupElementButton = popupButtons.get(1);
+    const popupElement = element(by.css('popup-element'));
+    const closeButton = popupElement.element(by.css('button'));
+
+    it('should be displayed on button click', () => {
+      expect(popupElement.isPresent()).toBe(false);
+
+      popupElementButton.click();
+      expect(popupElement.isPresent()).toBe(true);
+    });
+
+    it('should display the specified message', () => {
+      messageInput.clear();
+      messageInput.sendKeys('Angular rocks!');
+
+      popupElementButton.click();
+      expect(popupElement.getText()).toContain('Popup: Angular rocks!');
+    });
+
+    it('should be closed on "close" button click', () => {
+      popupElementButton.click();
+      expect(popupElement.isPresent()).toBe(true);
+
+      closeButton.click();
+      expect(popupElement.isPresent()).toBe(false);
+    });
+  });
+});

aio/content/examples/elements/example-config.json

@@ -0,0 +1,3 @@
+{
+  "projectType": "elements"
+}

aio/content/examples/elements/src/app/app.component.ts

@@ -1,6 +1,5 @@
-// #docregion
 import { Component, Injector } from '@angular/core';
-import { createNgElementConstructor } from '../elements-dist';
+import { createCustomElement } from '@angular/elements';
 import { PopupService } from './popup.service';
 import { PopupComponent } from './popup.component';
 
@@ -8,19 +7,15 @@ import { PopupComponent } from './popup.component';
   selector: 'app-root',
   template: `
     <input #input value="Message">
-    <button (click)="popup.showAsComponent(input.value)">
-        Show as component </button>
-    <button (click)="popup.showAsElement(input.value)">
-        Show as element </button>
-  `
+    <button (click)="popup.showAsComponent(input.value)">Show as component</button>
+    <button (click)="popup.showAsElement(input.value)">Show as element</button>
+  `,
 })
-
 export class AppComponent {
-   constructor(private injector: Injector, public popup: PopupService) {
-    // on init, convert PopupComponent to a custom element
-    const PopupElement =
-createNgElementConstructor(PopupComponent, {injector: this.injector});
-    // register the custom element with the browser.
-       customElements.define('popup-element', PopupElement);
+  constructor(injector: Injector, public popup: PopupService) {
+    // Convert `PopupComponent` to a custom element.
+    const PopupElement = createCustomElement(PopupComponent, {injector});
+    // Register the custom element with the browser.
+    customElements.define('popup-element', PopupElement);
   }
 }

aio/content/examples/elements/src/app/app.module.ts

@@ -1,22 +1,21 @@
-// #docregion
+import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
-import { PopupService } from './popup.service';
 import { PopupComponent } from './popup.component';
+import { PopupService } from './popup.service';
 
-// include the PopupService provider,
-// but exclude PopupComponent from compilation,
-// because it will be added dynamically
+// Include the `PopupService` provider,
+// but exclude `PopupComponent` from compilation,
+// because it will be added dynamically.
 
 @NgModule({
-  declarations: [AppComponent, PopupComponent],
   imports: [BrowserModule, BrowserAnimationsModule],
   providers: [PopupService],
+  declarations: [AppComponent, PopupComponent],
   bootstrap: [AppComponent],
   entryComponents: [PopupComponent],
 })
-
-export class AppModule {}
+export class AppModule {
+}

aio/content/examples/elements/src/app/popup.component.ts

@@ -1,14 +1,14 @@
-// #docregion
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { AnimationEvent } from '@angular/animations';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 
 @Component({
   selector: 'my-popup',
-  template: 'Popup: {{message}}',
+  template: `
+    <span>Popup: {{message}}</span>
+    <button (click)="closed.next()">&#x2716;</button>
+  `,
   host: {
     '[@state]': 'state',
-    '(@state.done)': 'onAnimationDone($event)',
   },
   animations: [
     trigger('state', [
@@ -27,13 +27,17 @@ import { animate, state, style, transition, trigger } from '@angular/animations'
       height: 48px;
       padding: 16px;
       display: flex;
+      justify-content: space-between;
       align-items: center;
       border-top: 1px solid black;
       font-size: 24px;
     }
+
+    button {
+      border-radius: 50%;
+    }
   `]
 })
-
 export class PopupComponent {
   private state: 'opened' | 'closed' = 'closed';
 
@@ -41,18 +45,10 @@ export class PopupComponent {
   set message(message: string) {
     this._message = message;
     this.state = 'opened';
-
-    setTimeout(() => this.state = 'closed', 2000);
   }
   get message(): string { return this._message; }
   _message: string;
 
   @Output()
   closed = new EventEmitter();
-
-  onAnimationDone(e: AnimationEvent) {
-    if (e.toState === 'closed') {
-      this.closed.next();
-    }
-  }
 }

aio/content/examples/elements/src/app/popup.service.ts

@@ -1,9 +1,8 @@
 
-// #docregion
 import { ApplicationRef, ComponentFactoryResolver, Injectable, Injector } from '@angular/core';
-
+import { NgElement, WithProperties } from '@angular/elements';
 import { PopupComponent } from './popup.component';
-import { NgElementConstructor } from '../elements-dist';
+
 
 @Injectable()
 export class PopupService {
@@ -40,7 +39,7 @@ export class PopupService {
   // This uses the new custom-element method to add the popup to the DOM.
   showAsElement(message: string) {
     // Create element
-    const popupEl = document.createElement('popup-element');
+    const popupEl: NgElement & WithProperties<PopupComponent> = document.createElement('popup-element') as any;
 
     // Listen to the close event
     popupEl.addEventListener('closed', () => document.body.removeChild(popupEl));

aio/content/examples/elements/src/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <base href="/">
+    <title>Elements</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
+</html>

aio/content/examples/elements/src/main.ts

@@ -1,4 +1,3 @@
-// tslint:disable:no-unused-variable
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
@@ -10,4 +9,3 @@ if (environment.production) {
 }
 
 platformBrowserDynamic().bootstrapModule(AppModule);
-

aio/content/examples/ngmodules/src/app/app.module.ts

@@ -1,7 +1,5 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
 
 /* App Root */
 import { AppComponent } from './app.component';

aio/content/examples/observables/src/multicasting.ts

@@ -15,7 +15,7 @@ function sequenceSubscriber(observer) {
       if (idx === arr.length - 1) {
         observer.complete();
       } else {
-        doSequence(arr, idx++);
+        doSequence(arr, ++idx);
       }
     }, 1000);
   }
@@ -95,7 +95,7 @@ function multicastSequenceSubscriber() {
         },
         complete() {
           // Notify all complete callbacks
-          observers.forEach(obs => obs.complete());
+          observers.slice(0).forEach(obs => obs.complete());
         }
       }, seq, 0);
     }
@@ -121,13 +121,13 @@ function doSequence(observer, arr, idx) {
     if (idx === arr.length - 1) {
       observer.complete();
     } else {
-      doSequence(observer, arr, idx++);
+      doSequence(observer, arr, ++idx);
     }
   }, 1000);
 }
 
 // Create a new Observable that will deliver the above sequence
-const multicastSequence = new Observable(multicastSequenceSubscriber);
+const multicastSequence = new Observable(multicastSequenceSubscriber());
 
 // Subscribe starts the clock, and begins to emit after 1 second
 multicastSequence.subscribe({

aio/content/examples/reactive-forms/debug.log

@@ -1,3 +0,0 @@
-[1030/162525.401:ERROR:process_reader_win.cc(123)] NtOpenThread: {Acceso denegado} Un proceso ha solicitado acceso a un objeto, pero no se le han concedido esos derechos de acceso.  (0xc0000022)
-[1030/162525.402:ERROR:exception_snapshot_win.cc(87)] thread ID 26896 not found in process
-[1030/162525.402:WARNING:crash_report_exception_handler.cc(62)] ProcessSnapshotWin::Initialize failed

aio/content/examples/reactive-forms/final.stackblitz.json

@@ -1,24 +0,0 @@
-{
-  "description": "Angular Reactive Forms (final)",
-  "files":[
-    "src/styles.css",
-
-    "src/app/app.component.ts",
-    "src/app/app.component.html",
-    "src/app/app.component.css",
-    "src/app/app.module.ts",
-    "src/app/data-model.ts",
-    "src/app/hero.service.ts",
-    "src/app/hero-detail/hero-detail.component.html",
-    "src/app/hero-detail/hero-detail.component.ts",
-    "src/app/hero-detail/hero-detail.component.css",
-    "src/app/hero-list/hero-list.component.html",
-    "src/app/hero-list/hero-list.component.ts",
-    "src/app/hero-list/hero-list.component.css",
-
-    "src/main-final.ts",
-    "src/index-final.html"
-  ],
-  "main": "src/index-final.html",
-  "tags": ["reactive", "forms"]
-}

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

@@ -1,4 +1,10 @@
-<div class="container">
-  <h1>Reactive Forms</h1>
-  <app-hero-detail></app-hero-detail>
-</div>
+<!-- #docplaster -->
+<h1>Reactive Forms</h1>
+
+<!-- #docregion app-name-editor-->
+<app-name-editor></app-name-editor>
+<!-- #enddocregion app-name-editor-->
+
+<!-- #docregion app-profile-editor -->
+<app-profile-editor></app-profile-editor>
+<!-- #enddocregion app-profile-editor -->

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

@@ -1,4 +1,17 @@
-<div class="container">
-  <h1>Reactive Forms</h1>
-  <app-hero-list></app-hero-list>
-</div>
+<!-- #docplaster -->
+<!-- #docregion app-name-editor -->
+<h1>Reactive Forms</h1>
+
+<!-- #enddocregion app-name-editor -->
+<nav>
+  <a (click)="toggleEditor('name')">Name Editor</a>
+  <a (click)="toggleEditor('profile')">Profile Editor</a>
+</nav>
+
+<!-- #docregion app-name-editor -->
+<app-name-editor *ngIf="showNameEditor"></app-name-editor>
+<!-- #enddocregion app-name-editor -->
+
+<!-- #docregion app-profile-editor -->
+<app-profile-editor *ngIf="showProfileEditor"></app-profile-editor>
+<!-- #enddocregion app-profile-editor -->

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

@@ -0,0 +1,27 @@
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+  it('should create the app', async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  }));
+  it(`should have as title 'app'`, async(() => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    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).toContain('Welcome to reactive-forms!');
+  }));
+});

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

@@ -1,9 +1,24 @@
-// #docregion
 import { Component } from '@angular/core';
 
+export type EditorType = 'name' | 'profile';
+
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent { }
+export class AppComponent {
+  editor: EditorType = 'name';
+
+  get showNameEditor() {
+    return this.editor === 'name';
+  }
+
+  get showProfileEditor() {
+    return this.editor === 'profile';
+  }
+
+  toggleEditor(type: EditorType) {
+    this.editor = type;
+  }
+}

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

@@ -1,45 +1,34 @@
 // #docplaster
-// #docregion
-// #docregion v1
-import { NgModule }            from '@angular/core';
-import { BrowserModule }       from '@angular/platform-browser';
-import { ReactiveFormsModule } from '@angular/forms';  // <-- #1 import module
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+// #docregion imports
+import { ReactiveFormsModule } from '@angular/forms';
 
-import { AppComponent }        from './app.component';
-import { HeroDetailComponent } from './hero-detail/hero-detail.component';
-// #enddocregion v1
-// #docregion hero-service-list
-// add JavaScript imports
-import { HeroListComponent }   from './hero-list/hero-list.component';
-import { HeroService }         from './hero.service';
-// #docregion v1
+// #enddocregion imports
+import { AppComponent } from './app.component';
+import { NameEditorComponent } from './name-editor/name-editor.component';
+import { ProfileEditorComponent } from './profile-editor/profile-editor.component';
 
+// #docregion imports
 @NgModule({
+// #enddocregion imports
   declarations: [
     AppComponent,
-    HeroDetailComponent,
-// #enddocregion v1
-    HeroListComponent // <--declare HeroListComponent
-// #docregion v1
+    NameEditorComponent,
+    ProfileEditorComponent
   ],
- // #enddocregion hero-service-list
+// #docregion imports
   imports: [
+// #enddocregion imports
     BrowserModule,
-    ReactiveFormsModule // <-- #2 add to @NgModule imports
+// #docregion imports
+    // other imports ...
+    ReactiveFormsModule
   ],
-  // #enddocregion v1
-  // export for the DemoModule
-  // #docregion hero-service-list
-  // ...
-  exports: [
-    AppComponent,
-    HeroDetailComponent,
-    HeroListComponent // <-- export HeroListComponent
-  ],
-  providers: [ HeroService ], // <-- provide HeroService
-// #enddocregion hero-service-list
-// #docregion v1
-  bootstrap: [ AppComponent ]
+// #enddocregion imports
+  providers: [],
+  bootstrap: [AppComponent]
+// #docregion imports
 })
 export class AppModule { }
-// #enddocregion v1
+// #enddocregion imports

aio/content/examples/reactive-forms/src/app/data-model.ts

@@ -1,40 +0,0 @@
-// #docregion
-// #docregion model-classes
-export class Hero {
-  id = 0;
-  name = '';
-  addresses: Address[];
-}
-
-export class Address {
-  street = '';
-  city   = '';
-  state  = '';
-  zip    = '';
-}
-// #enddocregion model-classes
-
-export const heroes: Hero[] = [
-  {
-    id: 1,
-    name: 'Whirlwind',
-    addresses: [
-      {street: '123 Main',  city: 'Anywhere', state: 'CA',  zip: '94801'},
-      {street: '456 Maple', city: 'Somewhere', state: 'VA', zip: '23226'},
-    ]
-  },
-  {
-    id: 2,
-    name: 'Bombastic',
-    addresses: [
-      {street: '789 Elm',  city: 'Smallville', state: 'OH',  zip: '04501'},
-    ]
-  },
-  {
-    id: 3,
-    name: 'Magneta',
-    addresses: [ ]
-  },
-];
-
-export const states = ['CA', 'MD', 'OH', 'VA'];

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

@@ -1,40 +0,0 @@
-<div class="container">
-<h1>Reactive Forms</h1>
-<h4><i>Pick a demo:</i>
-  <select [selectedIndex]="demo - 1" (change)="selectDemo($event.target.selectedIndex)">
-    <option *ngFor="let demo of demos">{{demo}}</option>
-  </select>
-</h4>
-
-<hr>
-
-<div class="demo">
-  <app-hero-list *ngIf="demo===final"></app-hero-list>
-  <app-hero-detail-1 *ngIf="demo===1"></app-hero-detail-1>
-  <app-hero-detail-2 *ngIf="demo===2"></app-hero-detail-2>
-  <app-hero-detail-3 *ngIf="demo===3"></app-hero-detail-3>
-  <app-hero-detail-4 *ngIf="demo===4"></app-hero-detail-4>
-  <app-hero-detail-5 *ngIf="demo===5"></app-hero-detail-5>
-
-  <div *ngIf="demo >= 6 && demo !== final" >
-
-    <h3 *ngIf="isLoading"><i>Loading heroes ... </i></h3>
-    <h3 *ngIf="!isLoading">Select a hero:</h3>
-
-    <nav>
-      <button (click)="getHeroes()" class="btn btn-primary">Refresh</button>
-      <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-    </nav>
-
-    <div *ngIf="selectedHero">
-      <hr>
-      <h2>Hero Detail</h2>
-      <h3>Editing: {{selectedHero.name}}</h3>
-      <app-hero-detail-6 [hero]=selectedHero *ngIf="demo===6"></app-hero-detail-6>
-      <app-hero-detail-7 [hero]=selectedHero *ngIf="demo===7"></app-hero-detail-7>
-      <app-hero-detail-8 [hero]=selectedHero *ngIf="demo===8"></app-hero-detail-8>
-
-    </div>
-  </div>
-</div>
-</div>

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

@@ -1,49 +0,0 @@
-/* tslint:disable:member-ordering */
-import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
-import { finalize } from 'rxjs/operators';
-
-import { Hero }        from './data-model';
-import { HeroService } from './hero.service';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './demo.component.html'
-})
-export class DemoComponent {
-
-  demos: string[] = [
-    'Just a FormControl',
-    'FormControl in a FormGroup',
-    'Simple FormBuilder group',
-    'Group with multiple controls',
-    'Nested FormBuilder group',
-    'PatchValue',
-    'SetValue',
-    'FormArray',
-    'Final'].map(n => n + ' Demo');
-
-  final = this.demos.length;
-  demo = this.final; // current demo
-
-  heroes: Observable<Hero[]>;
-  isLoading = false;
-  selectedHero: Hero;
-
-  constructor(private heroService: HeroService) { }
-
-  getHeroes() {
-    this.isLoading = true;
-    this.heroes = this.heroService.getHeroes().pipe(
-                      finalize(() => this.isLoading = false)
-    );
-    this.selectedHero = undefined;
-  }
-
-  select(hero: Hero) { this.selectedHero = hero; }
-
-  selectDemo(demo: number) {
-    this.demo = demo + 1;
-    this.getHeroes();
-  }
-}

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

@@ -1,33 +0,0 @@
-import { NgModule }             from '@angular/core';
-import { BrowserModule }        from '@angular/platform-browser';
-import { ReactiveFormsModule }  from '@angular/forms';
-
-import { AppModule }            from './app.module';
-import { DemoComponent }        from './demo.component';
-import { HeroDetailComponent1 } from './hero-detail/hero-detail-1.component';
-import { HeroDetailComponent2 } from './hero-detail/hero-detail-2.component';
-import { HeroDetailComponent3 } from './hero-detail/hero-detail-3.component';
-import { HeroDetailComponent4 } from './hero-detail/hero-detail-4.component';
-import { HeroDetailComponent5 } from './hero-detail/hero-detail-5.component';
-import { HeroDetailComponent6 } from './hero-detail/hero-detail-6.component';
-import { HeroDetailComponent7 } from './hero-detail/hero-detail-7.component';
-import { HeroDetailComponent8 } from './hero-detail/hero-detail-8.component';
-
-@NgModule({
-  imports: [
-    BrowserModule,
-    ReactiveFormsModule,
-    AppModule,
-  ],
-  declarations: [ DemoComponent,
-  HeroDetailComponent1,
-  HeroDetailComponent2,
-  HeroDetailComponent3,
-  HeroDetailComponent4,
-  HeroDetailComponent5,
-  HeroDetailComponent6,
-  HeroDetailComponent7,
-  HeroDetailComponent8],
-  bootstrap:    [ DemoComponent ]
-})
-export class DemoModule { }

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

@@ -1,8 +0,0 @@
-<!-- #docregion simple-control-->
-<h2>Hero Detail</h2>
-<h3><i>Just a FormControl</i></h3>
-<label class="center-block">Name:
-  <input class="form-control" [formControl]="name">
-</label>
-<!-- #enddocregion simple-control-->
-

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

@@ -1,15 +0,0 @@
-/* tslint:disable:component-class-suffix */
-
-import { Component } from '@angular/core';
-// #docregion import
-import { FormControl } from '@angular/forms';
-// #enddocregion import
-
-@Component({
-  selector: 'app-hero-detail-1',
-  templateUrl: './hero-detail-1.component.html'
-})
-// #docregion v1
-export class HeroDetailComponent1 {
-  name = new FormControl();
-}

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

@@ -1,18 +0,0 @@
-<!-- #docregion basic-form-->
-<h2>Hero Detail</h2>
-<h3><i>FormControl in a FormGroup</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-</form>
-<!-- #enddocregion basic-form-->
-
-<!-- #docregion form-value-json -->
-<p>Form value: {{ heroForm.value | json }}</p>
-<!-- #enddocregion form-value-json  -->
-
-
-

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

@@ -1,17 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }              from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-2',
-  templateUrl: './hero-detail-2.component.html'
-})
-// #docregion v2
-export class HeroDetailComponent2 {
-  heroForm = new FormGroup ({
-    name: new FormControl()
-  });
-}
-// #enddocregion v2

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

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

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

@@ -1,27 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-3',
-  templateUrl: './hero-detail-3.component.html'
-})
-// #docregion v3
-export class HeroDetailComponent3 {
-  heroForm: FormGroup; // <--- heroForm is of type FormGroup
-
-  constructor(private fb: FormBuilder) { // <--- inject FormBuilder
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion required
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-    });
-    // #enddocregion required
-  }
-}
-// #enddocregion v3

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

@@ -1,25 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }              from '@angular/core';
-import { FormBuilder, FormGroup } from '@angular/forms';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-3',
-  templateUrl: './hero-detail-3.component.html'
-})
-// #docregion v3a
-export class HeroDetailComponent3 {
-  heroForm: FormGroup; // <--- heroForm is of type FormGroup
-
-  constructor(private fb: FormBuilder) { // <--- inject FormBuilder
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: '', // <--- the FormControl called "name"
-    });
-  }
-}
-// #enddocregion v3a

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

@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-          <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>

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

@@ -1,34 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { states } from '../data-model';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-4',
-  templateUrl: './hero-detail-4.component.html'
-})
-// #docregion v4
-export class HeroDetailComponent4 {
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      street: '',
-      city: '',
-      state: '',
-      zip: '',
-      power: '',
-      sidekick: ''
-    });
-  }
-}
-// #enddocregion v4

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

@@ -1,56 +0,0 @@
-
-<form [formGroup]="heroForm">
-    <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-    </div>
-<!-- #docregion add-group-->
-    <div formGroupName="address" class="well well-lg">
-      <h4>Secret Lair</h4>
-      <div class="form-group">
-        <label class="center-block">Street:
-          <input class="form-control" formControlName="street">
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">City:
-          <input class="form-control" formControlName="city">
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">State:
-          <select class="form-control" formControlName="state">
-            <option *ngFor="let state of states" [value]="state">{{state}}</option>
-          </select>
-        </label>
-      </div>
-      <div class="form-group">
-        <label class="center-block">Zip Code:
-          <input class="form-control" formControlName="zip">
-        </label>
-      </div>
-    </div>
-<!-- #enddocregion add-group-->
-    <div class="form-group radio">
-      <h4>Super power:</h4>
-      <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-      <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-      <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-    </div>
-    <div class="checkbox">
-      <label class="center-block">
-        <input type="checkbox" formControlName="sidekick">I have a sidekick.
-      </label>
-    </div>
-</form>
-
-<p>heroForm value: {{ heroForm.value | json}}</p>
-<h4>Extra info for the curious:</h4>
-<!-- #docregion inspect-value -->
-<p>Name value: {{ heroForm.get('name').value }}</p>
-<!-- #enddocregion inspect-value -->
-
-<!-- #docregion inspect-child-control -->
-<p>Street value: {{ heroForm.get('address.street').value}}</p>
-<!-- #enddocregion inspect-child-control -->

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

@@ -1,35 +0,0 @@
-/* tslint:disable:component-class-suffix */
-import { Component }                          from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { states } from '../data-model';
-
-@Component({
-  selector: 'app-hero-detail-5',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v5
-export class HeroDetailComponent5 {
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    this.heroForm = this.fb.group({ // <-- the parent FormGroup
-      name: ['', Validators.required ],
-      address: this.fb.group({ // <-- the child FormGroup
-        street: '',
-        city: '',
-        state: '',
-        zip: ''
-      }),
-      power: '',
-      sidekick: ''
-    });
-  }
-}
-// #enddocregion v5
-

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

@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>PatchValue to initialize a value</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-        <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>

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

@@ -1,66 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion import-input
-import { Component, Input, OnChanges }             from '@angular/core';
-// #enddocregion import-input
-import { FormBuilder, FormGroup, Validators }      from '@angular/forms';
-
-// #docregion import-hero
-import { Hero, states } from '../data-model';
-// #enddocregion import-hero
-
-////////// 6 ////////////////////
-
-@Component({
-  selector: 'app-hero-detail-6',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v6
-export class HeroDetailComponent6 implements OnChanges {
-  // #docregion hero
-  @Input() hero: Hero;
-  // #enddocregion hero
-
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion hero-form-model
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      address: this.fb.group({
-        street: '',
-        city: '',
-        state: '',
-        zip: ''
-      }),
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion hero-form-model
-  }
-
-  // #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
-    this.heroForm.reset();
-    // #docregion patch-value
-    this.heroForm.patchValue({
-      name: this.hero.name
-    });
-    // #enddocregion patch-value
-  }
-  // #enddocregion patch-value-rebuildform
-}
-
-
-
-// #enddocregion v6

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

@@ -1,46 +0,0 @@
-<!-- #docregion -->
-<h2>Hero Detail</h2>
-<h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
-  <div class="form-group">
-    <label class="center-block">Name:
-      <input class="form-control" formControlName="name">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Street:
-      <input class="form-control" formControlName="street">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">City:
-      <input class="form-control" formControlName="city">
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">State:
-      <select class="form-control" formControlName="state">
-        <option *ngFor="let state of states" [value]="state">{{state}}</option>
-      </select>
-    </label>
-  </div>
-  <div class="form-group">
-    <label class="center-block">Zip Code:
-      <input class="form-control" formControlName="zip">
-    </label>
-  </div>
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-
-
-<p>Form value: {{ heroForm.value | json }}</p>

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

@@ -1,68 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docplaster
-// #docregion imports
-import { Component, Input, OnChanges }             from '@angular/core';
-import { FormBuilder, FormGroup, Validators }      from '@angular/forms';
-
-// #docregion import-address
-import { Address, Hero, states } from '../data-model';
-// #enddocregion import-address
-
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-7',
-  templateUrl: './hero-detail-5.component.html'
-})
-// #docregion v7
-export class HeroDetailComponent7 implements OnChanges {
-  @Input() hero: Hero;
-
-  heroForm: FormGroup;
-  states = states;
-
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-  }
-
-  createForm() {
-    // #docregion address-form-group
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      address: this.fb.group(new Address()), // <-- a FormGroup with a new address
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion address-form-group
-  }
-
-  // #docregion ngOnChanges
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-   // #enddocregion ngOnChanges
-
-    // #docregion rebuildForm
-  rebuildForm() {
-    this.heroForm.reset({
-      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
-  }
-}

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

@@ -1,72 +0,0 @@
-<!-- #docplaster-->
-<h3><i>Using FormArray to add groups</i></h3>
-
-<form [formGroup]="heroForm">
-    <p>Form Changed: {{ heroForm.dirty }}</p>
-
-    <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-    </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 -->
-        <h4>Address #{{i + 1}}</h4>
-        <div style="margin-left: 1em;">
-          <div class="form-group">
-            <label class="center-block">Street:
-              <input class="form-control" formControlName="street">
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">City:
-              <input class="form-control" formControlName="city">
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">State:
-              <select class="form-control" formControlName="state">
-                <option *ngFor="let state of states" [value]="state">{{state}}</option>
-              </select>
-            </label>
-          </div>
-          <div class="form-group">
-            <label class="center-block">Zip Code:
-              <input class="form-control" formControlName="zip">
-            </label>
-          </div>
-        </div>
-        <br>
-        <!-- End of the repeated address template -->
-    <!-- #docregion form-array-skeleton -->
-      </div>
-    <!-- #enddocregion form-array-skeleton -->
-    <!-- #enddocregion form-array-->
-      <!-- #docregion add-lair -->
-      <button (click)="addLair()" type="button">Add a Secret Lair</button>
-      <!-- #enddocregion add-lair -->
-    <!-- #docregion form-array-->
-    <!-- #docregion form-array-skeleton -->
-    </div>
-    <!-- #enddocregion form-array-skeleton -->
-    <!-- #enddocregion form-array-->
-    <div class="form-group radio">
-        <h4>Super power:</h4>
-        <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-        <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-        <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-      </div>
-      <div class="checkbox">
-        <label class="center-block">
-          <input type="checkbox" formControlName="sidekick">I have a sidekick.
-        </label>
-      </div>
-</form>
-
-<p>heroForm value: {{ heroForm.value | json}}</p>

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

@@ -1,74 +0,0 @@
-/* tslint:disable:component-class-suffix */
-// #docregion imports
-import { Component, Input, OnChanges }                   from '@angular/core';
-import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
-
-import { Address, Hero, states } from '../data-model';
-// #enddocregion imports
-
-@Component({
-  selector: 'app-hero-detail-8',
-  templateUrl: './hero-detail-8.component.html'
-})
-// #docregion v8
-export class HeroDetailComponent8 implements OnChanges {
-  @Input() hero: Hero;
-
-  heroForm: FormGroup;
-  states = states;
-
-  // #docregion ctor
-  constructor(private fb: FormBuilder) {
-    this.createForm();
-    this.logNameChange();
-  }
-  // #enddocregion ctor
-
-  createForm() {
-    // #docregion secretLairs-form-array
-    this.heroForm = this.fb.group({
-      name: ['', Validators.required ],
-      secretLairs: this.fb.array([]), // <-- secretLairs as an empty FormArray
-      power: '',
-      sidekick: ''
-    });
-    // #enddocregion secretLairs-form-array
-  }
-
-  logNameChange() {/* Coming soon */}
-
-  // #docregion onchanges
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-  // #enddocregion onchanges
-
-  // #docregion rebuildform
-  rebuildForm() {
-    this.heroForm.reset({
-      name: this.hero.name
-    });
-    this.setAddresses(this.hero.addresses);
-  }
-// #enddocregion rebuildform
-
-  // #docregion get-secret-lairs
-  get secretLairs(): FormArray {
-    return this.heroForm.get('secretLairs') as FormArray;
-  };
-  // #enddocregion get-secret-lairs
-
-  // #docregion set-addresses
-  setAddresses(addresses: Address[]) {
-    const addressFGs = addresses.map(address => this.fb.group(address));
-    const addressFormArray = this.fb.array(addressFGs);
-    this.heroForm.setControl('secretLairs', addressFormArray);
-  }
-  // #enddocregion set-addresses
-
-  // #docregion add-lair
-  addLair() {
-    this.secretLairs.push(this.fb.group(new Address()));
-  }
-  // #enddocregion add-lair
-}

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

@@ -1,73 +0,0 @@
-<!-- #docplaster -->
-<!-- #docregion -->
-  <!-- #docregion buttons -->
-<form [formGroup]="heroForm" (ngSubmit)="onSubmit()">
-  <div style="margin-bottom: 1em">
-    <button type="submit"
-            [disabled]="heroForm.pristine" class="btn btn-success">Save</button> &nbsp;
-    <button type="button" (click)="revert()"
-            [disabled]="heroForm.pristine" class="btn btn-danger">Revert</button>
-  </div>
-
-  <!-- Hero Detail Controls -->
-  <!-- #enddocregion buttons -->
-  <div class="form-group">
-      <label class="center-block">Name:
-        <input class="form-control" formControlName="name">
-      </label>
-  </div>
-
-  <div formArrayName="secretLairs" class="well well-lg">
-    <div *ngFor="let address of secretLairs.controls; let i=index" [formGroupName]="i" >
-      <!-- The repeated address template -->
-      <h4>Address #{{i + 1}}</h4>
-      <div style="margin-left: 1em;">
-        <div class="form-group">
-          <label class="center-block">Street:
-            <input class="form-control" formControlName="street">
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">City:
-            <input class="form-control" formControlName="city">
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">State:
-            <select class="form-control" formControlName="state">
-              <option *ngFor="let state of states" [value]="state">{{state}}</option>
-            </select>
-          </label>
-        </div>
-        <div class="form-group">
-          <label class="center-block">Zip Code:
-            <input class="form-control" formControlName="zip">
-          </label>
-        </div>
-      </div>
-      <br>
-      <!-- End of the repeated address template -->
-    </div>
-    <button (click)="addLair()" type="button">Add a Secret Lair</button>
-  </div>
-  <!-- #docregion buttons -->
-  <div class="form-group radio">
-    <h4>Super power:</h4>
-    <label class="center-block"><input type="radio" formControlName="power" value="flight">Flight</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="x-ray vision">X-ray vision</label>
-    <label class="center-block"><input type="radio" formControlName="power" value="strength">Strength</label>
-  </div>
-  <div class="checkbox">
-    <label class="center-block">
-      <input type="checkbox" formControlName="sidekick">I have a sidekick.
-    </label>
-  </div>
-</form>
-  <!-- #enddocregion buttons -->
-
-<p>heroForm value: {{ heroForm.value | json}}</p>
-
-<!-- #docregion name-change-log -->
-<h4>Name change log</h4>
-<div *ngFor="let name of nameChangeLog">{{name}}</div>
-<!-- #enddocregion name-change-log -->

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

@@ -1,113 +0,0 @@
-// #docplaster
-// #docregion
-import { Component, Input, OnChanges }       from '@angular/core';
-import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
-
-import { Address, Hero, states } from '../data-model';
-// #docregion import-service
-import { HeroService }           from '../hero.service';
-// #enddocregion import-service
-
-@Component({
-  selector: 'app-hero-detail',
-  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;
-  // #docregion log-name-change
-  nameChangeLog: string[] = [];
-  // #enddocregion log-name-change
-  states = states;
-
-  // #docregion ctor
-  constructor(
-    private fb: FormBuilder,
-    private heroService: HeroService) {
-
-    this.createForm();
-    this.logNameChange();
-  }
-  // #enddocregion ctor
-
-  createForm() {
-    this.heroForm = this.fb.group({
-      name: '',
-      secretLairs: this.fb.array([]),
-      power: '',
-      sidekick: ''
-    });
-  }
-
-  ngOnChanges() {
-    this.rebuildForm();
-  }
-
-  rebuildForm() {
-    this.heroForm.reset({
-      name: this.hero.name
-    });
-    this.setAddresses(this.hero.addresses);
-  }
-
-  get secretLairs(): FormArray {
-    return this.heroForm.get('secretLairs') as FormArray;
-  };
-
-  setAddresses(addresses: Address[]) {
-    const addressFGs = addresses.map(address => this.fb.group(address));
-    const addressFormArray = this.fb.array(addressFGs);
-    this.heroForm.setControl('secretLairs', addressFormArray);
-  }
-
-  addLair() {
-    this.secretLairs.push(this.fb.group(new Address()));
-  }
-
-  // #docregion on-submit
-  onSubmit() {
-    this.hero = this.prepareSaveHero();
-    this.heroService.updateHero(this.hero).subscribe(/* error handling */);
-    this.rebuildForm();
-  }
-  // #enddocregion on-submit
-
-  // #docregion prepare-save-hero
-  prepareSaveHero(): Hero {
-    const formModel = this.heroForm.value;
-
-    // deep copy of form model lairs
-    const secretLairsDeepCopy: Address[] = formModel.secretLairs.map(
-      (address: Address) => Object.assign({}, address)
-    );
-
-    // return new `Hero` object containing a combination of original hero value(s)
-    // and deep copies of changed form model values
-    const saveHero: Hero = {
-      id: this.hero.id,
-      name: formModel.name as string,
-      // addresses: formModel.secretLairs // <-- bad!
-      addresses: secretLairsDeepCopy
-    };
-    return saveHero;
-  }
-  // #enddocregion prepare-save-hero
-
-  // #docregion revert
-  revert() { this.rebuildForm(); }
-  // #enddocregion revert
-
-  // #docregion log-name-change
-  logNameChange() {
-    const nameControl = this.heroForm.get('name');
-    nameControl.valueChanges.forEach(
-      (value: string) => this.nameChangeLog.push(value)
-    );
-  }
-  // #enddocregion log-name-change
-}

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

@@ -1,8 +0,0 @@
-<!-- #docregion -->
-<nav>
-  <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-</nav>
-
-<div *ngIf="selectedHero">
-  <app-hero-detail [hero]="selectedHero"></app-hero-detail>
-</div>

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

@@ -1,17 +0,0 @@
-<!-- #docregion -->
-<h3 *ngIf="isLoading"><i>Loading heroes ... </i></h3>
-<h3 *ngIf="!isLoading">Select a hero:</h3>
-
-<nav>
-  <button (click)="getHeroes()" class="btn btn-primary">Refresh</button>
-  <a *ngFor="let hero of heroes | async" (click)="select(hero)">{{hero.name}}</a>
-</nav>
-
-<div *ngIf="selectedHero">
-  <hr>
-  <h2>Hero Detail</h2>
-  <h3>Editing: {{selectedHero.name}}</h3>
-  <!-- #docregion hero-binding -->
-  <app-hero-detail [hero]="selectedHero"></app-hero-detail>
-  <!-- #enddocregion hero-binding -->
-</div>

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

@@ -1,32 +0,0 @@
-// #docregion
-import { Component, OnInit } from '@angular/core';
-import { Observable }        from 'rxjs';
-import { finalize } from 'rxjs/operators';
-
-import { Hero }        from '../data-model';
-import { HeroService } from '../hero.service';
-
-@Component({
-  selector: 'app-hero-list',
-  templateUrl: './hero-list.component.html',
-  styleUrls: ['./hero-list.component.css']
-})
-export class HeroListComponent implements OnInit {
-  heroes: Observable<Hero[]>;
-  isLoading = false;
-  selectedHero: Hero;
-
-  constructor(private heroService: HeroService) { }
-
-  ngOnInit() { this.getHeroes(); }
-
-  getHeroes() {
-    this.isLoading = true;
-    this.heroes = this.heroService.getHeroes()
-                      // TODO: error handling
-                      .pipe(finalize(() => this.isLoading = false));
-    this.selectedHero = undefined;
-  }
-
-  select(hero: Hero) { this.selectedHero = hero; }
-}

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

@@ -1,25 +0,0 @@
-// #docregion
-import { Injectable } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
-import { delay } from 'rxjs/operators';
-
-import { Hero, heroes } from './data-model';
-
-@Injectable()
-export class HeroService {
-
-  delayMs = 500;
-
-  // Fake server get; assume nothing can go wrong
-  getHeroes(): Observable<Hero[]> {
-    return of(heroes).pipe(delay(this.delayMs)); // simulate latency with delay
-  }
-
-  // Fake server update; assume nothing can go wrong
-  updateHero(hero: Hero): Observable<Hero>  {
-    const oldHero = heroes.find(h => h.id === hero.id);
-    const newHero = Object.assign(oldHero, hero); // Demo: mutate cached hero
-    return of(newHero).pipe(delay(this.delayMs)); // simulate latency with delay
-  }
-}

aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.css

@@ -0,0 +1,19 @@
+:host {
+  display: flex;
+  flex-direction: column;
+  padding-top: 24px;
+}
+
+label {
+  display: block;
+  width: 6em;
+  margin: .5em 0;
+  color: #607D8B;
+  font-weight: bold;
+}
+
+input {
+  height: 2em;
+  font-size: 1em;
+  padding-left: .4em;
+}

aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.html

@@ -0,0 +1,21 @@
+<!-- #docregion control-binding -->
+<label>
+  Name:
+  <input type="text" [formControl]="name">
+</label>
+
+<!-- #enddocregion control-binding -->
+
+<!-- #docregion display-value -->
+
+<p>
+  Value: {{ name.value }}
+</p>
+<!-- #enddocregion display-value -->
+
+<!-- #docregion update-value -->
+
+<p>
+  <button (click)="updateName()">Update Name</button>
+</p>
+<!-- #enddocregion update-value -->

aio/content/examples/reactive-forms/src/app/name-editor/name-editor.component.ts

@@ -0,0 +1,22 @@
+// #docplaster
+// #docregion create-control
+import { Component } from '@angular/core';
+import { FormControl } from '@angular/forms';
+
+@Component({
+  selector: 'app-name-editor',
+  templateUrl: './name-editor.component.html',
+  styleUrls: ['./name-editor.component.css']
+})
+export class NameEditorComponent {
+  name = new FormControl('');
+// #enddocregion create-control
+
+// #docregion update-value
+  updateName() {
+    this.name.setValue('Nancy');
+  }
+// #enddocregion update-value
+// #docregion create-control
+}
+// #enddocregion create-control

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.html

@@ -0,0 +1,67 @@
+<!-- #docplaster -->
+<!-- #docregion formgroup -->
+<form [formGroup]="profileForm">
+  
+  <label>
+    First Name:
+    <input type="text" formControlName="firstName">
+  </label>
+
+  <label>
+    Last Name:
+    <input type="text" formControlName="lastName">
+  </label>
+
+<!-- #enddocregion formgroup -->
+  <!-- #docregion formgroupname -->
+  <div formGroupName="address">
+    <h3>Address</h3>
+
+    <label>
+      Street:
+      <input type="text" formControlName="street">
+    </label>
+
+    <label>
+      City:
+      <input type="text" formControlName="city">
+    </label>
+    
+    <label>
+      State:
+      <input type="text" formControlName="state">
+    </label>
+
+    <label>
+      Zip Code:
+      <input type="text" formControlName="zip">
+    </label>
+  </div>
+  <!-- #enddocregion formgroupname -->
+
+  <!-- #docregion formarrayname -->
+  <div formArrayName="aliases">
+    <h3>Aliases</h3> <button (click)="addAlias()">Add Alias</button>
+
+    <div *ngFor="let address of aliases.controls; let i=index">
+      <!-- The repeated alias template -->
+      <label>
+        Alias:
+        <input type="text" [formControlName]="i">
+      </label>
+    </div>
+  </div>
+  <!-- #enddocregion formarrayname -->
+<!-- #docregion formgroup -->  
+</form>
+<!-- #enddocregion formgroup -->
+
+<p>
+  Form Value: {{ profileForm.value | json }}
+</p>
+
+<!-- #docregion patch-value -->
+<p>
+  <button (click)="updateProfile()">Update Profile</button>
+</p>
+<!-- #enddocregion patch-value -->

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.1.ts

@@ -0,0 +1,40 @@
+// #docplaster
+// #docregion formgroup, nested-formgroup
+import { Component } from '@angular/core';
+// #docregion imports
+import { FormGroup, FormControl } from '@angular/forms';
+// #enddocregion imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion formgroup-compare
+  profileForm = new FormGroup({
+    firstName: new FormControl(''),
+    lastName: new FormControl(''),
+// #enddocregion formgroup
+    address: new FormGroup({
+      street: new FormControl(''),
+      city: new FormControl(''),
+      state: new FormControl(''),
+      zip: new FormControl('')
+    })
+// #docregion formgroup
+  });
+// #enddocregion formgroup, nested-formgroup, formgroup-compare
+// #docregion patch-value
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+// #enddocregion patch-value
+// #docregion formgroup, nested-formgroup
+}
+// #enddocregion formgroup

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.2.ts

@@ -0,0 +1,58 @@
+// #docplaster
+// #docregion form-builder
+import { Component } from '@angular/core';
+// #docregion form-builder-imports
+import { FormBuilder } from '@angular/forms';
+// #enddocregion form-builder-imports, form-builder
+// #docregion form-array-imports
+import { FormArray } from '@angular/forms';
+// #docregion form-builder-imports, form-builder
+// #enddocregion form-builder-imports, form-array-imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion formgroup-compare
+  profileForm = this.fb.group({
+    firstName: [''],
+    lastName: [''],
+    address: this.fb.group({
+      street: [''],
+      city: [''],
+      state: [''],
+      zip: ['']
+    }),
+// #enddocregion form-builder, formgroup-compare
+    aliases: this.fb.array([
+      this.fb.control('')
+    ])
+// #docregion form-builder, formgroup-compare
+  });
+// #enddocregion form-builder, formgroup-compare
+  get aliases() {
+    return this.profileForm.get('aliases') as FormArray;
+  }
+
+// #docregion inject-form-builder, form-builder
+
+  constructor(private fb: FormBuilder) { }
+// #enddocregion inject-form-builder, form-builder
+
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+
+  addAlias() {
+    this.aliases.push(this.fb.control(''));
+  }
+// #docregion form-builder
+}
+// #enddocregion form-builder

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.css

@@ -0,0 +1,39 @@
+/* ProfileEditorComponent's private CSS styles */
+:host {
+  display: flex;
+  flex-direction: column;
+  padding-top: 24px;
+}
+
+label {
+  display: block;
+  width: 6em;
+  margin: .5em 0;
+  color: #607D8B;
+  font-weight: bold;
+}
+
+input {
+  height: 2em;
+  font-size: 1em;
+  padding-left: .4em;
+}
+
+button {
+  font-family: Arial;
+  background-color: #eee;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 4px;
+  cursor: pointer;
+}
+
+button:hover {
+  background-color: #cfd8dc;
+}
+
+button:disabled {
+  background-color: #eee;
+  color: #ccc;
+  cursor: auto;
+}

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.html

@@ -0,0 +1,80 @@
+<!-- #docplaster -->
+<!-- #docregion ng-submit -->
+<form [formGroup]="profileForm" (ngSubmit)="onSubmit()">
+<!-- #enddocregion ng-submit -->
+  <label>
+    First Name:
+    <!-- #docregion required-attribute -->
+    <input type="text" formControlName="firstName" required>
+    <!-- #enddocregion required-attribute -->
+  </label>
+
+  <label>
+    Last Name:
+    <input type="text" formControlName="lastName">
+  </label>
+
+  <div formGroupName="address">
+    <h3>Address</h3>
+
+    <label>
+      Street:
+      <input type="text" formControlName="street">
+    </label>
+
+    <label>
+      City:
+      <input type="text" formControlName="city">
+    </label>
+    
+    <label>
+      State:
+      <input type="text" formControlName="state">
+    </label>
+
+    <label>
+      Zip Code:
+      <input type="text" formControlName="zip">
+    </label>
+  </div>
+
+  <!-- #docregion formarrayname -->
+  <div formArrayName="aliases">
+    <h3>Aliases</h3> <button (click)="addAlias()">Add Alias</button>
+
+    <div *ngFor="let address of aliases.controls; let i=index">
+      <!-- The repeated alias template -->
+      <label>
+        Alias:
+        <input type="text" [formControlName]="i">
+      </label>
+    </div>
+  </div>
+  <!-- #enddocregion formarrayname -->
+
+  <!-- #docregion submit-button -->
+  <button type="submit" [disabled]="!profileForm.valid">Submit</button>
+  <!-- #enddocregion submit-button -->
+</form>
+
+<hr>
+
+<!-- #docregion display-value -->
+
+<p>
+  Form Value: {{ profileForm.value | json }}
+</p>
+<!-- #enddocregion display-value -->
+
+<!-- #docregion display-status -->
+
+<p>
+  Form Status: {{ profileForm.status }}
+</p>
+<!-- #enddocregion display-status -->
+
+<!-- #docregion patch-value -->
+<p>
+  <button (click)="updateProfile()">Update Profile</button>
+</p>
+<!-- #enddocregion patch-value -->

aio/content/examples/reactive-forms/src/app/profile-editor/profile-editor.component.ts

@@ -0,0 +1,73 @@
+// #docplaster
+// #docregion form-builder
+import { Component } from '@angular/core';
+// #docregion form-builder-imports
+import { FormBuilder } from '@angular/forms';
+// #enddocregion form-builder-imports
+// #docregion validator-imports
+import { Validators } from '@angular/forms';
+// #enddocregion validator-imports
+// #docregion form-array-imports
+import { FormArray } from '@angular/forms';
+// #enddocregion form-array-imports
+
+@Component({
+  selector: 'app-profile-editor',
+  templateUrl: './profile-editor.component.html',
+  styleUrls: ['./profile-editor.component.css']
+})
+export class ProfileEditorComponent {
+// #docregion required-validator, aliases
+  profileForm = this.fb.group({
+    firstName: ['', Validators.required],
+    lastName: [''],
+    address: this.fb.group({
+      street: [''],
+      city: [''],
+      state: [''],
+      zip: ['']
+    }),
+// #enddocregion form-builder, required-validator
+    aliases: this.fb.array([
+      this.fb.control('')
+    ])
+// #docregion form-builder, required-validator
+  });
+// #enddocregion form-builder, required-validator, aliases
+// #docregion aliases-getter
+
+  get aliases() {
+    return this.profileForm.get('aliases') as FormArray;
+  }
+
+// #enddocregion aliases-getter
+// #docregion inject-form-builder, form-builder
+  constructor(private fb: FormBuilder) { }
+
+// #enddocregion inject-form-builder
+
+  updateProfile() {
+    this.profileForm.patchValue({
+      firstName: 'Nancy',
+      address: {
+        street: '123 Drew Street'
+      }
+    });
+  }
+// #enddocregion form-builder
+// #docregion add-alias
+
+  addAlias() {
+    this.aliases.push(this.fb.control(''));
+  }
+// #enddocregion add-alias
+// #docregion on-submit
+
+  onSubmit() {
+    // TODO: Use EventEmitter with form value
+    console.warn(this.profileForm.value);
+  }
+// #enddocregion on-submit
+// #docregion form-builder
+}
+// #enddocregion form-builder

aio/content/examples/reactive-forms/src/index-final.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<!-- #docregion -->
-<html lang="en">
-
-<head>
-  <title>Hero Form</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <!-- #docregion bootstrap -->
-  <link rel="stylesheet" href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css">
-</head>
-
-<body>
-  <app-root></app-root>
-</body>
-
-</html>

aio/content/examples/reactive-forms/src/index.html

@@ -2,10 +2,9 @@
 <!-- #docregion -->
 <html lang="en">
   <head>
-    <title>Hero Form</title>
+    <title>Angular Reactive Forms</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css">
   </head>
 
   <body>

aio/content/examples/reactive-forms/src/main.ts

@@ -2,12 +2,11 @@
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app.module'; // just the final version
-import { DemoModule } from './app/demo.module'; // demo picker
+import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(DemoModule);
+platformBrowserDynamic().bootstrapModule(AppModule);

aio/content/examples/reactive-forms/src/styles.1.css

@@ -1 +0,0 @@
-@import url('https://unpkg.com/bootstrap@3.3.7/dist/css/bootstrap.min.css');

aio/content/examples/reactive-forms/stackblitz.json

@@ -3,6 +3,7 @@
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
+    "!**/*.[0-9].*",
 
     "!src/app/app.component.1.ts",
     "!src/app/hero-list.component.1.html",

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

@@ -8,7 +8,7 @@ const nums = of(1, 2, 3, 4, 5);
 
 // Create a function that accepts an Observable.
 const squareOddVals = pipe(
-  filter(n => n % 2),
+  filter((n: number) => n % 2 !== 0),
   map(n => n * n)
 );
 

aio/content/examples/styleguide/src/01-01/app/app.component.ts

@@ -9,6 +9,6 @@ import { HeroService } from './heroes';
       <toh-heroes></toh-heroes>
     `,
   styleUrls: ['./app.component.css'],
-  providers: [ HeroService ]
+  providers: [HeroService]
 })
-export class AppComponent { }
+export class AppComponent {}

aio/content/examples/styleguide/src/01-01/app/heroes/hero.component.avoid.ts

@@ -1,9 +1,8 @@
 // #docregion
 /* avoid */
-
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { Component, NgModule, OnInit } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { NgModule, Component, OnInit } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
 class Hero {
   id: number;
@@ -24,24 +23,24 @@ class AppComponent implements OnInit {
   heroes: Hero[] = [];
 
   ngOnInit() {
-    getHeroes().then(heroes => this.heroes = heroes);
+    getHeroes().then(heroes => (this.heroes = heroes));
   }
 }
 
 @NgModule({
-  imports: [ BrowserModule ],
-  declarations: [ AppComponent ],
-  exports: [ AppComponent ],
-  bootstrap: [ AppComponent ]
+  imports: [BrowserModule],
+  declarations: [AppComponent],
+  exports: [AppComponent],
+  bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {}
 
 platformBrowserDynamic().bootstrapModule(AppModule);
 
 const HEROES: Hero[] = [
-  {id: 1, name: 'Bombasto'},
-  {id: 2, name: 'Tornado'},
-  {id: 3, name: 'Magneta'},
+  { id: 1, name: 'Bombasto' },
+  { id: 2, name: 'Tornado' },
+  { id: 3, name: 'Magneta' }
 ];
 
 function getHeroes(): Promise<Hero[]> {

aio/content/examples/styleguide/src/01-01/app/heroes/shared/mock-heroes.ts

@@ -2,7 +2,7 @@
 import { Hero } from './hero.model';
 
 export const HEROES: Hero[] = [
-  {id: 1, name: 'Bombasto'},
-  {id: 2, name: 'Tornado'},
-  {id: 3, name: 'Magneta'},
+  { id: 1, name: 'Bombasto' },
+  { id: 2, name: 'Tornado' },
+  { id: 3, name: 'Magneta' }
 ];

aio/content/examples/styleguide/src/01-01/main.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppModule }      from './app/app.module';
+import { AppModule } from './app/app.module';
 
 platformBrowserDynamic().bootstrapModule(AppModule);

aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.avoid.ts

@@ -3,9 +3,8 @@
 /* avoid */
 
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
-import { Http } from '@angular/http';
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { map } from 'rxjs/operators';
 import { Hero } from './hero.model';
 // #enddocregion example
 
@@ -16,18 +15,15 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json().data as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`);
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json().data as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`);
   }
 
 }
-

aio/content/examples/styleguide/src/03-06/app/heroes/shared/hero.service.ts

@@ -1,11 +1,11 @@
 // #docregion
 // #docregion example
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Http }       from '@angular/http';
-import { map }        from 'rxjs/operators';
 
-import { Hero } from './hero.model';
 import { ExceptionService, SpinnerService, ToastService } from '../../core';
+import { Hero } from './hero.model';
+
 // #enddocregion example
 
 @Injectable()
@@ -16,18 +16,15 @@ export class HeroService {
     private exceptionService: ExceptionService,
     private spinnerService: SpinnerService,
     private toastService: ToastService,
-    private http: Http
+    private http: HttpClient
   ) { }
 
   getHero(id: number) {
-    return this.http.get(`api/heroes/${id}`).pipe(
-      map(response => response.json() as Hero));
+    return this.http.get<Hero>(`api/heroes/${id}`);
   }
 
   getHeroes() {
-    return this.http.get(`api/heroes`).pipe(
-      map(response => response.json() as Hero[]));
+    return this.http.get<Hero[]>(`api/heroes`);
   }
 
 }
-

aio/content/guide/animations.md

@@ -22,7 +22,7 @@ code uses [AnimationBuilder](/api/animations/AnimationBuilder). If your code doe
 uncomment the `web-animations-js` polyfill from the `polyfills.ts` file generated by Angular CLI.
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The examples in this page are available as a <live-example></live-example>.
 
@@ -183,7 +183,7 @@ transition definitions, and not in a separate `state(void)` definition. Thus, th
 are different on enter and leave: the element enters from the left
 and leaves to the right.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 These two common animations have their own aliases:
 

aio/content/guide/aot-compiler.md

@@ -4,7 +4,7 @@ The Angular Ahead-of-Time (AOT) compiler converts your Angular HTML and TypeScri
 
 This guide explains how to build with the AOT compiler using different compiler options and how to write Angular metadata that AOT can compile.
 
-<div class="l-sub-section">
+<div class="alert is-helpful>
 
   <a href="https://www.youtube.com/watch?v=kW9cJsvcsGo">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.
 
@@ -39,7 +39,7 @@ For AOT compilation, append the `--aot` flags to the _build-only_ or the _build-
   ng serve --aot
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `--prod` meta-flag compiles with AOT by default.
 
@@ -297,7 +297,7 @@ At the same time, the AOT **_collector_** analyzes the metadata recorded in the
 
 You can think of `.metadata.json` as a diagram of the overall structure of a decorator's metadata, represented as an [abstract syntax tree (AST)](https://en.wikipedia.org/wiki/Abstract_syntax_tree).
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Angular's [schema.ts](https://github.com/angular/angular/blob/master/packages/compiler-cli/src/metadata/schema.ts)
 describes the JSON format as a collection of TypeScript interfaces.
@@ -333,7 +333,7 @@ Parentheses                        | `(a + b)`
 If an expression uses unsupported syntax, the _collector_ writes an error node to the `.metadata.json` file. The compiler later reports the error if it needs that
 piece of metadata to generate the application code.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
  If you want `ngc` to report syntax errors immediately rather than produce a `.metadata.json` file with errors, set the `strictMetadataEmit` option in `tsconfig`.
 

aio/content/guide/architecture-components.md

@@ -11,7 +11,7 @@ A _component_ controls a patch of screen called a *view*. For example, individua
 You define a component's application logic—what it does to support the view—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 holds an array of heroes. It also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list. The component acquires the heroes from a service, which is a TypeScript [parameter property[(http://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties) on the constructor. The service is provided to the component through the dependency injection system.
+For example, the `HeroListComponent` has a `heroes` property that holds an array of heroes. It also has a `selectHero()` method that sets a `selectedHero` property when the user clicks to choose a hero from that list. The component acquires the heroes from a service, which is a TypeScript [parameter property](http://www.typescriptlang.org/docs/handbook/classes.html#parameter-properties) on the constructor. The service is provided to the component through the dependency injection system.
 
 <code-example path="architecture/src/app/hero-list.component.ts" linenums="false" title="src/app/hero-list.component.ts (class)" region="class"></code-example>
 
@@ -40,7 +40,7 @@ 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 how provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.  
+* `providers`: An array of **dependency injection providers** for services that the component requires. In the example, this tells Angular how to provide the `HeroService` instance that the component's constructor uses to get the list of heroes to display.  
 
 <hr/>
 
@@ -177,4 +177,4 @@ or modify aspects of DOM elements and components
 
 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! -->
+<!-- PENDING: link to where to learn more about other kinds! -->

aio/content/guide/architecture-modules.md

@@ -26,7 +26,7 @@ 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">
+<div class="alert is-helpful">
 
   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.
 
@@ -56,7 +56,7 @@ A component and its template together define a _view_. A component can contain a
 
 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">
+<div class="alert is-helpful">
     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>
 
@@ -72,7 +72,7 @@ Other JavaScript modules use *import statements* to access public objects from o
 
 <code-example path="architecture/src/app/app.module.ts" region="export" linenums="false"></code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
   <a href="http://exploringjs.com/es6/ch_modules.html">Learn more about the JavaScript module system on the web.</a>
 </div>
 
@@ -99,7 +99,7 @@ In the example of the simple root module above, the application module needs mat
 
 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">
+<div class="alert is-helpful">
 
   Learn more from the [NgModules](guide/ngmodules) page.
 

aio/content/guide/architecture.md

@@ -27,7 +27,7 @@ Like JavaScript modules, NgModules can import functionality from other NgModules
 
 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">
+<div class="alert is-helpful">
 
   For a more detailed discussion, see [Introduction to modules](guide/architecture-modules).
 
@@ -39,7 +39,7 @@ Every Angular application has at least one component, the *root component* that
 
 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">
+<div class="alert is-helpful">
 
    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.
 
@@ -59,7 +59,7 @@ Before a view is displayed, Angular evaluates the directives and resolves the bi
 
 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">
+<div class="alert is-helpful">
 
   For a more detailed discussion of these concepts, see [Introduction to components](guide/architecture-components).
 
@@ -74,7 +74,7 @@ For data or logic that is not associated with a specific view, and that you want
 
  *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">
+<div class="alert is-helpful">
 
   For a more detailed discusssion, see [Introduction to services and DI](guide/architecture-services).
 
@@ -96,7 +96,7 @@ The router interprets a link URL according to your app's view navigation rules a
 
 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">
+ <div class="alert is-helpful">
 
    For a more detailed discussion, see [Routing and navigation](guide/router).
 
@@ -128,7 +128,7 @@ Each of these subjects is introduced in more detail in the following pages.
   * [Pipes](guide/architecture-components#pipes)
 * [Services and dependency injection](guide/architecture-services)
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
    Note that the code referenced on these pages is available as a <live-example></live-example>.
 </div>

aio/content/guide/attribute-directives.md

@@ -51,7 +51,7 @@ ng generate directive highlight
 
 The CLI creates `src/app/highlight.directive.ts`, a corresponding test file (`.../spec.ts`, and _declares_ the directive class in the root `AppModule`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 _Directives_ must be declared in [Angular Modules](guide/ngmodules) in the same manner as _components_.
 
@@ -71,7 +71,7 @@ Angular locates each element in the template that has an attribute named `appHig
 
 The _attribute selector_ pattern explains the name of this kind of directive.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 #### Why not "highlight"?
 
@@ -146,7 +146,7 @@ each adorned by the `HostListener` decorator.
 The `@HostListener` decorator lets you subscribe to events of the DOM
 element that hosts an attribute directive, the `<p>` in this case.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Of course you could reach into the DOM with standard JavaScript and attach event listeners manually.
 There are at least three problems with _that_ approach:

aio/content/guide/browser-support.md

@@ -95,7 +95,7 @@ Angular supports most recent browsers. This includes the following specific vers
 
 </table>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Angular's continuous integration process runs unit tests of the framework on all of these browsers for every pull request,
 using <a href="https://saucelabs.com/">SauceLabs</a> and
@@ -154,7 +154,7 @@ add it yourself, following the same pattern:
 1. install the npm package
 1. `import` the file in `polyfills.ts`
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Non-CLI users should follow the instructions [below](#non-cli).
 </div>

aio/content/guide/component-interaction.md

@@ -119,7 +119,7 @@ E2E tests of input property setter with empty and non-empty names:
 
 Detect and act upon changes to input property values with the `ngOnChanges()` method of the `OnChanges` lifecycle hook interface.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -311,7 +311,7 @@ The following example illustrates this technique with the same
 Neither its appearance nor its behavior will change.
 The child [CountdownTimerComponent](guide/component-interaction#countdown-timer-example) is the same as well.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -400,7 +400,7 @@ Each `AstronautComponent` is a child of the `MissionControlComponent` and theref
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 

aio/content/guide/component-styles.md

@@ -187,7 +187,7 @@ They are _not inherited_ by any components nested within the template nor by any
 
 </div>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can specify more than one styles file or even a combination of `styles` and `styleUrls`.
 
@@ -216,11 +216,10 @@ You can also write `<link>` tags into the component's HTML template.
 
 <div class="alert is-critical">
 
-The link tag's `href` URL must be relative to the
-_**application root**_, not relative to the component file.
-
 When building with the CLI, be sure to include the linked style file among the assets to be copied to the server as described in the [CLI documentation](https://github.com/angular/angular-cli/wiki/stories-asset-configuration).
 
+Once included, the CLI will include the stylesheet, whether the link tag's href URL is relative to the application root or the component file.
+
 </div>
 
 ### CSS @imports

aio/content/guide/dependency-injection-in-action.md

@@ -25,7 +25,7 @@ application and don't need to be listed in any module.
 Service classes can act as their own providers which is why defining them in the `@Injectable` decorator
 is all the registration you need.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -167,7 +167,7 @@ that is visible only to the component and its children, if any.
 You could also provide the `HeroService` to a *different* component elsewhere in the application.
 That would result in a *different* instance of the service, living in a *different* injector.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -433,7 +433,7 @@ It may already have that value in its internal container.
 If it doesn't, it may be able to make one with the help of a ***provider***.
 A *provider* is a recipe for delivering a service associated with a *token*.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -577,7 +577,7 @@ The second provider substitutes the `DateLoggerService` for the `LoggerService`.
 The `LoggerService` is already registered at the `AppComponent` level.
 When _this component_ requests the `LoggerService`, it receives the `DateLoggerService` instead.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -645,7 +645,7 @@ The `HeroOfTheMonthComponent` constructor's `logger` parameter is typed as `Mini
 Behind the scenes, Angular actually sets the `logger` parameter to the full service registered under the `LoggingService` token which happens to be the `DateLoggerService` that was [provided above](guide/dependency-injection-in-action#useclass).
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -707,7 +707,7 @@ After some undisclosed work, the function returns the string of names
 and Angular injects it into the `runnersUp` parameter of the `HeroOfTheMonthComponent`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -769,7 +769,7 @@ A ***class-interface*** should define *only* the members that its consumers are
 Such a narrowing interface helps decouple the concrete class from its consumers.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -866,7 +866,7 @@ and displays them in the order they arrive from the database.
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -982,7 +982,7 @@ If you're lucky, they all implement the same base class
 whose API your `NewsComponent` understands.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -1165,7 +1165,7 @@ its class signature doesn't mention `Parent`:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 

aio/content/guide/dependency-injection-pattern.md

@@ -81,7 +81,7 @@ now in the constructor.
 The `Car` class no longer creates an `engine` or `tires`.
 It just consumes them.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 This example leverages TypeScript's constructor syntax for declaring
 parameters and properties simultaneously.
@@ -101,7 +101,7 @@ conform to the general API requirements of an `engine` or `tires`.
 
 Now, if someone extends the `Engine` class, that is not `Car`'s problem.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The _consumer_ of `Car` has the problem. The consumer must update the car creation code to
 something like this:

aio/content/guide/dependency-injection.md

@@ -98,7 +98,7 @@ Without a provider, the injector would not know
 that it is responsible for injecting the service
 nor be able to create the service.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You'll learn much more about _providers_ [below](#providers).
 For now, it is sufficient to know that they configure where and how services are created.
@@ -141,7 +141,7 @@ The second registers a value (`HERO_DI_CONFIG`) under the `APP_CONFIG` _injectio
 With the above registrations, Angular can inject the `UserService` or the `HERO_DI_CONFIG` value
 into any class that it creates.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You'll learn about _injection tokens_ and _provider_ syntax [below](#providers).
 </div>
@@ -174,7 +174,7 @@ You're likely to inject the `UserService` in many places throughout the app
 and will want to inject the same service instance every time.
 Providing the `UserService` with an Angular module is a good choice if an `@Injectable` provider is not an option..
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 To be precise, Angular module providers are registered with the root injector
 _unless the module is_ [lazy loaded](guide/lazy-loading-ngmodules).
@@ -199,7 +199,7 @@ and is never destroyed so the `HeroService` created for the `HeroComponent` also
 If you want to restrict `HeroService` access to the `HeroComponent` and its nested `HeroListComponent`,
 providing the `HeroService` in the `HeroComponent` may be a good choice.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The scope and lifetime of component-provided services is a consequence of [the way Angular creates component instances](#component-child-injectors). 
 
@@ -375,7 +375,7 @@ and let the injector pass them along to the factory function:
 <code-example path="dependency-injection/src/app/heroes/hero.service.provider.ts" region="provider" title="src/app/heroes/hero.service.provider.ts (excerpt)" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `useFactory` field tells Angular that the provider is a factory function
 whose implementation is the `heroServiceFactory`.
@@ -440,7 +440,7 @@ The service can be instantiated by configuring a factory function as shown below
 
 <code-example path="dependency-injection/src/app/tree-shaking/service.0.ts"  title="src/app/tree-shaking/service.0.ts" linenums="false"> </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 To override tree-shakable providers, register the provider using the `providers: []` array syntax of any Angular decorator that supports it.
 
@@ -532,7 +532,7 @@ under test:
 <code-example path="dependency-injection/src/app/test.component.ts" region="spec" title="src/app/test.component.ts" linenums="false">
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Learn more in the [Testing](guide/testing) guide.
 
@@ -636,7 +636,7 @@ But what should you use as the token?
 You don't have a class to serve as a token.
 There is no `AppConfig` class.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 ### TypeScript interfaces aren't valid tokens
 
@@ -742,7 +742,7 @@ You can call `get()` with a second parameter, which is the value to return if th
 is not found. Angular can't find the service if it's not registered with this or any ancestor injector.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -776,7 +776,7 @@ If you define the component before the service,
 you'll get a runtime null reference error.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You actually can define the component first with the help of the `forwardRef()` method as explained
 in this [blog post](http://blog.thoughtram.io/angular/2015/09/03/forward-references-in-angular-2.html).

aio/content/guide/deployment.md

@@ -187,7 +187,7 @@ For example, given the `<base href="/my/app/">`, the browser resolves a URL such
 into a server request for `my/app/some/place/foo.jpg`.
 During navigation, the Angular router uses the _base href_ as the base path to component, template, and module files.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See also the [*APP_BASE_HREF*](api/common/APP_BASE_HREF "API: APP_BASE_HREF") alternative.
 
@@ -215,7 +215,7 @@ The `ng build` command writes generated build artifacts to the output folder.
 The `ng serve` command does not.
 It serves build artifacts from memory instead for a faster development experience.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The output folder is  `dist/` by default.
 To output to a different folder, change the `outputPath` in `angular.json`.

aio/content/guide/displaying-data.md

@@ -13,7 +13,7 @@ The final UI looks like this:
   <img src="generated/images/guide/displaying-data/final.png" alt="Final UI">
 </figure>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -60,7 +60,7 @@ interpolation:
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -79,7 +79,7 @@ inserts those values into the browser. Angular updates the display
 when these properties change.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -213,7 +213,7 @@ to the item (the hero) in the current iteration. Angular uses that variable as t
 context for the interpolation in the double curly braces.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 

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

@@ -47,7 +47,7 @@ The reader requests a page by its Page URL. The doc viewer fetches the correspon
 Page URLs mirror the `content` file structure. The URL for the page of a guide is in the form `guide/{page-name}`. The page for _this_ "Authors Style Guide" is located at `content/guide/docs-style-guide.md` and its URL is `guide/docs-style-guide`.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 _Tutorial_ pages are exactly like guide pages. The only difference is that they reside in `content/tutorial` instead of `content/guide` and have URLs like `tutorial/{page-name}`.
 
@@ -84,7 +84,7 @@ Standard markdown processors don't allow you to put markdown _within_ HTML tags.
 </div>
 ```
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   It is customary but not required to _precede_ the _closing HTML_ tag with a blank line as well.
 
@@ -162,34 +162,6 @@ Try to minimize the heading depth, preferably only two. But more headings, such
   Try to minimize ...
 ```
 
-## Subsections
-
-Subsections typically present extra detail and references to other pages.
-
-Use subsections for commentary that _enriches_ the reader's understanding of the text that precedes it.
-
-A subsection _must not_ contain anything _essential_ to that understanding. Don't put a critical instruction or a tutorial step in a subsection.
-
-A subsection is content within a `<div>` that has the `l-sub-section` CSS class. You should write the subsection content in markdown.
-
-Here is an example of a subsection `<div>` surrounding the subsection content written in markdown.
-
-<div class="l-sub-section">
-
-  You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
-
-</div>
-
-```html
-<div class="l-sub-section">
-
-You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
-
-</div>
-```
-
-Note that at least one blank line must follow the opening `<div>`. A blank line before the closing `</div>` is customary but not required.
-
 ## Table of contents
 
 Most pages display a table of contents (TOC). The TOC appears in the right panel when the viewport is wide. When narrow, the TOC appears in an expandable/collapsible region near the top of the page.
@@ -322,7 +294,7 @@ The author must also write end-to-end tests for the sample.
 
 Code samples are located in sub-folders of the `content/examples` directory of the `angular/angular` repository. An example folder name should be the same as the guide page it supports.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 A guide page might not have its own sample code. It might refer instead to a sample belonging to another page.
 
@@ -355,7 +327,7 @@ In this example, that path is  `docs-style-guide/src/app/app.module.ts`.
 You added a header to tell the reader where to find the file by setting the `title` attribute.
 Following convention, you set the `title` attribute to the file's location within the sample's root folder.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Unless otherwise noted, all code snippets in this page are derived from sample source code
 located in the `content/examples/docs-style-guide` directory.
@@ -523,7 +495,7 @@ The `linenums` attribute in the second pane restores line numbering for _itself
 
 You must add special code snippet markup to sample source code files before they can be displayed by `<code-example>` and `<code-tabs>` components.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The sample source code for this page, located in `context/examples/docs-style-guide`, contains examples of every code snippet markup described in this section.
 
@@ -570,7 +542,7 @@ The `<code-example>` and `<code-tabs>` components won't display a source code fi
 The _#docregion_ comment begins a code snippet region.
 Every line of code _after_ that comment belongs in the region _until_ the code fragment processor encounters the end of the file or a closing _#enddocregion_.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `src/main.ts` is a simple example of a file with a single _#docregion_ at the top of the file.
 
@@ -613,7 +585,7 @@ You can nest _#docregions_ within _#docregions_
 ... yet more code ...
 /// #enddocregion
 ```
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `src/app/app.module.ts` file has a good example of a nested region.
 
@@ -726,7 +698,7 @@ By adding `<live-example>` to the page you generate links that run sample code i
 
 Live examples (AKA "stackblitz") are defined by one or more `stackblitz.json` files in the root of a code sample folder. Each sample folder usually has a single unnamed definition file, the default `stackblitz.json`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You can create additional, named definition files in the form `name.stackblitz.json`. See `content/examples/testing` for examples.
 
@@ -826,14 +798,14 @@ Here's an embedded live example for this guide.
 
 Every section header tag is also an anchor point. Another guide page could add a link to this section by writing:
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See the ["Anchors"](guide/docs-style-guide#anchors "Style Guide - Anchors") section for details.
 
 </div>
 
 ```html
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 See the ["Anchors"](guide/docs-style-guide#anchors "Style Guide - Anchors") section for details.
 
@@ -875,7 +847,7 @@ Now [link to that custom anchor name](#ugly-anchors) as you did before.
 Now [link to that custom anchor name](#ugly-anchors) as you did before.
 ```
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Alternatively, you can use the HTML `<a>` tag.
 
@@ -889,44 +861,81 @@ If you do, be sure to set the `id` attribute - not the `name` attribute! The doc
 
 </div>
 
-## Alerts
+## Alerts and Calllouts
 
-Alerts draw attention to important points. Alerts should not be used for multi-line content (use callouts insteads) or stacked on top of each other.  Note that the content of an alert is indented to the right by two spaces.
+Alerts and callouts present warnings, extra detail or references to other pages. They can also be used to provide commentary that _enriches_ the reader's understanding of the content being presented.
+
+An alert or callout _must not_ contain anything _essential_ to that understanding. Don't put a critical instruction or a tutorial step in a subsection.
+
+### Alerts
+
+Alerts draw attention to short important points. Alerts should not be used for multi-line content (use [callouts](#callouts "callouts") instead).
+
+<div class="alert is-helpful">
+
+  You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
+
+</div>
+
+  Note that at least one blank line must follow both the opening and closing `<div>` tags. A blank line before the closing `</div>` is customary but not required.
+
+```html
+<div class="alert is-helpful">
+
+You'll learn about styles for live examples in the [section below](guide/docs-style-guide#live-examples "Live examples").
+
+</div>
+```
+
+There are three different _urgency levels_ used to style the alerts based on the severity or importance of the content.
 
 <div class="alert is-critical">
+
 A critical alert.
+
 </div>
 
 <div class="alert is-important">
+
 An important alert.
+
 </div>
 
 <div class="alert is-helpful">
+
 A helpful, informational alert.
+
 </div>
 
 
 Here is the markup for these alerts.
 ```html
 <div class="alert is-critical">
+
 A critical alert.
+
 </div>
 
 <div class="alert is-important">
+
 An important alert.
+
 </div>
 
 <div class="alert is-helpful">
+
 A helpful, informational alert.
+
 </div>
 ```
 
-Alerts are meant to grab the user's attention and should be used sparingly.
-They are not for casual asides or commentary. Use [subsections](#subsections "subsections") for commentary.
+### Callouts
 
-## Callouts
+Callouts, like alerts, are meant to draw attention to important points. Use a callout when you want a riveting header and multi-line content.
 
-Callouts (like alerts) are meant to draw attention to important points. Use a callout when you want a riveting header and multi-line content.
+If you have more than two paragraphs, consider creating a new page or making it part of the main content.
+
+Callouts use the same _urgency levels_ that alerts do.
 
 <div class="callout is-critical">
 <header>A critical point</header>
@@ -943,7 +952,7 @@ Callouts (like alerts) are meant to draw attention to important points. Use a ca
 </div>
 
 <div class="callout is-helpful">
-<header>A helpful point</header>
+<header>A helpful or informational point</header>
 
 **Pitchfork hoodie semiotics**, roof party pop-up _paleo_ messenger bag cred Carles tousled Truffaut yr. Semiotics viral freegan VHS, Shoreditch disrupt McSweeney's. Intelligentsia kale chips Vice four dollar toast, Schlitz crucifix
 
@@ -959,10 +968,10 @@ Here is the markup for the first of these callouts.
 </div>
 ```
 
-Notice that
-* the callout header text is forced to all upper case.
-* the callout body can be written in markdown.
-* a blank line separates the `</header>` tag from the markdown content.
+Notice that:
+* the callout header text is forced to all upper case
+* the callout body can be written in markdown
+* a blank line separates the `</header>` tag from the markdown content
 
 Callouts are meant to grab the user's attention. They are not for casual asides. Please use them sparingly.
 
@@ -1254,7 +1263,7 @@ Note that you generally don't wrap a floating image in a `<figure>` element.
 
 If you have a floating image inside an alert, callout, or a subsection, it is a good idea to apply the `clear-fix` class to the `div` to ensure that the image doesn't overflow its container. For example:
 
-<div class="l-sub-section clear-fix">
+<div class="alert is-helpful clear-fix">
 
   <img src="generated/images/guide/docs-style-guide/flying-hero.png"
     alt="flying Angular hero"
@@ -1266,7 +1275,7 @@ If you have a floating image inside an alert, callout, or a subsection, it is a
 </div>
 
 ```html
-<div class="l-sub-section clear-fix">
+<div class="alert is-helpful clear-fix">
 
   <img src="generated/images/guide/docs-style-guide/flying-hero.png"
     alt="flying Angular hero"

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

@@ -101,7 +101,7 @@ The `loadComponent()` method is doing a lot of the heavy lifting here.
 Take it step by step. First, it picks an ad.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 

aio/content/guide/elements.md

@@ -11,7 +11,7 @@ The `@angular/elements` package exports a `createCustomElement()` API that provi
 Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. 
 Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
     We are working on custom elements that can be used by web apps built on other frameworks. 
     A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 

aio/content/guide/form-validation.md

@@ -9,7 +9,7 @@ This page shows how to validate user input in the UI and display useful validati
 using both reactive and template-driven forms. It assumes some basic knowledge of the two 
 forms modules.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you're new to forms, start by reviewing the [Forms](guide/forms) and 
 [Reactive Forms](guide/reactive-forms) guides.
@@ -51,7 +51,7 @@ but only if the `name` is invalid and the control is either `dirty` or `touched`
 There are messages for `required`, `minlength`, and `forbiddenName`.
  
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -178,7 +178,7 @@ Once the `ForbiddenValidatorDirective` is ready, you can simply add its selector
 </code-example>
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 You may have noticed that the custom validation directive is instantiated with `useExisting`
 rather than `useClass`. The registered validator must be _this instance_ of
@@ -211,7 +211,7 @@ set the color of each form control's border.
 ## Cross field validation 
 This section shows how to perform cross field validation. It assumes some basic knowledge of creating custom validators.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you haven't created custom validators before, start by reviewing the [custom validators section](guide/form-validation#custom-validators).
 

aio/content/guide/forms.md

@@ -29,7 +29,7 @@ You can run the <live-example></live-example> in Stackblitz and download the cod
 You can build forms by writing templates in the Angular [template syntax](guide/template-syntax) with
 the form-specific directives and techniques described in this page.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can also use a reactive (or model-driven) approach to build forms.
   However, this page focuses on template-driven forms.
@@ -62,7 +62,7 @@ If you delete the hero name, the form displays a validation error in an attentio
 
 Note that the *Submit* button is disabled, and the "required" bar to the left of the input control changes from green to red.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can customize the colors and location of the "required" bar with standard CSS.
 
@@ -180,7 +180,7 @@ Update it with the following:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   There are two changes:
 
@@ -208,7 +208,7 @@ Replace the contents of its template with the following:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   There are only two changes.
   The `template` is simply the new element tag identified by the component's `selector` property.
@@ -235,7 +235,7 @@ You added a *Submit* button at the bottom with some classes on it for styling.
 
 *You're not using Angular yet*. There are no bindings or extra directives, just layout.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   In template driven forms, if you've imported `FormsModule`, you don't have to do anything
   to the `<form>` tag in order to make use of `FormsModule`. Continue on to see how this works.
@@ -311,7 +311,7 @@ Find the `<input>` tag for *Name* and update it like this:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You added a diagnostic interpolation after the input tag
   so you can see what you're doing.
@@ -331,7 +331,7 @@ a template variable for the form. Update the `<form>` tag with
 
 The variable `heroForm` is now a reference to the `NgForm` directive that governs the form as a whole.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   {@a ngForm}
 
@@ -362,7 +362,7 @@ At some point it might look like this:
 The diagnostic is evidence that values really are flowing from the input box to the model and
 back again.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   That's *two-way data binding*.
   For more information, see
@@ -375,7 +375,7 @@ Notice that you also added a `name` attribute to the `<input>` tag and set it to
 which makes sense for the hero's name. Any unique value will do, but using a descriptive name is helpful.
 Defining a `name` attribute is a requirement when using `[(ngModel)]` in combination with a form.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Internally, Angular creates `FormControl` instances and
   registers them with an `NgForm` directive that Angular attached to the `<form>` tag.
@@ -395,7 +395,7 @@ After revision, the core of the form should look like this:
 
 </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   * Each input element has an `id` property that is used by the `label` element's `for` attribute
   to match the label to its input control.
@@ -571,7 +571,7 @@ Here's an example of an error message added to the _name_ input box:
 You need a template reference variable to access the input box's Angular control from within the template.
 Here you created a variable called `name` and gave it the value "ngModel".
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Why "ngModel"?
   A directive's [exportAs](api/core/Directive) property
@@ -687,7 +687,7 @@ For you, it was as simple as this:
 
 Submitting the form isn't terribly dramatic at the moment.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   An unsurprising observation for a demo. To be honest,
   jazzing it up won't teach you anything new about forms.

aio/content/guide/glossary.md

@@ -580,7 +580,7 @@ For more information, see https://www.npmjs.com/package/@angular-devkit/schemati
 ## Scoped package
 
 A way to group related npm packages. 
-NgModules are delivered within *scoped packages* whose names begin with the Angular *scope name* `@angular`. For example, `@angular/core`, `@angular/common`, `@angular/http`, and `@angular/router`.
+NgModules are delivered within *scoped packages* whose names begin with the Angular *scope name* `@angular`. For example, `@angular/core`, `@angular/common`, `@angular/forms`, and `@angular/router`.
 
 Import a scoped package in the same way that you import a normal package. 
 

aio/content/guide/hierarchical-dependency-injection.md

@@ -24,7 +24,7 @@ An Angular application is a tree of components. Each component instance has its
 The tree of components parallels the tree of injectors.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -61,7 +61,7 @@ The requests keep bubbling up until Angular finds an injector that can handle th
 If it runs out of ancestors, Angular throws an error.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -196,7 +196,7 @@ Providing the service at the component level ensures that _every_ instance of th
 No tax return overwriting. No mess.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 
@@ -244,7 +244,7 @@ its injector produces an instance of `Car` resolved by injector (C) with an `Eng
 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 
 

aio/content/guide/http.md

@@ -497,7 +497,7 @@ and displays search results as they arrive.
 
 A search value reaches the service only if it's a new value and the user has stopped typing.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 The `withRefresh` option is explained [below](#cache-refresh).
 
@@ -517,7 +517,7 @@ it cancels that request and sends a new one.
 server returns them out of order. 
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you think you'll reuse this debouncing logic,
 consider moving it to a utility function or into the `PackageSearchService` itself.
@@ -622,7 +622,7 @@ Then import and add it to the `AppModule` _providers array_ like this:
 As you create new interceptors, add them to the `httpInterceptorProviders` array and
 you won't have to revisit the `AppModule`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 There are many more interceptors in the complete sample code.
 
@@ -824,7 +824,7 @@ and emits again later with the updated search results.
 
 The _cache-then-refresh_ option is triggered by the presence of a **custom `x-refresh` header**.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 A checkbox on the `PackageSearchComponent` toggles a `withRefresh` flag,
 which is one of the arguments to `PackageSearchService.search()`.

aio/content/guide/i18n.md

@@ -54,10 +54,10 @@ If you use JIT, you also need to define the `LOCALE_ID` provider in your main mo
 </code-example>
 
 
-For more information about Unicode locale identifiers, see the 
+For more information about Unicode locale identifiers, see the
 [CLDR core spec](http://cldr.unicode.org/core-spec#Unicode_Language_and_Locale_Identifiers).
 
-For a complete list of locales supported by Angular, see 
+For a complete list of locales supported by Angular, see
 [the Angular repository](https://github.com/angular/angular/tree/master/packages/common/locales).
 
 The locale identifiers used by CLDR and Angular are based on [BCP47](http://www.rfc-editor.org/rfc/bcp/bcp47.txt).
@@ -101,27 +101,27 @@ specify a custom locale id. For example, Angular's locale data defines the local
 "fr". You can use the second parameter to associate the imported French locale data with the custom
 locale id "fr-FR" instead of "fr".
 
-The files in `@angular/common/locales` contain most of the locale data that you 
+The files in `@angular/common/locales` contain most of the locale data that you
 need, but some advanced formatting options might only be available in the extra dataset that you can
 import from `@angular/common/locales/extra`. An error message informs you when this is the case.
-  
+
   <code-example path="i18n/doc-files/app.locale_data_extra.ts" region="import-locale-extra" title="src/app/app.module.ts" linenums="false">
   </code-example>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   All locale data used by Angular are extracted from the Unicode Consortium's
   <a href="http://cldr.unicode.org/" title="CLDR">Common Locale Data Repository (CLDR)</a>.
 
-</div> 
+</div>
 
 
 ## Template translations
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
-  This document refers to a unit of translatable text as "text," a "message", or a 
-  "text message." 
+  This document refers to a unit of translatable text as "text," a "message", or a
+  "text message."
 
 </div>
 
@@ -168,7 +168,7 @@ To mark the greeting for translation, add the `i18n` attribute to the `<h1>` tag
 {@a help-translator}
 ### Help the translator with a description and meaning
 
-To translate a text message accurately, the translator may need additional information or context. 
+To translate a text message accurately, the translator may need additional information or context.
 
 You can add a description of the text message as the value of the `i18n` attribute, as shown in the
 example below:
@@ -176,7 +176,7 @@ example below:
 <code-example path="i18n/doc-files/app.component.html" region="i18n-attribute-desc" title="src/app/app.component.html" linenums="false">
 </code-example>
 
-The translator may also need to know the meaning or intent of the text message within this particular 
+The translator may also need to know the meaning or intent of the text message within this particular
 app context.
 
 You add context by beginning the `i18n` attribute value with the _meaning_ and
@@ -192,7 +192,7 @@ The Angular extraction tool preserves both the meaning and the description in th
 source file to facilitate contextually-specific translations, but only the combination of meaning
 and text message are used to generate the specific id of a translation. If you have two
 similar text messages with different meanings, they are extracted separately. If you have two similar
-text messages with different descriptions (not different meanings), then they are extracted only once. 
+text messages with different descriptions (not different meanings), then they are extracted only once.
 
 
 {@a custom-id}
@@ -208,7 +208,7 @@ When you change the translatable text, the extractor tool generates a new id for
 You must then update the translation file with the new id.
 
 Alternatively, you can specify a custom id in the `i18n` attribute by using the prefix `@@`.
-The example below defines the custom id `introductionHeader`: 
+The example below defines the custom id `introductionHeader`:
 
 <code-example path='i18n/doc-files/app.component.html' region='i18n-attribute-solo-id' title='app/app.component.html' linenums="false">
 </code-example>
@@ -220,7 +220,7 @@ custom id.
 </code-example>
 
 The custom id is persistent. The extractor tool does not change it when the translatable text changes.
-Therefore, you do not need to update the translation. This approach makes maintenance easier. 
+Therefore, you do not need to update the translation. This approach makes maintenance easier.
 
 #### Use a custom id with a description
 
@@ -266,7 +266,7 @@ the same text, `Bonjour`:
     <!-- ... -->
     <p>Bonjour</p>
   ```
- 
+
 
 
 {@a no-element}
@@ -325,7 +325,7 @@ the number of minutes.
 * The third parameter defines a pluralization pattern consisting of pluralization categories and their matching values.
 
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   This syntax conforms to the
   <a href="http://userguide.icu-project.org/formatparse/messages" title="ICU Message Format">ICU Message Format</a>
@@ -352,7 +352,7 @@ Any unmatched cardinality uses `other {{{minutes}} minutes ago}`. You could choo
 for two, three, or any other number if the pluralization rules were different. For the example of
 "minute", only these three patterns are necessary in English.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   You can use interpolations and html markup inside of your translations.
 
@@ -399,7 +399,7 @@ By default, the tool generates a translation file named `messages.xlf` in the
 <a href="https://en.wikipedia.org/wiki/XLIFF">XML Localization Interchange File Format
 (XLIFF, version 1.2)</a>.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 If you don't use the CLI, you have two options:
 * You can use the `ng-xi18n` tool directly from the `@angular/compiler-cli` package.
@@ -430,7 +430,7 @@ ng xi18n  --i18n-format=xmb
 
 The sample in this guide uses the default XLIFF 1.2 format.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   XLIFF files have the extension .xlf. The XMB format generates .xmb source files but uses
   .xtb (XML Translation Bundle: XTB) translation files.
@@ -474,7 +474,7 @@ file. This information is not used by Angular, but external translation tools ma
 ## Translate text messages
 
 The `ng xi18n` command generates a translation source file named `messages.xlf` in the project `src`
-folder. 
+folder.
 
 The next step is to translate this source file into the specific language
 translation files. The example in this guide creates a French translation file.
@@ -488,7 +488,7 @@ for the project structure to reflect the entire internationalization effort.
 One approach is to dedicate a folder to localization and store related assets, such as
 internationalization files, there.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Localization and internationalization are
   <a href="https://en.wikipedia.org/wiki/Internationalization_and_localization">different but
@@ -526,7 +526,7 @@ This sample file is easy to translate without a special editor or knowledge of F
 </code-example>
 
 > This XML element represents the translation of the `<h1>` greeting tag that you marked with the
-  `i18n` attribute earlier in this guide. 
+  `i18n` attribute earlier in this guide.
 
 > Note that the translation unit `id=introductionHeader` is derived from the
   [custom `id`](#custom-id "Set a custom id") that you set earlier, but
@@ -573,7 +573,7 @@ To translate a `plural`, translate its ICU format match values:
 <code-example path="i18n/doc-files/messages.fr.xlf.html" region="translated-plural" title="src/locale/messages.fr.xlf (&lt;trans-unit&gt;)" linenums="false">
 </code-example>
 
-You can add or remove plural cases, with each language having its own cardinality.  (See 
+You can add or remove plural cases, with each language having its own cardinality.  (See
 [CLDR plural rules](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html).)
 
 {@a translate-select}
@@ -609,7 +609,7 @@ Here they are together, after translation:
 {@a translate-nested}
 ### Translate a nested expression
 
-A nested expression is similar to the previous examples. As in the previous example, there are 
+A nested expression is similar to the previous examples. As in the previous example, there are
 two translation units. The first one contains the text outside of the nested expression:
 
 <code-example path="i18n/doc-files/messages.fr.xlf.html" region="translate-nested-1" title="src/locale/messages.fr.xlf (&lt;trans-unit&gt;)" linenums="false">
@@ -683,28 +683,40 @@ You also need to instruct the AOT compiler to use your translation configuration
 * `i18nLocale`: the locale id.
 
 ```
-"configurations": {
+"build": {
   ...
-  "fr": {
-    "aot": true,
-    "outputPath": "dist/my-project-fr/",
-    "i18nFile": "src/locale/messages.fr.xlf",
-    "i18nFormat": "xlf",
-    "i18nLocale": "fr",
+  "configurations": {
     ...
+    "fr": {
+      "aot": true,
+      "outputPath": "dist/my-project-fr/",
+      "i18nFile": "src/locale/messages.fr.xlf",
+      "i18nFormat": "xlf",
+      "i18nLocale": "fr",
+      ...
+    }
+  }
+},
+"serve": {
+  ...
+  "configurations": {
+    ...
+    "fr": {
+      "browserTarget": "*project-name*:build:fr"
+    }
   }
 }
 ```
 
-You then pass the configuration with the `ng serve` or `ng build` commands. 
-The example below shows how to serve the French language file created in previous 
+You then pass the configuration with the `ng serve` or `ng build` commands.
+The example below shows how to serve the French language file created in previous
 sections of this guide:
 
 <code-example language="sh" class="code-shell">
   ng serve --configuration=fr
 </code-example>
 
-For production builds, you define a separate `production-fr` build configuration in 
+For production builds, you define a separate `production-fr` build configuration in
 your `angular.json`.
 
 ```

aio/content/guide/lifecycle-hooks.md

@@ -300,7 +300,7 @@ The sequence of log messages follows the prescribed hook calling order:
 `OnChanges`, `OnInit`, `DoCheck` (3x), `AfterContentInit`, `AfterContentChecked` (3x),
 `AfterViewInit`, `AfterViewChecked` (3x), and `OnDestroy`.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The constructor isn't an Angular hook *per se*.
   The log confirms that input properties (the `name` property in this case) have no assigned values at construction.
@@ -323,7 +323,7 @@ Go undercover with these two spy hooks to discover when an element is initialize
 This is the perfect infiltration job for a directive.
 The heroes will never know they're being watched.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Kidding aside, pay attention to two key points:
 
@@ -373,7 +373,7 @@ Use `ngOnInit()` for two main reasons:
 
 Experienced developers agree that components should be cheap and safe to construct.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Misko Hevery, Angular team lead,
   [explains why](http://misko.hevery.com/code-reviewers-guide/flaw-constructor-does-real-work/)
@@ -394,7 +394,7 @@ Remember also that a directive's data-bound input properties are not set until _
 That's a problem if you need to initialize the directive based on those properties.
 They'll have been set when `ngOnInit()` runs.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The `ngOnChanges()` method is your first opportunity to access those properties.
   Angular calls `ngOnChanges()` before `ngOnInit()` and many times after that.
@@ -460,7 +460,7 @@ The hero object *reference* didn't change so, from Angular's perspective, there
 
 Use the `DoCheck` hook to detect and act upon changes that Angular doesn't catch on its own.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   Use this method to detect a change that Angular overlooked.
 
@@ -549,7 +549,7 @@ The *AfterContent* sample explores the `AfterContentInit()` and `AfterContentChe
 *Content projection* is a way to import HTML content from outside the component and insert that content
 into the component's template in a designated spot.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   AngularJS developers know this technique as *transclusion*.
 
@@ -577,7 +577,7 @@ In this case, the projected content is the `<app-child>` from the parent.
   <img src='generated/images/guide/lifecycle-hooks/projected-child-view.png' alt="Projected Content">
 </figure>
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
   The telltale signs of *content projection* are twofold:
 

aio/content/guide/ngmodule-api.md

@@ -12,8 +12,8 @@ A basic understanding of the following concepts:
 
 At a high level, NgModules are a way to organize Angular apps
 and they accomplish this through the metadata in the `@NgModule`
-decorator. The metadata falls
-into three categories:
+decorator.
+The metadata falls into three categories:
 
 * **Static:** Compiler configuration which tells the compiler about directive selectors and where in templates the directives should be applied through selector matching. This is configured via the `declarations` array.
 * **Runtime:** Injector configuration via the `providers` array.
@@ -75,9 +75,8 @@ The following table summarizes the `@NgModule` metadata properties.
       </ol>
 
       Components, directives, and pipes must belong to _exactly_ one module.
-      The compiler emits an error if you try to declare the same class in more than one module.
-
-      Don't re-declare a class imported from another module.
+      The compiler emits an error if you try to declare the same class in more than one module. Be careful not to re-declare a class that is imported
+      directly or indirectly from another module.
 
     </td>
 
@@ -108,7 +107,7 @@ The following table summarizes the `@NgModule` metadata properties.
 
       Components in external modules continue to receive the instance provided by their injectors.
 
-      For more information on injector hierarchy and scoping, see [Providers](guide/providers).
+      For more information on injector hierarchy and scoping, see [Providers](guide/providers) and the [DI Guide](guide/dependency-injection).
 
     </td>
 

aio/content/guide/ngmodule-faq.md

@@ -71,7 +71,7 @@ as well as dynamically loaded in a pop-up dialog.
 This error often means that you haven't declared the directive "x"
 or haven't imported the NgModule to which "x" belongs.
 
-<div class="l-sub-section">
+<div class="alert is-helpful">
 
 Perhaps you declared "x" in an application sub-module but forgot to export it.
 The "x" class isn't visible to other modules until you add it to the `exports` list.