From b9733fdbb6f0351d78d25f7f3992b12b605d71e1 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Sat, 17 Sep 2016 08:00:14 -0700
Subject: [PATCH 01/42] chore(harp): use official pre-release 0.21 of harp
 (#2376)

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 96040cee6b..71125dcd07 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "gulp-tslint": "^5.0.0",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.4",
-    "harp": "git://github.com/filipesilva/harp.git#8da8d3497ddbfcbcbadd8be63e0fd731d7310cc4",
+    "harp": "0.21.0-pre.1",
     "html2jade": "^0.8.4",
     "indent-string": "^2.1.0",
     "jasmine-core": "^2.3.4",
@@ -77,4 +77,4 @@
     "jstransformer-marked": "^1.0.1"
   },
   "homepage": "http://angular.io/"
-}
\ No newline at end of file
+}

From 84b5297cc2fb5c89ebc57c42faad8f5e8b8fc560 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Sat, 17 Sep 2016 12:44:34 -0700
Subject: [PATCH 02/42] docs(testing): feedback from Joe Eames/add more
 scenarios (#2391)

---
 .../docs/_examples/testing/ts/app-specs.html  |   2 +-
 .../testing/ts/app/app.component.spec.ts      |  18 +-
 .../app/dashboard/dashboard.component.spec.ts |   8 +-
 .../ts/app/hero/hero-detail.component.html    |   5 +-
 .../hero-detail.component.no-testbed.spec.ts  |   6 +-
 .../ts/app/hero/hero-detail.component.spec.ts |  75 ++--
 .../ts/app/hero/hero-detail.component.ts      |  36 +-
 .../ts/app/hero/hero-list.component.spec.ts   |   4 +-
 .../testing/ts/app/welcome.component.spec.ts  |  19 +-
 .../testing/ts/testing/fake-router.ts         |  49 ---
 .../_examples/testing/ts/testing/index.ts     |   2 +-
 .../testing/ts/testing/router-stubs.ts        |  65 ++++
 public/docs/ts/latest/guide/testing.jade      | 332 ++++++++++++------
 .../testing/hero-detail.component.png         | Bin 0 -> 2746 bytes
 14 files changed, 394 insertions(+), 227 deletions(-)
 delete mode 100644 public/docs/_examples/testing/ts/testing/fake-router.ts
 create mode 100644 public/docs/_examples/testing/ts/testing/router-stubs.ts
 create mode 100644 public/resources/images/devguide/testing/hero-detail.component.png

diff --git a/public/docs/_examples/testing/ts/app-specs.html b/public/docs/_examples/testing/ts/app-specs.html
index c51f6cdedc..276659e26b 100644
--- a/public/docs/_examples/testing/ts/app-specs.html
+++ b/public/docs/_examples/testing/ts/app-specs.html
@@ -42,7 +42,7 @@
       'app/model/hero.spec',
       'app/model/http-hero.service.spec',
       'app/shared/title-case.pipe.spec',
-      'app/twain.component.spec',
+      'app/shared/twain.component.spec',
       'app/welcome.component.spec'
     ];
   </script>
diff --git a/public/docs/_examples/testing/ts/app/app.component.spec.ts b/public/docs/_examples/testing/ts/app/app.component.spec.ts
index c9fd54535f..388e29a73e 100644
--- a/public/docs/_examples/testing/ts/app/app.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/app.component.spec.ts
@@ -8,7 +8,7 @@ import { AppComponent }    from './app.component';
 import { BannerComponent } from './banner.component';
 import { SharedModule }    from './shared/shared.module';
 
-import { Router, FakeRouter, FakeRouterLinkDirective, FakeRouterOutletComponent
+import { Router, RouterStub, RouterLinkDirectiveStub, RouterOutletStubComponent
 } from '../testing';
 
 
@@ -20,9 +20,9 @@ describe('AppComponent & TestModule', () => {
     TestBed.configureTestingModule({
       declarations: [
         AppComponent, BannerComponent,
-        FakeRouterLinkDirective, FakeRouterOutletComponent
+        RouterLinkDirectiveStub, RouterOutletStubComponent
       ],
-      providers: [{ provide: Router, useClass: FakeRouter }],
+      providers: [{ provide: Router, useClass: RouterStub }],
       schemas:   [NO_ERRORS_SCHEMA]
     })
 
@@ -49,9 +49,9 @@ function tests() {
 
     const links = fixture.debugElement
       // find all elements with an attached FakeRouterLink directive
-      .queryAll(By.directive(FakeRouterLinkDirective))
+      .queryAll(By.directive(RouterLinkDirectiveStub))
       // use injector to get the RouterLink directive instance attached to each element
-      .map(de => de.injector.get(FakeRouterLinkDirective) as FakeRouterLinkDirective);
+      .map(de => de.injector.get(RouterLinkDirectiveStub) as RouterLinkDirectiveStub);
 
     expect(links.length).toBe(3, 'should have 3 links');
     expect(links[0].linkParams).toBe('/dashboard', '1st link should go to Dashboard');
@@ -63,11 +63,11 @@ function tests() {
 
     // Heroes RouterLink DebugElement
     const heroesLinkDe = fixture.debugElement
-      .queryAll(By.directive(FakeRouterLinkDirective))[1];
+      .queryAll(By.directive(RouterLinkDirectiveStub))[1];
 
     expect(heroesLinkDe).toBeDefined('should have a 2nd RouterLink');
 
-    const link = heroesLinkDe.injector.get(FakeRouterLinkDirective) as FakeRouterLinkDirective;
+    const link = heroesLinkDe.injector.get(RouterLinkDirectiveStub) as RouterLinkDirectiveStub;
 
     expect(link.navigatedTo).toBeNull('link should not have navigate yet');
 
@@ -101,8 +101,8 @@ describe('AppComponent & AppModule', () => {
     // Separate override because cannot both `set` and `add/remove` in same override
     .overrideModule(AppModule, {
       add: {
-        declarations: [ FakeRouterLinkDirective, FakeRouterOutletComponent ],
-        providers:    [{ provide: Router, useClass: FakeRouter }]
+        declarations: [ RouterLinkDirectiveStub, RouterOutletStubComponent ],
+        providers:    [{ provide: Router, useClass: RouterStub }]
       }
     })
 
diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
index 981e51db0f..7159bb820b 100644
--- a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
@@ -12,11 +12,11 @@ import { Router } from '@angular/router';
 import { DashboardComponent } from './dashboard.component';
 import { DashboardModule }    from './dashboard.module';
 
-// #docregion fake-router
-class FakeRouter {
+// #docregion router-stub
+class RouterStub {
   navigateByUrl(url: string) { return url;  }
 }
-// #enddocregion fake-router
+// #enddocregion router-stub
 
 beforeEach ( addMatchers );
 
@@ -73,7 +73,7 @@ function compileAndCreate() {
     TestBed.configureTestingModule({
       providers: [
         { provide: HeroService, useClass: FakeHeroService },
-        { provide: Router,      useClass: FakeRouter }
+        { provide: Router,      useClass: RouterStub }
       ]
     })
     .compileComponents().then(() => {
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.html b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.html
index 6927fc83ad..7e86a668f6 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.html
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.html
@@ -1,10 +1,11 @@
+<!-- #docregion -->
 <div *ngIf="hero">
   <h2><span>{{hero.name | titlecase}}</span> Details</h2>
   <div>
     <label>id: </label>{{hero.id}}</div>
   <div>
-    <label>name: </label>
-    <input [(ngModel)]="hero.name" placeholder="name" />
+    <label for="name">name: </label>
+    <input id="name" [(ngModel)]="hero.name" placeholder="name" />
   </div>
   <button (click)="save()">Save</button>
   <button (click)="cancel()">Cancel</button>
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.no-testbed.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.no-testbed.spec.ts
index 73c22f29e7..a6c1af98d7 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.no-testbed.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.no-testbed.spec.ts
@@ -1,12 +1,12 @@
 import { HeroDetailComponent } from './hero-detail.component';
 import { Hero }                from '../model';
 
-import { FakeActivatedRoute }  from '../../testing';
+import { ActivatedRouteStub }  from '../../testing';
 
 //////////  Tests  ////////////////////
 
 describe('HeroDetailComponent - no TestBed', () => {
-  let activatedRoute: FakeActivatedRoute;
+  let activatedRoute: ActivatedRouteStub;
   let comp: HeroDetailComponent;
   let expectedHero: Hero;
   let hds: any;
@@ -14,7 +14,7 @@ describe('HeroDetailComponent - no TestBed', () => {
 
   beforeEach( done => {
     expectedHero = new Hero(42, 'Bubba');
-    activatedRoute = new FakeActivatedRoute();
+    activatedRoute = new ActivatedRouteStub();
     activatedRoute.testParams = { id: expectedHero.id };
 
     router = jasmine.createSpyObj('router', ['navigate']);
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
index 0dd52ed54e..6c914a5011 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
@@ -1,3 +1,4 @@
+// #docplaster
 import {
   async, ComponentFixture, fakeAsync, inject, TestBed, tick
 } from '@angular/core/testing';
@@ -7,7 +8,7 @@ import { DebugElement } from '@angular/core';
 
 import {
   addMatchers, newEvent,
-  ActivatedRoute, FakeActivatedRoute, Router, FakeRouter
+  ActivatedRoute, ActivatedRouteStub, Router, RouterStub
 } from '../../testing';
 
 import { HEROES, FakeHeroService } from '../model/testing';
@@ -18,7 +19,7 @@ import { HeroDetailService }   from './hero-detail.service';
 import { Hero, HeroService }   from '../model';
 
 ////// Testing Vars //////
-let activatedRoute: FakeActivatedRoute;
+let activatedRoute: ActivatedRouteStub;
 let comp: HeroDetailComponent;
 let fixture: ComponentFixture<HeroDetailComponent>;
 let page: Page;
@@ -29,7 +30,7 @@ describe('HeroDetailComponent', () => {
 
   beforeEach( async(() => {
     addMatchers();
-    activatedRoute = new FakeActivatedRoute();
+    activatedRoute = new ActivatedRouteStub();
 
     TestBed.configureTestingModule({
       imports: [ HeroModule ],
@@ -40,12 +41,13 @@ describe('HeroDetailComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: HeroService,    useClass: FakeHeroService },
-        { provide: Router,         useClass: FakeRouter},
+        { provide: Router,         useClass: RouterStub},
       ]
     })
     .compileComponents();
   }));
 
+  // #docregion route-good-id
   describe('when navigate to hero id=' + HEROES[0].id, () => {
     let expectedHero: Hero;
 
@@ -55,51 +57,53 @@ describe('HeroDetailComponent', () => {
       createComponent();
     }));
 
+  // #docregion selected-tests
     it('should display that hero\'s name', () => {
       expect(page.nameDisplay.textContent).toBe(expectedHero.name);
     });
+  // #enddocregion route-good-id
 
     it('should navigate when click cancel', () => {
       page.cancelBtn.triggerEventHandler('click', null);
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     });
 
-    it('should save when click save', () => {
+    it('should save when click save but not navigate immediately', () => {
       page.saveBtn.triggerEventHandler('click', null);
       expect(page.saveSpy.calls.any()).toBe(true, 'HeroDetailService.save called');
+      expect(page.navSpy.calls.any()).toBe(false, 'router.navigate not called');
     });
 
-    it('should navigate when click click save resolves', fakeAsync(() => {
+    it('should navigate when click save and save resolves', fakeAsync(() => {
       page.saveBtn.triggerEventHandler('click', null);
-      tick(); // waits for async save to "complete" before navigating
+      tick(); // wait for async save to "complete" before navigating
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     }));
 
-
     // #docregion title-case-pipe
-    it('should convert original hero name to Title Case', () => {
-      expect(page.nameDisplay.textContent).toBe(comp.hero.name);
-    });
-    // #enddocregion title-case-pipe
-
     it('should convert hero name to Title Case', fakeAsync(() => {
       const inputName = 'quick BROWN  fox';
-      const expectedName = 'Quick Brown  Fox';
+      const titleCaseName = 'Quick Brown  Fox';
 
-      // simulate user entering new name in input
+      // simulate user entering new name into the input box
       page.nameInput.value = inputName;
 
       // dispatch a DOM event so that Angular learns of input value change.
-      // detectChanges() makes ngModel push input value to component property
-      // and Angular updates the output span
       page.nameInput.dispatchEvent(newEvent('input'));
+
+      // detectChanges() makes [(ngModel)] push input value to component property
+      // and Angular updates the output span through the title pipe
       fixture.detectChanges();
-      expect(page.nameDisplay.textContent).toBe(expectedName, 'hero name display');
-      expect(comp.hero.name).toBe(inputName, 'comp.hero.name');
+
+      expect(page.nameDisplay.textContent).toBe(titleCaseName);
     }));
-
+    // #enddocregion title-case-pipe
+  // #enddocregion selected-tests
+  // #docregion route-good-id
   });
+  // #enddocregion route-good-id
 
+  // #docregion route-no-id
   describe('when navigate with no hero id', () => {
     beforeEach( async( createComponent ));
 
@@ -111,7 +115,9 @@ describe('HeroDetailComponent', () => {
       expect(page.nameDisplay.textContent).toBe('');
     });
   });
+  // #enddocregion route-no-id
 
+  // #docregion route-bad-id
   describe('when navigate to non-existant hero id', () => {
     beforeEach( async(() => {
       activatedRoute.testParams = { id: 99999 };
@@ -123,6 +129,7 @@ describe('HeroDetailComponent', () => {
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     });
   });
+  // #enddocregion route-bad-id
 
   ///////////////////////////
 
@@ -145,22 +152,24 @@ describe('HeroDetailComponent', () => {
 
 /////////// Helpers /////
 
+// #docregion create-component
 /** Create the HeroDetailComponent, initialize it, set test variables  */
 function createComponent() {
   fixture = TestBed.createComponent(HeroDetailComponent);
   comp    = fixture.componentInstance;
   page    = new Page();
 
-  // change detection triggers ngOnInit which gets a hero
+  // 1st change detection triggers ngOnInit which gets a hero
   fixture.detectChanges();
   return fixture.whenStable().then(() => {
-    // got the hero and updated component
-    // change detection updates the view
+    // 2nd change detection displays the async-fetched hero
     fixture.detectChanges();
     page.addPageElements();
   });
 }
+// #enddocregion create-component
 
+// #docregion page
 class Page {
   gotoSpy:      jasmine.Spy;
   navSpy:       jasmine.Spy;
@@ -173,19 +182,19 @@ class Page {
 
   constructor() {
     // Use component's injector to see the services it injected.
-    let compInjector = fixture.debugElement.injector;
-    let hds          = compInjector.get(HeroDetailService);
-    let router       = compInjector.get(Router);
-    this.gotoSpy     = spyOn(comp, 'gotoList').and.callThrough();
-    this.saveSpy     = spyOn(hds, 'saveHero').and.callThrough();
-    this.navSpy      = spyOn(router, 'navigate').and.callThrough();
+    const compInjector = fixture.debugElement.injector;
+    const hds          = compInjector.get(HeroDetailService);
+    const router       = compInjector.get(Router);
+    this.gotoSpy       = spyOn(comp, 'gotoList').and.callThrough();
+    this.saveSpy       = spyOn(hds, 'saveHero').and.callThrough();
+    this.navSpy        = spyOn(router, 'navigate').and.callThrough();
   }
 
-  /** Add page elements after page initializes  */
+  /** Add page elements after hero arrives */
   addPageElements() {
     if (comp.hero) {
-      // have a hero so these DOM elements can be reached
-      let buttons = fixture.debugElement.queryAll(By.css('button'));
+      // have a hero so these elements are now in the DOM
+      const buttons    = fixture.debugElement.queryAll(By.css('button'));
       this.saveBtn     = buttons[0];
       this.cancelBtn   = buttons[1];
       this.nameDisplay = fixture.debugElement.query(By.css('span')).nativeElement;
@@ -193,4 +202,4 @@ class Page {
     }
   }
 }
-
+// #enddocregion page
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
index 9350c369af..3b5555c481 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute, Router }   from '@angular/router';
+import 'rxjs/add/operator/pluck';
 
 import { Hero }              from '../model';
 import { HeroDetailService } from './hero-detail.service';
@@ -16,31 +17,34 @@ import { HeroDetailService } from './hero-detail.service';
 export class HeroDetailComponent implements OnInit {
   @Input() hero: Hero;
 
+  // #docregion ctor
   constructor(
     private heroDetailService: HeroDetailService,
     private route: ActivatedRoute,
     private router: Router) {
   }
+  // #enddocregion ctor
 
-  ngOnInit() {
-    let id = this.route.snapshot.params['id'];
+  // #docregion ng-on-init
+  ngOnInit(): void {
+    // get hero when `id` param changes
+    this.route.params.pluck<string>('id')
+      .forEach(id => this.getHero(id))
+      .catch(() => this.hero = new Hero()); // no id; should edit new hero
+  }
+  // #enddocregion ng-on-init
 
-    // tslint:disable-next-line:triple-equals
-    if (id == undefined) {
-      // no id; act as if is new
-      this.hero = new Hero();
-    } else {
-      this.heroDetailService.getHero(id).then(hero => {
-        if (hero) {
-          this.hero = hero;
-        } else {
-          this.gotoList(); // id not found; navigate to list
-        }
-      });
-    }
+  private getHero(id: string): void {
+    this.heroDetailService.getHero(id).then(hero => {
+      if (hero) {
+        this.hero = hero;
+      } else {
+        this.gotoList(); // id not found; navigate to list
+      }
+    });
   }
 
-  save() {
+  save(): void {
     this.heroDetailService.saveHero(this.hero).then(() => this.gotoList());
   }
 
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
index f997cf787e..ea08cd499c 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
@@ -4,7 +4,7 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick
 import { By }           from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
-import { addMatchers, newEvent, Router, FakeRouter
+import { addMatchers, newEvent, Router, RouterStub
 } from '../../testing';
 
 import { HEROES, FakeHeroService } from '../model/testing';
@@ -28,7 +28,7 @@ describe('HeroListComponent', () => {
       imports: [HeroModule],
       providers: [
         { provide: HeroService, useClass: FakeHeroService },
-        { provide: Router,      useClass: FakeRouter}
+        { provide: Router,      useClass: RouterStub}
       ]
     })
     .compileComponents()
diff --git a/public/docs/_examples/testing/ts/app/welcome.component.spec.ts b/public/docs/_examples/testing/ts/app/welcome.component.spec.ts
index ec59ef5bc2..f99687148f 100644
--- a/public/docs/_examples/testing/ts/app/welcome.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/welcome.component.spec.ts
@@ -13,15 +13,20 @@ describe('WelcomeComponent', () => {
   let userService: UserService; // the actually injected service
   let welcomeEl: DebugElement;  // the element with the welcome message
 
+  let userServiceStub: {
+    isLoggedIn: boolean;
+    user: { name: string}
+  };
+
   // #docregion setup
   beforeEach(() => {
-    // fake UserService for test purposes
-    // #docregion fake-userservice
-    const fakeUserService = {
+    // stub UserService for test purposes
+    // #docregion user-service-stub
+    userServiceStub = {
       isLoggedIn: true,
       user: { name: 'Test User'}
     };
-    // #enddocregion fake-userservice
+    // #enddocregion user-service-stub
 
     // #docregion config-test-module
     TestBed.configureTestingModule({
@@ -29,7 +34,7 @@ describe('WelcomeComponent', () => {
     // #enddocregion setup
     // providers:    [ UserService ]  // a real service would be a problem!
     // #docregion setup
-       providers:    [ {provide: UserService, useValue: fakeUserService } ]
+       providers:    [ {provide: UserService, useValue: userServiceStub } ]
     });
     // #enddocregion config-test-module
 
@@ -80,4 +85,8 @@ describe('WelcomeComponent', () => {
     expect(content).toMatch(/log in/i, '"log in"');
   });
   // #enddocregion tests
+
+  it('orig stub and injected UserService are not the same object', () => {
+    expect(userServiceStub === userService).toBe(false);
+  });
 });
diff --git a/public/docs/_examples/testing/ts/testing/fake-router.ts b/public/docs/_examples/testing/ts/testing/fake-router.ts
deleted file mode 100644
index d42a3f8ad9..0000000000
--- a/public/docs/_examples/testing/ts/testing/fake-router.ts
+++ /dev/null
@@ -1,49 +0,0 @@
- // export for convenience.
-export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
-
-import { Component, Directive, Injectable, Input } from '@angular/core';
-import { NavigationExtras } from '@angular/router';
-
-@Directive({
-  selector: '[routerLink]',
-  host: {
-    '(click)': 'onClick()',
-    '[attr.href]': 'visibleHref',
-    '[class.router-link-active]': 'isRouteActive'
-  }
-})
-export class FakeRouterLinkDirective  {
-
-  isRouteActive = false;
-  visibleHref: string; // the url displayed on the anchor element.
-
-  @Input('routerLink') linkParams: any;
-  navigatedTo: any = null;
-
-  onClick() {
-    this.navigatedTo = this.linkParams;
-  }
-}
-
-@Component({selector: 'router-outlet', template: ''})
-export class FakeRouterOutletComponent { }
-
-@Injectable()
-export class FakeRouter {
-  lastCommand: any[];
-  navigate(commands: any[], extras?: NavigationExtras) {
-    this.lastCommand = commands;
-    return commands;
-  }
-}
-
-@Injectable()
-export class FakeActivatedRoute {
-  testParams: {} = {};
-
-  get snapshot()  {
-    return {
-      params: this.testParams
-    };
-  }
-}
diff --git a/public/docs/_examples/testing/ts/testing/index.ts b/public/docs/_examples/testing/ts/testing/index.ts
index f648a212e9..907b968c0c 100644
--- a/public/docs/_examples/testing/ts/testing/index.ts
+++ b/public/docs/_examples/testing/ts/testing/index.ts
@@ -1,7 +1,7 @@
 import { tick, ComponentFixture } from '@angular/core/testing';
 
 export * from './jasmine-matchers';
-export * from './fake-router';
+export * from './router-stubs';
 
 // Short utilities
 /**
diff --git a/public/docs/_examples/testing/ts/testing/router-stubs.ts b/public/docs/_examples/testing/ts/testing/router-stubs.ts
new file mode 100644
index 0000000000..83a84fcb3a
--- /dev/null
+++ b/public/docs/_examples/testing/ts/testing/router-stubs.ts
@@ -0,0 +1,65 @@
+ // export for convenience.
+export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
+
+import { Component, Directive, Injectable, Input } from '@angular/core';
+import { NavigationExtras } from '@angular/router';
+
+@Directive({
+  selector: '[routerLink]',
+  host: {
+    '(click)': 'onClick()',
+    '[attr.href]': 'href',
+    '[class.router-link-active]': 'isRouteActive'
+  }
+})
+export class RouterLinkDirectiveStub {
+
+  isRouteActive = false;
+  href: string; // the url displayed on the anchor element.
+
+  @Input('routerLink') linkParams: any;
+  navigatedTo: any = null;
+
+  onClick() {
+    this.navigatedTo = this.linkParams;
+  }
+}
+
+@Component({selector: 'router-outlet', template: ''})
+export class RouterOutletStubComponent { }
+
+@Injectable()
+export class RouterStub {
+  lastCommand: any[];
+  navigate(commands: any[], extras?: NavigationExtras) {
+    this.lastCommand = commands;
+    return commands;
+  }
+}
+
+
+// Only implements params and part of snapshot.params
+// #docregion activated-route-stub
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
+@Injectable()
+export class ActivatedRouteStub {
+
+  // ActivatedRoute.params is Observable
+  private subject = new BehaviorSubject(this.testParams);
+  params = this.subject.asObservable();
+
+  // Test parameters
+  private _testParams: {};
+  get testParams() { return this._testParams; }
+  set testParams(params: {}) {
+    this._testParams = params;
+    this.subject.next(params);
+  }
+
+  // ActivatedRoute.snapshot.params
+  get snapshot() {
+    return { params: this.testParams };
+  }
+}
+// #enddocregion activated-route-stub
diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index d52179b9bd..51ba85876f 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -26,7 +26,9 @@ a#top
   * [Test a component with an external template](#component-with-external-template)
   * [Test a component with inputs and outputs](#component-with-inputs-output)
   * [Test a component inside a test host component](#component-inside-test-host)
-  * [Test a routed component](#routed-component)  
+  * [Test a routed component](#routed-component)
+  * [Test a routed component with parameters](#routed-component-w-param)
+  * [Use a _page_ object to simplify setup](#page-object)
   * [Isolated tests](#testing-without-atp "Testing without the Angular Testing Platform")
   * [_TestBed_ API](#atp-api)
   * [FAQ](#faq "Frequently asked questions")
@@ -177,9 +179,9 @@ table(width="100%")
     td
       :marked
         [SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md) 
-        loads the application and test modules.
-        This script tells SystemJS where to find the module files and how to load them.
-        It's the same version of the file used by QuickStart-based applications.
+        loads the application and test files.
+        This script tells SystemJS where to find those files and how to load them.
+        It's the same version of `systemjs.config.js` used by QuickStart-based applications.
   tr
     td(style="vertical-align: top") <code>systemjs.config.extras.js</code>
     td
@@ -344,7 +346,7 @@ a#atp-intro
   for components, directives, pipes, and services.
   Isolated unit tests examine an instance of a class all by itself without 
   any dependence on Angular or any injected values. 
-  The tester creates a test instance of the class with new, supplying fake constructor parameters as needed, and
+  The tester creates a test instance of the class with new, supplying test doubles for the constructor parameters as needed, and
   then probes the test instance API surface.
 
   Isolated tests don't reveal how the class interacts with Angular. 
@@ -355,12 +357,8 @@ a#atp-intro
   ### Testing with the _ Angular Testing Platform_
 
   The  _Angular Testing Platform_ consists of the `TestBed` class and some helper functions from `@angular/core/testing`.
-.alert.is-important
-  :marked
-    The _TestBed_ is officially _experimental_ and thus subject to change.
-    Consult the [API reference](../api/core/testing/index/TestBed-class.html) for the latest status.
-:marked
-  The `TestBed` creates an Angular test module &mdash; an `@NgModule` class &mdash;
+
+  The `TestBed` creates an Angular testing module &mdash; an `@NgModule` class &mdash;
   that you configure to produce the module environment for the class you want to test. 
   You tell the `TestBed` to create an instance of the test component and probe that instance with tests.
 
@@ -372,19 +370,20 @@ a#atp-intro
   :marked
     You can access that hidden instance anytime by calling `getTestBed()`;
 :marked
-  This `TestBed` instance comes pre-configured with a baseline of default providers and declarables (components, directives, and pipes)
+  Thanks to initialization in the [testing shims](#setup), 
+  the default `TestBed` instance is pre-configured with a baseline of default providers and declarables (components, directives, and pipes)
   that almost everyone needs. 
-  This chapter tests a browser application so the default includes the `CommonModule` declarables from `@angular/common`
+
+  The shims in this chapter are designed for testing a browser application so the default configuration includes the `CommonModule` declarables from `@angular/common`
   and the `BrowserModule` providers (some of them mocked) from `@angular/platform-browser`.
 
-  You refine the default test module configuration with application and test specifics 
-  so that it can produce an instance of the test component in the Angular environment suitable for your tests.
-
-  Start by calling `TestBed.configureTestingModule` with an object that looks like `@NgModule` metadata.
-  This object defines additional imports, declarations, providers and schemas.
+  This default testing module configuration is a _foundation_ for testing _any_ browser app.
+  You call `TestBed.configureTestingModule` with an object that defines additional imports, declarations, providers and schemas
+  to reshape the testing module to fit your application tests.
+  Optional `override...` methods can fine-tune aspects of the configuration.
 
   After configuring the `TestBed`, tell it to create an instance of the test component and the test fixture
-  you'll need to inspect and control the component's immediate environment.
+  that you'll need to inspect and control the component's immediate environment.
   
 +makeExample('testing/ts/app/banner.component.spec.ts', 'simple-example-before-each', 'app/banner.component.spec.ts (simplified)')(format='.')
 :marked
@@ -393,7 +392,7 @@ a#atp-intro
   and see the effects of these actions both in the test component and in the test DOM.
 +makeExample('testing/ts/app/banner.component.spec.ts', 'simple-example-it', 'app/banner.component.spec.ts (simplified)')(format='.')
 :marked
-  A comprehensive review of the _TestBed_ API appears [later in the chapter](#atp-api).
+  A comprehensive review of the _Angular Testing Platform_ APIs appears [later in the chapter](#atp-api).
   Let's dive right into Angular testing, starting with with the components of a sample application.
 
 a(href="#top").to-top Back to top
@@ -415,7 +414,7 @@ a#sample-app
 
   It includes the tests discussed in this chapter and additional tests for you to explore.
   This live example contains both application and test code. 
-  It is large and can take several minutes to start. Please be patient.
+  It is large and can take up to a minute to start. Please be patient.
 <live-example plnkr="app-specs" embedded img="devguide/testing/app-specs-plunker.png"></live-example>
 
 a(href="#top").to-top Back to top
@@ -444,7 +443,7 @@ a#simple-component-test
   `TestBed.configureTestingModule` takes an `@NgModule`-like metadata object.
   This one simply declares the component to test, `BannerComponent`.
   
-  It lacks `imports` because (a) it extends the default test module configuration which 
+  It lacks `imports` because (a) it extends the default testing module configuration which 
   already has what `BannerComponent` needs
   and (b) `BannerComponent` doesn't interact with any other components.
 
@@ -539,18 +538,18 @@ a#component-with-dependency
 :marked
   The `WelcomeComponent` has decision logic that interacts with the service;
   such logic makes this component worth testing.
-  Here's the test module configuration for the spec file, `app/welcome.component.spec.ts`:
+  Here's the testing module configuration for the spec file, `app/welcome.component.spec.ts`:
 +makeExample('testing/ts/app/welcome.component.spec.ts', 'config-test-module', 'app/welcome.component.spec.ts')(format='.')
 :marked
   This time, in addition to declaring the component under test,
   the configurations sets the `providers` list with the dependent `UserService`.
 
-  This example configures the test module with a _fake_ `UserService`.
+  This example configures the testing module with a stub `UserService`.
   
-  ## Provide service fakes
+  ## Provide service test doubles
 
   A component under test doesn't have to be injected with real services. 
-  In fact, it is usually better if they are fakes.
+  In fact, it is usually better if they are test doubles (stubs, fakes, spies, or mocks).
   The purpose of the spec is to test the component, not the service,
   and real services can be trouble.
 
@@ -558,22 +557,21 @@ a#component-with-dependency
   The real service might try to ask the user for login credentials and 
   try to reach an authentication server.
   These behaviors could be hard to intercept. 
-  It is far easier to create and register a fake `UserService`.
+  It is far easier to create and register a test double in place of the real `UserService`.
 
-  There are many ways to fake a service. 
-  This test suit supplies a minimal `UserService` that satisfies the needs of the `WelcomeComponent`
+  This particular test suite supplies a minimal `UserService` stub that satisfies the needs of the `WelcomeComponent`
   and its tests:
-+makeExample('testing/ts/app/welcome.component.spec.ts', 'fake-userservice')(format='.')
++makeExample('testing/ts/app/welcome.component.spec.ts', 'user-service-stub')(format='.')
 
 a#injected-service-reference
 :marked
   ## Referencing injected services
-  The tests need access to the injected (fake) `UserService`.
+  The tests need access to the injected (stubbed) `UserService`.
 
-  You cannot reference the `fakeUserService` object provided to the test module. 
+  You cannot reference the `userServiceStub` object provided to the testing module. 
   **It does not work!** 
-  Surprisingly, the instance actually injected into the component is _not the same_ 
-  as the provided `fakeUserService` object.
+  Surprisingly, the instance actually injected into the component is _not the same_ object
+  as the provided `userServiceStub`.
 
 .alert.is-important
   :marked
@@ -609,7 +607,7 @@ a#welcome-spec-setup
   And here are some tests:
 +makeExample('testing/ts/app/welcome.component.spec.ts', 'tests', 'app/welcome.component.spec.ts')(format='.')
 :marked
-  The first is a sanity test; it confirms that the fake `UserService` is working.
+  The first is a sanity test; it confirms that the stubbed `UserService` is called and working.
   The remaining tests confirm the logic of the component when the service returns different values.
   The second test validates the effect of changing the user name.
   The third test checks that the component displays the proper message when there is no logged-in user.
@@ -634,7 +632,7 @@ a#component-with-async-service
   It is sufficient to see within `ngOnInit` that `twainService.getQuote` returns a promise which means it is asynchronous.
 
   In general, tests should not make calls to remote servers. 
-  They should fake such calls. The setup in this `app/shared/twain.component.spec.ts` shows one way to do that: 
+  They should emulate such calls. The setup in this `app/shared/twain.component.spec.ts` shows one way to do that: 
 +makeExample('testing/ts/app/shared/twain.component.spec.ts', 'setup', 'app/shared/twain.component.spec.ts (setup)')(format='.')
 
 a#service-spy
@@ -642,7 +640,7 @@ a#service-spy
   ### Spying on the real service
 
   This setup is similar to the [`welcome.component.spec` setup](#welcome-spec-setup).
-  But instead of creating a fake service object, it injects the _real_ service (see the test module `providers`) and 
+  But instead of creating a stubbed service object, it injects the _real_ service (see the testing module `providers`) and 
   replaces the critical `getQuote` method with a Jasmine spy.
 +makeExample('testing/ts/app/shared/twain.component.spec.ts', 'spy')(format='.')
 :marked
@@ -669,24 +667,27 @@ a#service-spy
 
   The test must become an "async test" ... like the third test
 
-a#async-fn-in-it
+a#async
 :marked
   ## The _async_ function in _it_
 
   Notice the `async` in the third test.
 +makeExample('testing/ts/app/shared/twain.component.spec.ts', 'async-test', 'app/shared/twain.component.spec.ts (async test)')(format='.')
 :marked
-  The `async` function is part of the _Angular TestBed_ feature set.
-  It _takes_ a parameterless function and _returns_ a parameterless function
+  The `async` function is an independent feature of the _Angular Testing Platform_. 
+
+  It simplifyies coding of asynchronous tests by arranging for the tester's code to run in a special _async test zone_.
+
+  The `async` function _takes_ a parameterless function and _returns_ a parameterless function
   which becomes the argument to the  Jasmine `it` call. 
 
   The body of the `async` argument looks much like the body of a normal `it` argument.
-  There is nothing obviously asynchronous about it. For example, it doesn't return a promise.
+  There is nothing obviously asynchronous about it. 
+  For example, it doesn't return a promise and 
+  there is no `done` function to call as there is in standard Jasmine asynchronous tests.
 
-  The `async` function arranges for the tester's code to run in a special _async test zone_
-  that almost hides the mechanics of asynchronous execution.
-
-  Almost but not completely.
+  Some functions called within a test (such as `fixture.whenStable`) continue to reveal their asynchronous behavior.
+  Consider also the [_fakeAsync_](#fake-async) alternative which affords a more linear coding experience.
 
 a#when-stable
 :marked
@@ -720,20 +721,18 @@ a#fake-async
 +makeExample('testing/ts/app/shared/twain.component.spec.ts', 'fake-async-test', 'app/shared/twain.component.spec.ts (fakeAsync test)')(format='.')
 :marked
   Notice that `fakeAsync` replaces `async` as the `it` argument.
-  The `fakeAsync` function is also part of the _Angular TestBed_ feature set.
-  Like `async`, it too _takes_ a parameterless function and _returns_ a parameterless function
+  The `fakeAsync` function is another, independent feature of the _Angular Testing Platform_.
+
+  Like [async](#), it _takes_ a parameterless function and _returns_ a parameterless function
   which becomes the argument to the  Jasmine `it` call. 
 
-  The `async` function arranges for the tester's code to run in a special _fakeAsync test zone_.
+  The `fakeAsync` function enables a linear coding style by running the test body in a special _fakeAsync test zone_.
 
-  The key advantage of `fakeAsync` is that the test body looks entirely synchronous.
+  The principle advantage of `fakeAsync` over `async` is that the test appears to be synchronous.
   There are no promises at all. 
   No `then(...)` chains to disrupt the visible flow of control.
 
-.l-sub-section
-  :marked
-    There are limitations. For example, you cannot make an XHR call from within a `fakeAsync`.
-:marked
+  There are limitations. For example, you cannot make an XHR call from within a `fakeAsync`.
 
 a#tick
 a#tick-first-look
@@ -741,7 +740,7 @@ a#tick-first-look
   ## The _tick_ function
   Compare the third and fourth tests. Notice that `fixture.whenStable` is gone, replaced by `tick()`.
 
-  The `tick` function is a part of the _Angular TestBed_ feature set and a companion to `fakeAsync`.
+  The `tick` function is a part of the _Angular Testing Platform_ and a companion to `fakeAsync`.
   It can only be called within a `fakeAsync` body.
 
   Calling `tick()` simulates the passage of time until all pending asynchronous activities complete,
@@ -796,7 +795,7 @@ a#component-with-external-template
   The compiler must read these files from a file system before it can create a component instance.
 
   The `TestBed.compileComponents` method asynchronously compiles all the components configured in its
-  current test module. After it completes, external templates and css files, have been "inlined"
+  current testing module. After it completes, external templates and css files, have been "inlined"
   and `TestBed.createComponent` can do its job synchronously.
 .l-sub-section
   :marked
@@ -810,23 +809,15 @@ a#async-fn-in-before-each
 :marked
   ## The _async_ function in _beforeEach_
 
-  Notice the `async` call in the `beforeEach`.
-
-  The `async` function is part of the _Angular TestBed_ feature set.
-  It _takes_ a parameterless function and _returns_ a parameterless function
-  which becomes the argument to the Jasmine `beforeEach` call. 
-
-  The body of the `async` argument looks much like the body of a normal `beforEach` argument.
-  There is nothing obviously asynchronous about it. For example, it doesn't return a promise.
-
+  Notice the `async` call in the `beforeEach`. 
   The `async` function arranges for the tester's code to run in a special _async test zone_
-  that hides the mechanics of asynchronous execution.
+  that hides the mechanics of asynchronous execution, just as it does when passed to an [_it_ test)(#async).
 
 a#compile-components
 :marked
   ## _compileComponents_ 
   In this example, `Testbed.compileComponents` compiles one component, the `DashboardComponent`. 
-  It's the only declared component in this test module.
+  It's the only declared component in this testing module.
 
   Tests later in this chapter have more declared components and some of them import application
   modules that declare yet more components.
@@ -884,8 +875,12 @@ a#component-with-inputs-outputs
 +makeExample('testing/ts/app/dashboard/dashboard.component.ts', 'ctor', 'app/dashboard/dashboard.component.ts (constructor)')(format='.')
 :marked
   The `DashboardComponent` depends upon the Angular router and the `HeroService`.
-  You'd probably have to fake them both and that's a lot of work. The router is particularly challenging (see below).
-
+  You'd probably have to replace them both with test doubles and that looks like a lot of work. 
+  The router seems particularly challenging.
+.l-sub-section
+  :marked
+    The [discussion below](#routed-component) covers testing components that requre the router.
+:marked
   The immediate goal is to test the `DashboardHeroComponent`, not the `DashboardComponent`, and there's no need
   to work hard unnecessarily. Let's try the second and third options.
 
@@ -957,7 +952,7 @@ a#component-inside-test-host
   The setup for the test-host tests is similar to the setup for the stand-alone tests:
 +makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'test-host-setup', 'app/dashboard/dashboard-hero.component.spec.ts (test host setup)')(format='.')
 :marked
-  This test module configuration shows two important differences:
+  This testing module configuration shows two important differences:
   1. It _declares_ both the `DashboardHeroComponent` and the `TestHostComponent`.
   1. It _creates_ the `TestHostComponent` instead of the `DashboardHeroComponent`.
 
@@ -994,10 +989,10 @@ a#routed-component
   This is often the case.
   As a rule you test the component, not the router,
   and care only if the component navigates with the right address under the given conditions.
-  Faking the router is an easy option. This should do the trick:
-+makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'fake-router', 'app/dashboard/dashboard.component.spec.ts (fakeRouter)')(format='.')
+  Stubbing the router with a test implementation is an easy option. This should do the trick:
++makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'router-stub', 'app/dashboard/dashboard.component.spec.ts (Router Stub)')(format='.')
 :marked
-  Now we setup the test module with the `fakeRouter` and a fake `HeroService` and 
+  Now we setup the testing module with test stubs for the `Router` and `HeroService` and 
   create a test instance of the `DashbaordComponent` for subsequent testing.
 +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'compile-and-create-body', 'app/dashboard/dashboard.component.spec.ts (compile and create)')(format='.')
 :marked
@@ -1011,7 +1006,7 @@ a#inject
   Notice the `inject` function in the second `it` argument.
 +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'inject')(format='.')
 :marked
-  The `inject` function is part of the _Angular TestBed_ feature set.
+  The `inject` function is an independent feature of the _Angular Testing Platform_.
   It injects services into the test function where you can alter, spy on, and manipulate them.
 
   The `inject` function has two parameters
@@ -1046,6 +1041,138 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
+a#routed-component-w-param
+:marked
+  # Test a routed component with parameters
+  
+  Clicking a _Dashboard_ hero triggers navigation to `heroes/:id` where `:id`
+  is a route parameter whose value is the `id` of the hero to edit. 
+  That URL matches a route to the `HeroDetailComponent`.
+
+  The router pushes the `:id` token value into the `ActivatedRoute.params` _Observable_ property,
+  Angular injects the `ActivatedRoute` into the `HeroDetailComponent`, 
+  and the component extracts the `id` so it can fetch the corresponding hero via the `HeroDetailService`.
+  Here's the `HeroDetailComponent` constructor:
++makeExample('testing/ts/app/hero/hero-detail.component.ts', 'ctor', 'app/hero/hero-detail.component.ts (constructor)')(format='.')
+:marked
+  `HeroDetailComponent`  listens for changes to the `ActivatedRoute.params` in its `ngOnInit` method.
++makeExample('testing/ts/app/hero/hero-detail.component.ts', 'ng-on-init', 'app/hero/hero-detail.component.ts (ngOnInit)')(format='.')
+.l-sub-section
+  :marked
+    The expression after `route.params` chains an _Observable_ operator that _plucks_ the `id` from the `params` 
+    and then chains a `forEach` operator to subscribes to `id`-changing events. 
+    The `id` changes every time the user navigates to a different hero.
+    
+    The `forEach` passes the new `id` value to the component's `getHero` method (not shown)
+    which fetches a hero and sets the component's `hero` property. 
+    If the`id` parameter is missing, the `pluck` operator fails and the `catch` treats failure as a request to edit a new hero.
+    
+    The [Router](router.html#route-parameters) chapter covers `ActivatedRoute.params` in more detail.
+:marked
+  A test can explore how the `HeroDetailComponent` responds to different `id` parameter values
+  by manipulating the `ActivatedRoute` injected into the component's constructor.
+
+  By now you know how to stub the `Router` and a data service.
+  Stubbing the `ActivatedRoute` would follow the same pattern except for a complication:
+  the `ActivatedRoute.params` is an _Observable_.
+a#stub-observable
+:marked
+  ### _Observable_ test double
+
+  The `hero-detail.component.spec.ts` relies on an `ActivatedRouteStub` to set `ActivatedRoute.params` values for each test.
+  This is a cross-application, re-usable _test helper class_. 
+  We recommend locating such helpers in a `testing` folder sibling to the `app` folder.
+  This sample keeps `ActivatedRouteStub` in `testing/router-stubs.ts`:
+  
++makeExample('testing/ts/testing/router-stubs.ts', 'activated-route-stub', 'testing/router-stubs.ts (ActivatedRouteStub)')(format='.')
+:marked
+  Notable features of this stub:
+
+  * The stub implements only two of the `ActivatedRoute` capabilities: `params` and `snapshot.params`.
+
+  * <a href="https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/subjects/behaviorsubject.md" target="_blank">_BehaviorSubject_</a> 
+  drives the stub's `params` _Observable_ and returns the same value to every `params` subscriber until it's given a new value.
+
+  * The `HeroDetailComponent` chain its expressions to this stub `params` _Observable_ which is now under the tester's control.
+
+  * Setting the `testParams` property causes the `subject` to push the assigned value into `params`.
+   That triggers the `HeroDetailComponent` _params_ subscription, described above, in the same way that navigation does.
+
+  * Setting the `testParams` property also updates the stub's internal value for the `snapshot` property to return.
+.l-sub-section(style="margin-left:30px")
+  :marked
+    The [_snapshot_](router.html#snapshot "Router Chapter: snapshot") is another popular way for components to consume route parameters.
+.callout.is-helpful
+  :marked
+    The router stubs in this chapter are meant to inspire you. Create your own stubs to fit your testing needs.
+
+a#observable-tests
+:marked
+  ### _Observable_ tests
+  Here's a test demonstrating the component's behavior when the observed `id` refers to an existing hero:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'route-good-id', 'app/hero/hero-detail.component.spec.ts (existing id)')(format='.')
+.l-sub-section
+  :marked
+    The `createComponent` method and `page` object are discussed [in the next section](#page-object).
+    Rely on your intuition for now.
+:marked
+  When the `id` cannot be found, the component should re-route to the `HeroListComponent`.
+  The test suite setup provided the same `RouterStub` [described above](#routed-component) which spies on the router without actually navigating.
+  This test supplies a "bad" id and expects the component to try to navigate.
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'route-bad-id', 'app/hero/hero-detail.component.spec.ts (bad id)')(format='.')
+:marked
+:marked
+  While this app doesn't have a route to the `HeroDetailComponent` that omits the `id` parameter, it might add such a route someday. 
+  The component should do something reasonable when there is no `id`.
+
+  In this implementation, the component should create and display a new hero.
+  New heroes have `id=0` and a blank `name`. This test confirms that the component behaves as expected:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'route-no-id', 'app/hero/hero-detail.component.spec.ts (no id)')(format='.')
+:marked
+.callout.is-helpful
+  :marked
+    Inspect and download _all_ of the chapter's application test code with this <live-example plnkr="app-specs">live example</live-example>.
+
+.l-hr
+
+a#page-object
+:marked
+  # Use a _page_ object to simplify setup
+
+  The `HeroDetailComponent` is a simple view with a title, two hero fields, and two buttons.
+figure.image-display
+  img(src='/resources/images/devguide/testing/hero-detail.component.png' alt="HeroDetailComponent in action")
+:marked
+  But there's already plenty of template complexity.
++makeExample('testing/ts/app/hero/hero-detail.component.html', '', 'app/hero/hero-detail.component.html')(format='.')
+:marked
+  To fully exercise the component, the test needs ...
+  * to wait until a `hero` arrives before `*ngIf` allows any element in DOM
+  * element references for the title name span and name input-box to inspect their values
+  * two button references to click
+  * spies on services and component methods
+
+  Even a small form such as this one can produce a mess of tortured conditional setup and CSS element selection.
+
+  Tame the madness with a `Page` class that simplifies access to component properties and encapsulates the logic that sets them.
+  Here's the `Page` class for the `hero-detail.component.spec.ts`
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'page', 'app/hero/hero-detail.component.spec.ts (Page)')(format='.')
+:marked
+  Now the important hooks for component manipulation and inspection are neatly organized and accessible from an instance of `Page`.
+
+  A `createComponent` method creates a `page` and fills in the blanks once the `hero` arrives.
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'create-component', 'app/hero/hero-detail.component.spec.ts (createComponent)')(format='.')
+:marked
+  The [observable tests](#observable-tests) in the previous section demonstrate how `createComponent` and `page` 
+  keep the tests short and _on message_. 
+  There are no distractions: no waiting for promises to resolve and no searching the DOM for element values to compare.
+  Here are a few more `HeroDetailComponent` tests to drive the point home.
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'selected-tests', 'app/hero/hero-detail.component.spec.ts (selected tests)')(format='.')
+:marked
+
+a(href="#top").to-top Back to top
+.l-hr
+
 a#isolated-tests
 a#testing-without-atp
 :marked
@@ -1067,7 +1194,7 @@ a#testing-without-atp
   They do
   * exhibit standard, Angular-agnostic testing techniques
   * create instances directly with `new`
-  * use stubs, spys, and mocks to fake dependencies.
+  * substitute test doubles (stubs, spys, and mocks) for the real dependencies.
 
 .callout.is-important
   header Write both kinds of tests
@@ -1119,7 +1246,7 @@ a#testing-without-atp
   The first test creates a `FancyService` with `new` and passes it to the `DependentService` constructor.
   
   It's rarely that simple. The injected service can be difficult to create or control.
-  You can mock the dependency, or use a fake value, or stub the pertinent service method
+  You can mock the dependency, or use a dummy value, or stub the pertinent service method
   with a substitute method that is easy to control.
 
   These _isolated_ unit testing techniques are great for exploring the inner logic of a service or its
@@ -1143,7 +1270,7 @@ a#testing-without-atp
   Use simple Jasmine to explore the expected cases and the edge cases.
 +makeExample('testing/ts/app/shared/title-case.pipe.spec.ts', 'excerpt', 'app/shared/title-case.pipe.spec.ts')
 :marked
-  ## Write ATP tests too
+  ### Write ATP tests too
   These are tests of the pipe _in isolation_.
   They can't tell if the `TitleCasePipe` is working properly 
   as applied in the application components.
@@ -1208,24 +1335,30 @@ table
     td
       :marked
         Runs the body of a test (`it`) or setup (`beforeEach`) function within a special _async test zone_.
-        See [here](#async-fn-in-it) and [here](#async-fn-in-before-each).
+        See [discussion above](#async).
   tr
     td(style="vertical-align: top") <code>fakeAsync</code>
     td
       :marked
         Runs the body of a test (`it`) within a special _fakeAsync test zone_, enabling
-        a linear control flow coding style. See [above](#fake-async).
+        a linear control flow coding style. See [discussion above](#fake-async).
   tr
     td(style="vertical-align: top") <code>tick</code>
     td
       :marked
         Simulates the passage of time and the completion of pending asynchronous activities
-        by flushing timer and micro-task queues in the _fakeAsync test zone_.
-        
+        by flushing both _timer_ and _micro-task_ queues within the _fakeAsync test zone_.
+
+      .l-sub-section
+        :marked
+          The curious, dedicated reader might enjoy this lengthy blog post, 
+          "<a href="https://jakearchibald.com/2015/tasks-microtasks-queues-and-schedules/" 
+          target="_blank">_Tasks, microtasks, queues and schedules_</a>".
+      :marked
         Accepts an optional argument that moves the virtual clock forward
         the specified number of milliseconds, 
         clearing asynchronous activities scheduled within that timeframe.
-        See [above](#tick).
+        See [discussion bove](#tick).
 
   tr
     td(style="vertical-align: top")  <code>inject</code>
@@ -1238,22 +1371,22 @@ table
     td(style="vertical-align: top") <code>discardPeriodicTasks</code>
     td
       :marked
-        When a `fakeAsync` test ends with pending timer event tasks (queued `setTimeOut` and `setInterval` callbacks),
+        When a `fakeAsync` test ends with pending timer event _tasks_ (queued `setTimeOut` and `setInterval` callbacks),
         the test fails with a clear error message.
         
         In general, a test should end with no queued tasks. 
-        When pending timer tasks are expected, call `discardPeriodicTasks` to flush the queues
+        When pending timer tasks are expected, call `discardPeriodicTasks` to flush the _task_ queue
         and avoid the error.
 
   tr
     td(style="vertical-align: top") <code>flushMicrotasks</code>
     td
       :marked
-        When a `fakeAsync` test ends with pending "microtasks" such as unresolved promises,
+        When a `fakeAsync` test ends with pending _micro-tasks_ such as unresolved promises,
         the test fails with a clear error message.
         
-        In general, a test should wait for microtasks to finish.
-        When pending microtasks are expected, call `discardPeriodicTasks` to flush the queues
+        In general, a test should wait for micro-tasks to finish.
+        When pending microtasks are expected, call `flushMicrotasks` to flush the  _micro-task_ queue
         and avoid the error.
 
   tr
@@ -1277,16 +1410,11 @@ table
 a#testbed-class-summary
 :marked
   # _TestBed_ Class Summary
-  The `TestBed` class API is quite large and can be overwhelming until you've explored it first
+  The `TestBed` class is a principle feature of the _Angular Testing Platform_. 
+  Its API is quite large and can be overwhelming until you've explored it first
   a little at a time. Read the early part of this chapter first
   to get the basics before trying to absorb the full API.
 
-.alert.is-important
-  :marked
-    The _TestBed_ is officially _experimental_ and thus subject to change.
-    Consult the [API reference](../api/core/testing/index/TestBed-class.html) for the latest status.
-
-:marked
   The module definition passed to `configureTestingModule`, 
   is a subset of the `@NgModule` metadata properties.
 code-example(format="." language="javascript").
@@ -1327,18 +1455,18 @@ table
     td
       :marked
         The testing shims (`karma-test-shim`, `browser-test-shim`) 
-        establish the [initial test environment](#a#testbed-initTestEnvironment) and a default test module.
-        The default test module is configured with basic declaratives and some Angular service substitutes (e.g. `DebugDomRender`) 
+        establish the [initial test environment](#a#testbed-initTestEnvironment) and a default testing module.
+        The default testing module is configured with basic declaratives and some Angular service substitutes (e.g. `DebugDomRender`) 
         that every tester needs.
         
-        Call `configureTestingModule` to refine the test module configuration for a particular set of tests
+        Call `configureTestingModule` to refine the testing module configuration for a particular set of tests
         by adding and removing imports, declarations (of components, directives, and pipes), and providers.
   tr
     td(style="vertical-align: top") <code>compileComponents</code>
     td
       :marked
-        Compile the test module asynchronously after you've finished configuring it.
-        You **must** call this method if _any_ of the test module components have a `templateUrl`
+        Compile the testing module asynchronously after you've finished configuring it.
+        You **must** call this method if _any_ of the testing module components have a `templateUrl`
         or `styleUrls` because fetching component template and style files is necessarily asynchronous.
         See [above](#compile-components).
 
@@ -1355,7 +1483,7 @@ table
     td
       :marked
         Replace metadata for the given `NgModule`. Recall that modules can import other modules.
-        The `overrideModule` method can reach deeply into the current test module to
+        The `overrideModule` method can reach deeply into the current testing module to
         modify one of these inner modules.
   tr
     td(style="vertical-align: top") <code>overrideComponent</code>
@@ -1408,14 +1536,14 @@ table
         This method may be called _exactly once_. Call `resetTestEnvironment` first
         if you absolutely need to change this default in the middle of your test run.
 
-        Specify the Angular compiler factory, a `PlatformRef`, and a default Angular test module.
-        Test modules and platforms for individual platforms are available from
+        Specify the Angular compiler factory, a `PlatformRef`, and a default Angular testing module.
+        Alternatives for non-browser platforms are available from
         `angular2/platform/testing/<platform_name>`.
   tr
     td(style="vertical-align: top") <code>resetTestEnvironment</code>
     td
       :marked
-        Reset the initial test environment including the default test module.
+        Reset the initial test environment including the default testing module.
 
 :marked
   A few of the `TestBed` instance methods are not covered by static `TestBed` _class_ methods.
diff --git a/public/resources/images/devguide/testing/hero-detail.component.png b/public/resources/images/devguide/testing/hero-detail.component.png
new file mode 100644
index 0000000000000000000000000000000000000000..3510be66dba05fb3f6e1c625d545e429dc8a29cb
GIT binary patch
literal 2746
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
AR{#J2

literal 0
HcmV?d00001


From 8b7c3b6e70df005a9386bf6f8338795d37b8dc19 Mon Sep 17 00:00:00 2001
From: Alex Wolfe <alex@wolfe-studios.com>
Date: Sat, 17 Sep 2016 14:52:46 -0700
Subject: [PATCH 03/42] update title on sidenav (#2386)

---
 public/docs/_includes/_side-nav.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/_includes/_side-nav.jade b/public/docs/_includes/_side-nav.jade
index 0f3fedb90f..f34ad29074 100644
--- a/public/docs/_includes/_side-nav.jade
+++ b/public/docs/_includes/_side-nav.jade
@@ -104,7 +104,7 @@ nav(class="sidenav l-pinned-left l-layer-4 l-offset-nav"  ng-class="appCtrl.show
             li(class="nav-list-item #{item.class}"): a(href="#{item.href}" title="#{item.tooltip}") #{index + 1}. #{item.navTitle}
 
     li.sidenav-section
-      a(class="nav-title is-parent #{anyItemSelected(guide)}" href="#{guide[0].href}" title="#{guide[0].tooltip}") Advanced Documentation
+      a(class="nav-title is-parent #{anyItemSelected(guide)}" href="#{guide[0].href}" title="#{guide[0].tooltip}") Advanced
         img(class="inline-arrow-down-svg" src="/resources/images/icons/ic_keyboard_arrow_down_black_24px.svg")
 
       .nav-unordered-lists(class="#{isCollapsed(anyItemSelected(guide))}")

From 5bd269484a6c9ad8674558df5fe9f12327ce19d6 Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Sat, 17 Sep 2016 23:56:36 +0200
Subject: [PATCH 04/42] fix(ngmodule): fix broken anchor (#2373)

---
 public/docs/ts/latest/guide/ngmodule.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/guide/ngmodule.jade b/public/docs/ts/latest/guide/ngmodule.jade
index f8ff77c7a6..bb0cc6ca7a 100644
--- a/public/docs/ts/latest/guide/ngmodule.jade
+++ b/public/docs/ts/latest/guide/ngmodule.jade
@@ -94,7 +94,7 @@ a#angular-modularity
 
   We'll see how later in the page. Let's start with the _root module_.
 
-a#root_module 
+a#root-module 
 .l-main-section
 :marked
   ## _AppModule_ - the application root module

From c6cf4dc310a3bbd1c53833254bd3cd3fd867c108 Mon Sep 17 00:00:00 2001
From: Sarun Intaralawan <sarun.intaralawan@gmail.com>
Date: Sun, 18 Sep 2016 04:56:55 +0700
Subject: [PATCH 05/42] docs(router): add missing backticks (#2366)

---
 public/docs/ts/latest/guide/router.jade | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/docs/ts/latest/guide/router.jade b/public/docs/ts/latest/guide/router.jade
index 0af9b5d1d3..a35b29bde1 100644
--- a/public/docs/ts/latest/guide/router.jade
+++ b/public/docs/ts/latest/guide/router.jade
@@ -1365,13 +1365,13 @@ a#child-routing-component
   They *extend* the path of the parent route.
   With each step down the route tree, we add a slash followed by the route path (unless the route path is _empty_).
 
-  For example, the parent path to the `CrisisCenterComponent` is `/crisis-center
-  The router appends these child paths to the parent path to the `CrisisCenterComponent` (`/crisis-center).
+  For example, the parent path to the `CrisisCenterComponent` is `/crisis-center`
+  The router appends these child paths to the parent path to the `CrisisCenterComponent` (`/crisis-center`).
 
-  * to navigate to the `CrisisCenterHomeComponent, the full URL is `/crisis-center` (/crisis-center` + `''` + `''`).
+  * to navigate to the `CrisisCenterHomeComponent`, the full URL is `/crisis-center` (`/crisis-center` + `''` + `''`).
 
   * to navigate to the `CrisisDetailComponent` for a crisis with `id=2`, the full URL is
-  `/crisis-center/2` (/crisis-center` + `''` + `'/2'`).
+  `/crisis-center/2` (`/crisis-center` + `''` + `'/2'`).
 
   The absolute URL for the latter example, including the origin, is
 code-example.

From 0605019c06920908b2ee617698164df547d1013a Mon Sep 17 00:00:00 2001
From: Aristeidis Bampakos <bampakoa@gmail.com>
Date: Sun, 18 Sep 2016 00:57:21 +0300
Subject: [PATCH 06/42] docs(news): Fix RC7 announcement link (#2363)

Fix RC7 announcement link
---
 public/news.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/news.jade b/public/news.jade
index 2cda4af6b4..0541debdf0 100644
--- a/public/news.jade
+++ b/public/news.jade
@@ -23,7 +23,7 @@
       .title
         a(
         target="_blank"
-        href="http://angularjs.blogspot.com/2016/08/angular-2-rc5-ngmodules-lazy-loading.html"
+        href="http://angularjs.blogspot.com/2016/09/rc7-now-available.html"
         ) RC7 Now Available
       p Today we’re happy to announce that we are shipping Angular 2.0.0-rc.7. This small release is focused on bugfixes. What's fixed? Lazy loading, RxJS, IDE Docs Integration...
       .author

From 665c346d8f6a99772066dbec54dd25a3a4cfc8b0 Mon Sep 17 00:00:00 2001
From: Mike Reid <mike@pixelchutes.com>
Date: Sat, 17 Sep 2016 15:58:54 -0600
Subject: [PATCH 07/42] docs(devguide): fix invalid JavaScript syntax in
 hero-form.component.js example (#2343)

Fix Unmatched '{' JavaScript syntax error in hero-form.component.js example
---
 public/docs/_examples/forms/js/app/hero-form.component.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/_examples/forms/js/app/hero-form.component.js b/public/docs/_examples/forms/js/app/hero-form.component.js
index 428ff82d35..505993a1fd 100644
--- a/public/docs/_examples/forms/js/app/hero-form.component.js
+++ b/public/docs/_examples/forms/js/app/hero-form.component.js
@@ -48,5 +48,5 @@
 
       // #docregion first, final
     });
-  // #enddocregion first, final
 })(window.app || (window.app = {}));
+// #enddocregion first, final

From 159b196baf8261a70d9c453d6f232a24d1ea7ce9 Mon Sep 17 00:00:00 2001
From: John Papa <johnpapa@users.noreply.github.com>
Date: Sun, 18 Sep 2016 12:34:32 -0400
Subject: [PATCH 08/42] docs(toh): fix spelling of ActivateRoute to
 ActivatedRoute (#2400)

* fixed spelling of ActivateRoute to ActivatedRoute

* dont do cache
---
 public/docs/ts/latest/tutorial/toh-pt5.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/tutorial/toh-pt5.jade b/public/docs/ts/latest/tutorial/toh-pt5.jade
index 2bab094724..1ea7702e1d 100644
--- a/public/docs/ts/latest/tutorial/toh-pt5.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt5.jade
@@ -536,7 +536,7 @@ block route-params
 block ngOnInit
   :marked
     Inside the `ngOnInit` lifecycle hook, we use the `params` observable to
-    extract the `id` parameter value from the `ActivateRoute` service
+    extract the `id` parameter value from the `ActivatedRoute` service
     and use the `HeroService` to fetch the hero with that `id`.
 
 +makeExcerpt('app/hero-detail.component.ts', 'ngOnInit')

From 40f320d7210508092dc94e9f27cbf0e1fe86c266 Mon Sep 17 00:00:00 2001
From: Maxime <maxime.robert1992@gmail.com>
Date: Sun, 18 Sep 2016 18:54:40 +0200
Subject: [PATCH 09/42] docs(testing): fix small typo (#2401)

---
 public/docs/ts/latest/guide/testing.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index 51ba85876f..3e61e0023a 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -142,7 +142,7 @@ a#setup
 
 .alert.is-helpful
   :marked
-    If youur application was based on the QuickStart repository,
+    If your application was based on the QuickStart repository,
     you can skip the rest of this section and get on with your first test.
     The QuickStart repo provides all necessary setup.
 

From a384065576c7c9e936777d60f4757fc2ae8c0ff7 Mon Sep 17 00:00:00 2001
From: Martin-Wegner <martin.wegner@ebp.de>
Date: Mon, 19 Sep 2016 13:59:00 +0200
Subject: [PATCH 10/42] docs(webpack): remove unused ts-loader (#2361)

https://github.com/angular/angular.io/commit/69ae63c4b1d525936c1e445320258b79bd64efca changed `public/docs/_examples/webpack/ts/config/webpack.common.js` and `public/docs/_examples/webpack/ts/config/webpack.test.js` and replaced `ts` with `awesome-typescript-loader`. So we can remove `"ts-loader": "^0.8.1",` from the `public/docs/_examples/webpack/ts/package.webpack.json`.
---
 public/docs/_examples/webpack/ts/package.webpack.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/docs/_examples/webpack/ts/package.webpack.json b/public/docs/_examples/webpack/ts/package.webpack.json
index 5e3630dc2a..ff8477675c 100644
--- a/public/docs/_examples/webpack/ts/package.webpack.json
+++ b/public/docs/_examples/webpack/ts/package.webpack.json
@@ -41,7 +41,6 @@
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.2",
     "style-loader": "^0.13.1",
-    "ts-loader": "^0.8.1",
     "typescript": "^2.0.2",
     "typings": "^1.3.2",
     "webpack": "^1.13.0",

From c17f8596e506ee538b1ef2abc1241dfce3acb09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Mon, 19 Sep 2016 18:38:54 +0200
Subject: [PATCH 11/42] docs(webpack): move to core-js in testing (#2404)

---
 public/docs/_examples/webpack/ts/config/karma-test-shim.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/_examples/webpack/ts/config/karma-test-shim.js b/public/docs/_examples/webpack/ts/config/karma-test-shim.js
index 973543a02a..2ea37fbd72 100644
--- a/public/docs/_examples/webpack/ts/config/karma-test-shim.js
+++ b/public/docs/_examples/webpack/ts/config/karma-test-shim.js
@@ -2,7 +2,7 @@
 Error.stackTraceLimit = Infinity;
 
 require('core-js/es6');
-require('reflect-metadata');
+require('core-js/es7/reflect');
 
 require('zone.js/dist/zone');
 require('zone.js/dist/long-stack-trace-zone');

From 45fec1c13501dcdce8c8ba20d417c72e183827fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Mon, 19 Sep 2016 18:39:53 +0200
Subject: [PATCH 12/42] docs(forms): remove deprecated forms notice for js
 (#2395)

---
 public/docs/js/latest/guide/forms.jade | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/docs/js/latest/guide/forms.jade b/public/docs/js/latest/guide/forms.jade
index 6b08f641cc..f8fb0606db 100644
--- a/public/docs/js/latest/guide/forms.jade
+++ b/public/docs/js/latest/guide/forms.jade
@@ -1,11 +1,5 @@
 include ../_util-fns
 
-.alert.is-important
-  :marked
-    This guide is using the new forms API. 
-    
-    The old forms API is deprecated, but we still maintain a separate version of the guide using the deprecated forms API <a href='/docs/js/latest/guide/forms-deprecated.html'>here</a>.
-
 :marked
   We’ve all used a form to login, submit a help request, place an order, book a flight,
   schedule a meeting and perform countless other data entry tasks.

From d07d42873ad7ec907085c86067af8f7a75f2816f Mon Sep 17 00:00:00 2001
From: Mike Reid <mike@pixelchutes.com>
Date: Mon, 19 Sep 2016 10:41:31 -0600
Subject: [PATCH 13/42] docs(devguide): add missing app.module.js source in
 Basics > Forms (#2342)

Add missing app.module.js source example in Basics > Forms dev guide
- File is missing for JavaScript, but present for TypeScript
---
 public/docs/js/latest/guide/forms.jade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/docs/js/latest/guide/forms.jade b/public/docs/js/latest/guide/forms.jade
index f8fb0606db..5efeb01199 100644
--- a/public/docs/js/latest/guide/forms.jade
+++ b/public/docs/js/latest/guide/forms.jade
@@ -636,6 +636,7 @@ figure.image-display
   `forms/js/app/hero-form.component.js,
    forms/js/app/hero-form.component.html,
    forms/js/app/hero.js,
+   forms/js/app/app.module.js,
    forms/js/app/app.component.js,
    forms/js/app/main.js,   
    forms/js/index.html,
@@ -644,6 +645,7 @@ figure.image-display
   `hero-form.component.js,
    hero-form.component.html,   
    hero.js,
+   app.module.js,
    app.component.js,
    main.js,
    index.html,

From d26007aa67f055f6b3ab4b4fb8aedd3987c1e17e Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Mon, 19 Sep 2016 15:52:41 -0700
Subject: [PATCH 14/42] docs: fix {ts,dart,js}/latest/_data.json (#2387)

* docs: fix {ts,dart,js}/latest/_data.json

Fixes #2384.
Fixes #2385.

* post-review updates

Addressing #2407.
---
 public/docs/dart/latest/_data.json | 24 ++++++++++++++++--------
 public/docs/js/latest/_data.json   | 25 ++++++++++++++++---------
 public/docs/ts/latest/_data.json   | 20 +++++++++-----------
 3 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json
index 420f3b50f8..c23053213e 100644
--- a/public/docs/dart/latest/_data.json
+++ b/public/docs/dart/latest/_data.json
@@ -4,66 +4,74 @@
     "title": "Angular Docs",
     "subtitle": "Dart",
     "menuTitle": "Docs Home",
-    "banner": "Current release is <strong>beta.21</strong>. View the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>change Log</a> to see enhancements, fixes, and breaking changes."
+    "banner": "Angular release is <b>beta.21</b>. View the <a href='https://github.com/dart-lang/angular2/blob/master/CHANGELOG.md' target='_blank'>change log</a> to see enhancements, fixes, and breaking changes."
   },
 
   "quickstart": {
     "icon": "query-builder",
-    "title": "5 Min Quickstart",
-    "description": "Get up and running with Angular 2"
+    "title": "Quickstart",
+    "subtitle": "Dart",
+    "description": "Get up and running with Angular",
+    "banner": "This QuickStart guide demonstrates how to build and run a simple Angular application."
   },
 
   "tutorial": {
     "icon": "list",
     "title": "Tutorial",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "Dart"
   },
 
   "guide": {
     "icon": "list",
     "title": "Developer Guides",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "Dart"
   },
 
   "cookbook": {
     "icon": "list",
     "title": "Cookbook",
+    "subtitle": "Dart",
     "banner": "How to solve common implementation challenges."
   },
 
   "api/": {
     "icon": "book",
-    "title": "API Preview",
+    "title": "API Reference",
+    "subtitle": "Dart",
     "reference": true
   },
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
+    "subtitle": "Dart",
     "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "reference": false
   },
 
   "glossary": {
     "title": "Glossary",
-    "intro": "Brief definitions of the most important words in the Angular 2 vocabulary",
+    "subtitle": "Dart",
+    "intro": "Brief definitions of the most important words in the Angular vocabulary",
     "reference": false
   },
 
   "resources": {
     "icon": "play-circle-fill",
     "title": "Angular Resources",
-    "banner": "Angular 2 is currently in Release Candidate.",
+    "subtitle": "Dart",
     "resources": true
   },
 
   "help": {
     "icon": "chat",
     "title": "Help & Support",
+    "subtitle": "From our team & community",
     "resources": true
   },
 
   "styleguide": {
     "title": "Docs Style Guide",
+    "subtitle": "Dart",
     "intro": "Design & Layout Patterns For Documentation"
   }
 }
diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json
index 22e6851bd4..67e96e2f7f 100644
--- a/public/docs/js/latest/_data.json
+++ b/public/docs/js/latest/_data.json
@@ -4,66 +4,73 @@
     "title": "Angular Docs",
     "subtitle": "JavaScript",
     "menuTitle": "Docs Home",
-    "banner": "Angular 2 release is <b>2.0.0</b>. View the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>change Log</a> to see enhancements, fixes, and breaking changes."
+    "banner": "Angular release is <b>2.0.0</b>. View the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>change log</a> to see enhancements, fixes, and breaking changes."
   },
 
   "quickstart": {
     "icon": "query-builder",
-    "title": "5 Min Quickstart",
-    "description": "Get up and running with Angular 2"
+    "title": "Quickstart",
+    "subtitle": "JavaScript",
+    "description": "Get up and running with Angular",
+    "banner": "This QuickStart guide demonstrates how to build and run a simple Angular application."
   },
 
   "tutorial": {
     "icon": "list",
     "title": "Tutorial",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "JavaScript"
   },
 
   "guide": {
     "icon": "list",
     "title": "Developer Guides",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "JavaScript"
   },
 
   "cookbook": {
     "icon": "list",
     "title": "Cookbook",
-    "banner": "How to solve common implementation challenges."
+    "subtitle": "JavaScript"
   },
 
   "api/": {
     "icon": "book",
-    "title": "API Preview",
+    "title": "API Reference",
+    "subtitle": "JavaScript",
     "reference": true
   },
 
   "cheatsheet": {
     "title": "Angular Cheat Sheet",
+    "subtitle": "JavaScript",
     "intro": "A quick guide to Angular syntax. (Content is provisional and may change.)",
     "reference": false
   },
 
   "glossary": {
     "title": "Glossary",
-    "intro": "Brief definitions of the most important words in the Angular 2 vocabulary",
+    "subtitle": "JavaScript",
+    "intro": "Brief definitions of the most important words in the Angular vocabulary",
     "reference": false
   },
 
   "resources": {
     "icon": "play-circle-fill",
     "title": "Angular Resources",
-    "banner": "Angular 2 is currently in Release Candidate.",
+    "subtitle": "JavaScript",
     "resources": true
   },
 
   "help": {
     "icon": "chat",
     "title": "Help & Support",
+    "subtitle": "From our team & community",
     "resources": true
   },
 
   "styleguide": {
     "title": "Docs Style Guide",
+    "subtitle": "JavaScript",
     "intro": "Design & Layout Patterns For Documentation"
   }
 }
diff --git a/public/docs/ts/latest/_data.json b/public/docs/ts/latest/_data.json
index c893f78305..93bfe769c4 100644
--- a/public/docs/ts/latest/_data.json
+++ b/public/docs/ts/latest/_data.json
@@ -4,36 +4,35 @@
     "title": "Angular Docs",
     "subtitle": "TypeScript",
     "menuTitle": "Docs Home",
-    "banner": "Angular 2 release is <b>2.0.0</b>. View the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>change Log</a> to see enhancements, fixes, and breaking changes."
+    "banner": "Angular release is <b>2.0.0</b>. View the <a href='https://github.com/angular/angular/blob/master/CHANGELOG.md' target='_blank'>change log</a> to see enhancements, fixes, and breaking changes."
   },
 
   "cli-quickstart": {
     "icon": "query-builder",
     "title": "CLI Quickstart",
     "subtitle": "TypeScript",
-    "description": "Use the CLI tool to build apps quickly in Angular 2",
+    "description": "Use the CLI tool to quickly build Angular applications",
     "hide": true
   },
 
   "quickstart": {
     "icon": "query-builder",
+    "title": "Quickstart",
     "subtitle": "TypeScript",
-    "description": "Get up and running with Angular 2",
-    "banner": "This QuickStart guide demonstrates how to build and run a simple Angular 2 application in TypeScript."
+    "description": "Get up and running with Angular",
+    "banner": "This QuickStart guide demonstrates how to build and run a simple Angular application."
   },
 
   "tutorial": {
     "icon": "list",
     "title": "Tutorial",
-    "subtitle": "TypeScript",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "TypeScript"
   },
 
   "guide": {
     "icon": "list",
     "title": "Developer Guides",
-    "subtitle": "TypeScript",
-    "banner": "Angular 2 is currently in Release Candidate."
+    "subtitle": "TypeScript"
   },
 
   "cookbook": {
@@ -45,7 +44,7 @@
 
   "api/": {
     "icon": "book",
-    "title": "API Preview",
+    "title": "API Reference",
     "subtitle": "TypeScript",
     "reference": true
   },
@@ -60,7 +59,7 @@
   "glossary": {
     "title": "Glossary",
     "subtitle": "TypeScript",
-    "intro": "Brief definitions of the most important words in the Angular 2 vocabulary",
+    "intro": "Brief definitions of the most important words in the Angular vocabulary",
     "reference": false
   },
 
@@ -68,7 +67,6 @@
     "icon": "play-circle-fill",
     "title": "Angular Resources",
     "subtitle": "TypeScript",
-    "banner": "Angular 2 is currently in Release Candidate.",
     "resources": true
   },
 

From e016f3f31eeff0e5139dd6488c4a50ff4390139c Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Mon, 19 Sep 2016 16:56:17 -0700
Subject: [PATCH 15/42] docs(tutorial): don't use shredder for intro page
 (#2388)

An initial multilang cleanup for ng2.io
---
 public/docs/dart/latest/tutorial/index.jade |  6 +-
 public/docs/ts/_cache/tutorial/index.jade   | 85 +++++++++++++++++++++
 public/docs/ts/latest/tutorial/index.jade   |  8 +-
 3 files changed, 91 insertions(+), 8 deletions(-)
 create mode 100644 public/docs/ts/_cache/tutorial/index.jade

diff --git a/public/docs/dart/latest/tutorial/index.jade b/public/docs/dart/latest/tutorial/index.jade
index f18795e25e..d586842a35 100644
--- a/public/docs/dart/latest/tutorial/index.jade
+++ b/public/docs/dart/latest/tutorial/index.jade
@@ -1,5 +1,5 @@
-include ../_util-fns
+extends ../../../ts/_cache/tutorial/index.jade
 
-+includeShared('{ts}', 'intro')
-+includeShared('{ts}', 'main')
+block includes
+  include ../_util-fns
 
diff --git a/public/docs/ts/_cache/tutorial/index.jade b/public/docs/ts/_cache/tutorial/index.jade
new file mode 100644
index 0000000000..77770baa20
--- /dev/null
+++ b/public/docs/ts/_cache/tutorial/index.jade
@@ -0,0 +1,85 @@
+block includes
+  include ../_util-fns
+
+:marked
+  # Tour of Heroes: the vision
+
+  Our grand plan is to build an app to help a staffing agency manage its stable of heroes.
+  Even heroes need to find work.
+
+  Of course we'll only make a little progress in this tutorial. What we do build will
+  have many of the features we expect to find in a full-blown, data-driven application: acquiring and displaying
+  a list of heroes, editing a selected hero's detail, and navigating among different
+  views of heroic data.
+
+  The Tour of Heroes covers the core fundamentals of Angular.
+  We’ll use built-in directives to show/hide elements and display lists of hero data.
+  We’ll create a component to display hero details and another to show an array of heroes.
+  We'll use one-way data binding for read-only data. We'll add editable fields to update a model
+  with two-way data binding. We'll bind component methods to user events like key strokes and clicks.
+  We’ll learn to select a hero from a master list and edit that hero in the details view. We'll
+  format data with pipes. We'll create a shared service to assemble our heroes. And we'll use routing to navigate among different views and their components.
+
+  We’ll learn enough core Angular to get started and gain confidence that
+  Angular can do whatever we need it to do.
+  We'll be covering a lot of ground at an introductory level but we’ll find plenty of links
+  to chapters with greater depth.
+
+  Run the <live-example name="toh-6"></live-example>.
+
+.l-main-section
+:marked
+  ## The End Game
+
+  Here's a visual idea of where we're going in this tour, beginning with the "Dashboard"
+  view and our most heroic heroes:
+
+figure.image-display
+  img(src='/resources/images/devguide/toh/heroes-dashboard-1.png' alt="Output of heroes dashboard")
+
+:marked
+  Above the dashboard are two links ("Dashboard" and "Heroes").
+  We could click them to navigate between this Dashboard and a Heroes view.
+
+  Instead we click the dashboard hero named "Magneta" and the router takes us to a "Hero Details" view
+  of that hero where we can change the hero's name.
+
+figure.image-display
+  img(src='/resources/images/devguide/toh/hero-details-1.png' alt="Details of hero in app")
+
+:marked
+  Clicking the "Back" button would return us to the "Dashboard".
+  Links at the top can take us to either of the main views.
+  We'll click "Heroes". The app takes to the "Heroes" master list view.
+
+figure.image-display
+  img(src='/resources/images/devguide/toh/heroes-list-2.png' alt="Output of heroes list app")
+
+:marked
+  We click a different hero and the readonly mini-detail beneath the list reflects our new choice.
+
+  We click the "View Details" button to drill into the
+  editable details of our selected hero.
+
+  The following diagram captures all of our navigation options.
+
+figure.image-display
+  img(src='/resources/images/devguide/toh/nav-diagram.png' alt="View navigations")
+
+:marked
+  Here's our app in action
+
+figure.image-display
+  img(src='/resources/images/devguide/toh/toh-anim.gif' alt="Tour of Heroes in Action")
+
+.l-main-section
+:marked
+  ## Up Next
+
+  We’ll build this Tour of Heroes together, step by step.
+  We'll motivate each step with a requirement that we've
+  met in countless applications. Everything has a reason.
+
+  And we’ll meet many of the core fundamentals of Angular along the way.
+
+  [Let's get started!](./toh-pt1.html)
diff --git a/public/docs/ts/latest/tutorial/index.jade b/public/docs/ts/latest/tutorial/index.jade
index 21f67233f7..77770baa20 100644
--- a/public/docs/ts/latest/tutorial/index.jade
+++ b/public/docs/ts/latest/tutorial/index.jade
@@ -1,6 +1,6 @@
-include ../_util-fns
+block includes
+  include ../_util-fns
 
-// #docregion intro
 :marked
   # Tour of Heroes: the vision
 
@@ -26,8 +26,7 @@ include ../_util-fns
   to chapters with greater depth.
 
   Run the <live-example name="toh-6"></live-example>.
-// #enddocregion intro
-// #docregion main
+
 .l-main-section
 :marked
   ## The End Game
@@ -84,4 +83,3 @@ figure.image-display
   And we’ll meet many of the core fundamentals of Angular along the way.
 
   [Let's get started!](./toh-pt1.html)
-// #enddocregion main

From 1027e3e9be70e7b327323d6c9f7ac891fa6615d5 Mon Sep 17 00:00:00 2001
From: Naomi Black <naomitraveller@gmail.com>
Date: Mon, 19 Sep 2016 17:40:50 -0700
Subject: [PATCH 16/42] about(shannon): add shannon's bio

---
 harp.json                                |   6 ++++++
 public/resources/images/bios/shannon.jpg | Bin 0 -> 18898 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 public/resources/images/bios/shannon.jpg

diff --git a/harp.json b/harp.json
index 0b50cc5308..38277fcd4a 100644
--- a/harp.json
+++ b/harp.json
@@ -316,6 +316,12 @@
         "bio": "Max Sills is Angular's Open Source lawyer.",
         "type": "Google"
       },
+      "shannon": {
+        "name": "Shannon Ayres",
+        "picture": "/resources/images/bios/shannon.jpg",
+        "bio": "Shannon is a technical editor in Developer Relations at Google. She loves movies, especially Sunset Boulevard, and her favorite TV show is The Walking Dead. Her mission: Righting wrong writing!",
+        "type": "Google"
+      },
 
       "pawel": {
         "name": "Pawel Kozlowski",
diff --git a/public/resources/images/bios/shannon.jpg b/public/resources/images/bios/shannon.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..23d98dc23d0dcb089c39b646fda08b6930b71839
GIT binary patch
literal 18898
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

literal 0
HcmV?d00001


From 7b5244ce878cfb7a8e2666882810f9373290e3ed Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Mon, 19 Sep 2016 19:57:59 -0700
Subject: [PATCH 17/42] docs(testing): more scenarios (#2396)

---
 .../docs/_examples/testing/ts/app-specs.html  |   1 +
 .../testing/ts/app/about.component.spec.ts    |  26 ++
 .../testing/ts/app/about.component.ts         |   7 +-
 .../testing/ts/app/app-routing.module.ts      |  16 +
 .../testing/ts/app/app.component.html         |   1 +
 .../testing/ts/app/app.component.spec.ts      | 157 +++++----
 .../_examples/testing/ts/app/app.component.ts |   3 +-
 .../_examples/testing/ts/app/app.module.ts    |  10 +-
 .../app/dashboard/dashboard.component.spec.ts |   2 +-
 .../ts/app/dashboard/dashboard.component.ts   |   5 +-
 .../ts/app/hero/hero-detail.component.spec.ts |   2 +-
 .../ts/app/hero/hero-detail.component.ts      |   5 +-
 .../ts/app/hero/hero-list.component.spec.ts   |   2 +-
 .../ts/app/hero/hero-list.component.ts        |   5 +-
 .../ts/app/shared/highlight.directive.spec.ts |  94 ++++--
 .../ts/app/shared/highlight.directive.ts      |  12 +-
 .../testing/ts/app/shared/styles.css          |   1 -
 .../testing/ts/testing/router-stubs.ts        |  18 +-
 public/docs/ts/latest/guide/testing.jade      | 298 +++++++++++++++---
 .../testing/highlight-directive-spec.png      | Bin 0 -> 7965 bytes
 20 files changed, 487 insertions(+), 178 deletions(-)
 create mode 100644 public/docs/_examples/testing/ts/app/about.component.spec.ts
 create mode 100644 public/docs/_examples/testing/ts/app/app-routing.module.ts
 delete mode 100644 public/docs/_examples/testing/ts/app/shared/styles.css
 create mode 100644 public/resources/images/devguide/testing/highlight-directive-spec.png

diff --git a/public/docs/_examples/testing/ts/app-specs.html b/public/docs/_examples/testing/ts/app-specs.html
index 276659e26b..c41fbf88ea 100644
--- a/public/docs/_examples/testing/ts/app-specs.html
+++ b/public/docs/_examples/testing/ts/app-specs.html
@@ -30,6 +30,7 @@
 
   <script>
     var __spec_files__ = [
+      'app/about.component.spec',
       'app/app.component.spec',
       'app/app.component.router.spec',
       'app/banner.component.spec',
diff --git a/public/docs/_examples/testing/ts/app/about.component.spec.ts b/public/docs/_examples/testing/ts/app/about.component.spec.ts
new file mode 100644
index 0000000000..dbc7361823
--- /dev/null
+++ b/public/docs/_examples/testing/ts/app/about.component.spec.ts
@@ -0,0 +1,26 @@
+import { NO_ERRORS_SCHEMA }          from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { By }                        from '@angular/platform-browser';
+
+import { AboutComponent }     from './about.component';
+import { HighlightDirective } from './shared/highlight.directive';
+
+let fixture: ComponentFixture<AboutComponent>;
+
+describe('AboutComponent (highlightDirective)', () => {
+  // #docregion tests
+  beforeEach(() => {
+    fixture = TestBed.configureTestingModule({
+      declarations: [ AboutComponent, HighlightDirective],
+      schemas:      [ NO_ERRORS_SCHEMA ]
+    })
+    .createComponent(AboutComponent);
+    fixture.detectChanges(); // initial binding
+  });
+
+  it('should have skyblue <h2>', () => {
+    const de = fixture.debugElement.query(By.css('h2'));
+    expect(de.styles['backgroundColor']).toBe('skyblue');
+  });
+  // #enddocregion tests
+});
diff --git a/public/docs/_examples/testing/ts/app/about.component.ts b/public/docs/_examples/testing/ts/app/about.component.ts
index b2690f5a93..90e7132b4c 100644
--- a/public/docs/_examples/testing/ts/app/about.component.ts
+++ b/public/docs/_examples/testing/ts/app/about.component.ts
@@ -1,12 +1,9 @@
 // #docregion
-import { Component }   from '@angular/core';
-
+import { Component } from '@angular/core';
 @Component({
   template: `
   <h2 highlight="skyblue">About</h2>
   <twain-quote></twain-quote>
-  <p>All about this sample</p>
-  `,
-  styleUrls: ['app/shared/styles.css']
+  <p>All about this sample</p>`
 })
 export class AboutComponent { }
diff --git a/public/docs/_examples/testing/ts/app/app-routing.module.ts b/public/docs/_examples/testing/ts/app/app-routing.module.ts
new file mode 100644
index 0000000000..6096a513df
--- /dev/null
+++ b/public/docs/_examples/testing/ts/app/app-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule }       from '@angular/core';
+import { RouterModule }   from '@angular/router';
+
+import { AboutComponent } from './about.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forRoot([
+      { path: '', redirectTo: 'dashboard', pathMatch: 'full'},
+      { path: 'about', component: AboutComponent },
+      { path: 'heroes', loadChildren: 'app/hero/hero.module#HeroModule'}
+    ])
+  ],
+  exports: [ RouterModule ] // re-export the module declarations
+})
+export class AppRoutingModule { };
diff --git a/public/docs/_examples/testing/ts/app/app.component.html b/public/docs/_examples/testing/ts/app/app.component.html
index 3690f3cf11..232bcebb6d 100644
--- a/public/docs/_examples/testing/ts/app/app.component.html
+++ b/public/docs/_examples/testing/ts/app/app.component.html
@@ -1,3 +1,4 @@
+<!-- #docregion -->
 <app-banner></app-banner>
 <app-welcome></app-welcome>
 
diff --git a/public/docs/_examples/testing/ts/app/app.component.spec.ts b/public/docs/_examples/testing/ts/app/app.component.spec.ts
index 388e29a73e..2f10eec6d5 100644
--- a/public/docs/_examples/testing/ts/app/app.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/app.component.spec.ts
@@ -1,108 +1,94 @@
+// #docplaster
 import { async, ComponentFixture, TestBed
 } from '@angular/core/testing';
 
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
 
-import { AppComponent }    from './app.component';
-import { BannerComponent } from './banner.component';
-import { SharedModule }    from './shared/shared.module';
+  // #docregion setup-schemas
+  import { NO_ERRORS_SCHEMA }          from '@angular/core';
+  // #enddocregion setup-schemas
+  // #docregion setup-stubs-w-imports
+  import { Component }                 from '@angular/core';
+  // #docregion setup-schemas
+  import { AppComponent }              from './app.component';
+  // #enddocregion setup-schemas
+  import { BannerComponent }           from './banner.component';
+  import { RouterLinkStubDirective }   from '../testing';
+  // #docregion setup-schemas
+  import { RouterOutletStubComponent } from '../testing';
 
-import { Router, RouterStub, RouterLinkDirectiveStub, RouterOutletStubComponent
-} from '../testing';
+  // #enddocregion setup-schemas
+  @Component({selector: 'app-welcome', template: ''})
+  class WelcomeStubComponent {}
 
+  // #enddocregion setup-stubs-w-imports
 
 let comp:    AppComponent;
 let fixture: ComponentFixture<AppComponent>;
 
 describe('AppComponent & TestModule', () => {
+  // #docregion setup-stubs, setup-stubs-w-imports
   beforeEach( async(() => {
     TestBed.configureTestingModule({
       declarations: [
-        AppComponent, BannerComponent,
-        RouterLinkDirectiveStub, RouterOutletStubComponent
-      ],
-      providers: [{ provide: Router, useClass: RouterStub }],
-      schemas:   [NO_ERRORS_SCHEMA]
+        AppComponent,
+        BannerComponent, WelcomeStubComponent,
+        RouterLinkStubDirective, RouterOutletStubComponent
+      ]
     })
 
     .compileComponents()
-
     .then(() => {
       fixture = TestBed.createComponent(AppComponent);
       comp    = fixture.componentInstance;
     });
-
   }));
-
+  // #enddocregion setup-stubs, setup-stubs-w-imports
   tests();
 });
 
-function tests() {
+//////// Testing w/ NO_ERRORS_SCHEMA //////
+describe('AppComponent & NO_ERRORS_SCHEMA', () => {
+  // #docregion setup-schemas
+  beforeEach( async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AppComponent, RouterLinkStubDirective ],
+      schemas:      [ NO_ERRORS_SCHEMA ]
+    })
 
-  it('can instantiate it', () => {
-    expect(comp).not.toBeNull();
-  });
-
-  it('can get RouterLinks from template', () => {
-    fixture.detectChanges();
-
-    const links = fixture.debugElement
-      // find all elements with an attached FakeRouterLink directive
-      .queryAll(By.directive(RouterLinkDirectiveStub))
-      // use injector to get the RouterLink directive instance attached to each element
-      .map(de => de.injector.get(RouterLinkDirectiveStub) as RouterLinkDirectiveStub);
-
-    expect(links.length).toBe(3, 'should have 3 links');
-    expect(links[0].linkParams).toBe('/dashboard', '1st link should go to Dashboard');
-    expect(links[1].linkParams).toBe('/heroes', '1st link should go to Heroes');
-  });
-
-  it('can click Heroes link in template', () => {
-    fixture.detectChanges();
-
-    // Heroes RouterLink DebugElement
-    const heroesLinkDe = fixture.debugElement
-      .queryAll(By.directive(RouterLinkDirectiveStub))[1];
-
-    expect(heroesLinkDe).toBeDefined('should have a 2nd RouterLink');
-
-    const link = heroesLinkDe.injector.get(RouterLinkDirectiveStub) as RouterLinkDirectiveStub;
-
-    expect(link.navigatedTo).toBeNull('link should not have navigate yet');
-
-    heroesLinkDe.triggerEventHandler('click', null);
-
-    fixture.detectChanges();
-    expect(link.navigatedTo).toBe('/heroes');
-  });
-}
+    .compileComponents()
+    .then(() => {
+      fixture = TestBed.createComponent(AppComponent);
+      comp    = fixture.componentInstance;
+    });
+  }));
+  // #enddocregion setup-schemas
+  tests();
+});
 
 //////// Testing w/ real root module //////
-// Best to avoid
 // Tricky because we are disabling the router and its configuration
+// Better to use RouterTestingModule
 import { AppModule }    from './app.module';
+import { AppRoutingModule } from './app-routing.module';
 
 describe('AppComponent & AppModule', () => {
 
   beforeEach( async(() => {
 
     TestBed.configureTestingModule({
-      imports:      [ AppModule ],
+      imports: [ AppModule ]
     })
 
+    // Get rid of app's Router configuration otherwise many failures.
+    // Doing so removes Router declarations; add the Router stubs
     .overrideModule(AppModule, {
-      // Must get rid of `RouterModule.forRoot` to prevent attempt to configure a router
-      // Can't remove it because it doesn't have a known type (`forRoot` returns an object)
-      // therefore, must reset the entire `imports` with just the necessary stuff
-      set: { imports: [ SharedModule ]}
-    })
-
-    // Separate override because cannot both `set` and `add/remove` in same override
-    .overrideModule(AppModule, {
+      remove: {
+        imports: [ AppRoutingModule ]
+      },
       add: {
-        declarations: [ RouterLinkDirectiveStub, RouterOutletStubComponent ],
-        providers:    [{ provide: Router, useClass: RouterStub }]
+        declarations: [ RouterLinkStubDirective, RouterOutletStubComponent ]
       }
     })
 
@@ -117,3 +103,46 @@ describe('AppComponent & AppModule', () => {
   tests();
 });
 
+function tests() {
+  let links: RouterLinkStubDirective[];
+  let linkDes: DebugElement[];
+
+  // #docregion test-setup
+  beforeEach(() => {
+    // trigger initial data binding
+    fixture.detectChanges();
+
+    // find DebugElements with an attached RouterLinkStubDirective
+    linkDes = fixture.debugElement
+      .queryAll(By.directive(RouterLinkStubDirective));
+
+    // get the attached link directive instances using the DebugElement injectors
+    links = linkDes
+      .map(de => de.injector.get(RouterLinkStubDirective) as RouterLinkStubDirective);
+  });
+  // #enddocregion test-setup
+
+  it('can instantiate it', () => {
+    expect(comp).not.toBeNull();
+  });
+
+  // #docregion tests
+  it('can get RouterLinks from template', () => {
+    expect(links.length).toBe(3, 'should have 3 links');
+    expect(links[0].linkParams).toBe('/dashboard', '1st link should go to Dashboard');
+    expect(links[1].linkParams).toBe('/heroes', '1st link should go to Heroes');
+  });
+
+  it('can click Heroes link in template', () => {
+    const heroesLinkDe = linkDes[1];
+    const heroesLink = links[1];
+
+    expect(heroesLink.navigatedTo).toBeNull('link should not have navigated yet');
+
+    heroesLinkDe.triggerEventHandler('click', null);
+    fixture.detectChanges();
+
+    expect(heroesLink.navigatedTo).toBe('/heroes');
+  });
+  // #docregion tests
+}
diff --git a/public/docs/_examples/testing/ts/app/app.component.ts b/public/docs/_examples/testing/ts/app/app.component.ts
index 156feee06d..9b785144ab 100644
--- a/public/docs/_examples/testing/ts/app/app.component.ts
+++ b/public/docs/_examples/testing/ts/app/app.component.ts
@@ -1,6 +1,5 @@
 // #docregion
-import { Component }   from '@angular/core';
-
+import { Component } from '@angular/core';
 @Component({
   selector: 'my-app',
   templateUrl: 'app/app.component.html'
diff --git a/public/docs/_examples/testing/ts/app/app.module.ts b/public/docs/_examples/testing/ts/app/app.module.ts
index adea748781..d3c288ad11 100644
--- a/public/docs/_examples/testing/ts/app/app.module.ts
+++ b/public/docs/_examples/testing/ts/app/app.module.ts
@@ -1,9 +1,9 @@
 import { NgModule }         from '@angular/core';
 import { BrowserModule }    from '@angular/platform-browser';
-import { RouterModule }     from '@angular/router';
-
 
 import { AppComponent }     from './app.component';
+import { AppRoutingModule } from './app-routing.module';
+
 import { AboutComponent }   from './about.component';
 import { BannerComponent }  from './banner.component';
 import { HeroService,
@@ -19,11 +19,7 @@ import { SharedModule }     from './shared/shared.module';
   imports: [
     BrowserModule,
     DashboardModule,
-    RouterModule.forRoot([
-      { path: '', redirectTo: 'dashboard', pathMatch: 'full'},
-      { path: 'about', component: AboutComponent },
-      { path: 'heroes', loadChildren: 'app/hero/hero.module#HeroModule'}
-    ]),
+    AppRoutingModule,
     SharedModule
   ],
   providers:    [ HeroService, TwainService, UserService ],
diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
index 7159bb820b..f783899143 100644
--- a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
@@ -14,7 +14,7 @@ import { DashboardModule }    from './dashboard.module';
 
 // #docregion router-stub
 class RouterStub {
-  navigateByUrl(url: string) { return url;  }
+  navigateByUrl(url: string) { return url; }
 }
 // #enddocregion router-stub
 
diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.ts
index 7c7f4cc077..bc2b707906 100644
--- a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.ts
+++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.ts
@@ -7,10 +7,7 @@ import { Hero, HeroService } from '../model';
 @Component({
   selector: 'app-dashboard',
   templateUrl: 'app/dashboard/dashboard.component.html',
-  styleUrls:  [
-    'app/shared/styles.css',
-    'app/dashboard/dashboard.component.css'
-  ]
+  styleUrls:  ['app/dashboard/dashboard.component.css']
 })
 export class DashboardComponent implements OnInit {
 
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
index 6c914a5011..272d69f579 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
@@ -187,7 +187,7 @@ class Page {
     const router       = compInjector.get(Router);
     this.gotoSpy       = spyOn(comp, 'gotoList').and.callThrough();
     this.saveSpy       = spyOn(hds, 'saveHero').and.callThrough();
-    this.navSpy        = spyOn(router, 'navigate').and.callThrough();
+    this.navSpy        = spyOn(router, 'navigate');
   }
 
   /** Add page elements after hero arrives */
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
index 3b5555c481..1cbf5389b9 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
@@ -8,10 +8,7 @@ import { HeroDetailService } from './hero-detail.service';
 @Component({
   selector: 'app-hero-detail',
   templateUrl: 'app/hero/hero-detail.component.html',
-  styleUrls:   [
-    'app/shared/styles.css',
-    'app/hero/hero-detail.component.css'
-  ],
+  styleUrls:  ['app/hero/hero-detail.component.css'],
   providers:  [ HeroDetailService ]
 })
 export class HeroDetailComponent implements OnInit {
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
index ea08cd499c..dbf9d37d71 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-list.component.spec.ts
@@ -132,7 +132,7 @@ class Page {
 
     // Get the component's injected router and spy on it
     const router = fixture.debugElement.injector.get(Router);
-    this.navSpy = spyOn(router, 'navigate').and.callThrough();
+    this.navSpy = spyOn(router, 'navigate');
   };
 }
 
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-list.component.ts b/public/docs/_examples/testing/ts/app/hero/hero-list.component.ts
index d4ad30b019..625c402581 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-list.component.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-list.component.ts
@@ -6,10 +6,7 @@ import { Hero, HeroService } from '../model';
 @Component({
   selector: 'app-heroes',
   templateUrl: 'app/hero/hero-list.component.html',
-  styleUrls:   [
-    'app/shared/styles.css',
-    'app/hero/hero-list.component.css'
-  ]
+  styleUrls:  ['app/hero/hero-list.component.css']
 })
 export class HeroListComponent implements OnInit {
   heroes: Promise<Hero[]>;
diff --git a/public/docs/_examples/testing/ts/app/shared/highlight.directive.spec.ts b/public/docs/_examples/testing/ts/app/shared/highlight.directive.spec.ts
index c5f13934b9..6c219ab808 100644
--- a/public/docs/_examples/testing/ts/app/shared/highlight.directive.spec.ts
+++ b/public/docs/_examples/testing/ts/app/shared/highlight.directive.spec.ts
@@ -1,58 +1,100 @@
 import { Component, DebugElement }   from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { By }                        from '@angular/platform-browser';
+import { By } from '@angular/platform-browser';
 
-import { HighlightDirective }        from './highlight.directive';
+import { HighlightDirective } from './highlight.directive';
+import { newEvent }           from '../../testing';
 
-// Component to test directive
+// #docregion test-component
 @Component({
   template: `
   <h2 highlight="yellow">Something Yellow</h2>
-  <h2 highlight>Something Gray</h2>
-  <h2>Something White</h2>
-  `
-
+  <h2 highlight>The Default (Gray)</h2>
+  <h2>No Highlight</h2>
+  <input #box [highlight]="box.value" value="cyan"/>`
 })
 class TestComponent { }
+// #enddocregion test-component
 
-////// Tests //////////
 describe('HighlightDirective', () => {
 
   let fixture: ComponentFixture<TestComponent>;
-  let h2Des: DebugElement[];
+  let des: DebugElement[];  // the three elements w/ the directive
+  let bareH2: DebugElement; // the <h2> w/o the directive
 
+  // #docregion selected-tests
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
       declarations: [ HighlightDirective, TestComponent ]
     })
     .createComponent(TestComponent);
 
-    h2Des = fixture.debugElement.queryAll(By.css('h2'));
+    fixture.detectChanges(); // initial binding
+
+    // all elements with an attached HighlightDirective
+    des = fixture.debugElement.queryAll(By.directive(HighlightDirective));
+
+    // the h2 without the HighlightDirective
+    bareH2 = fixture.debugElement.query(By.css('h2:not([highlight])'));
   });
 
-  it('should have `HighlightDirective`', () => {
-    // The HighlightDirective listed in <h2> tokens means it is attached
-    expect(h2Des[0].providerTokens).toContain(HighlightDirective, 'HighlightDirective');
+  // color tests
+  it('should have three highlighted elements', () => {
+    expect(des.length).toBe(3);
   });
 
-  it('should color first <h2> background "yellow"', () => {
-    fixture.detectChanges();
-    const h2 = h2Des[0].nativeElement as HTMLElement;
-    expect(h2.style.backgroundColor).toBe('yellow');
+  it('should color 1st <h2> background "yellow"', () => {
+    expect(des[0].styles['backgroundColor']).toBe('yellow');
   });
 
-  it('should color second <h2> background w/ default color', () => {
-    fixture.detectChanges();
-    const h2 = h2Des[1].nativeElement as HTMLElement;
-    expect(h2.style.backgroundColor).toBe(HighlightDirective.defaultColor);
+  it('should color 2nd <h2> background w/ default color', () => {
+    const dir = des[1].injector.get(HighlightDirective) as HighlightDirective;
+    expect(des[1].styles['backgroundColor']).toBe(dir.defaultColor);
   });
 
-  it('should NOT color third <h2> (no directive)', () => {
-    // no directive
-    expect(h2Des[2].providerTokens).not.toContain(HighlightDirective, 'HighlightDirective');
+  it('should bind <input> background to value color', () => {
+    // easier to work with nativeElement
+    const input = des[2].nativeElement as HTMLInputElement;
+    expect(input.style.backgroundColor).toBe('cyan', 'initial backgroundColor');
+
+    // dispatch a DOM event so that Angular responds to the input value change.
+    input.value = 'green';
+    input.dispatchEvent(newEvent('input'));
     fixture.detectChanges();
 
-    const h2 = h2Des[2].nativeElement as HTMLElement;
-    expect(h2.style.backgroundColor).toBe('', 'backgroundColor');
+    expect(input.style.backgroundColor).toBe('green', 'changed backgroundColor');
+  });
+
+  // customProperty tests
+  it('all highlighted elements should have a true customProperty', () => {
+    const allTrue = des.map(de => !!de.properties['customProperty']).every(v => v === true);
+    expect(allTrue).toBe(true);
+  });
+
+  it('bare <h2> should not have a customProperty', () => {
+    expect(bareH2.properties['customProperty']).toBeUndefined();
+  });
+  // #enddocregion selected-tests
+
+  // injected directive
+  // attached HighlightDirective can be injected
+  it('can inject `HighlightDirective` in 1st <h2>', () => {
+    const dir = des[0].injector.get(HighlightDirective);
+    expect(dir).toBeTruthy();
+  });
+
+  it('cannot inject `HighlightDirective` in 3rd <h2>', () => {
+    const dir = bareH2.injector.get(HighlightDirective, null);
+    expect(dir).toBe(null);
+  });
+
+  // DebugElement.providerTokens
+  // attached HighlightDirective should be listed in the providerTokens
+  it('should have `HighlightDirective` in 1st <h2> providerTokens', () => {
+    expect(des[0].providerTokens).toContain(HighlightDirective);
+  });
+
+  it('should not have `HighlightDirective` in 3rd <h2> providerTokens', () => {
+    expect(bareH2.providerTokens).not.toContain(HighlightDirective);
   });
 });
diff --git a/public/docs/_examples/testing/ts/app/shared/highlight.directive.ts b/public/docs/_examples/testing/ts/app/shared/highlight.directive.ts
index 9c091b3638..4a45c8d5aa 100644
--- a/public/docs/_examples/testing/ts/app/shared/highlight.directive.ts
+++ b/public/docs/_examples/testing/ts/app/shared/highlight.directive.ts
@@ -1,13 +1,12 @@
+// #docregion
 import { Directive, ElementRef, Input, OnChanges, Renderer } from '@angular/core';
 
 @Directive({ selector: '[highlight]' })
-/**
- * Set backgroundColor for the attached element ton highlight color and
- * set element `customProperty` = true
- */
+/** Set backgroundColor for the attached element to highlight color
+ *  and set the element's customProperty to true */
 export class HighlightDirective implements OnChanges {
 
-  static defaultColor =  'rgb(211, 211, 211)'; // lightgray
+  defaultColor =  'rgb(211, 211, 211)'; // lightgray
 
   @Input('highlight') bgColor: string;
 
@@ -18,7 +17,6 @@ export class HighlightDirective implements OnChanges {
   ngOnChanges() {
     this.renderer.setElementStyle(
       this.el.nativeElement, 'backgroundColor',
-      this.bgColor || HighlightDirective.defaultColor );
+      this.bgColor || this.defaultColor );
   }
 }
-
diff --git a/public/docs/_examples/testing/ts/app/shared/styles.css b/public/docs/_examples/testing/ts/app/shared/styles.css
deleted file mode 100644
index b26317fa5e..0000000000
--- a/public/docs/_examples/testing/ts/app/shared/styles.css
+++ /dev/null
@@ -1 +0,0 @@
-/* MISSING */
diff --git a/public/docs/_examples/testing/ts/testing/router-stubs.ts b/public/docs/_examples/testing/ts/testing/router-stubs.ts
index 83a84fcb3a..75a2858f65 100644
--- a/public/docs/_examples/testing/ts/testing/router-stubs.ts
+++ b/public/docs/_examples/testing/ts/testing/router-stubs.ts
@@ -4,19 +4,14 @@ export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router
 import { Component, Directive, Injectable, Input } from '@angular/core';
 import { NavigationExtras } from '@angular/router';
 
+// #docregion router-link
 @Directive({
   selector: '[routerLink]',
   host: {
-    '(click)': 'onClick()',
-    '[attr.href]': 'href',
-    '[class.router-link-active]': 'isRouteActive'
+    '(click)': 'onClick()'
   }
 })
-export class RouterLinkDirectiveStub {
-
-  isRouteActive = false;
-  href: string; // the url displayed on the anchor element.
-
+export class RouterLinkStubDirective {
   @Input('routerLink') linkParams: any;
   navigatedTo: any = null;
 
@@ -24,17 +19,14 @@ export class RouterLinkDirectiveStub {
     this.navigatedTo = this.linkParams;
   }
 }
+// #enddocregion router-link
 
 @Component({selector: 'router-outlet', template: ''})
 export class RouterOutletStubComponent { }
 
 @Injectable()
 export class RouterStub {
-  lastCommand: any[];
-  navigate(commands: any[], extras?: NavigationExtras) {
-    this.lastCommand = commands;
-    return commands;
-  }
+  navigate(commands: any[], extras?: NavigationExtras) { }
 }
 
 
diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index 3e61e0023a..0014c5e3fa 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -13,25 +13,63 @@ block includes
 
 a#top
 :marked
-  # Contents
-
-  * [Introduction to Angular Testing](#testing-101)
-  * [Setup](#setup)
-  * [The first karma test](#1st-karma-test)
-  * [The Angular Testing Platform (ATP) ](#atp-intro)
-  * [The sample application and its tests](#sample-app)
-  * [A simple component test](#simple-component-test)
-  * [Test a component with a service dependency](#component-with-dependency)
-  * [Test a component with an async service](#component-with-async-service)
-  * [Test a component with an external template](#component-with-external-template)
-  * [Test a component with inputs and outputs](#component-with-inputs-output)
-  * [Test a component inside a test host component](#component-inside-test-host)
-  * [Test a routed component](#routed-component)
-  * [Test a routed component with parameters](#routed-component-w-param)
-  * [Use a _page_ object to simplify setup](#page-object)
-  * [Isolated tests](#testing-without-atp "Testing without the Angular Testing Platform")
-  * [_TestBed_ API](#atp-api)
-  * [FAQ](#faq "Frequently asked questions")
+  # Table of Contents
+  1. [Introduction to Angular Testing](#testing-intro)
+  <br><br>
+  1. [Setup](#setup)
+    - [setup files](#setup-files): `karma.conf`, `karma-test-shim`, `systemjs.config`
+    - [npm packages](#npm-packages)
+  1. [The first karma test](#1st-karma-test)
+  <br><br>
+  1. [The Angular Testing Platform (ATP) ](#atp-intro)
+  <br><br>
+  1. [The sample application and its tests](#sample-app)
+  <br><br>
+  1. [A simple component test](#simple-component-test)
+    - [_configureTestingModule_](#configure-testing-module)
+    - [_createComponent_](#create-component)
+    - [_detectChanges_](#detect-changes)
+    - [_autoDetectChanges_](#auto-detect-changes)
+  1. [Test a component with a service dependency](#component-with-dependency)
+  <br><br>
+  1. [Test a component with an async service](#component-with-async-service)
+    - [spies](#service-spy)
+    - [_async_](#async)
+    - [_whenStable_](#when-stable)
+    - [_fakeAsync_](#async)
+    - [_tick_](#tick)
+    - [_jasmine.done_](#jasmine-done)
+  1. [Test a component with an external template](#component-with-external-template)
+    - [_async_](#async-in-before-each) in `beforeEach`
+    - [_compileComponents_](#compile-components)
+  1. [Test a component with inputs and outputs](#component-with-inputs-output)
+  <br><br>
+  1. [Test a component inside a test host component](#component-inside-test-host)
+  <br><br>
+  1. [Test a routed component](#routed-component)
+    - [_inject_](#inject)
+  1. [Test a routed component with parameters](#routed-component-w-param)
+    - [_Observable_ test double](#stub-observable)
+  1. [Use a _page_ object to simplify setup](#page-object)
+  <br><br>
+  1. [Test a _RouterOutlet_ component](#router-outlet-component)
+    - [stubbing unneeded components](#stub-component)
+    - [Stubbing the _RouterLink_](#router-link-stub)
+    - [_By.directive_ and injected directives](#by-directive)
+  1. ["Shallow" component tests with  *NO\_ERRORS\_SCHEMA*](#shallow-component-test)
+  <br><br>
+  1. [Test an attribute directive](#attribute-directive)
+  <br><br>  
+  1. [Isolated tests](#testing-without-atp "Testing without the Angular Testing Platform")
+    - [Services](#isolated-service-tests)
+    - [Pipes](#isolated-pipe-tests)
+    - [Components](#isolated-component-tests)
+  1. [_Angular Testing Platform_ API](#atp-api)
+    - [Stand-alone functions](#atp-api): `async`, `fakeAsync`, etc.
+    - [_TestBed_](#testbed-class-summary)
+    - [_ComponentFixture_](#component-fixture-class-summary)
+    - [_DebugElement_](#debug-element-details)
+  1. [FAQ](#faq "Frequently asked questions")
 :marked
   It’s a big agenda. Fortunately, you can learn a little bit at a time and put each lesson to use.
 
@@ -45,7 +83,7 @@ a#top
 a(href="#top").to-top Back to top
 
 .l-hr
-a#testing-101
+a#testing-intro
 :marked
   # Introduction to Angular Testing
 
@@ -146,7 +184,9 @@ a#setup
     you can skip the rest of this section and get on with your first test.
     The QuickStart repo provides all necessary setup.
 
+a#setup-files
 :marked
+  ### Setup files
   Here's brief description of the setup files.
  
 table(width="100%")
@@ -424,7 +464,6 @@ a#simple-component-test
 :marked
   # Test a component
 
-:marked
   The top of the screen displays application title, presented by the `BannerComponent` in `app/banner.component.ts`.
 +makeExample('testing/ts/app/banner.component.ts', '', 'app/banner.component.ts')(format='.')
 :marked
@@ -436,9 +475,11 @@ a#simple-component-test
 
   Start with ES6 import statements to get access to symbols referenced in the spec.
 +makeExample('testing/ts/app/banner.component.spec.ts', 'imports', 'app/banner.component.spec.ts (imports)')(format='.')
+
+a#configure-testing-module
 :marked
   Here's the setup for the tests followed by observations about the `beforeEach`:
-+makeExample('testing/ts/app/banner.component.spec.ts', 'setup', 'app/banner.component.spec.ts (imports)')(format='.')
++makeExample('testing/ts/app/banner.component.spec.ts', 'setup', 'app/banner.component.spec.ts (setup)')(format='.')
 :marked
   `TestBed.configureTestingModule` takes an `@NgModule`-like metadata object.
   This one simply declares the component to test, `BannerComponent`.
@@ -451,6 +492,8 @@ a#simple-component-test
   But that would lead to tons more configuration in order to support the other components within `AppModule` 
   that have nothing to do with `BannerComponent`.
 
+a#create-component
+:marked
   `TestBed.createComponent` creates an instance of `BannerComponent` to test.
   The method returns a `ComponentFixture`, a handle on the test environment surrounding the created component.
   The fixture provides access to the component instance itself and 
@@ -458,7 +501,6 @@ a#simple-component-test
 
   Query the `DebugElement` by CSS selector for the `<h1>` sub-element that holds the actual title.
 
-
   ### _createComponent_ closes configuration
   `TestBed.createComponent` closes the current `TestBed` instance to further configuration.
     You cannot call any more `TestBed` configuration methods, not `configureTestModule` 
@@ -474,7 +516,7 @@ a#simple-component-test
 :markdown
   These tests ask the `DebugElement` for the native HTML element to satisfy their expectations.
 
-a#fixture-detect-changes
+a#detect-changes
 :marked
   ### _detectChanges_: Angular change detection under test
 
@@ -498,7 +540,7 @@ a#fixture-detect-changes
   It gives the tester an opportunity to investigate the state of
   the component _before Angular initiates data binding or calls lifecycle hooks_.
 
-a#automatic-change-detection
+a#auto-detect-changes
 :marked
   ### Automatic change detection
   Some testers prefer that the Angular test environment run change detection automatically.
@@ -805,7 +847,7 @@ a#component-with-external-template
   The `app/dashboard/dashboard-hero.component.spec.ts` demonstrates the pre-compilation process:
 +makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'compile-components', 'app/dashboard/dashboard-hero.component.spec.ts (compileComponents)')(format='.')
 
-a#async-fn-in-before-each
+a#async-in-before-each
 :marked
   ## The _async_ function in _beforeEach_
 
@@ -992,7 +1034,7 @@ a#routed-component
   Stubbing the router with a test implementation is an easy option. This should do the trick:
 +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'router-stub', 'app/dashboard/dashboard.component.spec.ts (Router Stub)')(format='.')
 :marked
-  Now we setup the testing module with test stubs for the `Router` and `HeroService` and 
+  Now we setup the testing module with the test stubs for the `Router` and `HeroService` and 
   create a test instance of the `DashbaordComponent` for subsequent testing.
 +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'compile-and-create-body', 'app/dashboard/dashboard.component.spec.ts (compile and create)')(format='.')
 :marked
@@ -1169,10 +1211,187 @@ figure.image-display
   Here are a few more `HeroDetailComponent` tests to drive the point home.
 +makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'selected-tests', 'app/hero/hero-detail.component.spec.ts (selected tests)')(format='.')
 :marked
+a(href="#top").to-top Back to top
+.l-hr
+
+a#router-outlet-component
+:marked
+  # Test a _RouterOutlet_ component
+
+  The `AppComponent` displays routed components in a `<router-outlet>`.
+  It also displays a navigation bar with anchors and their `RouterLink` directives.
+a#app-component-html
++makeExample('testing/ts/app/app.component.html', '', 'app/app.component.html')(format='.')
+:marked
+  The component class does nothing.
++makeExample('testing/ts/app/app.component.ts', '', 'app/app.component.ts')(format='.')
+.l-sub-section
+  :marked
+    This component may not seem worth testing but it's instructive to show how to test it.
+:marked
+  Unit tests can confirm that the anchors are wired properly without engaging the router.
+
+a#stub-component
+:marked
+  ### Stubbing unneeded components
+
+  The test setup should look familiar
++makeExample('testing/ts/app/app.component.spec.ts', 'setup-stubs', 'app/app.component.spec.ts (Stub Setup)')(format='.')
+:marked
+  The `AppComponent` is the declared test subject 
+  The setup extends the default testing module with one real component (`BannerComponent`) and several stubs.
+
+  * `BannerComponent` is simple and harmless to use as is.
+
+  * The real `WelcomeComponent` has an injected service. `WelcomeStubComponent` is a placeholder with no service to worry about.
+
+  * The real `RouterOutlet` is complex and errors easily. 
+  The `RouterOutletStubComponent` (in `testing/router-stubs.ts`) is safely inert.
+  
+  The component stubs are essential. 
+  Without them, the Angular compiler doesn't recognize the `<app-welcome>` and `<router-outlet>` tags 
+  and throws an error. 
+a#router-link-stub
+:marked
+  ### Stubbing the _RouterLink_
+
+  The `RouterLinkStubDirective` contributes substantively to the test
++makeExample('testing/ts/testing/router-stubs.ts', 'router-link', 'testing/router-stubs.ts (RouterLinkStubDirective)')(format='.')
+:marked
+  The `host` metadata property wires the click event of the host element (the `<a>`) to the directive's `onClick` method.
+  The URL bound to the `[routerLink]` attribute flows to the directive's `linkParams` property. 
+  Clicking the anchor should trigger the `onClick` method which sets the telltale `navigatedTo` property.
+  Tests can inspect that property to confirm the expected _click-to-navigation_ behavior.
+
+a#by-directive
+a#inject-directive
+:marked
+  ### _By.directive_ and injected directives
+
+  A little more setup triggers the initial data binding and gets references to the navigation links:
++makeExample('testing/ts/app/app.component.spec.ts', 'test-setup', 'app/app.component.spec.ts (test setup)')(format='.')
+:marked
+  Two points of special interest:
+
+  1. You can locate elements _by directive_, using `By.directive`, not just by css selectors.
+
+  1. You can use the component's dependency injector to get an attached directive because 
+  Angular always adds attached directives to the component's injector.
+
+a#app-component-tests
+:marked
+  Here are some tests that leverage this setup:
++makeExample('testing/ts/app/app.component.spec.ts', 'tests', 'app/app.component.spec.ts (selected tests)')(format='.')
+.l-sub-section
+  :marked
+    The "click" test _in this example_ is worthless.
+    It works hard to appear useful when in fact it 
+    tests the `RouterLinkStubDirective` rather than the _component_.
+    This is a common failing of directive stubs.
+    
+    It has a legitimate purpose in this chapter. 
+    It demonstrates how to find a `RouterLink` element, click it, and inspect a result,
+    without engaging the full router machinery.
+    This is a skill you may need to test a more sophisticated component, one that changes the display,
+    re-calculates parameters, or re-arranges navigation options when the user clicks the link.
 
 a(href="#top").to-top Back to top
 .l-hr
 
+a#shallow-component-test
+:marked
+  # "Shallow component tests" with *NO\_ERRORS\_SCHEMA*
+
+  The [previous setup](#stub-component) declared the `BannerComponent` and stubbed two other components 
+  for _no reason other than to avoid a compiler error_.
+  
+  Without them, the Angular compiler doesn't recognize the `<app-banner>`, `<app-welcome>` and `<router-outlet>` tags 
+  in the [_app.component.html_](#app-component-html) template and throws an error. 
+
+  Add `NO_ERRORS_SCHEMA` to the testing module's `schemas` metadata
+  to tell the compiler to ignore unrecognized elements and attributes.
+  You no longer have to declare irrelevant components and directives.
+  
+  These tests are ***shallow*** because they only "go deep" into the components you want to test.
+  Here is a setup (with `import` statements) that demonstrates the improved simplicity of _shallow_ tests, relative to the stubbing setup.
++makeTabs('testing/ts/app/app.component.spec.ts, testing/ts/app/app.component.spec.ts', 
+  'setup-schemas, setup-stubs-w-imports', 
+  'app/app.component.spec.ts (NO_ERRORS_SCHEMA), app/app.component.spec.ts (Stubs)')(format='.')
+:marked
+  The _only_ declarations are the _component-under-test_ (`AppComponent`) and the `RouterLinkStubDirective` 
+  that contributes actively to the tests.
+  The [tests in this example](#app-component-tests) are unchanged.
+
+.alert.is-important
+  :marked
+    _Shallow component tests_ with `NO_ERRORS_SCHEMA` greatly simplify unit testing of complex templates.
+    However, the compiler no longer alerts you to mistakes 
+    such as misspelled or misused components and directives.
+
+a(href="#top").to-top Back to top
+
+.l-hr
+
+a#attribute-directive
+:marked
+  # Test an attribute directive
+
+  An _attribute directive_ modifies the behavior of an element, component or another directive.
+  Its name reflects the way the directive is applied: as an attribute on a host element.
+
+  The sample application's `HighlightDirective` sets the background color of an element
+  based on either a data bound color or a default color (lightgray).
+  It also sets a custom property of the element (`customProperty`) to `true` 
+  for no reason other than to show that it can.
++makeExample('testing/ts/app/shared/highlight.directive.ts', '', 'app/shared/highlight.directive.ts')(format='.')
+:marked
+  It's used throughout the application, perhaps most simply in the `AboutComponent`:
++makeExample('testing/ts/app/about.component.ts', '', 'app/about.component.ts')(format='.')
+:marked
+  Testing the specific use of the `HighlightDirective` within the `AboutComponent` requires only the
+  techniques explored above (in particular the ["Shallow test"](#shallow-component-test) approach).
++makeExample('testing/ts/app/about.component.spec.ts', 'tests', 'app/about.component.spec.ts')(format='.')
+:marked
+  However, testing a single use case is unlikely to explore the full range of a directive's capabilities.
+  Finding and testing all components that use the directive is tedious, brittle, and almost as unlikely to afford full coverage.
+
+  [Isolated unit tests](#isolated-tests) might be helpful. 
+  But attribute directives like this one tend to manipulate the DOM. 
+  Isolated tests don't and therefore don't inspire confidence in the directive's efficacy.
+
+  A better solution is to create an artificial test component that demonstrates all ways to apply the directive.
++makeExample('testing/ts/app/shared/highlight.directive.spec.ts', 'test-component', 'app/shared/highlight.directive.spec.ts (test component)')(format='.')
+figure.image-display
+  img(src='/resources/images/devguide/testing/highlight-directive-spec.png' width="200px" alt="HighlightDirective spec in action")
+.l-sub-section
+  :marked
+    The `<input>` case binds the `HighlightDirective` to the name of a color value in the input box.
+    The initial value is the word "cyan" which should be the background color of the input box.
+:marked
+  Here are some tests of this component:
++makeExample('testing/ts/app/shared/highlight.directive.spec.ts', 'selected-tests', 'app/shared/highlight.directive.spec.ts (selected tests)')
+:marked
+  A few techniques are noteworthy:
+
+  * The `By.directive` predicate is a great way to get the elements that have this directive _when their element types are unknown_.
+
+  * The <a href="https://developer.mozilla.org/en-US/docs/Web/CSS/:not" target="_blank">`:not` pseudo-class</a> 
+  in `By.css('h2:not([highlight])')` helps find `<h2>` elements that _do not_ have the directive.
+  `By.css('*:not([highlight])')` finds _any_ element that does not have the directive.
+
+  * `DebugElement.styles` affords access to element styles even in the absence of a real browser, thanks to the `DebugElement` abstraction.
+  But feel free to exploit the `nativeElement` when that seems easier or more clear than the abstraction.
+
+  * Angular adds a directive to the injector of the element to which it is applied. 
+  The test for the default color uses the injector of the 2nd `<h2>` to get its `HighlightDirective` instance
+  and its `defaultColor`.
+  
+  * `DebugElement.properties` affords access to the artificial custom property that is set by the directive.
+
+a(href="#top").to-top Back to top
+
+.l-hr
+
 a#isolated-tests
 a#testing-without-atp
 :marked
@@ -1204,9 +1423,10 @@ a#testing-without-atp
     Write _Angular_ tests to validate the part as it interacts with Angular,
     updates the DOM, and collaborates with the rest of the application.
 
+a#isolated-service-tests
 :marked
   ## Services
-  Services are good candidates for vanilla unit testing. 
+  Services are good candidates for isolated unit testing. 
   Here are some synchronous and asynchronous unit tests of the `FancyService` 
   written without assistance from Angular Testing Platform.
 
@@ -1254,6 +1474,8 @@ a#testing-without-atp
   Use the Angular Testing Platform when writing tests that validate how a service interacts with components
   _within the Angular runtime environment_.
 
+a#isolated-pipe-tests
+:marked
   ## Pipes
   Pipes are easy to test without the Angular Testing Platform (ATP).
 
@@ -1322,9 +1544,9 @@ a#atp-api
   This section takes inventory of the most useful _Angular Testing Platform_ features and summarizes what they do.
 
   The _Angular Testing Platform_ consists of the `TestBed` and `ComponentFixture` classes plus a handful of functions in the test environment.
-  The [_TestBed_](#testbed-api-summary) and [_ComponentFixture_](#componentfixture-api-summary) classes are covered separately.
+  The [_TestBed_](#testbed-api-summary) and [_ComponentFixture_](#component-fixture-api-summary) classes are covered separately.
 
-  Here's a summary of the functions, in order of likely utility:
+  Here's a summary of the stand-alone functions, in order of likely utility:
 
 table
   tr
@@ -1537,8 +1759,8 @@ table
         if you absolutely need to change this default in the middle of your test run.
 
         Specify the Angular compiler factory, a `PlatformRef`, and a default Angular testing module.
-        Alternatives for non-browser platforms are available from
-        `angular2/platform/testing/<platform_name>`.
+        Alternatives for non-browser platforms are available in the general form
+        `@angular/platform-<platform_name>/testing/<platform_name>`.
   tr
     td(style="vertical-align: top") <code>resetTestEnvironment</code>
     td
@@ -1549,7 +1771,7 @@ table
   A few of the `TestBed` instance methods are not covered by static `TestBed` _class_ methods.
   These are rarely needed.
 
-a#componentfixture-api-summary
+a#component-fixture-api-summary
 :marked
   ## The _ComponentFixture_
 
@@ -1560,7 +1782,7 @@ a#componentfixture-api-summary
   The `ComponentFixture` properties and methods provide access to the component, 
   its DOM representation, and aspects of its Angular environment. 
 
-a#componentfixture-properties
+a#component-fixture-properties
 :marked
   ### _ComponentFixture_ properties
 
@@ -1582,7 +1804,7 @@ table
         The `DebugElement` associated with the root element of the component.
 
         The `debugElement` provides insight into the component and its DOM element during test and debugging.
-        It's a critical property for testers. The most interesting members are covered [below](#debugelement-details).
+        It's a critical property for testers. The most interesting members are covered [below](#debug-element-details).
   tr
     td(style="vertical-align: top") <code>nativeElement</code>
     td
@@ -1598,7 +1820,7 @@ table
         component that has the `ChangeDetectionStrategy.OnPush`
         or the component's change detection is under your programmatic control.
 
-a#componentfixture-methods
+a#component-fixture-methods
 :marked
   ### _ComponentFixture_ methods
 
@@ -1665,7 +1887,7 @@ table
       :marked
         Trigger component destruction.
 
-a#debugelement-details
+a#debug-element-details
 :marked
   ### _DebugElement_
 
@@ -1855,7 +2077,7 @@ a(href="#top").to-top Back to top
     General
     * [When are end-to-end (e2e) tests a good choice?](#q-when-e2e)
     * [When to use the _TestBed_?](#q-why-testbed)
-    * [When to write vanilla tests without the _TestBed_?](#q-when-no-testbed)
+    * [When to write isolated unit tests without the _TestBed_?](#q-when-no-testbed)
     * [When can I skip _TestBed.compileComponents_?](#q-when-no-compile-components)
     * [Why must _TestBed.compileComponents_ be called last?](#q-why-compile-components-is-last)
     * [Why must _inject_ be called last?](#q-why-last-last)  
diff --git a/public/resources/images/devguide/testing/highlight-directive-spec.png b/public/resources/images/devguide/testing/highlight-directive-spec.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eb88b2bd5922fa765e813287a0761db9977b835
GIT binary patch
literal 7965
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

literal 0
HcmV?d00001


From 0c678c2355b1a216079598191709f42fca0025b3 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Mon, 19 Sep 2016 20:08:03 -0700
Subject: [PATCH 18/42] docs: use Jade include rather than Harp partial (#2392)

No net effect on the generated docs.
Preparatory work for ng2.io.
---
 public/docs/_includes/_ts-temp.jade           | 27 ++++---------------
 .../cookbook/a1-a2-quick-reference.jade       |  2 +-
 .../cookbook/component-communication.jade     |  2 +-
 .../cookbook/component-relative-paths.jade    |  2 +-
 .../latest/cookbook/dependency-injection.jade |  2 +-
 .../cookbook/dynamic-form-deprecated.jade     |  2 +-
 .../dart/latest/cookbook/dynamic-form.jade    |  2 +-
 .../dart/latest/cookbook/form-validation.jade |  2 +-
 public/docs/dart/latest/cookbook/index.jade   |  2 +-
 .../dart/latest/cookbook/ngmodule-faq.jade    |  2 +-
 .../docs/dart/latest/cookbook/rc4-to-rc5.jade |  2 +-
 .../latest/cookbook/set-document-title.jade   |  2 +-
 .../docs/dart/latest/cookbook/ts-to-js.jade   |  2 +-
 .../latest/cookbook/visual-studio-2015.jade   |  2 +-
 public/docs/dart/latest/guide/animations.jade |  2 +-
 .../dart/latest/guide/browser-support.jade    |  2 +-
 public/docs/dart/latest/guide/ngmodule.jade   |  2 +-
 public/docs/dart/latest/guide/router.jade     |  2 +-
 public/docs/dart/latest/guide/security.jade   |  2 +-
 .../docs/dart/latest/guide/style-guide.jade   |  2 +-
 public/docs/dart/latest/guide/testing.jade    |  2 +-
 .../guide/typescript-configuration.jade       |  2 +-
 public/docs/dart/latest/guide/upgrade.jade    |  2 +-
 public/docs/dart/latest/guide/webpack.jade    |  2 +-
 public/docs/dart/latest/styleguide.jade       |  2 +-
 .../testing/application-under-test.jade       |  2 +-
 .../dart/latest/testing/first-app-tests.jade  |  2 +-
 public/docs/dart/latest/testing/index.jade    |  2 +-
 .../latest/testing/jasmine-testing-101.jade   |  2 +-
 .../testing/testing-an-angular-pipe.jade      |  2 +-
 .../cookbook/a1-a2-quick-reference.jade       |  2 +-
 .../cookbook/component-communication.jade     |  2 +-
 .../cookbook/component-relative-paths.jade    |  2 +-
 .../latest/cookbook/dependency-injection.jade |  2 +-
 .../cookbook/dynamic-form-deprecated.jade     |  2 +-
 .../docs/js/latest/cookbook/dynamic-form.jade |  2 +-
 .../js/latest/cookbook/form-validation.jade   |  2 +-
 .../docs/js/latest/cookbook/ngmodule-faq.jade |  2 +-
 .../docs/js/latest/cookbook/rc4-to-rc5.jade   |  2 +-
 .../latest/cookbook/set-document-title.jade   |  2 +-
 .../latest/cookbook/visual-studio-2015.jade   |  2 +-
 public/docs/js/latest/guide/animations.jade   |  2 +-
 public/docs/js/latest/guide/architecture.jade |  2 +-
 .../js/latest/guide/attribute-directives.jade |  2 +-
 .../docs/js/latest/guide/browser-support.jade |  2 +-
 .../js/latest/guide/component-styles.jade     |  2 +-
 .../js/latest/guide/dependency-injection.jade |  2 +-
 .../docs/js/latest/guide/displaying-data.jade |  2 +-
 .../hierarchical-dependency-injection.jade    |  2 +-
 .../docs/js/latest/guide/lifecycle-hooks.jade |  2 +-
 public/docs/js/latest/guide/ngmodule.jade     |  2 +-
 public/docs/js/latest/guide/npm-packages.jade |  2 +-
 public/docs/js/latest/guide/pipes.jade        |  2 +-
 public/docs/js/latest/guide/router.jade       |  2 +-
 public/docs/js/latest/guide/security.jade     |  2 +-
 .../js/latest/guide/server-communication.jade |  2 +-
 .../latest/guide/structural-directives.jade   |  2 +-
 public/docs/js/latest/guide/style-guide.jade  |  2 +-
 .../docs/js/latest/guide/template-syntax.jade |  2 +-
 public/docs/js/latest/guide/testing.jade      |  2 +-
 .../guide/typescript-configuration.jade       |  2 +-
 public/docs/js/latest/guide/upgrade.jade      |  2 +-
 public/docs/js/latest/guide/user-input.jade   |  2 +-
 public/docs/js/latest/guide/webpack.jade      |  2 +-
 public/docs/js/latest/help.jade               |  2 +-
 public/docs/js/latest/styleguide.jade         |  2 +-
 .../testing/application-under-test.jade       |  2 +-
 .../js/latest/testing/first-app-tests.jade    |  2 +-
 public/docs/js/latest/testing/index.jade      |  2 +-
 .../latest/testing/jasmine-testing-101.jade   |  2 +-
 .../testing/testing-an-angular-pipe.jade      |  2 +-
 public/docs/js/latest/tutorial/index.jade     |  2 +-
 public/docs/js/latest/tutorial/toh-pt1.jade   |  2 +-
 public/docs/js/latest/tutorial/toh-pt2.jade   |  2 +-
 public/docs/js/latest/tutorial/toh-pt3.jade   |  2 +-
 public/docs/js/latest/tutorial/toh-pt4.jade   |  2 +-
 public/docs/js/latest/tutorial/toh-pt5.jade   |  2 +-
 public/docs/js/latest/tutorial/toh-pt6.jade   |  2 +-
 public/docs/ts/latest/cookbook/ts-to-js.jade  |  2 +-
 public/docs/ts/latest/help.jade               |  2 +-
 public/docs/ts/latest/styleguide.jade         |  2 +-
 81 files changed, 85 insertions(+), 102 deletions(-)

diff --git a/public/docs/_includes/_ts-temp.jade b/public/docs/_includes/_ts-temp.jade
index b4a6b8ad8a..7c162672f4 100644
--- a/public/docs/_includes/_ts-temp.jade
+++ b/public/docs/_includes/_ts-temp.jade
@@ -8,26 +8,9 @@ if language == 'js'
 if language == 'ts'
   - lang = 'TypeScript'
 
-- var page = ''
-if current.path[4]
-  - var page = current.path[4] + '.html'
-
+- var page = current.path[4] ? current.path[4] + '.html' : ''
+- if (page === 'index.html') page = ''
 - var path = '/docs/ts/latest/'+ current.path[3] + '/' + page
-
-- var name = 'it'
-- var secondaryPath = public.docs[current.path[1]][current.path[2]][current.path[3]]
-if secondaryPath
-  - var data = secondaryPath._data
-  - var listType = data._listtype
-  - var items = listType == 'api' ? secondaryPath : data
-  
-  for item, slug in items
-    if slug == current.path[4]
-      - name = 'the <b><i>' + item.title + '</i></b> chapter'
-    
-p.
-  This chapter is not yet available in #{lang}.
-  We recommend reading the TypeScript version.
-a(href=path, class='md-primary md-button md-ink-ripple').
-  Read !{name} in TypeScript
-// != partial(path)
\ No newline at end of file
+:marked
+  This page is not yet available in #{lang}.
+  We recommend reading [it in TypeScript](!{path}).
\ No newline at end of file
diff --git a/public/docs/dart/latest/cookbook/a1-a2-quick-reference.jade b/public/docs/dart/latest/cookbook/a1-a2-quick-reference.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/a1-a2-quick-reference.jade
+++ b/public/docs/dart/latest/cookbook/a1-a2-quick-reference.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/component-communication.jade b/public/docs/dart/latest/cookbook/component-communication.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/component-communication.jade
+++ b/public/docs/dart/latest/cookbook/component-communication.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/component-relative-paths.jade b/public/docs/dart/latest/cookbook/component-relative-paths.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/component-relative-paths.jade
+++ b/public/docs/dart/latest/cookbook/component-relative-paths.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/dependency-injection.jade b/public/docs/dart/latest/cookbook/dependency-injection.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/cookbook/dependency-injection.jade
+++ b/public/docs/dart/latest/cookbook/dependency-injection.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/cookbook/dynamic-form-deprecated.jade b/public/docs/dart/latest/cookbook/dynamic-form-deprecated.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/cookbook/dynamic-form-deprecated.jade
+++ b/public/docs/dart/latest/cookbook/dynamic-form-deprecated.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/cookbook/dynamic-form.jade b/public/docs/dart/latest/cookbook/dynamic-form.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/dynamic-form.jade
+++ b/public/docs/dart/latest/cookbook/dynamic-form.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/form-validation.jade b/public/docs/dart/latest/cookbook/form-validation.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/form-validation.jade
+++ b/public/docs/dart/latest/cookbook/form-validation.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/index.jade b/public/docs/dart/latest/cookbook/index.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/index.jade
+++ b/public/docs/dart/latest/cookbook/index.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/ngmodule-faq.jade b/public/docs/dart/latest/cookbook/ngmodule-faq.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/ngmodule-faq.jade
+++ b/public/docs/dart/latest/cookbook/ngmodule-faq.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/rc4-to-rc5.jade b/public/docs/dart/latest/cookbook/rc4-to-rc5.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/rc4-to-rc5.jade
+++ b/public/docs/dart/latest/cookbook/rc4-to-rc5.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/set-document-title.jade b/public/docs/dart/latest/cookbook/set-document-title.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/cookbook/set-document-title.jade
+++ b/public/docs/dart/latest/cookbook/set-document-title.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/cookbook/ts-to-js.jade b/public/docs/dart/latest/cookbook/ts-to-js.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/cookbook/ts-to-js.jade
+++ b/public/docs/dart/latest/cookbook/ts-to-js.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/cookbook/visual-studio-2015.jade b/public/docs/dart/latest/cookbook/visual-studio-2015.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/dart/latest/cookbook/visual-studio-2015.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/guide/animations.jade b/public/docs/dart/latest/guide/animations.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/animations.jade
+++ b/public/docs/dart/latest/guide/animations.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/guide/browser-support.jade b/public/docs/dart/latest/guide/browser-support.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/browser-support.jade
+++ b/public/docs/dart/latest/guide/browser-support.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/guide/ngmodule.jade b/public/docs/dart/latest/guide/ngmodule.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/ngmodule.jade
+++ b/public/docs/dart/latest/guide/ngmodule.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/guide/router.jade b/public/docs/dart/latest/guide/router.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/guide/router.jade
+++ b/public/docs/dart/latest/guide/router.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/guide/security.jade b/public/docs/dart/latest/guide/security.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/guide/security.jade
+++ b/public/docs/dart/latest/guide/security.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/guide/style-guide.jade b/public/docs/dart/latest/guide/style-guide.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/guide/style-guide.jade
+++ b/public/docs/dart/latest/guide/style-guide.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/guide/testing.jade b/public/docs/dart/latest/guide/testing.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/guide/testing.jade
+++ b/public/docs/dart/latest/guide/testing.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/guide/typescript-configuration.jade b/public/docs/dart/latest/guide/typescript-configuration.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/typescript-configuration.jade
+++ b/public/docs/dart/latest/guide/typescript-configuration.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/guide/upgrade.jade b/public/docs/dart/latest/guide/upgrade.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/upgrade.jade
+++ b/public/docs/dart/latest/guide/upgrade.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/guide/webpack.jade b/public/docs/dart/latest/guide/webpack.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/dart/latest/guide/webpack.jade
+++ b/public/docs/dart/latest/guide/webpack.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/dart/latest/styleguide.jade b/public/docs/dart/latest/styleguide.jade
index 29caa74a86..b8afd2b812 100644
--- a/public/docs/dart/latest/styleguide.jade
+++ b/public/docs/dart/latest/styleguide.jade
@@ -1 +1 @@
-!= partial("../../_includes/styleguide/_styleguide")
+include ../../_includes/styleguide/_styleguide
diff --git a/public/docs/dart/latest/testing/application-under-test.jade b/public/docs/dart/latest/testing/application-under-test.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/testing/application-under-test.jade
+++ b/public/docs/dart/latest/testing/application-under-test.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/testing/first-app-tests.jade b/public/docs/dart/latest/testing/first-app-tests.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/testing/first-app-tests.jade
+++ b/public/docs/dart/latest/testing/first-app-tests.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/testing/index.jade b/public/docs/dart/latest/testing/index.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/testing/index.jade
+++ b/public/docs/dart/latest/testing/index.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/testing/jasmine-testing-101.jade b/public/docs/dart/latest/testing/jasmine-testing-101.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/testing/jasmine-testing-101.jade
+++ b/public/docs/dart/latest/testing/jasmine-testing-101.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/dart/latest/testing/testing-an-angular-pipe.jade b/public/docs/dart/latest/testing/testing-an-angular-pipe.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/dart/latest/testing/testing-an-angular-pipe.jade
+++ b/public/docs/dart/latest/testing/testing-an-angular-pipe.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/cookbook/a1-a2-quick-reference.jade b/public/docs/js/latest/cookbook/a1-a2-quick-reference.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/a1-a2-quick-reference.jade
+++ b/public/docs/js/latest/cookbook/a1-a2-quick-reference.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/component-communication.jade b/public/docs/js/latest/cookbook/component-communication.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/component-communication.jade
+++ b/public/docs/js/latest/cookbook/component-communication.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/component-relative-paths.jade b/public/docs/js/latest/cookbook/component-relative-paths.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/component-relative-paths.jade
+++ b/public/docs/js/latest/cookbook/component-relative-paths.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/dependency-injection.jade b/public/docs/js/latest/cookbook/dependency-injection.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/cookbook/dependency-injection.jade
+++ b/public/docs/js/latest/cookbook/dependency-injection.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/cookbook/dynamic-form-deprecated.jade b/public/docs/js/latest/cookbook/dynamic-form-deprecated.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/cookbook/dynamic-form-deprecated.jade
+++ b/public/docs/js/latest/cookbook/dynamic-form-deprecated.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/cookbook/dynamic-form.jade b/public/docs/js/latest/cookbook/dynamic-form.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/cookbook/dynamic-form.jade
+++ b/public/docs/js/latest/cookbook/dynamic-form.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/cookbook/form-validation.jade b/public/docs/js/latest/cookbook/form-validation.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/form-validation.jade
+++ b/public/docs/js/latest/cookbook/form-validation.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/ngmodule-faq.jade b/public/docs/js/latest/cookbook/ngmodule-faq.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/ngmodule-faq.jade
+++ b/public/docs/js/latest/cookbook/ngmodule-faq.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/rc4-to-rc5.jade b/public/docs/js/latest/cookbook/rc4-to-rc5.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/cookbook/rc4-to-rc5.jade
+++ b/public/docs/js/latest/cookbook/rc4-to-rc5.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/set-document-title.jade b/public/docs/js/latest/cookbook/set-document-title.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/cookbook/set-document-title.jade
+++ b/public/docs/js/latest/cookbook/set-document-title.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/cookbook/visual-studio-2015.jade b/public/docs/js/latest/cookbook/visual-studio-2015.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/js/latest/cookbook/visual-studio-2015.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/animations.jade b/public/docs/js/latest/guide/animations.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/animations.jade
+++ b/public/docs/js/latest/guide/animations.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/architecture.jade b/public/docs/js/latest/guide/architecture.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/architecture.jade
+++ b/public/docs/js/latest/guide/architecture.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/attribute-directives.jade b/public/docs/js/latest/guide/attribute-directives.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/attribute-directives.jade
+++ b/public/docs/js/latest/guide/attribute-directives.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/browser-support.jade b/public/docs/js/latest/guide/browser-support.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/browser-support.jade
+++ b/public/docs/js/latest/guide/browser-support.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/component-styles.jade b/public/docs/js/latest/guide/component-styles.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/component-styles.jade
+++ b/public/docs/js/latest/guide/component-styles.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/dependency-injection.jade b/public/docs/js/latest/guide/dependency-injection.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/dependency-injection.jade
+++ b/public/docs/js/latest/guide/dependency-injection.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/displaying-data.jade b/public/docs/js/latest/guide/displaying-data.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/displaying-data.jade
+++ b/public/docs/js/latest/guide/displaying-data.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/hierarchical-dependency-injection.jade b/public/docs/js/latest/guide/hierarchical-dependency-injection.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/hierarchical-dependency-injection.jade
+++ b/public/docs/js/latest/guide/hierarchical-dependency-injection.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/lifecycle-hooks.jade b/public/docs/js/latest/guide/lifecycle-hooks.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/lifecycle-hooks.jade
+++ b/public/docs/js/latest/guide/lifecycle-hooks.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/ngmodule.jade b/public/docs/js/latest/guide/ngmodule.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/ngmodule.jade
+++ b/public/docs/js/latest/guide/ngmodule.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/npm-packages.jade b/public/docs/js/latest/guide/npm-packages.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/npm-packages.jade
+++ b/public/docs/js/latest/guide/npm-packages.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/pipes.jade b/public/docs/js/latest/guide/pipes.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/pipes.jade
+++ b/public/docs/js/latest/guide/pipes.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/router.jade b/public/docs/js/latest/guide/router.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/router.jade
+++ b/public/docs/js/latest/guide/router.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/security.jade b/public/docs/js/latest/guide/security.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/security.jade
+++ b/public/docs/js/latest/guide/security.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/server-communication.jade b/public/docs/js/latest/guide/server-communication.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/server-communication.jade
+++ b/public/docs/js/latest/guide/server-communication.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/structural-directives.jade b/public/docs/js/latest/guide/structural-directives.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/structural-directives.jade
+++ b/public/docs/js/latest/guide/structural-directives.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/style-guide.jade b/public/docs/js/latest/guide/style-guide.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/style-guide.jade
+++ b/public/docs/js/latest/guide/style-guide.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/template-syntax.jade b/public/docs/js/latest/guide/template-syntax.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/template-syntax.jade
+++ b/public/docs/js/latest/guide/template-syntax.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/testing.jade b/public/docs/js/latest/guide/testing.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/testing.jade
+++ b/public/docs/js/latest/guide/testing.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/typescript-configuration.jade b/public/docs/js/latest/guide/typescript-configuration.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/typescript-configuration.jade
+++ b/public/docs/js/latest/guide/typescript-configuration.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/upgrade.jade b/public/docs/js/latest/guide/upgrade.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/upgrade.jade
+++ b/public/docs/js/latest/guide/upgrade.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/guide/user-input.jade b/public/docs/js/latest/guide/user-input.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/guide/user-input.jade
+++ b/public/docs/js/latest/guide/user-input.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/guide/webpack.jade b/public/docs/js/latest/guide/webpack.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/guide/webpack.jade
+++ b/public/docs/js/latest/guide/webpack.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/help.jade b/public/docs/js/latest/help.jade
index 8421f25772..fa92c49a01 100644
--- a/public/docs/js/latest/help.jade
+++ b/public/docs/js/latest/help.jade
@@ -1 +1 @@
-!= partial("../../_includes/_help")
\ No newline at end of file
+include ../../_includes/_help
\ No newline at end of file
diff --git a/public/docs/js/latest/styleguide.jade b/public/docs/js/latest/styleguide.jade
index 29caa74a86..b8afd2b812 100644
--- a/public/docs/js/latest/styleguide.jade
+++ b/public/docs/js/latest/styleguide.jade
@@ -1 +1 @@
-!= partial("../../_includes/styleguide/_styleguide")
+include ../../_includes/styleguide/_styleguide
diff --git a/public/docs/js/latest/testing/application-under-test.jade b/public/docs/js/latest/testing/application-under-test.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/testing/application-under-test.jade
+++ b/public/docs/js/latest/testing/application-under-test.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/testing/first-app-tests.jade b/public/docs/js/latest/testing/first-app-tests.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/testing/first-app-tests.jade
+++ b/public/docs/js/latest/testing/first-app-tests.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/testing/index.jade b/public/docs/js/latest/testing/index.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/testing/index.jade
+++ b/public/docs/js/latest/testing/index.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/testing/jasmine-testing-101.jade b/public/docs/js/latest/testing/jasmine-testing-101.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/testing/jasmine-testing-101.jade
+++ b/public/docs/js/latest/testing/jasmine-testing-101.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/testing/testing-an-angular-pipe.jade b/public/docs/js/latest/testing/testing-an-angular-pipe.jade
index f8df2a84a6..4782ba81d3 100644
--- a/public/docs/js/latest/testing/testing-an-angular-pipe.jade
+++ b/public/docs/js/latest/testing/testing-an-angular-pipe.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
\ No newline at end of file
+include ../../../_includes/_ts-temp
\ No newline at end of file
diff --git a/public/docs/js/latest/tutorial/index.jade b/public/docs/js/latest/tutorial/index.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/index.jade
+++ b/public/docs/js/latest/tutorial/index.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt1.jade b/public/docs/js/latest/tutorial/toh-pt1.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt1.jade
+++ b/public/docs/js/latest/tutorial/toh-pt1.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt2.jade b/public/docs/js/latest/tutorial/toh-pt2.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt2.jade
+++ b/public/docs/js/latest/tutorial/toh-pt2.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt3.jade b/public/docs/js/latest/tutorial/toh-pt3.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt3.jade
+++ b/public/docs/js/latest/tutorial/toh-pt3.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt4.jade b/public/docs/js/latest/tutorial/toh-pt4.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt4.jade
+++ b/public/docs/js/latest/tutorial/toh-pt4.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt5.jade b/public/docs/js/latest/tutorial/toh-pt5.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt5.jade
+++ b/public/docs/js/latest/tutorial/toh-pt5.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/tutorial/toh-pt6.jade b/public/docs/js/latest/tutorial/toh-pt6.jade
index 6778b6af28..c743361ac8 100644
--- a/public/docs/js/latest/tutorial/toh-pt6.jade
+++ b/public/docs/js/latest/tutorial/toh-pt6.jade
@@ -1 +1 @@
-!= partial("../../../_includes/_ts-temp")
+include ../../../_includes/_ts-temp
diff --git a/public/docs/ts/latest/cookbook/ts-to-js.jade b/public/docs/ts/latest/cookbook/ts-to-js.jade
index c892875b51..2e00a56272 100644
--- a/public/docs/ts/latest/cookbook/ts-to-js.jade
+++ b/public/docs/ts/latest/cookbook/ts-to-js.jade
@@ -1 +1 @@
-!= partial("../../../js/latest/cookbook/ts-to-js")
+include ../../../js/latest/cookbook/ts-to-js
diff --git a/public/docs/ts/latest/help.jade b/public/docs/ts/latest/help.jade
index 8421f25772..fa92c49a01 100644
--- a/public/docs/ts/latest/help.jade
+++ b/public/docs/ts/latest/help.jade
@@ -1 +1 @@
-!= partial("../../_includes/_help")
\ No newline at end of file
+include ../../_includes/_help
\ No newline at end of file
diff --git a/public/docs/ts/latest/styleguide.jade b/public/docs/ts/latest/styleguide.jade
index 29caa74a86..b8afd2b812 100644
--- a/public/docs/ts/latest/styleguide.jade
+++ b/public/docs/ts/latest/styleguide.jade
@@ -1 +1 @@
-!= partial("../../_includes/styleguide/_styleguide")
+include ../../_includes/styleguide/_styleguide

From 98efced0683d74b6918e613ba099794e0ae284fc Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Mon, 19 Sep 2016 20:14:31 -0700
Subject: [PATCH 19/42] docs(lang/latest): parameterize landing page Jade by
 language (#2389)

ng2.io preparatory work.
---
 public/docs/dart/latest/index.jade | 20 +--------
 public/docs/index.jade             |  1 -
 public/docs/js/latest/index.jade   | 68 +-----------------------------
 public/docs/ts/latest/index.jade   | 33 ++++++++-------
 4 files changed, 20 insertions(+), 102 deletions(-)

diff --git a/public/docs/dart/latest/index.jade b/public/docs/dart/latest/index.jade
index 1781aa6eba..338a52da92 100644
--- a/public/docs/dart/latest/index.jade
+++ b/public/docs/dart/latest/index.jade
@@ -1,22 +1,4 @@
-.clearfix
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/quickstart.html")
-    h2.text-headline.text-uppercase Quickstart
-    p A short beginner guide explaining the basic concepts of Angular
-
-    footer View Quickstart
-
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/guide/")
-    h2.text-headline.text-uppercase Developer Guide
-    p An intermediate development guide covering all major features of Angular
-
-    footer View Guide
-
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/api/")
-    h2.text-headline.text-uppercase API Reference
-    p An advanced reference of all Angular Classes, Methods, etc.
-
-    footer View API
-
+include ../../ts/latest/index
 
 div.c12.l-space-top-3
   .alert.is-helpful.
diff --git a/public/docs/index.jade b/public/docs/index.jade
index 7b2e524ff8..61725df2c8 100644
--- a/public/docs/index.jade
+++ b/public/docs/index.jade
@@ -8,7 +8,6 @@
 
     p <a href="/docs/js/latest">Angular 2 JS - Latest Version</a>
 
-
     h3 Dart
 
     p: <a href="/docs/dart/latest">Angular 2 Dart - Latest Version</a>
\ No newline at end of file
diff --git a/public/docs/js/latest/index.jade b/public/docs/js/latest/index.jade
index 1f20647815..032f09c5ae 100644
--- a/public/docs/js/latest/index.jade
+++ b/public/docs/js/latest/index.jade
@@ -1,67 +1 @@
-.clearfix
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/quickstart.html")
-    h2.text-headline.text-uppercase Quickstart
-    p A short beginner guide explaining the basic concepts of Angular
-
-    footer View Quickstart
-
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/guide/")
-    h2.text-headline.text-uppercase Developer Guide
-    p An intermediate development guide covering all major features of Angular
-
-    footer View Guide
-
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/api/")
-    h2.text-headline.text-uppercase API Reference
-    p An advanced reference of all Angular Classes, Methods, etc.
-
-    footer View API
-
-
-.c4.secondary-content-list
-  h4 Advanced Documentation
-  ul
-    li
-      a(href="/docs/js/latest/guide/ngmodule.html") Angular Modules
-    li
-      a(href="/docs/js/latest/guide/animations.html") Animations
-    li
-      a(href="/docs/js/latest/guide/attribute-directives.html") Attribute Directives
-    li
-      a(href="/docs/js/latest/guide/browser-support.html") Browser Support
-    li
-      a(href="/docs/js/latest/guide/component-styles.html") Component Styles
-    li
-      a(href="/docs/js/latest/guide/ngmodule.html") View All...
-
-.c4.secondary-content-list
-  h4 Cookbook
-  ul
-    li
-      a(href="/docs/js/latest/cookbook/a1-a2-quick-reference.html") Angular 1 to Angular 2
-    li
-      a(href="/docs/js/latest/cookbook/ngmodule-faq.html") Angular Module FAQ
-    li
-      a(href="/docs/js/latest/cookbook/component-communication.html") Component Interaction
-    li
-      a(href="/docs/js/latest/cookbook/component-relative-paths.html") Component-Relative Paths
-    li
-      a(href="/docs/js/latest/cookbook/dependency-injection.html") Dependency Injection
-    li
-      a(href="/docs/js/latest/cookbook/") View All...
-
-.c4.secondary-content-list
-  h4 Tools & Libraries
-  ul
-    li
-      a(target="_blank" href="https://github.com/angular/universal") Angular Universal
-    li
-      a(target="_blank" href="https://augury.angular.io/") Augury
-    li
-      a(target="_blank" href="https://github.com/jaxio/celerio-angular-quickstart") Celerio Angular Quickstart
-    li
-      a(target="_blank" href="https://github.com/mgechev/codelyzer") Codelyzer
-    li
-      a(target="_blank" href="https://github.com/johnpapa/lite-server") Lite-server
-    li
-      a(target="_blank" href="/resources/") View All...
+include ../../ts/latest/index
diff --git a/public/docs/ts/latest/index.jade b/public/docs/ts/latest/index.jade
index 4389af05d5..aa1ffea3c4 100644
--- a/public/docs/ts/latest/index.jade
+++ b/public/docs/ts/latest/index.jade
@@ -1,17 +1,20 @@
+- var lang = current.path[1]
+- var vers = current.path[2]
+
 .clearfix
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/quickstart.html")
+  a.card.c4(href="/docs/#{lang}/#{vers}/quickstart.html")
     h2.text-headline.text-uppercase Quickstart
     p A short beginner guide explaining the basic concepts of Angular
 
     footer View Quickstart
 
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/guide/")
+  a.card.c4(href="/docs/#{lang}/#{vers}/guide/")
     h2.text-headline.text-uppercase Developer Guide
     p An intermediate development guide covering all major features of Angular
 
     footer View Guide
 
-  a.card.c4(href="/docs/#{current.path[1]}/#{current.path[2]}/api/")
+  a.card.c4(href="/docs/#{lang}/#{vers}/api/")
     h2.text-headline.text-uppercase API Reference
     p An advanced reference of all Angular Classes, Methods, etc.
 
@@ -21,33 +24,33 @@
   h4 Advanced Documentation
   ul
     li
-      a(href="/docs/ts/latest/guide/ngmodule.html") Angular Modules
+      a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") Angular Modules
     li
-      a(href="/docs/ts/latest/guide/animations.html") Animations
+      a(href="/docs/#{lang}/#{vers}/guide/animations.html") Animations
     li
-      a(href="/docs/ts/latest/guide/attribute-directives.html") Attribute Directives
+      a(href="/docs/#{lang}/#{vers}/guide/attribute-directives.html") Attribute Directives
     li
-      a(href="/docs/ts/latest/guide/browser-support.html") Browser Support
+      a(href="/docs/#{lang}/#{vers}/guide/browser-support.html") Browser Support
     li
-      a(href="/docs/ts/latest/guide/component-styles.html") Component Styles
+      a(href="/docs/#{lang}/#{vers}/guide/component-styles.html") Component Styles
     li
-      a(href="/docs/ts/latest/guide/ngmodule.html") View All...
+      a(href="/docs/#{lang}/#{vers}/guide/ngmodule.html") View All...
 
 .c4.secondary-content-list
   h4 Cookbook
   ul
     li
-      a(href="/docs/ts/latest/cookbook/aot-compiler.html") Ahead-of-Time Compilation
+      a(href="/docs/#{lang}/#{vers}/cookbook/aot-compiler.html") Ahead-of-Time Compilation
     li
-      a(href="/docs/ts/latest/cookbook/a1-a2-quick-reference.html") Angular 1 to Angular 2
+      a(href="/docs/#{lang}/#{vers}/cookbook/a1-a2-quick-reference.html") Angular 1 to Angular 2
     li
-      a(href="/docs/ts/latest/cookbook/ngmodule-faq.html") Angular Module FAQ
+      a(href="/docs/#{lang}/#{vers}/cookbook/ngmodule-faq.html") Angular Module FAQ
     li
-      a(href="/docs/ts/latest/cookbook/component-communication.html") Component Interaction
+      a(href="/docs/#{lang}/#{vers}/cookbook/component-communication.html") Component Interaction
     li
-      a(href="/docs/ts/latest/cookbook/component-relative-paths.html") Component-Relative Paths
+      a(href="/docs/#{lang}/#{vers}/cookbook/component-relative-paths.html") Component-Relative Paths
     li
-      a(href="/docs/ts/latest/cookbook/") View All...
+      a(href="/docs/#{lang}/#{vers}/cookbook/") View All...
 
 .c4.secondary-content-list
   h4 Tools & Libraries

From 730c93b5bd9f64596cfcdcb796de3eb90202b025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Tue, 20 Sep 2016 05:18:20 +0200
Subject: [PATCH 20/42] docs(ts-to-js): change angular2 to @angular (#2403)

---
 public/docs/js/latest/cookbook/ts-to-js.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/js/latest/cookbook/ts-to-js.jade b/public/docs/js/latest/cookbook/ts-to-js.jade
index a41d441028..1880cf6537 100644
--- a/public/docs/js/latest/cookbook/ts-to-js.jade
+++ b/public/docs/js/latest/cookbook/ts-to-js.jade
@@ -59,7 +59,7 @@ table(width="100%")
         [the Angular 2 packages](../glossary.html#!#scoped-package),
         we can access Angular code through the global `ng` object. In the
         nested members of this object we'll find everything we would import
-        from `angular2` in TypeScript:
+        from `@angular` in TypeScript:
 
       +makeExample('cb-ts-to-js/js/app/main.js', 'ng2import')(format="." )
 

From 693f6ae462d22a1ff96da46b06a2cf2d60a28a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Tue, 20 Sep 2016 05:24:40 +0200
Subject: [PATCH 21/42] chore: rename Angular 2 to simply Angular (#2402)

---
 README.md                                     |  4 +--
 gulpfile.js                                   |  2 +-
 harp.json                                     |  8 ++---
 package.json                                  |  2 +-
 public/_includes/_footer.jade                 |  2 +-
 public/_includes/_head-include.jade           |  8 ++---
 public/_includes/_version-dropdown.jade       | 12 +++----
 public/contribute.jade                        |  6 ++--
 .../_protractor/protractor.config.js          |  2 +-
 public/docs/_examples/animations/e2e-spec.ts  |  2 +-
 .../docs/_examples/animations/ts/plnkr.json   |  2 +-
 .../architecture/dart/web/index.html          |  2 +-
 .../docs/_examples/architecture/e2e-spec.ts   |  2 +-
 .../_examples/architecture/ts/app/mini-app.ts |  2 +-
 .../docs/_examples/architecture/ts/index.html |  2 +-
 .../_examples/architecture/ts/mini-app.html   |  2 +-
 .../docs/_examples/architecture/ts/plnkr.json |  2 +-
 .../_examples/cb-aot-compiler/e2e-spec.ts     |  2 +-
 .../cb-aot-compiler/ts/app/app.component.html |  2 +-
 .../cb-set-document-title/ts/plnkr.json       |  2 +-
 .../cli-quickstart/e2e-spec.ts.disabled       |  2 +-
 .../ts/src/app/cli-quickstart.component.ts    |  2 +-
 .../homepage-hello-world/ts/index.1.html      |  2 +-
 .../homepage-hello-world/ts/index.html        |  2 +-
 .../_examples/homepage-tabs/ts/index.1.html   |  2 +-
 .../_examples/homepage-tabs/ts/index.html     |  2 +-
 .../_examples/homepage-todo/ts/index.1.html   |  2 +-
 .../_examples/homepage-todo/ts/index.html     |  2 +-
 .../_examples/lifecycle-hooks/ts/index.html   |  2 +-
 public/docs/_examples/plunker.README.md       |  2 +-
 public/docs/_examples/quickstart/e2e-spec.ts  |  2 +-
 .../quickstart/js/app/app.component.js        |  2 +-
 .../docs/_examples/quickstart/js/index.html   |  2 +-
 .../quickstart/ts/app/app.component.ts        |  2 +-
 .../docs/_examples/quickstart/ts/index.html   |  2 +-
 .../_examples/quickstart/ts/package.1.json    |  2 +-
 .../quickstart/ts/systemjs.config.1.js        |  2 +-
 .../server-communication/ts/index.html        |  2 +-
 .../structural-directives/ts/index.html       |  2 +-
 public/docs/_examples/styleguide/e2e-spec.ts  |  2 +-
 public/docs/_examples/styleguide/js/app.js    |  4 +--
 .../styleguide/ts/app/app.component.ts        |  2 +-
 public/docs/_examples/systemjs.config.js      |  2 +-
 .../systemjs.config.plunker.build.js          |  2 +-
 .../docs/_examples/systemjs.config.plunker.js |  2 +-
 public/docs/_examples/toh-1/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-1/ts/index.html     |  2 +-
 public/docs/_examples/toh-2/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-2/ts/index.html     |  2 +-
 public/docs/_examples/toh-3/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-3/ts/index.html     |  2 +-
 public/docs/_examples/toh-4/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-4/ts/index.html     |  2 +-
 public/docs/_examples/toh-5/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-5/ts/index.html     |  2 +-
 public/docs/_examples/toh-6/e2e-spec.ts       |  2 +-
 public/docs/_examples/toh-6/ts/index.html     |  2 +-
 public/docs/_examples/webpack/e2e-spec.ts     |  2 +-
 .../_examples/webpack/ts/package.webpack.json |  2 +-
 .../webpack/ts/src/app/app.component.html     |  2 +-
 .../docs/_examples/webpack/ts/src/vendor.ts   |  2 +-
 .../_includes/styleguide/_code-examples.jade  |  4 +--
 .../docs/dart/latest/guide/architecture.jade  |  2 +-
 public/docs/dart/latest/guide/forms.jade      |  6 ++--
 .../latest/guide/server-communication.jade    |  2 +-
 .../dart/latest/guide/template-syntax.jade    |  4 +--
 public/docs/index.jade                        |  4 +--
 public/docs/js/latest/cookbook/ts-to-js.jade  | 36 +++++++++----------
 public/docs/js/latest/guide/forms.jade        |  8 ++---
 public/docs/js/latest/quickstart.jade         | 26 +++++++-------
 .../cookbook/component-relative-paths.jade    |  2 +-
 public/docs/ts/latest/cookbook/index.jade     |  6 ++--
 .../latest/cookbook/set-document-title.jade   |  2 +-
 .../latest/cookbook/visual-studio-2015.jade   |  2 +-
 public/docs/ts/latest/glossary.jade           | 12 +++----
 public/docs/ts/latest/guide/architecture.jade |  4 +--
 .../ts/latest/guide/component-styles.jade     |  4 +--
 .../ts/latest/guide/dependency-injection.jade |  2 +-
 public/docs/ts/latest/guide/forms.jade        |  4 +--
 .../hierarchical-dependency-injection.jade    |  4 +--
 public/docs/ts/latest/guide/index.jade        |  4 +--
 public/docs/ts/latest/guide/npm-packages.jade |  2 +-
 public/docs/ts/latest/guide/pipes.jade        |  2 +-
 public/docs/ts/latest/guide/router.jade       |  6 ++--
 public/docs/ts/latest/guide/style-guide.jade  | 10 +++---
 .../docs/ts/latest/guide/template-syntax.jade | 10 +++---
 .../guide/typescript-configuration.jade       |  2 +-
 public/docs/ts/latest/guide/webpack.jade      | 16 ++++-----
 public/docs/ts/latest/help-new.jade           |  4 +--
 public/docs/ts/latest/quickstart.jade         | 14 ++++----
 public/docs/ts/latest/tutorial/toh-pt1.jade   |  4 +--
 public/docs/ts/latest/tutorial/toh-pt2.jade   |  2 +-
 public/docs/ts/latest/tutorial/toh-pt3.jade   |  4 +--
 public/docs/ts/latest/tutorial/toh-pt4.jade   |  4 +--
 public/docs/ts/latest/tutorial/toh-pt5.jade   |  4 +--
 public/docs/ts/latest/tutorial/toh-pt6.jade   |  2 +-
 public/news.jade                              |  2 +-
 public/support.jade                           |  2 +-
 scripts/deploy-install.sh                     |  4 +--
 tools/api-builder/angular.io-package/index.js |  2 +-
 tools/plunker-builder/builder.js              |  4 +--
 tools/plunker-builder/embeddedPlunker.js      |  2 +-
 tools/plunker-builder/plunkerBuilder.js       |  4 +--
 tools/styles-builder/less/a2docs.less         |  8 ++---
 104 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/README.md b/README.md
index a9d982cd3b..c291cccc6e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Angular.io
 [![Build Status][travis-badge]][travis-badge-url]
 
-Angular.io is site for Angular 2 **documentation** . 
+Angular.io is site for Angular **documentation** . 
 
 This site also includes links to other helpful angular resources including 
 Angular 2, Angular 1, Angular Material, and AngularFire.
@@ -77,7 +77,7 @@ Such code resides in the `public/docs/_examples` directory, under page-specific
 
 For example, the TypeScript QuickStart sample is in `public/docs/_examples/quickstart/ts`.
 
-All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular 2.
+All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular.
 This consistency is possible in part thanks to gulp-driven tooling. 
 To run the samples locally and confirm that they work properly, 
 take the following extra steps to prepare the environment:
diff --git a/gulpfile.js b/gulpfile.js
index 36185cfb30..80b6839cde 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -461,7 +461,7 @@ gulp.task('_copy-example-boilerplate', function (done) {
   return argv.fast ? done() : buildStyles(copyExampleBoilerplate, done);
 });
 
-//Builds Angular 2 Docs CSS file from Bootstrap npm LESS source
+//Builds Angular Docs CSS file from Bootstrap npm LESS source
 //and copies the result to the _examples folder to be included as
 //part of the example boilerplate.
 function buildStyles(cb, done){
diff --git a/harp.json b/harp.json
index 38277fcd4a..4a8328d35e 100644
--- a/harp.json
+++ b/harp.json
@@ -85,7 +85,7 @@
         "picture": "/resources/images/bios/tobias.jpg",
         "twitter": "tbosch1009",
         "website": "https://plus.google.com/+TobiasBosch",
-        "bio": "Tobias Bosch is a software engineer at Google. He is part of the Angular core team and works on Angular 2.",
+        "bio": "Tobias Bosch is a software engineer at Google. He is part of the Angular core team and works on Angular.",
         "type": "Google"
       },
 
@@ -184,7 +184,7 @@
         "picture": "/resources/images/bios/hansl.jpg",
         "twitter": "hanslatwork",
         "website": "http://www.codingatwork.com/",
-        "bio": "Hans is a software engineer at Google on the Angular team and was previously at Slack. He works everyday to help make it easier for everyone to create beautiful, consistent web applications using Angular2, using Material Design components and the CLI tool.",
+        "bio": "Hans is a software engineer at Google on the Angular team and was previously at Slack. He works everyday to help make it easier for everyone to create beautiful, consistent web applications using Angular, using Material Design components and the CLI tool.",
         "type": "Google"
       },
 
@@ -360,7 +360,7 @@
         "picture": "/resources/images/bios/marclaval.jpg",
         "twitter": "marclaval",
         "website": "https://github.com/mlaval",
-        "bio": "Marc is a manager at Amadeus where he leads the team in charge of developing and recommending UI frameworks for the company. He is also an open source developer and a contributor to Angular 2.",
+        "bio": "Marc is a manager at Amadeus where he leads the team in charge of developing and recommending UI frameworks for the company. He is also an open source developer and a contributor to Angular.",
         "type": "Community"
       },
 
@@ -378,7 +378,7 @@
         "picture": "/resources/images/bios/patrick-stapleton.jpg",
         "twitter": "gdi2290",
         "website": "https://angularclass.com",
-        "bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular2, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular 2 server-side rendering as Universal Angular 2 and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.",
+        "bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular2, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular server-side rendering as Universal Angular and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.",
         "type": "Community"
       },
 
diff --git a/package.json b/package.json
index 71125dcd07..5ab4ceea6d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "angular.io",
   "version": "0.0.0",
   "private": true,
-  "description": "Angular 2 documentation",
+  "description": "Angular documentation",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade
index 659591edb8..62a9e97016 100644
--- a/public/_includes/_footer.jade
+++ b/public/_includes/_footer.jade
@@ -17,7 +17,7 @@ else
       h3.text-headline RESOURCES
 
       ul.text-body
-        // TODO: (ericjim) make a libraries page to showcase all angular 2 libraries
+        // TODO: (ericjim) make a libraries page to showcase all angular libraries
         //li <a href="/libraries.html">Libraries</a>
         li <a href="/about/">About</a>
         li <a href="/resources/">Books & Training</a>
diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade
index 2e46febe96..a0c7429fa1 100644
--- a/public/_includes/_head-include.jade
+++ b/public/_includes/_head-include.jade
@@ -12,7 +12,7 @@ if title == "Angular"
 else if language
   title #{title} - #{language}
 else
-  title #{title} - Angular 2
+  title #{title} - Angular
 
 meta(charset="utf-8")
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
@@ -22,14 +22,14 @@ meta(name="robots" content="all")
 meta(name="referrer" content="origin")
 meta(name="viewport" id="viewport" content="width=device-width, initial-scale=1")
 
-meta(property="og:title" content="Angular 2")
+meta(property="og:title" content="Angular")
 meta(property="og:image" content="/resources/images/logos/standard/shield-large.png")
 meta(property="og:image:type" content="image/png")
 meta(property="og:image:width" content="184")
 meta(property="og:image:height" content="200")
 meta(property="og:description" content="#{description}")
 
-meta(itemprop="name" content="Angular 2")
+meta(itemprop="name" content="Angular")
 meta(itemprop="description" content="#{description}")
 meta(itemprop="image" content="https://angular.io/resources/images/logos/standard/shield-large.png")
 
@@ -57,4 +57,4 @@ link(rel="stylesheet" href="/resources/css/main.css")
 <link rel="icon" type="image/png" href="/resources/images/favicons/favicon-96x96.png" sizes="96x96">
 <link rel="icon" type="image/png" href="/resources/images/favicons/android-chrome-192x192.png" sizes="192x192">
 <link rel="icon" type="image/png" href="/resources/images/favicons/favicon-16x16.png" sizes="16x16">
-<link rel="manifest" href="/resources/images/favicons/manifest.json">
\ No newline at end of file
+<link rel="manifest" href="/resources/images/favicons/manifest.json">
diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade
index 5d61619ae7..2b5162b391 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/public/_includes/_version-dropdown.jade
@@ -44,20 +44,20 @@ mixin tree(directory, urlPrefix, name, latest)
 //- BUTTON TITLE GENERATION
 if language == 'ts'
   if version == "latest"
-    - var title = 'Angular 2 for TypeScript'
+    - var title = 'Angular for TypeScript'
   else
     - var title = 'Angular ' + version + ' for TypeScript'
 
 if language == 'js'
   if version == "latest"
-    - var title = 'Angular 2 for JavaScript'
+    - var title = 'Angular for JavaScript'
   else
     - var title = 'Angular ' + version + ' for JavaScript'
 
 
 if language == 'dart'
   if version == "latest"
-    - var title = 'Angular 2 for Dart'
+    - var title = 'Angular for Dart'
   else
     - var title = 'Angular ' + version + ' for Dart'
 
@@ -69,8 +69,8 @@ nav.dropdown
 
   <!-- DROPDOWN MENU -->
   ul(class="dropdown-menu" ng-class="appCtrl.showMenu ? 'is-visible' : ''")
-    mixin tree(public.docs.ts, "/docs/ts", "Angular 2 for TypeScript")
-    mixin tree(public.docs.js, "/docs/js", "Angular 2 for JavaScript")
+    mixin tree(public.docs.ts, "/docs/ts", "Angular for TypeScript")
+    mixin tree(public.docs.js, "/docs/js", "Angular for JavaScript")
     //- Disable cross-language link for API entry pages (but keep for top API search page):
     if ! (current.path[3] === 'api' && public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]])
-      mixin tree(public.docs.dart, "/docs/dart", "Angular 2 for Dart")
+      mixin tree(public.docs.dart, "/docs/dart", "Angular for Dart")
diff --git a/public/contribute.jade b/public/contribute.jade
index 002c8da4a1..994d46a36d 100644
--- a/public/contribute.jade
+++ b/public/contribute.jade
@@ -3,11 +3,11 @@
   p We'd love for you to contribute to our source code and to make Angular projects even better.
 
   .l-sub-section
-    h3 Angular 2
+    h3 Angular
 
-    p Angular 2 is a next generation mobile and desktop application development platform.
+    p Angular is a next generation mobile and desktop application development platform.
 
-    a(href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular 2
+    a(href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular
 
   .l-sub-section
     h3 Angular for JavaScript or Dart
diff --git a/public/docs/_examples/_protractor/protractor.config.js b/public/docs/_examples/_protractor/protractor.config.js
index fc68f03b98..2452bea764 100644
--- a/public/docs/_examples/_protractor/protractor.config.js
+++ b/public/docs/_examples/_protractor/protractor.config.js
@@ -26,7 +26,7 @@ exports.config = {
   // Framework to use. Jasmine is recommended.
   framework: 'jasmine',
 
-  // For angular2 tests
+  // For angular tests
   useAllAngular2AppRoots: true,
 
   // Base URL for application server
diff --git a/public/docs/_examples/animations/e2e-spec.ts b/public/docs/_examples/animations/e2e-spec.ts
index 9b6319db66..31eefbf345 100644
--- a/public/docs/_examples/animations/e2e-spec.ts
+++ b/public/docs/_examples/animations/e2e-spec.ts
@@ -4,7 +4,7 @@
  * The tests here basically just checking that the end styles
  * of each animation are in effect.
  *
- * Relies on the Angular 2 testability only becoming stable once
+ * Relies on the Angular testability only becoming stable once
  * animation(s) have finished.
  *
  * Ideally we'd use https://developer.mozilla.org/en-US/docs/Web/API/Document/getAnimations
diff --git a/public/docs/_examples/animations/ts/plnkr.json b/public/docs/_examples/animations/ts/plnkr.json
index 5a4139282b..4fface319e 100644
--- a/public/docs/_examples/animations/ts/plnkr.json
+++ b/public/docs/_examples/animations/ts/plnkr.json
@@ -1,5 +1,5 @@
 {
-  "description": "Angular 2 Animations",
+  "description": "Angular Animations",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"
diff --git a/public/docs/_examples/architecture/dart/web/index.html b/public/docs/_examples/architecture/dart/web/index.html
index a422e64542..840f107c53 100644
--- a/public/docs/_examples/architecture/dart/web/index.html
+++ b/public/docs/_examples/architecture/dart/web/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Architecture of Angular 2</title>
+    <title>Architecture of Angular</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/architecture/e2e-spec.ts b/public/docs/_examples/architecture/e2e-spec.ts
index 54bf9be8f2..0bdcdd0069 100644
--- a/public/docs/_examples/architecture/e2e-spec.ts
+++ b/public/docs/_examples/architecture/e2e-spec.ts
@@ -10,7 +10,7 @@ class Hero {
 
 describe('Architecture', () => {
 
-  const expectedTitle = 'Architecture of Angular 2';
+  const expectedTitle = 'Architecture of Angular';
   const expectedH2 = ['Hero List', 'Sales Tax Calculator'];
 
   beforeAll(() => browser.get(''));
diff --git a/public/docs/_examples/architecture/ts/app/mini-app.ts b/public/docs/_examples/architecture/ts/app/mini-app.ts
index 8a35a607a2..b064428be3 100644
--- a/public/docs/_examples/architecture/ts/app/mini-app.ts
+++ b/public/docs/_examples/architecture/ts/app/mini-app.ts
@@ -13,7 +13,7 @@ import { Component } from '@angular/core';
 
 @Component({
  selector: 'my-app',
- template: 'Welcome to Angular 2'
+ template: 'Welcome to Angular'
 })
 export class AppComponent {
   constructor(logger: Logger) {
diff --git a/public/docs/_examples/architecture/ts/index.html b/public/docs/_examples/architecture/ts/index.html
index e365c39f02..090bd17c7b 100644
--- a/public/docs/_examples/architecture/ts/index.html
+++ b/public/docs/_examples/architecture/ts/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Architecture of Angular 2</title>
+    <title>Architecture of Angular</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/architecture/ts/mini-app.html b/public/docs/_examples/architecture/ts/mini-app.html
index a17a191e90..ecb7dd21ae 100644
--- a/public/docs/_examples/architecture/ts/mini-app.html
+++ b/public/docs/_examples/architecture/ts/mini-app.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Architecture of Angular 2</title>
+    <title>Architecture of Angular</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/architecture/ts/plnkr.json b/public/docs/_examples/architecture/ts/plnkr.json
index 3acf69014c..9a4180a9d4 100644
--- a/public/docs/_examples/architecture/ts/plnkr.json
+++ b/public/docs/_examples/architecture/ts/plnkr.json
@@ -1,5 +1,5 @@
 {
-  "description": "Intro to Angular2",
+  "description": "Intro to Angular",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
diff --git a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts
index 1f7c00704c..fe72681ee3 100644
--- a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts
+++ b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts
@@ -9,7 +9,7 @@ describe('AOT Compilation', function () {
 
     it('should load page and click button', function (done) {
       let headingSelector = element.all(by.css('h1')).get(0);
-      expect(headingSelector.getText()).toEqual('My First Angular 2 App');
+      expect(headingSelector.getText()).toEqual('My First Angular App');
 
       expect(element.all(by.xpath('//div[text()="Magneta"]')).get(0).isPresent()).toBe(true);
       expect(element.all(by.xpath('//div[text()="Bombasto"]')).get(0).isPresent()).toBe(true);
diff --git a/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html b/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html
index c6a7babb8b..4d7dd8c63f 100644
--- a/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html
+++ b/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html
@@ -1,6 +1,6 @@
 <!-- #docregion -->
 <button (click)="toggleHeading()">Toggle Heading</button>
-<h1 *ngIf="showHeading">My First Angular 2 App</h1>
+<h1 *ngIf="showHeading">My First Angular App</h1>
 
 <h3>List of Heroes</h3>
 <div *ngFor="let hero of heroes">{{hero}}</div>
diff --git a/public/docs/_examples/cb-set-document-title/ts/plnkr.json b/public/docs/_examples/cb-set-document-title/ts/plnkr.json
index 0131610c20..1863d49471 100644
--- a/public/docs/_examples/cb-set-document-title/ts/plnkr.json
+++ b/public/docs/_examples/cb-set-document-title/ts/plnkr.json
@@ -1,5 +1,5 @@
 {
-	"description": "Set The Document Title In Angular 2",
+	"description": "Set The Document Title In Angular",
 	"files": [
 		"!**/*.d.ts",  
 		"!**/*.js",
diff --git a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled
index f214b75d93..ef30b01ec1 100644
--- a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled
+++ b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled
@@ -7,6 +7,6 @@ describe('cli-quickstart App', () => {
 
   it('should display message saying app works', () => {
     let pageTitle = element(by.css('cli-quickstart-app h1')).getText();
-    expect(pageTitle).toEqual('My First Angular 2 App');
+    expect(pageTitle).toEqual('My First Angular App');
   });
 });
diff --git a/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts b/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts
index 5510df7476..8c6b3a43cc 100644
--- a/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts
+++ b/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts
@@ -12,6 +12,6 @@ import { Component } from '@angular/core';
 // #enddocregion metadata
 // #docregion title, class
 export class CliQuickstartAppComponent {
-  title = 'My First Angular 2 App';
+  title = 'My First Angular App';
 }
 // #enddocregion title, class
diff --git a/public/docs/_examples/homepage-hello-world/ts/index.1.html b/public/docs/_examples/homepage-hello-world/ts/index.1.html
index aa342316ab..5637880406 100644
--- a/public/docs/_examples/homepage-hello-world/ts/index.1.html
+++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Hello World</title>
+    <title>Angular Hello World</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/homepage-hello-world/ts/index.html b/public/docs/_examples/homepage-hello-world/ts/index.html
index 794935d3bb..283343ace7 100644
--- a/public/docs/_examples/homepage-hello-world/ts/index.html
+++ b/public/docs/_examples/homepage-hello-world/ts/index.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Hello World</title>
+    <title>Angular Hello World</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/homepage-tabs/ts/index.1.html b/public/docs/_examples/homepage-tabs/ts/index.1.html
index 600739b704..6ff25956dc 100644
--- a/public/docs/_examples/homepage-tabs/ts/index.1.html
+++ b/public/docs/_examples/homepage-tabs/ts/index.1.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tabs</title>
+    <title>Angular Tabs</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/homepage-tabs/ts/index.html b/public/docs/_examples/homepage-tabs/ts/index.html
index 1fe2ebc8ba..66ce8f3ecc 100644
--- a/public/docs/_examples/homepage-tabs/ts/index.html
+++ b/public/docs/_examples/homepage-tabs/ts/index.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tabs</title>
+    <title>Angular Tabs</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
diff --git a/public/docs/_examples/homepage-todo/ts/index.1.html b/public/docs/_examples/homepage-todo/ts/index.1.html
index 181cf44ce2..26800d3e05 100644
--- a/public/docs/_examples/homepage-todo/ts/index.1.html
+++ b/public/docs/_examples/homepage-todo/ts/index.1.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Todos</title>
+    <title>Angular Todos</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/homepage-todo/ts/index.html b/public/docs/_examples/homepage-todo/ts/index.html
index 2bddce017c..8839065224 100644
--- a/public/docs/_examples/homepage-todo/ts/index.html
+++ b/public/docs/_examples/homepage-todo/ts/index.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Todos</title>
+    <title>Angular Todos</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
diff --git a/public/docs/_examples/lifecycle-hooks/ts/index.html b/public/docs/_examples/lifecycle-hooks/ts/index.html
index 6fa866c6e6..07cf7d4a03 100644
--- a/public/docs/_examples/lifecycle-hooks/ts/index.html
+++ b/public/docs/_examples/lifecycle-hooks/ts/index.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <html>
   <head>
-    <title>Angular 2 Lifecycle Hooks</title>
+    <title>Angular Lifecycle Hooks</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/plunker.README.md b/public/docs/_examples/plunker.README.md
index 5bcc99414d..fa2e46f47a 100644
--- a/public/docs/_examples/plunker.README.md
+++ b/public/docs/_examples/plunker.README.md
@@ -1,2 +1,2 @@
-### Angular 2 Documentation Example 
+### Angular Documentation Example 
 
diff --git a/public/docs/_examples/quickstart/e2e-spec.ts b/public/docs/_examples/quickstart/e2e-spec.ts
index 4a6d169756..5a1c683cfd 100644
--- a/public/docs/_examples/quickstart/e2e-spec.ts
+++ b/public/docs/_examples/quickstart/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 describe('QuickStart E2E Tests', function () {
 
-  let expectedMsg = 'My First Angular 2 App';
+  let expectedMsg = 'My First Angular App';
 
   beforeEach(function () {
     browser.get('');
diff --git a/public/docs/_examples/quickstart/js/app/app.component.js b/public/docs/_examples/quickstart/js/app/app.component.js
index f86b3bde46..69d3e9127e 100644
--- a/public/docs/_examples/quickstart/js/app/app.component.js
+++ b/public/docs/_examples/quickstart/js/app/app.component.js
@@ -10,7 +10,7 @@
     ng.core.Component({
       // #enddocregion ng-namespace-funcs
       selector: 'my-app',
-      template: '<h1>My First Angular 2 App</h1>'
+      template: '<h1>My First Angular App</h1>'
     // #docregion ng-namespace-funcs
     })
     // #enddocregion component
diff --git a/public/docs/_examples/quickstart/js/index.html b/public/docs/_examples/quickstart/js/index.html
index 551e4fb134..03fcbb37c4 100644
--- a/public/docs/_examples/quickstart/js/index.html
+++ b/public/docs/_examples/quickstart/js/index.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <html>
   <head>
-    <title>Angular 2 QuickStart JS</title>
+    <title>Angular QuickStart JS</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
 
diff --git a/public/docs/_examples/quickstart/ts/app/app.component.ts b/public/docs/_examples/quickstart/ts/app/app.component.ts
index ea76b32116..e6c635440b 100644
--- a/public/docs/_examples/quickstart/ts/app/app.component.ts
+++ b/public/docs/_examples/quickstart/ts/app/app.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
 // #docregion metadata
 @Component({
   selector: 'my-app',
-  template: '<h1>My First Angular 2 App</h1>'
+  template: '<h1>My First Angular App</h1>'
 })
 // #enddocregion metadata
 // #docregion class
diff --git a/public/docs/_examples/quickstart/ts/index.html b/public/docs/_examples/quickstart/ts/index.html
index fef30ef98b..4ee082433c 100644
--- a/public/docs/_examples/quickstart/ts/index.html
+++ b/public/docs/_examples/quickstart/ts/index.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <html>
   <head>
-    <title>Angular 2 QuickStart</title>
+    <title>Angular QuickStart</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/quickstart/ts/package.1.json b/public/docs/_examples/quickstart/ts/package.1.json
index 4fe519331e..35efebb2c2 100644
--- a/public/docs/_examples/quickstart/ts/package.1.json
+++ b/public/docs/_examples/quickstart/ts/package.1.json
@@ -1,5 +1,5 @@
 {
-  "name": "angular2-quickstart",
+  "name": "angular-quickstart",
   "version": "1.0.0",
   "scripts": {
     "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
diff --git a/public/docs/_examples/quickstart/ts/systemjs.config.1.js b/public/docs/_examples/quickstart/ts/systemjs.config.1.js
index d92e1361d0..852c46168d 100644
--- a/public/docs/_examples/quickstart/ts/systemjs.config.1.js
+++ b/public/docs/_examples/quickstart/ts/systemjs.config.1.js
@@ -1,6 +1,6 @@
 // #docregion
 /**
- * System configuration for Angular 2 samples
+ * System configuration for Angular samples
  * Adjust as necessary for your application needs.
  */
 (function (global) {
diff --git a/public/docs/_examples/server-communication/ts/index.html b/public/docs/_examples/server-communication/ts/index.html
index c2d2656c84..d265bef2f9 100644
--- a/public/docs/_examples/server-communication/ts/index.html
+++ b/public/docs/_examples/server-communication/ts/index.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <html>
   <head>
-    <title>Angular 2 Http Demo</title>
+    <title>Angular Http Demo</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/structural-directives/ts/index.html b/public/docs/_examples/structural-directives/ts/index.html
index da815d8e69..2dc2548cc4 100644
--- a/public/docs/_examples/structural-directives/ts/index.html
+++ b/public/docs/_examples/structural-directives/ts/index.html
@@ -2,7 +2,7 @@
 <!-- #docregion -->
 <html>
   <head>
-    <title>Angular 2 Structural Directives</title>
+    <title>Angular Structural Directives</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/styleguide/e2e-spec.ts b/public/docs/_examples/styleguide/e2e-spec.ts
index 6dc2753038..321e86c8a1 100644
--- a/public/docs/_examples/styleguide/e2e-spec.ts
+++ b/public/docs/_examples/styleguide/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 describe('Documentation StyleGuide E2E Tests', function() {
 
-  let expectedMsg = 'My First Angular 2 App';
+  let expectedMsg = 'My First Angular App';
 
   beforeEach(function () {
     browser.get('');
diff --git a/public/docs/_examples/styleguide/js/app.js b/public/docs/_examples/styleguide/js/app.js
index 61a0f2ae31..d38669cd78 100644
--- a/public/docs/_examples/styleguide/js/app.js
+++ b/public/docs/_examples/styleguide/js/app.js
@@ -8,7 +8,7 @@ app.AppComponent =
       selector: 'my-app',
     // #enddocregion
     // #docregion view
-      template: '<h1 id="output">My First Angular 2 App</h1>'
+      template: '<h1 id="output">My First Angular App</h1>'
     })
     // #enddocregion
     // #docregion class
@@ -48,7 +48,7 @@ app.AppComponent = function  AppComponent () {}
 app.AppComponent.annotations = [
   new ng.core.Component({
     selector: 'my-app',
-    template: '<h1 id="output">My First Angular 2 App</h1>'
+    template: '<h1 id="output">My First Angular App</h1>'
   })
 ];
 // #enddocregion
diff --git a/public/docs/_examples/styleguide/ts/app/app.component.ts b/public/docs/_examples/styleguide/ts/app/app.component.ts
index 7659920b9f..8b71f6ddc4 100644
--- a/public/docs/_examples/styleguide/ts/app/app.component.ts
+++ b/public/docs/_examples/styleguide/ts/app/app.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 @Component({
   selector: 'my-app',
-  template: '<h1 id="output">My First Angular 2 App</h1>'
+  template: '<h1 id="output">My First Angular App</h1>'
 })
 export class AppComponent { }
 
diff --git a/public/docs/_examples/systemjs.config.js b/public/docs/_examples/systemjs.config.js
index fa3e0cc61f..cc06fc9422 100644
--- a/public/docs/_examples/systemjs.config.js
+++ b/public/docs/_examples/systemjs.config.js
@@ -1,5 +1,5 @@
 /**
- * System configuration for Angular 2 samples
+ * System configuration for Angular samples
  * Adjust as necessary for your application needs.
  */
 (function (global) {
diff --git a/public/docs/_examples/systemjs.config.plunker.build.js b/public/docs/_examples/systemjs.config.plunker.build.js
index 5334adf005..36ad2c7d16 100644
--- a/public/docs/_examples/systemjs.config.plunker.build.js
+++ b/public/docs/_examples/systemjs.config.plunker.build.js
@@ -1,7 +1,7 @@
 /**
  * PLUNKER VERSION FOR CURRENT ANGULAR BUILD
  * (based on systemjs.config.js in angular.io)
- * System configuration for Angular 2 samples
+ * System configuration for Angular samples
  * Adjust as necessary for your application needs.
  *
  * UNTESTED !
diff --git a/public/docs/_examples/systemjs.config.plunker.js b/public/docs/_examples/systemjs.config.plunker.js
index 26b8a17aab..ccfee00019 100644
--- a/public/docs/_examples/systemjs.config.plunker.js
+++ b/public/docs/_examples/systemjs.config.plunker.js
@@ -1,7 +1,7 @@
 /**
  * PLUNKER VERSION
  * (based on systemjs.config.js in angular.io)
- * System configuration for Angular 2 samples
+ * System configuration for Angular samples
  * Adjust as necessary for your application needs.
  */
 (function (global) {
diff --git a/public/docs/_examples/toh-1/e2e-spec.ts b/public/docs/_examples/toh-1/e2e-spec.ts
index 51a935acab..11e51e4df9 100644
--- a/public/docs/_examples/toh-1/e2e-spec.ts
+++ b/public/docs/_examples/toh-1/e2e-spec.ts
@@ -4,7 +4,7 @@
 type WPromise<T> = webdriver.promise.Promise<T>;
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 
 class Hero {
   id: number;
diff --git a/public/docs/_examples/toh-1/ts/index.html b/public/docs/_examples/toh-1/ts/index.html
index e9c099696b..4445befc9a 100644
--- a/public/docs/_examples/toh-1/ts/index.html
+++ b/public/docs/_examples/toh-1/ts/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/toh-2/e2e-spec.ts b/public/docs/_examples/toh-2/e2e-spec.ts
index 617ca38a1f..cde9e93edf 100644
--- a/public/docs/_examples/toh-2/e2e-spec.ts
+++ b/public/docs/_examples/toh-2/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 const expectedH2 = 'My Heroes';
 const targetHero = { id: 16, name: 'RubberMan' };
 const nameSuffix = 'X';
diff --git a/public/docs/_examples/toh-2/ts/index.html b/public/docs/_examples/toh-2/ts/index.html
index e9c099696b..4445befc9a 100644
--- a/public/docs/_examples/toh-2/ts/index.html
+++ b/public/docs/_examples/toh-2/ts/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/toh-3/e2e-spec.ts b/public/docs/_examples/toh-3/e2e-spec.ts
index 0f9c747b90..f1e51f5b39 100644
--- a/public/docs/_examples/toh-3/e2e-spec.ts
+++ b/public/docs/_examples/toh-3/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 const expectedH2 = 'My Heroes';
 const targetHero = { id: 16, name: 'RubberMan' };
 const nameSuffix = 'X';
diff --git a/public/docs/_examples/toh-3/ts/index.html b/public/docs/_examples/toh-3/ts/index.html
index e9c099696b..4445befc9a 100644
--- a/public/docs/_examples/toh-3/ts/index.html
+++ b/public/docs/_examples/toh-3/ts/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/toh-4/e2e-spec.ts b/public/docs/_examples/toh-4/e2e-spec.ts
index 8c109167af..456297b6d2 100644
--- a/public/docs/_examples/toh-4/e2e-spec.ts
+++ b/public/docs/_examples/toh-4/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 const expectedH2 = 'My Heroes';
 const targetHero = { id: 16, name: 'RubberMan' };
 const nameSuffix = 'X';
diff --git a/public/docs/_examples/toh-4/ts/index.html b/public/docs/_examples/toh-4/ts/index.html
index e9c099696b..4445befc9a 100644
--- a/public/docs/_examples/toh-4/ts/index.html
+++ b/public/docs/_examples/toh-4/ts/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/toh-5/e2e-spec.ts b/public/docs/_examples/toh-5/e2e-spec.ts
index 2ae0d5b93b..6935ff19a2 100644
--- a/public/docs/_examples/toh-5/e2e-spec.ts
+++ b/public/docs/_examples/toh-5/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 const targetHero = { id: 15, name: 'Magneta' };
 const targetHeroDashboardIndex = 3;
 const nameSuffix = 'X';
diff --git a/public/docs/_examples/toh-5/ts/index.html b/public/docs/_examples/toh-5/ts/index.html
index 4df64edba1..f8383d0c94 100644
--- a/public/docs/_examples/toh-5/ts/index.html
+++ b/public/docs/_examples/toh-5/ts/index.html
@@ -5,7 +5,7 @@
   <head>
     <base href="/">
     <!-- #enddocregion base-href -->
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
diff --git a/public/docs/_examples/toh-6/e2e-spec.ts b/public/docs/_examples/toh-6/e2e-spec.ts
index 3b4ec4c805..8152ac308c 100644
--- a/public/docs/_examples/toh-6/e2e-spec.ts
+++ b/public/docs/_examples/toh-6/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 
 const expectedH1 = 'Tour of Heroes';
-const expectedTitle = `Angular 2 ${expectedH1}`;
+const expectedTitle = `Angular ${expectedH1}`;
 const targetHero = { id: 15, name: 'Magneta' };
 const targetHeroDashboardIndex = 3;
 const nameSuffix = 'X';
diff --git a/public/docs/_examples/toh-6/ts/index.html b/public/docs/_examples/toh-6/ts/index.html
index 8bbbc6123d..41faa36c28 100644
--- a/public/docs/_examples/toh-6/ts/index.html
+++ b/public/docs/_examples/toh-6/ts/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <base href="/">
-    <title>Angular 2 Tour of Heroes</title>
+    <title>Angular Tour of Heroes</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <link rel="stylesheet" href="styles.css">
diff --git a/public/docs/_examples/webpack/e2e-spec.ts b/public/docs/_examples/webpack/e2e-spec.ts
index 59bf5c5708..1e88bfccf1 100644
--- a/public/docs/_examples/webpack/e2e-spec.ts
+++ b/public/docs/_examples/webpack/e2e-spec.ts
@@ -2,7 +2,7 @@
 'use strict';
 describe('QuickStart E2E Tests', function () {
 
-  let expectedMsg = 'Hello from Angular 2 App with Webpack';
+  let expectedMsg = 'Hello from Angular App with Webpack';
 
   beforeEach(function () {
     browser.get('');
diff --git a/public/docs/_examples/webpack/ts/package.webpack.json b/public/docs/_examples/webpack/ts/package.webpack.json
index ff8477675c..3995e724db 100644
--- a/public/docs/_examples/webpack/ts/package.webpack.json
+++ b/public/docs/_examples/webpack/ts/package.webpack.json
@@ -1,7 +1,7 @@
 {
   "name": "angular2-webpack",
   "version": "1.0.0",
-  "description": "A webpack starter for angular 2",
+  "description": "A webpack starter for Angular",
   "scripts": {
     "start": "webpack-dev-server --inline --progress --port 8080",
     "test": "karma start",
diff --git a/public/docs/_examples/webpack/ts/src/app/app.component.html b/public/docs/_examples/webpack/ts/src/app/app.component.html
index a333a7a72f..b06ff16d11 100644
--- a/public/docs/_examples/webpack/ts/src/app/app.component.html
+++ b/public/docs/_examples/webpack/ts/src/app/app.component.html
@@ -1,6 +1,6 @@
 <!-- #docregion -->
 <main>
-  <h1>Hello from Angular 2 App with Webpack</h1>
+  <h1>Hello from Angular App with Webpack</h1>
 
   <img src="../../public/images/angular.png">
 </main>
diff --git a/public/docs/_examples/webpack/ts/src/vendor.ts b/public/docs/_examples/webpack/ts/src/vendor.ts
index ede1e2717d..8ffd09240a 100644
--- a/public/docs/_examples/webpack/ts/src/vendor.ts
+++ b/public/docs/_examples/webpack/ts/src/vendor.ts
@@ -1,5 +1,5 @@
 // #docregion
-// Angular 2
+// Angular
 import '@angular/platform-browser';
 import '@angular/platform-browser-dynamic';
 import '@angular/core';
diff --git a/public/docs/_includes/styleguide/_code-examples.jade b/public/docs/_includes/styleguide/_code-examples.jade
index 8291c74e59..2d6c6e74dd 100644
--- a/public/docs/_includes/styleguide/_code-examples.jade
+++ b/public/docs/_includes/styleguide/_code-examples.jade
@@ -116,7 +116,7 @@ include ../../../_includes/_util-fns
             selector: 'my-app',
           // #enddocregion component
           // #docregion view
-            template: '<h1 id="output">My First Angular 2 App</h1>'
+            template: '<h1 id="output">My First Angular App</h1>'
           })
           // #enddocregion view
           // #docregion class
@@ -143,7 +143,7 @@ include ../../../_includes/_util-fns
       // #enddocregion twoparts,  import
       @Component({
         selector: 'my-app',
-        template: '<h1 id="output">My first Angular 2 App</h1>'
+        template: '<h1 id="output">My first Angular App</h1>'
       })
       class AppComponent {
       }
diff --git a/public/docs/dart/latest/guide/architecture.jade b/public/docs/dart/latest/guide/architecture.jade
index 9bf1256210..c72080b6e9 100644
--- a/public/docs/dart/latest/guide/architecture.jade
+++ b/public/docs/dart/latest/guide/architecture.jade
@@ -6,7 +6,7 @@ block includes
   - var _at_angular = 'angular2'
 
 :marked
-  Angular 2 is a framework to help us build client applications in HTML and
+  Angular is a framework to help us build client applications in HTML and
   either JavaScript or a language (like Dart or TypeScript) that compiles to JavaScript.
 
 block angular-parts
diff --git a/public/docs/dart/latest/guide/forms.jade b/public/docs/dart/latest/guide/forms.jade
index 863ee5e9bd..3eaa3ae40e 100644
--- a/public/docs/dart/latest/guide/forms.jade
+++ b/public/docs/dart/latest/guide/forms.jade
@@ -89,7 +89,7 @@ figure.image-display
 
 :marked
   ## Setup
-  Create a new project folder (`angular2_forms`) and create 3 files:
+  Create a new project folder (`angular_forms`) and create 3 files:
   `pubspec.yaml`, `web/index.html`, and `web/main.dart`.
   (These files should be familiar from the
   [QuickStart](../quickstart.html).) Put these contents in the files:
@@ -160,7 +160,7 @@ figure.image-display
   There’s nothing special about this component, nothing form-specific,
   nothing to distinguish it from any component we've written before.
 
-  Understanding this component requires only the Angular 2 concepts covered in previous chapters.
+  Understanding this component requires only the Angular concepts covered in previous chapters.
 
   1. The code imports a standard set of symbols from the Angular library.
 
@@ -629,7 +629,7 @@ figure.image-display
 :marked
   ## Conclusion
 
-  The Angular 2 form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation, and more:
+  The Angular form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation, and more:
 
   - An Angular HTML form template.
   - A form component class with a `Component` decorator.
diff --git a/public/docs/dart/latest/guide/server-communication.jade b/public/docs/dart/latest/guide/server-communication.jade
index ef79633e6d..5dd2f5bace 100644
--- a/public/docs/dart/latest/guide/server-communication.jade
+++ b/public/docs/dart/latest/guide/server-communication.jade
@@ -17,7 +17,7 @@ block http-providers
     Actually, it is unnecessary to include `BrowserClient` in the list of providers.
     ***But*** as is mentioned in the *Angular 2 Dart Transformer* [wiki page][ng2dtri],
     the template compiler _generates_ dependency injection code, hence all the
-    identifiers used in DI have to be collected by the Angular 2 transformer
+    identifiers used in DI have to be collected by the Angular transformer
     so that the libraries containing these identifiers can be transformed.
 
     Unless special steps are taken, Dart libraries like `http`
diff --git a/public/docs/dart/latest/guide/template-syntax.jade b/public/docs/dart/latest/guide/template-syntax.jade
index b754481889..bee8fc97a7 100644
--- a/public/docs/dart/latest/guide/template-syntax.jade
+++ b/public/docs/dart/latest/guide/template-syntax.jade
@@ -82,7 +82,7 @@ block dart-no-truthy-falsey
       the value `true`; all other values are `false`.
       TypeScript and JavaScript, on the other hand, treat
       many values (including non-null objects) as true.
-      A TypeScript Angular 2 program, for example, often has code like
+      A TypeScript Angular program, for example, often has code like
       `*ngIf="currentHero"` where a Dart program has code like
       `*ngIf="currentHero != null"`.
 
@@ -109,7 +109,7 @@ block dart-safe-nav-op
     :marked
       The safe navigation operator (`?.`) is part of the Dart language.
       It's considered a template expression operator because
-      Angular 2 supports `?.` even in TypeScript and JavaScript apps.
+      Angular supports `?.` even in TypeScript and JavaScript apps.
 
 block json-pipe
   //- TODO: explain alternative in Dart
diff --git a/public/docs/index.jade b/public/docs/index.jade
index 61725df2c8..77690d7ed6 100644
--- a/public/docs/index.jade
+++ b/public/docs/index.jade
@@ -2,11 +2,11 @@
   .l-sub-section
     h3 TypeScript
 
-    p: <a href="/docs/ts/latest">Angular 2 TS - Latest Version</a>
+    p: <a href="/docs/ts/latest">Angular TS - Latest Version</a>
       
     h3 JavaScript
 
-    p <a href="/docs/js/latest">Angular 2 JS - Latest Version</a>
+    p <a href="/docs/js/latest">Angular JS - Latest Version</a>
 
     h3 Dart
 
diff --git a/public/docs/js/latest/cookbook/ts-to-js.jade b/public/docs/js/latest/cookbook/ts-to-js.jade
index 1880cf6537..580a628f50 100644
--- a/public/docs/js/latest/cookbook/ts-to-js.jade
+++ b/public/docs/js/latest/cookbook/ts-to-js.jade
@@ -1,15 +1,15 @@
 include ../../../../_includes/_util-fns
 
 :marked
-  Everything that we can do in Angular 2 in TypeScript, we can also do
+  Everything that we can do in Angular in TypeScript, we can also do
   in JavaScript. Translating from one language to the other is mostly a
   matter of changing the way we organize our code and the way we access
-  Angular 2 APIs.
+  Angular APIs.
 
-  Since TypeScript is a popular language option in Angular 2, many of the
+  Since TypeScript is a popular language option in Angular, many of the
   code examples you see on the Internet as well as on this site are written
   in TypeScript. This cookbook contains recipes for translating these kinds of
-  code examples to ES5, so that they can be applied to Angular 2 JavaScript
+  code examples to ES5, so that they can be applied to Angular JavaScript
   applications.
 
 <a id="toc"></a>
@@ -44,19 +44,19 @@ table(width="100%")
   tr(style=top)
     td
       :marked
-        ### Importing Angular 2 Code
+        ### Importing Angular Code
 
-        In TypeScript code, Angular 2 classes, functions, and other members
+        In TypeScript code, Angular classes, functions, and other members
         are imported with TypeScript `import` statements:
 
       +makeExample('cb-ts-to-js/ts/app/main.ts', 'ng2import')(format="." )
 
     td
       :marked
-        ### Accessing Angular 2 Code through the ng global
+        ### Accessing Angular Code through the ng global
 
         In JavaScript code, when using
-        [the Angular 2 packages](../glossary.html#!#scoped-package),
+        [the Angular packages](../glossary.html#!#scoped-package),
         we can access Angular code through the global `ng` object. In the
         nested members of this object we'll find everything we would import
         from `@angular` in TypeScript:
@@ -68,7 +68,7 @@ table(width="100%")
       :marked
         ### Importing and Exporting Application Code
 
-        Each file in an Angular 2 TypeScript application constitutes a
+        Each file in an Angular TypeScript application constitutes a
         TypeScript module. When we want to make something from a module available
         to other modules, we `export` it.
 
@@ -84,7 +84,7 @@ table(width="100%")
       :marked
         ### Sharing Application Code
 
-        In an Angular 2 JavaScript application, we load each file to the page
+        In an Angular JavaScript application, we load each file to the page
         using a `<script>` tag. Each file can make things available to other
         files via the shared global `window` scope.
 
@@ -112,8 +112,8 @@ table(width="100%")
 .alert.is-helpful
   :marked
     Alternatively, we can use a module loader such as Webpack or
-    Browserify in an Angular 2 JavaScript project. In such a project, we would
-    use CommonJS modules and the `require` function to load Angular 2 framework code.
+    Browserify in an Angular JavaScript project. In such a project, we would
+    use CommonJS modules and the `require` function to load Angular framework code.
     We would then use `module.exports` and `require` to export and import application
     code.
 
@@ -135,7 +135,7 @@ table(width="100%")
       :marked
         ### Classes
 
-        We put most of our Angular 2 TypeScript code into TypeScript classes.
+        We put most of our Angular TypeScript code into TypeScript classes.
 
       +makeExample('cb-ts-to-js/ts/app/hero.component.ts', 'class')(format="." )
 
@@ -144,7 +144,7 @@ table(width="100%")
         ### Constructors and Prototypes
 
         ES5 JavaScript has no classes. We use the constructor
-        pattern instead which works with Angular 2 as well as classes do.
+        pattern instead which works with Angular as well as classes do.
 
       +makeExample('cb-ts-to-js/js/app/hero.component.js', 'constructorproto')(format="." )
 
@@ -153,7 +153,7 @@ table(width="100%")
       :marked
         ### Metadata with Decorators
 
-        Most Angular 2 classes have one or more TypeScript *decorators*
+        Most Angular classes have one or more TypeScript *decorators*
         attached to provide configuration and metadata. For example,
         a component must have a [`@Component`](../api/core/index/Component-decorator.html) decorator.
 
@@ -225,7 +225,7 @@ table(width="100%")
         ### Implementing Methods without Interfaces
 
         TypeScript interfaces are purely for developer convenience
-        and are not used by Angular 2 at runtime. This means that in JavaScript
+        and are not used by Angular at runtime. This means that in JavaScript
         code we don't need to substitute anything for interfaces. We can just
         implement the methods.
 
@@ -294,7 +294,7 @@ table(width="100%")
       :marked
         ### Injection by Type
 
-        Angular 2 can often use TypeScript type information to
+        Angular can often use TypeScript type information to
         determine what needs to be injected.
 
       +makeExample('cb-ts-to-js/ts/app/hero-di.component.ts')(format="." )
@@ -418,7 +418,7 @@ table(width="100%")
         
         The  `host` value is an object whose properties are host property and listener bindings:
         
-        * Each key follows regular Angular 2 binding syntax: `[property]` for host bindings
+        * Each key follows regular Angular binding syntax: `[property]` for host bindings
           or `(event)` for host listeners.
         * Each value identifies the corresponding component property or method.
         
diff --git a/public/docs/js/latest/guide/forms.jade b/public/docs/js/latest/guide/forms.jade
index 5efeb01199..c9e90f88eb 100644
--- a/public/docs/js/latest/guide/forms.jade
+++ b/public/docs/js/latest/guide/forms.jade
@@ -101,7 +101,7 @@ figure.image-display
 
 :marked
   ## Setup
-  Create a new project folder (`angular2-forms`) and follow the steps in the [QuickStart](../quickstart.html).
+  Create a new project folder (`angular-forms`) and follow the steps in the [QuickStart](../quickstart.html).
 
   ## Create the Hero Model Class
 
@@ -146,7 +146,7 @@ code-example(format="").
 :marked
   There’s nothing special about this component, nothing form-specific, nothing to distinguish it from any component we've written before.
 
-  Understanding this component requires only the Angular 2 concepts we’ve learned in previous chapters
+  Understanding this component requires only the Angular concepts we’ve learned in previous chapters
 
   1. We use the `ng.core` object from the Angular library as we usually do.
 
@@ -601,7 +601,7 @@ figure.image-display
 :marked
   ## Conclusion
 
-  The Angular 2 form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation and more:
+  The Angular form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation and more:
 
   - An Angular HTML form template.
   - A form component class with a `Component` decorator.
@@ -614,7 +614,7 @@ figure.image-display
 
   Our final project folder structure should look like this:
 .filetree
-  .file angular2-forms
+  .file angular-forms
   .children
     .file app
     .children
diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade
index cba04af225..86df565921 100644
--- a/public/docs/js/latest/quickstart.jade
+++ b/public/docs/js/latest/quickstart.jade
@@ -1,12 +1,12 @@
 include _util-fns
 
 :marked
-  Let's start from zero and build a super simple Angular 2 application in JavaScript.
+  Let's start from zero and build a super simple Angular application in JavaScript.
 
 .callout.is-helpful
   header Don't want JavaScript?
   :marked
-    Although we're getting started in JavaScript, you can also write Angular 2 apps
+    Although we're getting started in JavaScript, you can also write Angular apps
     in TypeScript and Dart by selecting either of those languages from the combo-box in the banner.
 
 .l-main-section
@@ -14,7 +14,7 @@ include _util-fns
   ## See It Run!
 
   Running the <live-example></live-example>
-  is the quickest way to see an Angular 2 app come to life.
+  is the quickest way to see an Angular app come to life.
   
   Clicking that link fires up a browser, loads the sample in [plunker](http://plnkr.co/ "Plunker"),
   and displays a simple message:
@@ -24,7 +24,7 @@ figure.image-display
 :marked
   Here is the file structure:
 .filetree
-  .file angular2-quickstart
+  .file angular-quickstart
   .children
     .file app
     .children
@@ -65,8 +65,8 @@ figure.image-display
   ### Create a new project folder
   
 code-example(format="").
-  mkdir angular2-quickstart
-  cd    angular2-quickstart
+  mkdir angular-quickstart
+  cd    angular-quickstart
 :marked
   ### Add the libraries we need
   
@@ -208,7 +208,7 @@ code-example(format="").
 :marked
   The `template` property holds the component's companion template.
   A template is a form of HTML that tells Angular how to render a view.
-  Our template is a single line of HTML announcing "My First Angular 2 App".
+  Our template is a single line of HTML announcing "My First Angular App".
   
   Now we need something to tell Angular to load this component.
 
@@ -311,7 +311,7 @@ figure.image-display
 :marked
   ### Make some changes
   
-  Try changing the message to "My SECOND Angular 2 app".
+  Try changing the message to "My SECOND Angular app".
   
   `lite-server` is watching, so it should detect the change,
   refresh the browser, and display the revised message.
@@ -325,7 +325,7 @@ figure.image-display
   ## Final structure
   Our final project folder structure looks like this:
 .filetree
-  .file angular2-quickstart
+  .file angular-quickstart
   .children
     .file node_modules
     .file app
@@ -357,7 +357,7 @@ figure.image-display
 .l-main-section
 :marked
   ## Wrap Up
-  Our first application doesn't do much. It's basically "Hello, World" for Angular 2.
+  Our first application doesn't do much. It's basically "Hello, World" for Angular.
 
   We kept it simple in our first pass: we wrote a little Angular component,
   we added some JavaScript libraries to `index.html`, and launched with a
@@ -371,7 +371,7 @@ figure.image-display
   we'll likely open `index.html` only if we need to add a library or some css stylesheets.
 
   We're about to take the next step and build a small application that 
-  demonstrates the great things we can build with Angular 2.
+  demonstrates the great things we can build with Angular.
 
   Join us on the [Tour of Heroes Tutorial](./tutorial)!
 
@@ -399,7 +399,7 @@ figure.image-display
   Most applications need those capabilities and most applications
   should run in Internet Explorer.
 
-  Next are the polyfills for Angular2, `zone.js` and `Reflect.js`,
+  Next are the polyfills for Angular, `zone.js` and `Reflect.js`,
   followed by the Reactive Extensions RxJS library.
 .l-sub-section
   :marked
@@ -408,7 +408,7 @@ figure.image-display
     when working with observables.
     We added the library here in QuickStart so we don't forget later.
 :marked
-  Finally, we loaded the web development version of Angular 2 itself.
+  Finally, we loaded the web development version of Angular itself.
 
   We'll make different choices as we gain experience and
   become more concerned about production qualities such as
diff --git a/public/docs/ts/latest/cookbook/component-relative-paths.jade b/public/docs/ts/latest/cookbook/component-relative-paths.jade
index 835b5944af..b37a95ef98 100644
--- a/public/docs/ts/latest/cookbook/component-relative-paths.jade
+++ b/public/docs/ts/latest/cookbook/component-relative-paths.jade
@@ -29,7 +29,7 @@ include ../_util-fns
     with a suitable package loader such as `systemjs` or `webpack`.
     Learn why [below](#why-default).
     
-    The Angular 2 CLI uses these technologies and defaults to the
+    The Angular CLI uses these technologies and defaults to the
     *component-relative path* approach described here.
     CLI users can skip this chapter or read on to understand
     how it works.
diff --git a/public/docs/ts/latest/cookbook/index.jade b/public/docs/ts/latest/cookbook/index.jade
index 32b58d0406..08e3d5671a 100644
--- a/public/docs/ts/latest/cookbook/index.jade
+++ b/public/docs/ts/latest/cookbook/index.jade
@@ -2,11 +2,11 @@ include ../_util-fns
 
 // #docregion cookbook
 :marked
-  # Angular 2 Cookbook
+  # Angular Cookbook
   
   The *Cookbook* offers answers to common implementation questions.
   
-  Each cookbook chapter is a collection of recipes focused on a particular Angular 2 feature or application challenge
+  Each cookbook chapter is a collection of recipes focused on a particular Angular feature or application challenge
   such as data binding, cross-component interaction, and communicating with a remote server via HTTP.
   
 .l-sub-section
@@ -27,5 +27,5 @@ include ../_util-fns
   Post *documentation* issues and pull requests on the 
   [angular.io](https://github.com/angular/angular.io) github repository.
   
-  Post issues with *Angular 2 itself* to the [angular](https://github.com/angular/angular) github repository.
+  Post issues with *Angular itself* to the [angular](https://github.com/angular/angular) github repository.
 // #enddocregion cookbook
diff --git a/public/docs/ts/latest/cookbook/set-document-title.jade b/public/docs/ts/latest/cookbook/set-document-title.jade
index 60fa73a49b..8866131d7f 100644
--- a/public/docs/ts/latest/cookbook/set-document-title.jade
+++ b/public/docs/ts/latest/cookbook/set-document-title.jade
@@ -33,7 +33,7 @@ code-example(format='').
 
 :marked
   ## Use the *Title* service
-  Fortunately, Angular 2 bridges the gap by providing a `Title` service as part of the *Browser platform*.
+  Fortunately, Angular bridges the gap by providing a `Title` service as part of the *Browser platform*.
   The [Title](../api/platform-browser/index/Title-class.html) service is a simple class that provides an API
   for getting and setting the current HTML document title:
 
diff --git a/public/docs/ts/latest/cookbook/visual-studio-2015.jade b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
index ce6e4b5cad..cef858b9e6 100644
--- a/public/docs/ts/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
@@ -5,7 +5,7 @@ include ../_util-fns
    Some developers prefer Visual Studio as their Interactive Development Environment (IDE).
 
    This cookbook describes the steps required to set up and use the
-   Angular 2 QuickStart files in Visual Studio 2015 within an ASP.NET 4.x project.
+   Angular QuickStart files in Visual Studio 2015 within an ASP.NET 4.x project.
      
 .l-sub-section
   :marked
diff --git a/public/docs/ts/latest/glossary.jade b/public/docs/ts/latest/glossary.jade
index 4586fe8092..318c682bad 100644
--- a/public/docs/ts/latest/glossary.jade
+++ b/public/docs/ts/latest/glossary.jade
@@ -9,10 +9,10 @@ block includes
 - var _decoratorLink = '<a href="#' + _decorator + '">' + _decorator + '</a>'
 
 :marked
-  # Angular 2 Glossary
+  # Angular Glossary
 
-  Angular 2 has a vocabulary of its own.
-  Most Angular 2 terms are everyday English words
+  Angular has a vocabulary of its own.
+  Most Angular terms are everyday English words
   with a specific meaning within the Angular system.
 
   This glossary lists the most prominent terms
@@ -327,7 +327,7 @@ block includes
 
     The latest approved version of JavaScript is
     [ECMAScript 2016](http://www.ecma-international.org/ecma-262/7.0/)
-    (AKA "ES2016" or "ES7") and many Angular 2 developers write their applications
+    (AKA "ES2016" or "ES7") and many Angular developers write their applications
     either in this version of the language or a dialect that strives to be
     compatible with it, such as [TypeScript](#typescript).
 
@@ -335,7 +335,7 @@ block includes
     Applications written in ES2016, ES2015 or one of their dialects must be "[transpiled](#transpile)"
     to ES5 JavaScript.
 
-    Angular 2 developers may choose to write in ES5 directly.
+    Angular developers may choose to write in ES5 directly.
 
 :marked
   ## ES2015
@@ -712,7 +712,7 @@ a#snake-case
     code completion, refactoring, and intelligent search). Many code editors
     and IDEs support TypeScript either natively or with plugins.
 
-    TypeScript is the preferred language for Angular 2 development although
+    TypeScript is the preferred language for Angular development although
     you can use other JavaScript dialects such as [ES5](#es5).
 
     Read more about TypeScript at [typescript.org](http://www.typescriptlang.org/).
diff --git a/public/docs/ts/latest/guide/architecture.jade b/public/docs/ts/latest/guide/architecture.jade
index 176d299bc9..0cdbd2434f 100644
--- a/public/docs/ts/latest/guide/architecture.jade
+++ b/public/docs/ts/latest/guide/architecture.jade
@@ -4,7 +4,7 @@ block includes
   - var _at_angular = '@angular'
 
 :marked
-  Angular 2 is a framework for building client applications in HTML and
+  Angular is a framework for building client applications in HTML and
   either JavaScript or a language (like Dart or TypeScript) that compiles to JavaScript.
 
 block angular-parts
@@ -27,7 +27,7 @@ figure
   img(src="/resources/images/devguide/architecture/overview2.png" alt="overview" style="margin-left:-40px;" width="700")
 
 :marked
-  The architecture diagram identifies the eight main building blocks of an Angular 2 application:
+  The architecture diagram identifies the eight main building blocks of an Angular application:
 
   * [Modules](#modules)
   * [Components](#components)
diff --git a/public/docs/ts/latest/guide/component-styles.jade b/public/docs/ts/latest/guide/component-styles.jade
index c87e746a8e..9deaa3ca59 100644
--- a/public/docs/ts/latest/guide/component-styles.jade
+++ b/public/docs/ts/latest/guide/component-styles.jade
@@ -2,7 +2,7 @@ block includes
   include ../_util-fns
 
 :marked
-  Angular 2 applications are styled with regular CSS. That means we can apply
+  Angular applications are styled with regular CSS. That means we can apply
   everything we know about CSS stylesheets, selectors, rules, and media queries
   to our Angular applications directly.
   
@@ -26,7 +26,7 @@ block includes
 :marked
   ## Using Component Styles
   
-  For every Angular 2 component we write, we may define not only an HTML template,
+  For every Angular component we write, we may define not only an HTML template,
   but also the CSS styles that go with that template, 
   specifying any selectors, rules, and media queries that we need.
 
diff --git a/public/docs/ts/latest/guide/dependency-injection.jade b/public/docs/ts/latest/guide/dependency-injection.jade
index 3629e40078..94761c9c67 100644
--- a/public/docs/ts/latest/guide/dependency-injection.jade
+++ b/public/docs/ts/latest/guide/dependency-injection.jade
@@ -237,7 +237,7 @@ block ctor-syntax
     This is important in general, but not to our current story.
 
 :marked
-  A service is nothing more than a class in Angular 2.
+  A service is nothing more than a class in Angular.
   It remains nothing more than a class until we register it with an Angular injector.
 
 #bootstrap
diff --git a/public/docs/ts/latest/guide/forms.jade b/public/docs/ts/latest/guide/forms.jade
index 0939f5cded..bbe8b6db3a 100644
--- a/public/docs/ts/latest/guide/forms.jade
+++ b/public/docs/ts/latest/guide/forms.jade
@@ -85,7 +85,7 @@ figure.image-display
 
 :marked
   ## Setup
-  Create a new project folder (`angular2-forms`) and follow the steps in the [QuickStart](../quickstart.html).
+  Create a new project folder (`angular-forms`) and follow the steps in the [QuickStart](../quickstart.html).
 
 include ../_quickstart_repo
 :marked
@@ -693,7 +693,7 @@ figure.image-display
 
   Our final project folder structure should look like this:
 .filetree
-  .file angular2-forms
+  .file angular-forms
   .children
     .file app
     .children
diff --git a/public/docs/ts/latest/guide/hierarchical-dependency-injection.jade b/public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
index f5bd734b41..32fbbda946 100644
--- a/public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
+++ b/public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
@@ -153,7 +153,7 @@ figure.image-display
 
   By configuring a provider for the `RestoreService` on the `HeroEditComponent`, we get exactly one new instance of the `RestoreService`per `HeroEditComponent`.
 
-  Does that mean that services aren’t singletons anymore in Angular 2? Yes and no.
+  Does that mean that services aren’t singletons anymore in Angular? Yes and no.
   There can be only one instance of a service type in a particular injector.
   But we've learned that we can have multiple injectors operating at different levels of the application's component tree.
   Any of those injectors could have its own instance of the service.
@@ -166,7 +166,7 @@ figure.image-display
   of that component. We've made the `RestoreService` a kind of "private" singleton for each `HeroEditComponent`,
   scoped to that component instance and its child components.
 
-//- ## Advanced Dependency Injection in Angular 2
+//- ## Advanced Dependency Injection in Angular
 //- Restrict Dependency Lookups
 //- [TODO] (@Host) This has been postponed for now until we come up with a decent use case
 //- .l-main-section
diff --git a/public/docs/ts/latest/guide/index.jade b/public/docs/ts/latest/guide/index.jade
index 26f02585c1..c5ad3887ff 100644
--- a/public/docs/ts/latest/guide/index.jade
+++ b/public/docs/ts/latest/guide/index.jade
@@ -64,7 +64,7 @@ table(width="100%")
 
   1. For the big picture, read the [Architecture](architecture.html) overview.
 
-  1. Try [QuickStart](../quickstart.html). QuickStart is the "Hello, World" of Angular 2.
+  1. Try [QuickStart](../quickstart.html). QuickStart is the "Hello, World" of Angular.
   It shows you how to set up the libraries and tools you'll need to write *any* Angular app.
 
   1. Take the *Tour of Heroes* [tutorial](../tutorial), which picks up where QuickStart leaves off,
@@ -118,5 +118,5 @@ block example-links
   Use the [angular.io Github repo](https://github.com/angular/angular.io) for **documentation** issues and pull requests.
 
 
-  Use the [Angular Github repo](https://github.com/angular/angular) to report issues with **Angular 2** itself.
+  Use the [Angular Github repo](https://github.com/angular/angular) to report issues with **Angular** itself.
 // #enddocregion the-rest
diff --git a/public/docs/ts/latest/guide/npm-packages.jade b/public/docs/ts/latest/guide/npm-packages.jade
index 3e1fcdec9a..c3e20b0761 100644
--- a/public/docs/ts/latest/guide/npm-packages.jade
+++ b/public/docs/ts/latest/guide/npm-packages.jade
@@ -5,7 +5,7 @@ include ../_util-fns
   These packages are maintained and installed with the Node Package Manager (<a href="https://docs.npmjs.com/" target="_blank">npm</a>).
 .l-sub-section
   :marked
-    Node.js and npm are essential to Angular 2 development. 
+    Node.js and npm are essential to Angular development. 
     
     <a href="https://docs.npmjs.com/getting-started/installing-node" target="_blank" title="Installing Node.js and updating npm">
     Get them now</a> if they're not already installed on your machine.
diff --git a/public/docs/ts/latest/guide/pipes.jade b/public/docs/ts/latest/guide/pipes.jade
index 0308d8c1de..615eed60f6 100644
--- a/public/docs/ts/latest/guide/pipes.jade
+++ b/public/docs/ts/latest/guide/pipes.jade
@@ -59,7 +59,7 @@ block includes
     Learn more about these and many other built-in pipes in the [API Reference](../api/#!?apiFilter=pipe);
     filter for entries that include the word "pipe".
 
-    Angular 2 doesn't have a `FilterPipe` or an `OrderByPipe` for reasons explained in an [appendix below](#no-filter-pipe).
+    Angular doesn't have a `FilterPipe` or an `OrderByPipe` for reasons explained in an [appendix below](#no-filter-pipe).
 
 .l-main-section
 :marked
diff --git a/public/docs/ts/latest/guide/router.jade b/public/docs/ts/latest/guide/router.jade
index a35b29bde1..733ac4753b 100644
--- a/public/docs/ts/latest/guide/router.jade
+++ b/public/docs/ts/latest/guide/router.jade
@@ -84,7 +84,7 @@ include ../_util-fns
 :marked
   ### Router imports
   The Angular Router is an optional service that presents a particular component view for a given URL.
-  It is not part of the Angular 2 core. It is in its own library package, `@angular/router`.
+  It is not part of the Angular core. It is in its own library package, `@angular/router`.
   We import what we need from it as we would from any other Angular package.
 
 +makeExcerpt('app/app.routing.ts (import)', 'import-router')
@@ -409,7 +409,7 @@ a#base-href
   We begin by importing some symbols from the router library.
 
   The Router is in its own `@angular/router` package.
-  It's not part of the Angular 2 core. The router is an optional service because not all applications
+  It's not part of the Angular core. The router is an optional service because not all applications
   need routing and, depending on your requirements, you may need a different routing library.
 
   We teach our router how to navigate by configuring it with routes.
@@ -2275,7 +2275,7 @@ code-example(format=".", language="bash").
   It won't be easy to change later once the application is in production
   and there are lots of application URL references in the wild.
 
-  Almost all Angular 2 projects should use the default HTML 5 style.
+  Almost all Angular projects should use the default HTML 5 style.
   It produces URLs that are easier for users to understand.
   And it preserves the option to do **server-side rendering** later.
 
diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade
index cd5b67f6c7..b62f43ed80 100644
--- a/public/docs/ts/latest/guide/style-guide.jade
+++ b/public/docs/ts/latest/guide/style-guide.jade
@@ -6,7 +6,7 @@ include ../_util-fns
     introduced in RC5 and will add it to the style guide soon.
 
 :marked
-  Welcome to the Angular 2 Style Guide
+  Welcome to the Angular Style Guide
 
   ## Purpose
 
@@ -411,7 +411,7 @@ a(href="#toc") Back to top
 
 .s-why.s-why-last
   :marked
-    **Why?** The Angular 2 HTML parser is case sensitive and will recognize lower camel case.
+    **Why?** The Angular HTML parser is case sensitive and will recognize lower camel case.
 
 a(href="#toc") Back to top
 
@@ -1696,11 +1696,11 @@ a(href="#toc") Back to top
 
 .s-rule.do
   :marked
-    **Do** provide services to the Angular 2 injector at the top-most component where they will be shared.
+    **Do** provide services to the Angular injector at the top-most component where they will be shared.
 
 .s-why
   :marked
-    **Why?** The Angular 2 injector is hierarchical.
+    **Why?** The Angular injector is hierarchical.
 
 .s-why
   :marked
@@ -1812,7 +1812,7 @@ a(href="#toc") Back to top
 :marked
   ## Appendix
 
-  Useful tools and tips for Angular 2.
+  Useful tools and tips for Angular.
 
 a(href="#toc") Back to top
 
diff --git a/public/docs/ts/latest/guide/template-syntax.jade b/public/docs/ts/latest/guide/template-syntax.jade
index 5c3a5ce1fc..6288070a80 100644
--- a/public/docs/ts/latest/guide/template-syntax.jade
+++ b/public/docs/ts/latest/guide/template-syntax.jade
@@ -44,7 +44,7 @@ block includes
   HTML is the language of the Angular template. Our [QuickStart](../quickstart.html) application has a template that is pure HTML:
 
 code-example(language="html" escape="html").
-  <h1>My First Angular 2 App</h1>
+  <h1>My First Angular App</h1>
 
 :marked
   Almost all HTML syntax is valid template syntax. The `<script>` element is a notable exception; it is forbidden, eliminating the risk of script injection attacks. (In practice, `<script>` is simply ignored.)
@@ -387,7 +387,7 @@ table
 .callout.is-helpful
   header A world without attributes
   :marked
-    In the world of Angular 2, the only role of attributes is to initialize element and directive state.
+    In the world of Angular, the only role of attributes is to initialize element and directive state.
     When we data bind, we're dealing exclusively with element and directive properties and events.
     Attributes effectively disappear.
 :marked
@@ -929,8 +929,8 @@ figure.image-display
   The community contributed many more, and countless private directives
   have been created for internal applications.
 
-  We don’t need many of those directives in Angular 2.
-  Quite often we can achieve the same results with the more capable and expressive Angular 2 binding system.
+  We don’t need many of those directives in Angular.
+  Quite often we can achieve the same results with the more capable and expressive Angular binding system.
   Why create a directive to handle a click when we can write a simple binding such as this?
 +makeExample('template-syntax/ts/app/app.component.html', 'event-binding-1')(format=".")
 :marked
@@ -1239,7 +1239,7 @@ figure.image-display
 
   A **template reference variable** is a reference to a DOM element or directive within a template.
 
-  It can be used with native DOM elements but also with Angular 2 components &mdash; in fact, it will work with any custom web component.
+  It can be used with native DOM elements but also with Angular components &mdash; in fact, it will work with any custom web component.
 
 :marked
   ### Referencing a template reference variable
diff --git a/public/docs/ts/latest/guide/typescript-configuration.jade b/public/docs/ts/latest/guide/typescript-configuration.jade
index 849cf923fb..3b30797b59 100644
--- a/public/docs/ts/latest/guide/typescript-configuration.jade
+++ b/public/docs/ts/latest/guide/typescript-configuration.jade
@@ -26,7 +26,7 @@ a(id="tsconfig")
   We created the following `tsconfig.json` for [QuickStart](../quickstart.html):
 +makeJson('quickstart/ts/tsconfig.1.json', null, 'tsconfig.json')(format=".")
 :marked
-  This file contains options and flags that are essential for Angular 2 applications.
+  This file contains options and flags that are essential for Angular applications.
   
   <a id="noImplicitAny"></a>
   ### *noImplicitAny* and *suppressImplicitAnyIndexErrors*
diff --git a/public/docs/ts/latest/guide/webpack.jade b/public/docs/ts/latest/guide/webpack.jade
index 3569b2bed8..0e1fee111a 100644
--- a/public/docs/ts/latest/guide/webpack.jade
+++ b/public/docs/ts/latest/guide/webpack.jade
@@ -6,7 +6,7 @@ include ../_util-fns
   and for loading that code from a server into a browser.
   
   It's an excellent alternative to the *SystemJS* approach we use throughout the documentation.
-  In this guide we get a taste of Webpack and how to use it with Angular 2 applications.
+  In this guide we get a taste of Webpack and how to use it with Angular applications.
   
   <a id="top"></a>
   ## Table of contents
@@ -138,14 +138,14 @@ a(id="configure-webpack")
 :marked
   ## Configure Webpack
   
-  After that brief orientation, we are ready to build our own Webpack configuration for Angular 2 apps. 
+  After that brief orientation, we are ready to build our own Webpack configuration for Angular apps. 
   
   Begin by setting up the development environment.
   
   Create a **new project folder**
 code-example(format="").
-  mkdir angular2-webpack
-  cd    angular2-webpack
+  mkdir angular-webpack
+  cd    angular-webpack
 
 :marked
   Add these files to the root directory:
@@ -167,7 +167,7 @@ code-example(format="").
 )
 .l-sub-section
   :marked
-    Many of these files and much of their content should be familiar from other Angular 2 documentation chapters.
+    Many of these files and much of their content should be familiar from other Angular documentation chapters.
     
     Learn about the `package.json` in the [npm packages](../guide/npm-packages.html) chapter.
     We require packages for Webpack use in addition to the ones listed in that chapter.
@@ -200,8 +200,8 @@ a(id="common-configuration")
 :marked
   We are splitting our application into three bundles:
   
-  * polyfills - the standard polyfills we require to run Angular 2 applications in most modern browsers.
-  * vendor - the vendor files we need: Angular 2, lodash, bootstrap.css...
+  * polyfills - the standard polyfills we require to run Angular applications in most modern browsers.
+  * vendor - the vendor files we need: Angular, lodash, bootstrap.css...
   * app - our application code.
   
 .callout.is-critical
@@ -343,7 +343,7 @@ a(id="production-configuration")
   * **ExtractTextPlugin** - extracts embedded css as external files, adding cache-busting hash to the filename.
   * **DefinePlugin** - use to define environment variables that we can reference within our application.
   
-  Thanks to the *DefinePlugin* and the `ENV` variable defined at top, we can enable Angular 2 production mode like this:
+  Thanks to the *DefinePlugin* and the `ENV` variable defined at top, we can enable Angular production mode like this:
   
 +makeExample('webpack/ts/src/main.ts', 'enable-prod')(format=".")
   
diff --git a/public/docs/ts/latest/help-new.jade b/public/docs/ts/latest/help-new.jade
index 1034233e75..a786955a9b 100644
--- a/public/docs/ts/latest/help-new.jade
+++ b/public/docs/ts/latest/help-new.jade
@@ -2,7 +2,7 @@ div(flex)
   p.
     What's your question about?
   select#feedback-dropdown(name="Angular Version")
-    option(value="Angular2") Angular2
-    option(value="AngularJS") AngularJS
+    option(value="Angular2") Angular 2
+    option(value="Angular1") Angular 1
   button#feedback-btn.
     Submit
diff --git a/public/docs/ts/latest/quickstart.jade b/public/docs/ts/latest/quickstart.jade
index 17b90f4314..7b8fa37ba2 100644
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@@ -13,7 +13,7 @@ block includes
 .callout.is-helpful
   header Don't want #{_Lang}?
   p.
-    Although you're getting started in #{_Lang}, you can also write Angular 2 applications
+    Although you're getting started in #{_Lang}, you can also write Angular applications
     in JavaScript and #{_docsFor == 'ts' ? 'Dart' : 'TypeScript'}. Use the language selector in the
     left nav to switch development languages for this guide.
 .l-main-section
@@ -81,8 +81,8 @@ h2 Create the project folder
 
 - var _ = _docsFor == 'dart' ? '_' : '-';
 code-example(language="sh" class="code-shell").
-  mkdir angular2!{_}quickstart
-  cd    angular2!{_}quickstart
+  mkdir angular!{_}quickstart
+  cd    angular!{_}quickstart
 
 h2#add-config-files Create #{_package_and_config_files}
 block package-and-config-files
@@ -150,7 +150,7 @@ block install-packages
     You should now have the following structure:
 
   .filetree
-    .file angular2-quickstart
+    .file angular-quickstart
     .children
       .file node_modules ...
       .file typings ...
@@ -348,7 +348,7 @@ block build-app
 .l-main-section#make-changes
 h1 Step !{step++}: Make some live changes
 :marked
-  Try changing the message in `app/app.component.ts` to "My SECOND Angular 2 App".
+  Try changing the message in `app/app.component.ts` to "My SECOND Angular App".
 block server-watching
   :marked
     The TypeScript compiler and `lite-server` will detect your change, recompile the TypeScript into JavaScript,
@@ -363,7 +363,7 @@ h1#wrap-up Wrap up and next steps
   The final project folder structure looks like this:
 block project-file-structure
   .filetree
-    .file angular2-quickstart
+    .file angular-quickstart
     .children
       .file app
       .children
@@ -384,7 +384,7 @@ block project-file-structure
 .l-main-section
 :marked
   ## What next?
-  This first application doesn't do much. It's basically "Hello, World" for Angular 2.
+  This first application doesn't do much. It's basically "Hello, World" for Angular.
 
   You wrote a little Angular component, created a simple `index.html`, and launched with a
   static file server.
diff --git a/public/docs/ts/latest/tutorial/toh-pt1.jade b/public/docs/ts/latest/tutorial/toh-pt1.jade
index c75a3f81fc..dfc137c3b8 100644
--- a/public/docs/ts/latest/tutorial/toh-pt1.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt1.jade
@@ -7,7 +7,7 @@ include ../_util-fns
 
   Run the <live-example></live-example> for this part.
 
-  Create a folder called `angular2-tour-of-heroes` and follow the [QuickStart](../quickstart.html) steps
+  Create a folder called `angular-tour-of-heroes` and follow the [QuickStart](../quickstart.html) steps
   which provide the prerequisites, the folder structure, and the core files for our Tour of Heroes.
 
 include ../_quickstart_repo
@@ -15,7 +15,7 @@ include ../_quickstart_repo
   We should have the following structure:
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
diff --git a/public/docs/ts/latest/tutorial/toh-pt2.jade b/public/docs/ts/latest/tutorial/toh-pt2.jade
index def3c672af..fbf3d6325f 100644
--- a/public/docs/ts/latest/tutorial/toh-pt2.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt2.jade
@@ -20,7 +20,7 @@ include ../_util-fns
   If not, we’ll need to go back to Part 1 and figure out what we missed.
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
diff --git a/public/docs/ts/latest/tutorial/toh-pt3.jade b/public/docs/ts/latest/tutorial/toh-pt3.jade
index f293d141b7..f5c52b030a 100644
--- a/public/docs/ts/latest/tutorial/toh-pt3.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt3.jade
@@ -12,7 +12,7 @@ include ../_util-fns
   Before we continue with our Tour of Heroes, let’s verify we have the following structure. If not, we’ll need to go back and follow the previous chapters.
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
@@ -203,7 +203,7 @@ code-example(format=".")
   Let’s verify that we have the following structure after all of our good refactoring in this chapter:
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
diff --git a/public/docs/ts/latest/tutorial/toh-pt4.jade b/public/docs/ts/latest/tutorial/toh-pt4.jade
index 73bf0c9407..6b1870dcca 100644
--- a/public/docs/ts/latest/tutorial/toh-pt4.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt4.jade
@@ -24,7 +24,7 @@ include ../_util-fns
   If not, we’ll need to go back and follow the previous chapters.
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
@@ -304,7 +304,7 @@ a#child-component
   Let’s verify that we have the following structure after all of our good refactoring in this chapter:
 
 .filetree
-  .file angular2-tour-of-heroes
+  .file angular-tour-of-heroes
   .children
     .file app
     .children
diff --git a/public/docs/ts/latest/tutorial/toh-pt5.jade b/public/docs/ts/latest/tutorial/toh-pt5.jade
index 1ea7702e1d..706f3fe790 100644
--- a/public/docs/ts/latest/tutorial/toh-pt5.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt5.jade
@@ -52,7 +52,7 @@ figure.image-display
 
 block intro-file-tree
   .filetree
-    .file angular2-tour-of-heroes
+    .file angular-tour-of-heroes
     .children
       .file app
       .children
@@ -863,7 +863,7 @@ figure.image-display
 
 block file-tree-end
   .filetree
-    .file angular2-tour-of-heroes
+    .file angular-tour-of-heroes
     .children
       .file app
       .children
diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade
index 59a64aded2..2383f0a34e 100644
--- a/public/docs/ts/latest/tutorial/toh-pt6.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt6.jade
@@ -536,7 +536,7 @@ figure.image-display
 
 block filetree
   .filetree
-    .file angular2-tour-of-heroes
+    .file angular-tour-of-heroes
     .children
       .file app
       .children
diff --git a/public/news.jade b/public/news.jade
index 0541debdf0..132a09464b 100644
--- a/public/news.jade
+++ b/public/news.jade
@@ -12,7 +12,7 @@
         target="_blank"
         href="http://angularjs.blogspot.com/2016/09/angular2-final.html"
         ) Angular, version 2: proprioception-reinforcement
-      p Today, at a special meetup at Google HQ, we announced the final release version of Angular 2, the full-platform successor to Angular 1...
+      p Today, at a special meetup at Google HQ, we announced the final release version of Angular, the full-platform successor to Angular 1...
       .author
         img(src="/resources/images/bios/juleskremer.jpg")
         .posted Posted by <b>Jules Kremer</b>
diff --git a/public/support.jade b/public/support.jade
index 34fc2656a6..a6cffc4194 100644
--- a/public/support.jade
+++ b/public/support.jade
@@ -33,7 +33,7 @@
       figure
         img(src="/resources/images/support/github-logo.png" alt="Us" style="width:240px;" )
     .c8
-      p File Angular 2 issues at our <a href="https://github.com/angular/angular/issues" target="_blank">GitHub Repository</a>
+      p File Angular issues at our <a href="https://github.com/angular/angular/issues" target="_blank">GitHub Repository</a>
 
    hr
 
diff --git a/scripts/deploy-install.sh b/scripts/deploy-install.sh
index 67c6ddd67f..6364f8fb52 100755
--- a/scripts/deploy-install.sh
+++ b/scripts/deploy-install.sh
@@ -5,10 +5,10 @@ set -e -o pipefail
 [[ -z "$NGIO_ENV_DEFS" ]] && . ./scripts/env-set.sh
 
 if [[ -e "$NG2_REPO" ]]; then
-    echo Angular2 repo is already present at: $NG2_REPO
+    echo Angular repo is already present at: $NG2_REPO
 else
     travis_fold start install.ng2
-    echo GETTING Angular2 from GitHub ...
+    echo GETTING Angular from GitHub ...
     set -x
     git clone https://github.com/angular/angular.git $NG2_REPO
     git -C $NG2_REPO checkout $LATEST_RELEASE
diff --git a/tools/api-builder/angular.io-package/index.js b/tools/api-builder/angular.io-package/index.js
index 3070d822e3..57ddba5640 100644
--- a/tools/api-builder/angular.io-package/index.js
+++ b/tools/api-builder/angular.io-package/index.js
@@ -42,7 +42,7 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
   var angular_repo_path =  path.resolve(__dirname, '../../../../angular');
   // confirm that the angular repo is actually there.
   if (!fs.existsSync(angular_repo_path)) {
-    throw new Error('build-api-docs task requires the angular2 repo to be at ' + angular_repo_path);
+    throw new Error('build-api-docs task requires the angular repo to be at ' + angular_repo_path);
   }
   readTypeScriptModules.basePath = path.resolve(angular_repo_path, 'modules');
   readTypeScriptModules.ignoreExportsMatching = [/^_/];
diff --git a/tools/plunker-builder/builder.js b/tools/plunker-builder/builder.js
index 61a78ce29a..3f0fdacdd1 100644
--- a/tools/plunker-builder/builder.js
+++ b/tools/plunker-builder/builder.js
@@ -165,9 +165,9 @@ class PlunkerBuilder {
     if (!this.options.embedded) {
       postData.private = true;
 
-      postData.description = "Angular 2 Example - " + config.description;
+      postData.description = "Angular Example - " + config.description;
     } else {
-      postData.title = "Angular 2 Example - " + config.description;
+      postData.title = "Angular Example - " + config.description;
     }
 
     // Embedded needs to add more content, so if the callback is available, we call it
diff --git a/tools/plunker-builder/embeddedPlunker.js b/tools/plunker-builder/embeddedPlunker.js
index 6da491702d..0fbf7f4f18 100644
--- a/tools/plunker-builder/embeddedPlunker.js
+++ b/tools/plunker-builder/embeddedPlunker.js
@@ -16,7 +16,7 @@ function configureBuilder(options) {
 }
 
 function extraData(postData, config) {
-  postData['source[type]'] = config.description || 'Angular 2 example';
+  postData['source[type]'] = config.description || 'Angular example';
   postData['source[url]'] = 'https://angular.io'
 }
 
diff --git a/tools/plunker-builder/plunkerBuilder.js b/tools/plunker-builder/plunkerBuilder.js
index 19233ab5ec..9e2052517e 100644
--- a/tools/plunker-builder/plunkerBuilder.js
+++ b/tools/plunker-builder/plunkerBuilder.js
@@ -213,7 +213,7 @@ function createPostData(config) {
   // Leave here in case we want to add a md file later.
   // postData['files[license.md]'] = fs.readFileSync(path.join(__dirname, "license.md"));
 
-  var tags = ['angular2', 'example'].concat(config.tags || []);
+  var tags = ['angular', 'example'].concat(config.tags || []);
   tags.forEach(function(tag,ix) {
     postData['tags[' + ix + ']'] = tag;
   });
@@ -221,7 +221,7 @@ function createPostData(config) {
   // postData['tags[1]'] = "example";
   postData.private = true;
 
-  postData.description = "Angular 2 Example - " + config.description;
+  postData.description = "Angular Example - " + config.description;
   return postData;
 }
 
diff --git a/tools/styles-builder/less/a2docs.less b/tools/styles-builder/less/a2docs.less
index 9462e2d54f..4bce7e395d 100644
--- a/tools/styles-builder/less/a2docs.less
+++ b/tools/styles-builder/less/a2docs.less
@@ -1,17 +1,17 @@
-//Import angular 2 docs colors and mixins
+//Import angular docs colors and mixins
 @import './colors/docs-material-palette.colors.less';
 @import './mixins/docs.mixins.less';
 //Import Bootstrap scaffolding and variables
 @import '../../../node_modules/bootstrap/less/scaffolding.less';
 @import '../../../node_modules/bootstrap/less/variables.less';
-//Override Bootstrap variables with custom values for angular 2 docs
+//Override Bootstrap variables with custom values for angular docs
 @import './overrides/bootstrap.overrides.less';
 //Import Bootstrap layout systems
 @import '../../../node_modules/bootstrap/less/mixins.less';
 @import '../../../node_modules/bootstrap/less/grid.less';
 @import '../../../node_modules/bootstrap/less/utilities.less';
 @import '../../../node_modules/bootstrap/less/responsive-utilities.less';
-//Import only Bootstrap elements to support angular 2 docs styles
+//Import only Bootstrap elements to support angular docs styles
 @import '../../../node_modules/bootstrap/less/type.less';
 @import '../../../node_modules/bootstrap/less/forms.less';
 @import '../../../node_modules/bootstrap/less/buttons.less';
@@ -23,7 +23,7 @@
 @import '../../../node_modules/bootstrap/less/close.less';
 //Import opacity overrides
 @import './overrides/docs.opacity.overrides.less';
-//Import styles overrides and angular 2 doc styles layouts
+//Import styles overrides and angular doc styles layouts
 @import './overrides/docs.overrides.less';
 //Import accessibility tweaks
 @import './overrides/docs.a11y.overrides.less';

From 7d45d60c91b5e30e00c04c8f67eb6283326eb4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Tue, 20 Sep 2016 06:23:02 +0200
Subject: [PATCH 22/42] docs(overview): update to new organization (#2405)

---
 public/docs/ts/latest/guide/index.jade | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/docs/ts/latest/guide/index.jade b/public/docs/ts/latest/guide/index.jade
index c5ad3887ff..3868c3c573 100644
--- a/public/docs/ts/latest/guide/index.jade
+++ b/public/docs/ts/latest/guide/index.jade
@@ -30,6 +30,16 @@ table(width="100%")
     td
       :marked
         The foundation for every page and sample in this documentation.
+  tr(style=top)
+    td <b>Guide</b>
+    td
+      :marked
+        The essential ingredients of Angular development.
+  tr(style=top)
+    td <b>API Reference</b>
+    td
+      :marked
+        Authoritative details about each member of the Angular libraries.
   tr(style=top)
     td <b>Tutorial</b>
     td
@@ -37,12 +47,7 @@ table(width="100%")
         A step-by-step, immersive approach to learning Angular that
         introduces the major features of Angular in an application context.
   tr(style=top)
-    td <b>Basics</b>
-    td
-      :marked
-        The essential ingredients of Angular development.
-  tr(style=top)
-    td <b>Developer Guide</b>
+    td <b>Advanced</b>
     td
       :marked
         In-depth analysis of Angular features and development practices.
@@ -51,16 +56,11 @@ table(width="100%")
     td
       :marked
         Recipes for specific application challenges, mostly code snippets with a minimum of exposition.
-  tr(style=top)
-    td <b>API Reference</b>
-    td
-      :marked
-        Authoritative details about each member of the Angular libraries.
 :marked
   # Learning path
   You don't have to read the guide straight through.  Most pages stand on their own.
 
-  For those new to Angular, the recommended learning path runs through the *Basics* section:
+  For those new to Angular, the recommended learning path runs through the *Guide* section:
 
   1. For the big picture, read the [Architecture](architecture.html) overview.
 

From 03680e23bb6250b1aed34aa48b8332d770b35927 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Tue, 20 Sep 2016 02:37:16 -0700
Subject: [PATCH 23/42] chore: more "angular2" to "angular" cleanup (#2417)

---
 .../_includes/styleguide/_code-examples.jade  |   7 +++----
 public/docs/ts/latest/guide/architecture.jade |   5 ++---
 .../devguide/quickstart/my-first-app.png      | Bin 14936 -> 12910 bytes
 .../_test/test_jade/guides/setupAlt2.jade     |   2 +-
 .../_test/test_jade/setupAlt.jade             |   2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/public/docs/_includes/styleguide/_code-examples.jade b/public/docs/_includes/styleguide/_code-examples.jade
index 2d6c6e74dd..0586577c79 100644
--- a/public/docs/_includes/styleguide/_code-examples.jade
+++ b/public/docs/_includes/styleguide/_code-examples.jade
@@ -160,7 +160,6 @@ include ../../../_includes/_util-fns
     code-example(format="linenums" language="html").
       &lt;!-- #docregion -->
       ...
-      &lt;script src="https://code.angularjs.org/2.0.0-beta.7/angular2.sfx.dev.js">&lt;/script>
       &lt;script src="app.js">&lt;/script>
       ...
 
@@ -285,9 +284,9 @@ include ../../../_includes/_util-fns
       Styling selected portions of the json is also supported.
 
     code-example(format="" language="js").
-      +makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]})
+      +makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*zone.*)/, /(\Score-js.*)/, /(\Ssystem.*)/ ]})
 
-    +makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]})
+    +makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*zone.*)/, /(\Score-js.*)/, /(\Ssystem.*)/ ]})
 
     :marked
       As well as styling across multiple lines.
@@ -422,7 +421,7 @@ include ../../../_includes/_util-fns
     .alert.is-important.
       The '@example' and '@exampleTabs' inline tags MUST always appear at the beginning of a line.
 
-      Example files referenced by inline tags are all assumed to be in the 'modules/angular2' folder in the angular/angular repo.
+      Example files referenced by inline tags are all assumed to be in the 'modules/@angular' folder in the angular/angular repo.
 
     :marked
       #### @example inline tag parameters
diff --git a/public/docs/ts/latest/guide/architecture.jade b/public/docs/ts/latest/guide/architecture.jade
index 0cdbd2434f..b161aced7d 100644
--- a/public/docs/ts/latest/guide/architecture.jade
+++ b/public/docs/ts/latest/guide/architecture.jade
@@ -575,6 +575,5 @@ code-example().
   > [**Router**](router.html): Navigate from page to page within the client
     application and never leave the browser.
 
-  > [**Testing**](testing.html): Run unit tests with Angular's 
-  [testing library](https://pub.dartlang.org/packages/angular2_testing)
-   on your application parts as they interact with the Angular framework.
+  > [**Testing**](testing.html): Run unit tests on your application parts as they interact with the Angular framework
+  using the _Angular Testing Platform_.
diff --git a/public/resources/images/devguide/quickstart/my-first-app.png b/public/resources/images/devguide/quickstart/my-first-app.png
index fb38d08425004fd1f347dbe04a832cdd55867191..7e3b34e6f0bea41782e01df577db9c8338e84a52 100644
GIT binary patch
literal 12910
zcmXwgWmFtp(=C$V?(QDkEf65MTVQY*0t9ym?(Xiv26rFa-QC^YB?P{C-n;IPwtcF5
zt+V=cRqb8X;VMefs7OReP*6~)vNGS*prD||A?Nf6aFG4)J+U6h0nuIt-~<JQjQ!sR
z4V95a00H5hWfdjiw-Iq*xp|IgGVuNfNoqTbxj0+cIYO0IjmtnF6lVzZ-OS0<(bC@8
z(#{qN8<CP4f+PKhOW4_aI9i%pI73ySj|)OjwEv-wX2$=SQaD@Mm_hM8p(8>@5dRxd
zxBKbrX6$GNrEmZ7pE>gX9&YJmYHbWLb%bi}Zit1z2>-!a#*Vg@w&qaX#D}2}4F3P!
z@8W1`2KDd}c=rFzB<yT#%xs;Z9>-I<AQ;?#W*U~x)@D#8m$URxP!v$I-^DcCvo1P3
zyb85kj{bE_{U|S-?W|^LT>Np>*0yFF7(HP^EIc^KY%Gp|7#A1(r1<tT;f5W!jmjk<
zj)ed>^bJl1N(jz+)$_`>ZNsy?Z9&ay>#1?kJY6)WOih-lbipP7aR1lqo>6n*F6(IB
zY3l3Ky3=F_E%TTOZn^e=9mx;)caosqvTr|XBQ)PaBz~6@Y7a0$E}DtTL+t-&BK!k&
z=Rai2y@IG$v%&<o>qeU=s0+HLVj*f7GC-2loZ+weHq=|k9E4%VLtOrh8)&IR@^wi`
z_lh8cDUX<rHFWfyMH2{Wtz~|8Q7bn?HLj?w?_p=_-0a;~fC41cK*@e%Fi}a^+goHw
z9!}7<ul@?93zp({&4bm<x$=@iiS#BOV`LkC4o3Td%<s~gc~=R`&qL@GT$O-<5kqjU
zrzNLoi3ZhEGnqGMgA%2b$AA@LT<fIIs5t<zYt8QmG6hi(EOIDfH>>|`ogvM<z3V+=
z38EIPqrpTvt6-c2x|zOE=|3xeXE3opzUO(B0!`zDhZ)zl)h3PRHyiM!NL2X34}v`I
zKS=ft7BR0&jC9zoZr7=mE|*oKzb5#|5<6hG#7JB4xek&a`hM&)hw6lO<Kjjz8*z?%
z^6je|rYjqSxaEjpiyP_KUuz(fe~hZGe`b9H+qeJ`qY$(Ea-UQU;%>;-`}<Rtxi-%5
zg<keWJ0r@c6~FOmNqxg&Cp$cmUU!fnKsb9_>!BkPU5%M4=HM{1-^OHvOtF0-0_!aF
z3#o+H$H3iseQ`+if~4K=+3=0OgGH=lZ@FyLv$)KkJ~=;XnccAstn8bE-Uff?*Sf;@
z3W^FZ_nU^U4o}*%3+LVS8iG^+_lswPa`vFsRK5`NW%c8Mns3RUQj;;Hr(9}0B|eiC
zzgjH}ebFJ37mqtySdKgCJyT&<K$b<2S>WdqmcQEO_aNMSe&B#soPZNp;}usd4YiI9
zvDHR^j_~U%^QZcNkw`)WAI;+oJJn7cQIPD(VvUu7s1S8XkTR%-M6thtr3*Nw6mz7D
z7R>VLygq)ISXhUc$LQ~dr?NUcuhKl7SNY6woBlgRmvnz|7Ag`TDq=*V0tIL6>>qR@
zvNk=&=e``~K9r+D7lJiLo%E85El6G@&;BZQKWcog&qJurxdJko7-=IJ&rw<HB!O`|
zoxqu)mjne(!cRxn!fPDA>j&o}I6mksDu*$2{EPuXD995HkQvt4j|Mz)h;G2{Sy!<b
z^!GpSGY_pwUzc!-ZS*!Ue=<Vsu6Yi&y^5^Gd(hxepaMzu*C9wLuqsJwJ7zQ2eC?fK
zH{J;IwT7nVGM;>zblfcNNfM*k`Fqx5`+i&h%Y=UD+3@sqIl;<=ZusN*QLNLeCiy~u
zH48AAd!|#-VV;Da@hY>F<lbfCPaK)LX|b1rYGp5w#CP!24mgMz!Ru#pClq{Qp9`?u
zsCyV^*DAbn@>*-yM7jDhQ~lWuD&R2()5pCtb;2My%+gqjlw305I1R!6&5NGrpmnLp
z3a}_liXlF}$9UtT%R910JQplb+HXO7JOrb|SH|^4Aw}D%dIqJ?%->k7jLzY4mBMa|
zP}V;6qP+Sc#?f|tDn=u^2GdMOM}{k9p<y>VDgr1=D}!Ty{s2ae-7*@;t&|CfNk_P<
z8at?UvmGoNaWKtB0a>cXC6f7GxmdofNVGlAd-77r!}K*Uj7G9N3}CenmJA76U4jQ9
zYFiTVy;BS0-;L6GZU`4aLiU!NJ>O`2Vl4qOd;;Aj?YS1G`}f*@`Xca@eZ9TCHJ_4|
zf>YU^?o^gA&dQMvnVqm`9tA2CTD43F4owO;%I*%#SO`>*=~I$V7iX7fIX;$ZeK~Yy
zVLGw9VsE;h4RmAfa;>{`mAVor@g@bmi$V`MMB6yCgA|c9)x*C#EBw(&^te%gzgpE*
zwgsC5z*HlJq*l4MItmkT&@vDFs)a=_3X96&w+NCbKVgh%WVi1G_j0#nm|cTIRQh#|
zb?}rV>AoyTemtX?u?81t!M|*z``IAW!be&53^Y;JoD<UaopskR)BThvsS7hOn@cXF
zK{XGTiQqBp{z5i|NM?K<P4mgyIFKYaQ_-c!;x-xpubEQ9sN4Qs=G?Ey16Sci;y6V1
zcZ8Md(ZD8rFPy&$jYv-mDUp(m?Mufs0E)F3wz!PlRGVN%Y=8Q^Dy1k>H)jCH+1@LJ
z`lyX@kp=}BC@GF0Mq?6}KSDx$a|iJvi(0tMLf1huSvZHHuoM-U3V$UKYVH5fXk7+7
zW~QMUAJefGN33xaACABsd3F8(>GBl@j_DcEPS^RB0(9x2fPmh!*<Bmu$)PL~{L>``
z3UP+~#6uTWdDugss31q5vT~F9nQB^e8W60x*<78Is?<EUE~?ZizaxE7@V1z2d$|rs
z42qdZ6vf#|Udl+%L8L&m=O<mSEytsziOFdld`U6Tfd_Thm5j@q%1a>Xp2=M#e@{x~
zS5B-a@%qOUVr)b}CjhWqZ>r1~Nr#f2YH+++rO58%vWWO@qbj(zm|U9&MgU-a$$;91
z`zj9oT_I8-RKW&-C!r3_J-54ljnW~3y>DJLC}jGJcQ|>{_!c+3G^}TGmKkIo*v@%a
z++6@OLyJ4j#XVBXRVg#`6!N)^Pg5=HEORMt`J-~9uidp1Hk2xl7>?0^?{8DZz}aF-
z&gVmqAVdr!0=)RJ7`pN_Q1aV*KXKaGc^|zlL1vm%JgqZ!6HkgNAdB?qL0q03zv}T1
zBPS%t<v?O-QStS7Je?A^3-&xJksRkrTTuk~R<H25!s|wd9KZT;mV;gPYMB{qoIi~9
z`NWnflCz|msj!LJ&A=R9922c;M%;6YAQ0PURx`ZDShZC4?R=QFO7Co_-{j+wh;uF_
zcOtbn8RCXq%)-8wGMR(Ky}aZR2VT<OHk|OMf$2J_<6L&m_D`3BxAkg?zro@NzeDNx
z-=vVsm@#7rlJL#zoxBB1)uEO2ERMvjL`fy)pek6dYimJal@CR-f%mmfU}J|vIlkg*
z=ec#RNd<QC&Z&XH#?R+^hGMoMsi}r`KaJe6G*fD5!vC!;CLGl7tzmBLKezI}!bz#(
z2CMY{=`8a@U66F>i0H`aSRE@$G2oV@Bbi}j95<0R^|<BV<|NC5lA`;U)xIn%eT8rl
zsIKrrtqmiLmY#5qvxs9>TUr&=TQM(bV|zxr)4$@%Er}74#=VH6s-80xS#7YB%yppv
zPpxrKT<fMzOI(IrO<df*%-ik%sJhsS`}-dzZ;F}Y)TZDxweX5?f29Xed?|ai!7*?O
zB)5)6dy<AMjq<*;a`$$wAzBikd+Nl<G`u@ato4$Z%j<8Zwi6c@v|VoJ+=s07eD-hQ
z?XhER<i_JL7?aLCVEyA_$%qL-9aF?ZndRh!(d(+)veUT&mZro}<`~cG;5&Tql;Ppb
zQ^nCgyRERL#wbOZZd8vT4j~hON?NuQ;E_KSJVX$lre{qIl-HMii^=IhWPMbOt3>Ke
z=+DSk0RNUcUQ&#}vVbWm>wSu8xW2z38+QHX=11<Ol*jMZCmf6~ZUoJiZM}nSD2POB
zd;EB()zui^d{Jf!y#iE}Va4Ql^2pb!#W5LcFzVkHf@izi&|0O~fL4bS_2f<--93M9
z#1{&2e~t{LSc0ZDe*ZUv12?4eyx}V%rc@>#LiK#gRr&VsN}gL|9~0%w>!X#+YbX7V
zJNDJVD!>}>-Q4GRmL)1o(i@a1>Ny2>+2!4l{nqoC-|4e0tekUcs#}YnN`+ZVp^y1C
zAg_fmalAciQTc_IYogwo_^3J6f-t5hzMhny1zQ$tJcy-f9<R2bHUM9#agI}1F-P~H
zbWv4gMZ`!sN`BZ8l3Ad?Ra3`ReKU;vxCy@~{M+tzQHuR`VWsaUn=C<Rt>bkOZR-vS
zXKOEriQQ@ryvNZBFs?)GZ4mA6dOOGQeL0tu0tF<2f!wmwgdB)nv!hqmErVAbZt$W4
zGoz`#%bx&faky2BI76s;wizV+9?@)XV*(7062-Z8?=K>}8u&c{!PhT~&?2`3eQ{TQ
z?@+$)*KoW`sSX9Lb)Y7(_ec04k8=e!Z9GXdMB3FQ(C2JQY-aaAtf5n#zWBPoB9At<
zc-SZVe4PmDa0sHW8>h|>bfy@dybmbIivP$YKCj9zJ)di&g^a@Bc+_f<-pTcWM{1o&
z6+%%PaFQqgOkTcHA=RsCYbB$zCdb*<ut*;07K1&uFR15}k7$SKlu#-E^dA*g^-F|E
z&}remP5BB<KCwOpV&DkkyrLv3AU*;GW)vf(eZ2g?@%QEmx5skFa$P13C-jpF*n+-d
z?f1<m<$gR~^a*bW%VbFO6v#9X(j7$fcareE*YphK@cSF5dEI|qyO517QiNT%kD6xn
zPDeSx`B^lpoiU=$(g&0YkiU@l)GJtZ{OA0bcyC$T4;3wZmYe<{IQ{-18Y9ZBH|r=l
z^K!>uchRxLGs;GUzJn~-6yLMORGOufY^a@J<hU@`H1+R_Uanl3M4sqE&xP(62Zq^O
zvPm^E%111LCSW@zx-3>ey9PaKk-=>{(S!)BV!G%am^-)^iOs5mDV~H+^y}t$>m`Tl
zL7R#hqOA6Jra6m>aoFvVK>X+9y`hza3!qiVV58q84GeBilBH^yEY2&=&t6QC`~Grw
zeWIsLFzdT;EK{I*4n9|%pPFX=5DT@yex{7bauUR8y1y#$J&+}z)bxNA@E@#h8K<6V
z3j|}$J?Vy@N`Rx+ZzH^}yeWIGG;H-M!0=u*bSr(%9tC<EZ&Tsd{x4o1&TN*YM7FZV
z-Rz~#j7f#V1R*22UtMx~&v8WDmr^{W*l{@A--hU4#?h7PS;oY?t1?A=gC4^qo2d5i
z>0&!(29~W6BoSN}{;C8SN&Uc^7e<=hAfm-3JLS|PQ7Q5mJN5W?sxn-5UBjqYu)vsj
zsHVj_p<TIo%pL3V7emy73}^?69H~)~pYD$SPJsM*IezC`B8|_oaQ}RB?DaBvM`C_f
z13#)_yhDoT@<}|$-KWqgw;2J>iAQGCVyc4S05RA{Zk$00rbvmg$3NC*qz41Y9o)Zh
z#KE$*5s{THO*{I!DMQlb^&U+gai<#aq}0$#2B&!-=BX+Q**IebGv_%INTLE7X^2+f
z!sT2}%^ba2Z;gqzx=YVMy*V$}dO0k&NfI=B+;4kXmuIP{9^do+yEL`OWs#<EMrW&e
z==H>pO_}|qd2|~uv{>6j6WJNh=;M5hB`UlnovdZ%*_0^ycH?pS<#wf`^BfG_M;wU>
z6M=Cbic&YHcN|O@Bu>{T5`EZ-_$m!5Wssq-$ZT*$_c!Lm^4DKs)WG{`f4}ebJKWl)
ziUl<379-|M(9CqVegG}P!6{otZ%#)4HE{3kc@+UwDZMG3-E#@3t}pnJVU`(3fwIwH
zab1$t%G;ls;||U9O99)Qk5O>iv0lx6J7(g!ebS>o(l{gPj80^uP?rzCGC*N0pU*_i
zdU>S}yE2dgM(GumBtzVSxm%wHFrRe9#Vyj;Z1~GWKO}?(ky9<p>ow;$(U&{>63&7|
zXrJG2NK;uSy~U&R{HSCv&57JUa8*>(!l{riHvy6^vUJjH&T~S9-9<7AXLwI`EX54;
zsFa9mUneF1fh&&lIXx>&6ZxdfmlH1wT?G4KGm-aP{``e3TK;+Q{u%~X#`f9yq0rw_
zmfDG_Nuba7Qp^z=*s$&$E^$qMJ>;7|M!Y?LjZ9oSzOO<Veyj+D(7_f8;Ebwk8i;I+
zWDA`QKep~QKwkPT*OZ=-TMV{3f}lCo`hrS#;9ufl*{9icp7E~E+5WrAz9g_FP?pL%
zZCpF@?^q2p*f|nuBPfgzeT#W_D<D2hR;BrPA+^)Clj0&(`+4s~0{^Aw#K88;BPT&v
zO_6XU+eT~7ZWi}j9s)h9>&-<f8yD%!O6JM#w=;$%a46%bY$SF)GlbLyfWP<GwM+{H
z&><>Koc__lnC~f2)s4sR5Rv7idVTL*FhF}ytY=#r83@N9U)NKxG{!R$`XY1|@q82s
zs{yE4EV`ass&ZJW(s4|Y%h2X{<;^`|R3iI#&2qlhLgzCAE)!SNC(8A%3hxksmqhE~
zqSskzEB$3aK16|xKumWQIqPvRx+UcuOj=OQI#%SP2tC?taQL^ltyI<pBkT5Vb_9=i
z0dHqEfo;dMrIf`LgaL6wp9MthOWkq8b04R!;XC>?a0<CZ4vv6l2xoen_-}9rpHF~)
z*T17+OZL;y$c#^=>=!v%*+3hLF3Q=I1twxsPU>A0fVqdz;H25Uy0nIld?OgR$masq
zwB@CpJ1c8!e<56ULb8Hz8$iAjRW}!#{^!JjCNVsA%)=a1k9DWD*CH8O-!7;GjA8M(
z!^P(#Pa<vIEXk*Ce(>iN5x#1}(|o6OWiaUa^n2Kcw-pOH*z-=9s1er#Md|C1Xztlw
zXPJT=S4U8<Ae3$BXrSFz_jW(CR-04{yRdw)#Nh)V@aocVDCD%)qu~ctRoZQoGQ7a=
z&PWsh1>!M!`g&7m5>7L$U&gK8C9C4muPgo&*5rZ$AA^o*rM`@Ivsc=T4*Y=knh|=}
zq`PABb?KNX?4tBg5Yzh8vazcr9%07#ioc~4z4^#vYk`AmHf(ic+)qN8I=MBCw5KYz
zT{aQ0sKJ_!dXBscfVF4Hps>|004KCRA~GxGT-_?&ZK;(uLr)Di{VyNxH1BD#e*E)g
zVB3YYCr-3xuz~`-`~J(=`B<D-i2uyV^JJAI#&#U7xcDylWu^JQRq>D^5Mef2LT0+4
zn<|yODl9KA>2`Oi>tYLy0<sipB<aJzvoIRU-1ih3*NQJi&*^tT&WX;U<74`JS#7I*
zYt3w`d_>+!%%9B7soy3#iEIIe&=_p3xBQxy9X6y>ITt3*v&yB?dqS1eUUk0C@sv2r
zq11Y4>2ImJR(n$HO(x^APuJZSXYRKqqW)n$KdT4tQeR)Lk8#Xi2$|!3KHE-X45k2B
zM`ECp@PM~XB<Ka|KI7klVsbE-!6`H0ggGZ91!9Rkb}E2`XwY)-@~?oP?;2dpW4#9|
z%Uz{eT_Vd^7r;n9R+qcWuMh57kNS!AVoJPE@x`OZAjz1uo|xC&;|RAR|BufRQ2b`$
z`XbWp-r*`{VqHwbw<VD$Tir<NP@H(F5^%9wT{)pw>p<Vy&McLFvJ{Y+*0r=kq*Ux^
zIer_XkaN5ukK{hcQ&lrKN(0~U`T4@j)iGrrhtHA>KPPysPMd*p@!Mh2!5}tG)2*H*
z`F80S2@MYokc1$ylX^+@c<kJ`%-!`Q%YiV26M5SvJBIf6IBm3BDfe*-DSk?*8H=Hc
z=xwtr4Tm3P852*SIURLsrCsYAcZMpanjxK?arvrb?Ccn#l?l(_#Pr=cF^uLW_mQvP
zP0;_V*kaPpyY0%x_KzFWbJta;&4?Ot)s49CEXbiucRg***Owg+3KO3YLY&LS4y&z!
zvMOn3k(;KXKtYTc+jE__?}}I?xd=DOo_x2pPnQu|VnHrkodYhVRdyFdhizJLEBk7M
zsHf|yX`_!Jvkc^q9ai#A?iQvTTY@uEE*XKfDru%ig3I-#Sj9|iIVctVqfkAd(*Soz
zWh^QmZ!uS*wngC03$@L9N>P67CqmL(B?_+MDdWEU#e!PfiL6W76#YuZQ4>Q4BKS2a
z#-|bz!W=V4L8zB8X9T_z%uyKUJ{rEhvDI~)9HR8Rbw;N=)1>efcKv^*3QC_T*Ca#K
zi^>=v>AJkDQ3Z$9n4`P7B;1CCy0vq8mIZlHhh0=i$${Mk+0OUB1Ou$Woht}e`dTuU
zK8F+B#$*bVX_`reff9+ImT;B}N{~$``QSW5b4E6;(S?Xdp?0|{B^pinJ_AaDVA3e1
zS6L^ftjp~E&@JKKixo27Br{d@6h&_UuUT-qM(PoZhqH=vUACy8R-Lo1OsECM2D?XP
zX{7%O2G5GEK_<%G#}#9dFxVPP{13u%ZB^20MdWyp3({Antq#s{yXJ?)-1NE%JvwT*
zGcI9719=n1I4PfqKrU<_VJ4Ilx)6>fbqQ0hdj+@~Ml3Gy$RP>3=0N)0aoUW3a}!PI
z1R*OV@T|%`No=(&|3FcUAAa;0j``gU`dpw6{pL?mu*cQz(3pF)Wl=CwnQvJ95rjby
zA_>-o2!Uo6b=~ZWG?aJ)m8M}2)y6s`f^$mjIAXU9&n}4&x;qF8{3H~zD~l|TaLc8h
z7BTq2`x`e$WNXOxlnm5K#U?g%C@$|hJJee`a+AD9GWA$KmKS$$M`LYKLy(DPqI37v
zkkXo-l5IiucbQe*Cny;Qfng<=nc~cf_)kHopr5c~qiD8N02m5mT_eT#Ql^po4?Xg=
zcBE>Ts97OyCG{hA1{mLdBTpY94?rnK_Q3&vN08%c$#<lB?{-rOj@<Vdz~fPid#hc>
zVbgmHWxI1_uG1d0?U<vZ<LrLZ1MRa~mII}JGvW;}{2x#gOD`Mk?tKtO<b5;SJ%0`U
zNEOQ{-Idfphr5Xm%d!eX9D$CCPN=>eD5?LRW*n{fDR{-w>;6$t<aU{Z7bxa0O}o@^
zoPK?`YIUJN+6ITvbXa6>XG-bGr&-flMML%>vwA21_hZuf&Bs$;m|b{4-OjnLryOfu
z(UF9669>O?gIe`UfkHk&);CS@g|U5=H$XjkB#y;EaAEM#<>00+^<{je?lBWjq&Q%y
z@mU2y7K<UFJ8YD}gdpuOi;^T4krPA=EJG6OqoH4jUgOABsyHCDw3SmM)jLLyKX`tz
z4Q^NUOed)Rbw<1=rz@K6y{C6fbntzN-<%Exs6!`E79^dVcz^X~W?(J85}z5twt)Rl
z0b^|<zP)h#J>SzlfEwRZ`%EJ&4UZ5lcx=P;ZA2?qI+jpu>`{e7@z(|uL?f*nB_Yl@
zygwj2Wx74|_{n?tCe}=oQelki2O4#fCxABI=+>E*$~60u0n{TnYA`ed^yV=l@-B$S
z=Frz<MYrq#5tqgJ3Y34941YF8_IBj$Fa6TN?GmMOp>~XT++Hq>9J>~7oM90WwN;nD
zn{F6K<dn*{l%jIc79eVpa24nN;K=57Vfl>@CC2cysGpJpmv=e)tSGOJf;H=msMliz
z3)3dlh{hx#ez&kn_z5goyo5RC!iEaKW3-j-_1U)wqbRGWqjA5wIO9M`?DBl43Wfj4
z;5xS7rm-l5OJiLAac=GRan(9zUlYu>0T{B|swd4|3b*7?295JPfG`qIR?0g_E^|%H
zGo+Rq7#v2uKDNy|J+I~3r`H;~DUrpEv$+-NtkaTOHQ)bPqoY5?sy18Losu|#%-FgP
z;YN2U2Gl0l6}iY(8<|ybEM*I-nK(0;^K|8}$aDnyIj>SWaK>O{16GWJiqQ?Wh1d*t
zzb$<-QUxIap@S5pg1_g;8#vp|9wA>7;{nK|+q0N%+79fST0?W46>GRAHr0+aKBXA%
z#vaQo&m}|kY7dKV|DY8QkzH;mxhs2nZsdiCp%O|VZdDZ{hrG6<gH&{RVIo(p;Xjp@
zqFY({dh+P1ZR3KBcnjH9M~Uj8LoBgk2%KzEK9%K<x6u*W_EKk6e=qVl(eNNW2Kh_l
zK_*W-SR4rC2WFT%6OGk7lySbtg-axdr8zk#Oys-Zww_lG?-wh=CV6UhdNjo<M=L>U
zdWK!X{YuTfH>K>powY%?0mRyP^gsFs+Yn7YFZ9&JELq}fuoW#Jo97X4d?9UO*3&Vm
za8SavHZ|FCDf4>P*IjAsjEZFGAOTPJ^(<l<kY|53j;E5>XvMW1aWp2N^L@25XBbvG
z=n>*&{pnd%%Gb^v!#JTpF+NtjCX*Tlf5HQxB8m9kOda9=<!6n#6+{!_WG1QWKN+DI
znru|Z-^diCum65{{^Uedo3>QcqGd*?h@fy@IA+bxIc2I4B#L89SFxAWk9D8m#gyP{
zMR3@TUh!FLyr99)+IrXh_Q1*Oxpr^9sQg@R>G<}nMIWsx)$BUGPGJ<8i{H~GYzUnv
z@v1JgtV~9Ai1F}nVqgje6s(n~<$NvuW`yG#MtvkGn`-?V4{vBF5QF=iVA%_vEl0&#
z!EIZGMvXh2yfOCL(+2i@sw9f|Pd~FC28?syd%Ptt-AMVTUbuop|5np{TCv{|o~p+~
zb<7%)`M$jU!$G+T?f1cjX*Z#S=}0OR@{j2VO2Hb{d*Iua9u`+uctK4>#YQ_tWtaML
zn!r6R_+k6f`{;>$IT%Fb<|Q%NPJIJRH_gw;AGKSOv}uP9j%y)~WI{_rM6xDy1p5zT
zU$sHuC+L)VO3akC1;+2LS!aA=H0`W8il$OZdPg`JK;dc}Oyv3gblaYP9AuCrL_b5q
z#S+bK3o!IN&rIrV%I$(Ov(7QTlS28E3XV(?G+%skTk5*$Ax~O**@~8{_4%G|dR?IZ
z%Y;M{_}u8(x_^J)p5hm->~N5jAu4hfr>;7w_P0EfrKS!~J7#}OtH)j+8LzHoYCR-?
z2p=FLTiA&S%X`lU^fM4xIB7;=Iz>X3dAO?`N3t*(#hNk|(Aj+WLj<`MDda*z&}1_<
z%&;fm1CJY7*G{KR`gt%?v0`do#)SbT1cl6F3U0I0h9zAD-Jls(GbIf%yMP6#vai}x
zml|i1<9-<Smt`$6W9_S>_vhnd(t{ghZw*gwad0pd^1F#0Z7?BO6b*I+&3W{vDTv$h
zosHE>u0cr*EUv2c^!5<mB*iwec2uYBIZO3)Uwiz;E!oR`aRrn$aresL6O<}-T6u^(
zVMMFrI@}$tHK@%`E8z%&g2H6^uNT01_01T<w9M2M^GIQ1$Y7|0{+QbbBzmjww*lWU
z19j`$pVg|mJhnr=_NHlJtdVD(y3{suX4+++nWgGVCSPF1*ZNInOP=i0StDb~Pe=J;
z@%+lPiY$?H!JKtD-9S<%vyqDb6m5{4UenX5#}=)*BnwMx)f+&tQ@2zZc9<De$cC^9
zNt6h)(<m`eW@f+2naT1JFXAPfI;dpi_T(rgL(1lCSuMT3K5qyM5u{(zA43s>s2n61
zWML%nZoCI?Y#1ZSTWL(%+?DiCci-IobU8_*;8Dw*+P%)38u@VrEHAQ{<?m6H@8(+#
zgh7(wx(9|;G1u`aBDYP|W}SYi30tEF8Htxg%ySY$+c>3Y=>?`fliW{gDY=+W--=4$
z-Rnv-Cs!~eMd0&jj#Neyx{F3sVa<p70(xZLJm<LMX%IIW2nf<)Fdty6hitK=n;{7#
z-yn>&^Vt1(P-}f&T<GO`l%4+*ryvJ0awfEscPh>Al>7RkB!QIgg07v3;VT$13i#RT
zl$Sc0W5wjF5Gt76fd9z|Y6VdIJdHinN;@_nnA#he`s(5PB-37KcKNG~*C|_i2cBN2
zrKmQ!*+!SRkvt&G_@+1fXU;`B&@Mx2NFmL0=}--4B8AO58gafAr_=Ws2_oNW8){+{
z^N=FkB^IO}XQS3~O!VZ{QpDO$DYBQ@2}-5uQ5czbG9ht6``4I=X<8r>3TtF3*@E@Q
zc#b~n<^EEwibc0(J-n;dGb^9!NzUPb63!Se-xKR>X-;dWJ<YEgv&V{MKXLhz|3ar<
z_4(=JI2rlvvMUE}Bp{q3cinKr_n)>Pz_NBf!aK#p_9s)KDhm$_a;$t`>7+{$(-=Qa
zx*y?#PIN2GNHDw}jfA!MDRKJl%3St*3y_A=A|w3zqq90B^lFoHiZE&`^nwO0W@=W{
z!4Dt8a1>qsWY9@Zy3{y%d$i*)G5HmJN(}n#SXk`Q>SW58`@UoO2*xSX?BVlqjo}GS
z=axeEnMO^79jd-=)T*lCk)+K69+2p|zO*Z`Gb>PR(K<ERq|KB<rI$Lvn`X7n_9;&~
z*UyyG1^u=~!QAL3f8fooGvdT(>QFdDF}9jw2xW6tKgbf2{ffo1YPcRf0&Mj%M30%g
zo=sOO%W`!zrZB0k&r8d);AC6bNHH5iY@WwcjlXO{cd=(8Ax(p1My#hyjz_=Q<hr8<
zyP{Qsq(7z{LWay&477rb0VMo0y{Wl&CYehjO_g7Oj!!Xib>1V94K8!N1#)`C={waq
z{QW~$2FenWtchHdKF%fKzJjZA5)o1=eDOTV{~!Xi<*kcW3|}%cAnc8VJQ`s8w!<Dl
zGGUJx&Lau9gJ~Wq2tZWEZ2Gf-mQ0E|a15{8Q+KEo%)z39<2s+Ztx~<!lDw<<>hc9t
zTlj%(BdrfW6Dj^PQ}hSO?|x{)#<=yhzr*u%c<S0j2Tuzu<-Xf`r%?{0m~wo7W?jih
zLEEX@uSCGllWu>XZh#n*Z8db{GAqhEu{ujqH!Cdvip-I2U`f1v(!}BVmm5NV&$u=q
zdf>7Y`wCj{v6U@2^lS8huuopD$()Hq#HgFH+s*bGKH0G)%gx8AQHHDc`dX9bjC)D?
zh*6qev)tG<x9{5meyiIN5vSS)w;S5s{fW}gH)9edTuB<kXc_Tk><TK=3_4odWOBX-
z_2>Qa^|ofbSou8-C-PWw{;7ppz^Jf}*Nt02r;QRg^>?$}GW(4H4q9{c^|CsBi=829
zDH%NeTFCPwGCuzXPY4_MUb<U>!Xy{HWf;rA&Y5NKWl==wQL%2Y+(btu`xNNu?Vv|C
z7G0U}rXbQ%8|EvxC|96s=2SL{Y%bX9q(v%llH=ZoU64i#U~Cs;AAs+4LCKXc>#ZB+
zRxIma!m=;)4UxVqIk1_5xd4{qkJTj_6s0TW*b?t_YZ>;GGAa-~62fUh+ANH3SB?Ct
zee8+XPUQ=tnC<9)01<*~VzX`;up+EKXk-55laLEV&hfjugo&p{*{03^)?|t}OdzbI
z*_p+0#6c{kk~Afi=UP$$4FAI=%sMBc-m>w;gndUquNo<Iq}4r5@uxxL)*LLA*)PA1
zHjl*qBZDQfpoD=_9+@nS6#%nf>y*btO&=~cc)2p8J-D^r7QgkfXk|S-&EQb}w*7$C
zY2Ut)V^kBTnD{$1N;%QP%svI4_|{{I#l=-hpsby&SjzS%(tC|R72;_J)5qC2Y~TBO
zI%njJ_frGNI+5jJc~t$cU&<O@6AdwzZjOg|=iiwlKs~9kLfAyux|D4vWu5L`C5XFt
zwDE?bn$KkbH4h3Y-#ZQ@S5nsyq)e@17Cv9Hxlc37|Ei;&(RW0?-qY6Q8doQihE+X!
zZyh)FZ=a+-WW;(HDzvw_DQS9>PwA+IJhh$O*krD(nrXX}C%t`|cRWRbFIfEgsakI*
zJ~eYh%k0%$0t!+v<g9v#;lf2w&zI!dL?-$p6HsBXWzKZ>&;e!+{kPESb>J@4d<bTA
z_~LbOt@(bdf-F!ruEGw38A$5ESON-XHi}j^w(!E6V;9R<<Etp+g!F7EC&y{IBRwXG
zj?YQ6&MgRvY2_e?1bW?1GL2Rx`b7m3ucHOqJPf=wlk?p4Iup=@t4~}AJL}TBT~r08
ziAYg<C4vVEo@@>_zEZ#S#7<K6V)BB4-*%t1G2))tu1XG`uC{FKOdIiXVQ3M>hS^8t
zTy8&vTQYSwEe^W6rWImpwD(k|St6<XeC*5K`ucRAyY(}ttK8tkDyn}_anCih2%jEV
zKXEf)xs%*b)R_Sai(AgWW~b^}u)6j+r`2JR7a;;jDL>8iAV{#N3u}@1_sGo7WtpPj
z1B>d4^TNmti1R3jc7LH~dNt)S82s^+*fg5|SIZok{w>Y^4hJ3uThN?PA3q~g*^WZW
zLI>}kI&{WrvE}HrQ7=XNpYPq|vnOr5l7^kga4=DJNE4{tpCo_)ya<}-ZXsUClJ0yv
z_dt76PCSgWa2}PJal9fN+Z_iY;G~N#s}9m%Z4qvG3Kkb8V6=Px)p@^h7pg`XS4+*`
zP5jKdu{|r3wiCW`hE#U43YF`*!xYrppb%`t-P?qYFCEJR?lh@{)cu_#d42x^vG>77
z!u_Hh?&1G*%NZsgFlSI-SBp=^RE($;B8K8IoU*u7Lo8<n50CVYxC>V}V@{%tCa*VJ
z3qs6;x37G>B4G6sF=j7Zz@VCPhG^xEg80`mnD^Ikt+W|M;fMgH3DSEa-Dn)M;+tah
z^FL2F5+vv8e|ihzibo1h=u(RV_CbO#nNPNbKNX>`UU!uVh#vbig2GAjJTyOn%sBXQ
z3tPP-4z1~<PH*NW6z8ZGF1DYp)}*dla_KYS7@f!V1<V{3BJ1nLFgSDD>QmO5e%x$z
zxn;o?|NVyPb=T-B;`ju5CcColr*O21IJ)B|K;UektD)e^ZO;|oL1^a2sjXy!mrOwj
zawaN|l)2&G1vhY?Up4V0-EN4kN-z+J{h;YJrZy-`&^FFPXd#+soK)O<yjajk1v>2O
z!5@L?A)SwZBfPBb7|hH~1sE>{{^@8ZQ`YbS6+#q#jX5r>X^n%*gkubjK^_(vkWV{w
zjPpP5viLfSODxt>McIJpp2g&QQzZp5e?y>*GfQs|s)%7m+^jE7nPq0npes0o6EQ?u
zIdSST&6f!fYN|4}@kcKPVML|j{4A#R{$<T>SHeo6-{xnjLx898n}>H{{Wt||A>U6@
zz4j~e`8D^V=RgH9gc|1%Wax&h#%aQ;xC8t5S4#&gxn`}^ksN;EJ@Kg1^PstHPu@rn
zHQZ+p!W(R5JW`IID}RH@JFU1N*>LOhY~Mi)ChLPTC-!VSt(a^`=4!9=V#;AnYiE*k
zwbSOE2{+#l{F{67tr6sE{e%5ROc=0O{M5u1-pg<-T}{F$Tgq4b>*!G4d`4G<-tRSS
zwal(FocZCSgL&7wZZ?H^!=Vz5^?yS?`^RN_4NuDK5a(`ME<F&^LD+^Hvrk&LR@qPw
z`PRnp(BrEra76@{mZN~6<A)~A<*NSJ>!~<v<0A(@CqzLh1htfwGW-E?XI|#X{_KN8
z8=2&O)kBJ4X3K9ZuZ^<%s0}SB))jCt^UEovkhD}1(aafG4B_Nm!sQaUIFi5G2s6uo
zw1PPp<H?El)X1y58`<%AT3x_$1z;v7Sin#$wrAAob-tClU3aRpWVNhIuN^Z(YNGzL
zD7;HJwN{XJ&(y(OxW4r+GXzD=FoK_YAy5OYBAqwVZ4Sd&#v2quTnns91{6cV5U~>C
zjdWAqd?5PA!HNhv`bHzq2@i)IJDMy8+L=Y&b_^-c`DRVX%5hJdLF|~4T5W&>i%Hj?
z(!?XVoz8z}t=`h8{ze3V1Q|t#JjtQk=w$@sf8xIUKuc|?MZH6Lgr2TWNPNoWA7l}M
z@2EF^T-v`YQr<}37VLU?-ex1lYZ@b;y@3~hjKPP_D2v;5z(US6P)4KN0RE!$v&^{h
z+)`lJPDKS9&(3}g5CSWXolNgyPl)@Lv|6Ppd%XY#K`=&u3dZqma#1Hf55kcraoz4`
zXFr+m(waE4YI^J2l!s$fH|dbtglA+XP5iFIu7<CG&nIhvW#o((wU|arN4nwMw+k-e
zIboS1t%KvJ$rI_#iNTEgLXJtG=m18+!iwl%XxFnTow<aJ-`d5tXY9JXLzSJSj>&<U
zy<dxe#m%kN;7f$_o}{&_nn%pbq(7pM{WB77nfI!!XSb1|DTn1Iv5@#_<sb~t&TlXJ
zoI%uWR|eUse%(tqW~^$5?@#rexX-a!6<Ep#?|+L8j>a3snCd!!h2T=Qshxjzx_0J%
z*weE-;|Jjs$x7*mC+uzqplt_Qwx;NrDH#WrSFan2w$}WK<y&P0v5X<YtzJT3rFr(Z
zI;Gd8%1?mZFKvo(+CkuiB6rRVju#pqd#*Y#v_wlCbbEqTqA_q*S^9$@ql{fdU@Q@y
z&9T8Miia$ErKV@lnoWpE&h8iB?FW^Ify?Ko0aPmH@vjlMuC5h$alsLFCajwz?-G9*
z<kn86OIWXOVncN=+^vn$cCbmuC*f9_&7w)`5Y8H$QSY)-GlmnGHDuYbI9JrvzeUK`
zpWWmA?8aA+shvt_J~>=VKNmno?W>NcVhdvK{(`Ilh@+i)di?Q2i4R^Ai=SqVQ4Rln
zaArzOgil}k`A&SiBsyy9I`rcn3uHTuKRtsI*k~YR|N9rsuok&(AyrQ8+k!?^W=}NJ
zc>dp`us0n_Udpn%?Z?XGim%HG3<UWi8^M-3ZyS-R&x<p7v!qCSl!141l)P<boTNzb
z@a8Ymui~zDHRuS9+89%EUXyGxu3cq=wv5`{X`<q1GI5w2KofCgu(}y7J4<AwIwf3j
z07W-(de`33k$>|##$ep33syKm)_HazzoaQ#&rCSRkKyg=%d)-q=E|--!y=u5YEhHl
zDu(exd%4R~M_o@$qE_UeCF3X&U+H0k6sKtzRA~Or|K#euvSHgpCtq$H7YHwJ0rV$o
z)%AaETdFIsf>MkRPs0P8EN$)7`Vm1vzIERYPf`e<f+5KunzH?9&&qEW24Iy_q@xA7
zpKlo!l)6A6A_GzwhZRkwy=BF9{w>Y60tTiKVGHKk7w1QkV~pXXi__CljRADxGA$cK
z10Etx^EkDgW$Zp)YfL|&!yxmbqsq_x)aR6ZrxZ%WW(CM@g|w34ftVD=L~z8GCZ6lG
zQfT$i%w`DV%C$dtS%=s&R{Rbq*GBwdvTia`tV#WxvXiQI{ed5IMl9FC?sx<FtpZ9`
MQt5k@xKY6W0XAY3I{*Lx

literal 14936
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
Q=XXz8NhOI|F;MXT0jAPnPyhe`

diff --git a/tools/doc-shredder/_test/test_jade/guides/setupAlt2.jade b/tools/doc-shredder/_test/test_jade/guides/setupAlt2.jade
index 0330f55b90..f4a1a0d8ab 100644
--- a/tools/doc-shredder/_test/test_jade/guides/setupAlt2.jade
+++ b/tools/doc-shredder/_test/test_jade/guides/setupAlt2.jade
@@ -2,7 +2,7 @@ include ../../../../_includes/_util-fns
 
 .l-main-section
   :marked
-    ## Install Angular2
+    ## Install Angular
     There are four steps to create any Angular app:
 
     1. Create an entry point HTML file where users will start
diff --git a/tools/doc-shredder/_test/test_jade/setupAlt.jade b/tools/doc-shredder/_test/test_jade/setupAlt.jade
index 177edd9553..c35afd1e71 100644
--- a/tools/doc-shredder/_test/test_jade/setupAlt.jade
+++ b/tools/doc-shredder/_test/test_jade/setupAlt.jade
@@ -2,7 +2,7 @@ include ../../../../_includes/_util-fns
 
 .l-main-section
   :marked
-    ## Install Angular2
+    ## Install Angular
     There are four steps to create any Angular app:
 
     1. Create an entry point HTML file where users will start

From b2c6acf1add3ebd2df3ca0b581b7036cc557114c Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Tue, 20 Sep 2016 10:56:38 -0700
Subject: [PATCH 24/42] docs(tutorial): fix broken link (#2420)

Fixes #2419
---
 public/docs/ts/latest/tutorial/toh-pt6.jade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade
index 2383f0a34e..f761a9f19c 100644
--- a/public/docs/ts/latest/tutorial/toh-pt6.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt6.jade
@@ -348,6 +348,7 @@ block get-heroes-details
 :marked
   Refresh the browser and try the new delete functionality.
 
+#observables
 :marked
   ## !{_Observable}s
 

From 0f99a7c130bba082ff3dbc75358ceb688d264d46 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Tue, 20 Sep 2016 10:59:14 -0700
Subject: [PATCH 25/42] docs(cookbook): don't use shredder on intro page
 (#2418)

Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389.
---
 public/docs/dart/latest/cookbook/aot-compiler.jade | 1 +
 public/docs/js/latest/cookbook/aot-compiler.jade   | 1 +
 public/docs/js/latest/cookbook/index.jade          | 4 +---
 public/docs/ts/latest/cookbook/index.jade          | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 public/docs/dart/latest/cookbook/aot-compiler.jade
 create mode 100644 public/docs/js/latest/cookbook/aot-compiler.jade

diff --git a/public/docs/dart/latest/cookbook/aot-compiler.jade b/public/docs/dart/latest/cookbook/aot-compiler.jade
new file mode 100644
index 0000000000..c743361ac8
--- /dev/null
+++ b/public/docs/dart/latest/cookbook/aot-compiler.jade
@@ -0,0 +1 @@
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/aot-compiler.jade b/public/docs/js/latest/cookbook/aot-compiler.jade
new file mode 100644
index 0000000000..c743361ac8
--- /dev/null
+++ b/public/docs/js/latest/cookbook/aot-compiler.jade
@@ -0,0 +1 @@
+include ../../../_includes/_ts-temp
diff --git a/public/docs/js/latest/cookbook/index.jade b/public/docs/js/latest/cookbook/index.jade
index a3a1b000b7..ee19ecaf9f 100644
--- a/public/docs/js/latest/cookbook/index.jade
+++ b/public/docs/js/latest/cookbook/index.jade
@@ -1,3 +1 @@
-include ../../../../_includes/_util-fns 
-
-+includeShared('../../../ts/latest/cookbook/index.jade', 'cookbook')
+include ../../../ts/latest/cookbook/index.jade
diff --git a/public/docs/ts/latest/cookbook/index.jade b/public/docs/ts/latest/cookbook/index.jade
index 08e3d5671a..7d87540397 100644
--- a/public/docs/ts/latest/cookbook/index.jade
+++ b/public/docs/ts/latest/cookbook/index.jade
@@ -1,6 +1,5 @@
 include ../_util-fns 
 
-// #docregion cookbook
 :marked
   # Angular Cookbook
   
@@ -12,6 +11,7 @@ include ../_util-fns
 .l-sub-section
   :marked
     The cookbook is just getting started. Many more recipes are on the way.
+
 :marked
   Each cookbook chapter links to a live sample with every recipe included.
   
@@ -28,4 +28,3 @@ include ../_util-fns
   [angular.io](https://github.com/angular/angular.io) github repository.
   
   Post issues with *Angular itself* to the [angular](https://github.com/angular/angular) github repository.
-// #enddocregion cookbook

From 55bf126489d6c92fecbc1a948851f10e6297d4e8 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Tue, 20 Sep 2016 13:45:50 -0700
Subject: [PATCH 26/42] docs(testing): explain rationale for stubbed routerLink
 tests (#2422)

---
 public/docs/ts/latest/guide/testing.jade | 147 +++++++++++++----------
 1 file changed, 82 insertions(+), 65 deletions(-)

diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index 0014c5e3fa..dc4e9e873a 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -11,7 +11,7 @@ block includes
   Along the way you will learn some general testing principles and techniques but the focus is on
   Angular testing.
 
-a#top
+#top
 :marked
   # Table of Contents
   1. [Introduction to Angular Testing](#testing-intro)
@@ -83,7 +83,7 @@ a#top
 a(href="#top").to-top Back to top
 
 .l-hr
-a#testing-intro
+#testing-intro
 :marked
   # Introduction to Angular Testing
 
@@ -154,7 +154,7 @@ table(width="100%")
         and assert that the application responds in the browser as expected.
 
 .l-hr
-a#setup
+#setup
 :marked
   # Setup
 
@@ -184,7 +184,7 @@ a#setup
     you can skip the rest of this section and get on with your first test.
     The QuickStart repo provides all necessary setup.
 
-a#setup-files
+#setup-files
 :marked
   ### Setup files
   Here's brief description of the setup files.
@@ -247,7 +247,7 @@ table(width="100%")
   They were installed when you ran `npm install`.
 
 .l-hr
-a#1st-karma-test
+#1st-karma-test
 :marked
   # The first karma test
 
@@ -368,7 +368,7 @@ figure.image-display
 a(href="#top").to-top Back to top
 
 .l-hr
-a#atp-intro
+#atp-intro
 :marked
   # The Angular Testing Platform (ATP)
 
@@ -439,7 +439,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#sample-app
+#sample-app
 :marked
   # The sample application and its tests
 
@@ -460,7 +460,7 @@ a#sample-app
 a(href="#top").to-top Back to top
 .l-hr
 
-a#simple-component-test
+#simple-component-test
 :marked
   # Test a component
 
@@ -476,7 +476,7 @@ a#simple-component-test
   Start with ES6 import statements to get access to symbols referenced in the spec.
 +makeExample('testing/ts/app/banner.component.spec.ts', 'imports', 'app/banner.component.spec.ts (imports)')(format='.')
 
-a#configure-testing-module
+#configure-testing-module
 :marked
   Here's the setup for the tests followed by observations about the `beforeEach`:
 +makeExample('testing/ts/app/banner.component.spec.ts', 'setup', 'app/banner.component.spec.ts (setup)')(format='.')
@@ -492,7 +492,7 @@ a#configure-testing-module
   But that would lead to tons more configuration in order to support the other components within `AppModule` 
   that have nothing to do with `BannerComponent`.
 
-a#create-component
+#create-component
 :marked
   `TestBed.createComponent` creates an instance of `BannerComponent` to test.
   The method returns a `ComponentFixture`, a handle on the test environment surrounding the created component.
@@ -516,7 +516,7 @@ a#create-component
 :markdown
   These tests ask the `DebugElement` for the native HTML element to satisfy their expectations.
 
-a#detect-changes
+#detect-changes
 :marked
   ### _detectChanges_: Angular change detection under test
 
@@ -540,7 +540,7 @@ a#detect-changes
   It gives the tester an opportunity to investigate the state of
   the component _before Angular initiates data binding or calls lifecycle hooks_.
 
-a#auto-detect-changes
+#auto-detect-changes
 :marked
   ### Automatic change detection
   Some testers prefer that the Angular test environment run change detection automatically.
@@ -570,7 +570,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#component-with-dependency
+#component-with-dependency
 :marked
   # Test a component with a dependency
   Components often have service dependencies.
@@ -605,7 +605,7 @@ a#component-with-dependency
   and its tests:
 +makeExample('testing/ts/app/welcome.component.spec.ts', 'user-service-stub')(format='.')
 
-a#injected-service-reference
+#injected-service-reference
 :marked
   ## Referencing injected services
   The tests need access to the injected (stubbed) `UserService`.
@@ -641,7 +641,7 @@ a#injected-service-reference
 .alert.is-important
   :marked
     Use the component's own injector to get the component's injected service.
-a#welcome-spec-setup
+#welcome-spec-setup
 :marked
   Here's the complete, preferred `beforeEach`:
 +makeExample('testing/ts/app/welcome.component.spec.ts', 'setup', 'app/welcome.component.spec.ts')(format='.')
@@ -658,7 +658,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#component-with-async-service
+#component-with-async-service
 :marked
   # Test a component with an async service
   Many services return values asynchronously. 
@@ -677,7 +677,7 @@ a#component-with-async-service
   They should emulate such calls. The setup in this `app/shared/twain.component.spec.ts` shows one way to do that: 
 +makeExample('testing/ts/app/shared/twain.component.spec.ts', 'setup', 'app/shared/twain.component.spec.ts (setup)')(format='.')
 
-a#service-spy
+#service-spy
 :marked
   ### Spying on the real service
 
@@ -709,7 +709,7 @@ a#service-spy
 
   The test must become an "async test" ... like the third test
 
-a#async
+#async
 :marked
   ## The _async_ function in _it_
 
@@ -731,7 +731,7 @@ a#async
   Some functions called within a test (such as `fixture.whenStable`) continue to reveal their asynchronous behavior.
   Consider also the [_fakeAsync_](#fake-async) alternative which affords a more linear coding experience.
 
-a#when-stable
+#when-stable
 :marked
   ## _whenStable_
   The test must wait for the `getQuote` promise to resolve. 
@@ -754,8 +754,8 @@ a#when-stable
   The test kicks off another round of change detection (`fixture.detechChanges`) which tells Angular to update the DOM with the quote.
   The `getQuote` helper method extracts the display element text and the expectation confirms that the text matches the test quote.
 
-a#fakeAsync
-a#fake-async
+#fakeAsync
+#fake-async
 :marked
   ## The _fakeAsync_ function
 
@@ -776,8 +776,8 @@ a#fake-async
 
   There are limitations. For example, you cannot make an XHR call from within a `fakeAsync`.
 
-a#tick
-a#tick-first-look
+#tick
+#tick-first-look
 :marked
   ## The _tick_ function
   Compare the third and fourth tests. Notice that `fixture.whenStable` is gone, replaced by `tick()`.
@@ -795,7 +795,7 @@ a#tick-first-look
   To more fully appreciate the improvement, imagine a succession of asynchronous operations, 
   chained in a long sequence of promise callbacks.
 
-a#jasmine-done
+#jasmine-done
 :marked
   ## _jasmine.done_
 
@@ -819,7 +819,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#component-with-external-template
+#component-with-external-template
 :marked
   # Test a component with an external template
   The `TestBed.createComponent` is a synchronous method. 
@@ -847,7 +847,7 @@ a#component-with-external-template
   The `app/dashboard/dashboard-hero.component.spec.ts` demonstrates the pre-compilation process:
 +makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'compile-components', 'app/dashboard/dashboard-hero.component.spec.ts (compileComponents)')(format='.')
 
-a#async-in-before-each
+#async-in-before-each
 :marked
   ## The _async_ function in _beforeEach_
 
@@ -855,7 +855,7 @@ a#async-in-before-each
   The `async` function arranges for the tester's code to run in a special _async test zone_
   that hides the mechanics of asynchronous execution, just as it does when passed to an [_it_ test)(#async).
 
-a#compile-components
+#compile-components
 :marked
   ## _compileComponents_ 
   In this example, `Testbed.compileComponents` compiles one component, the `DashboardComponent`. 
@@ -884,7 +884,7 @@ a#compile-components
 
 .l-hr
 
-a#component-with-inputs-outputs
+#component-with-inputs-outputs
 :marked
   # Test a component with inputs and outputs
   A component with inputs and outputs typically appears inside the view template of a host component.
@@ -971,7 +971,7 @@ a#component-with-inputs-outputs
 
 .l-hr
 
-a#component-inside-test-host
+#component-inside-test-host
 :marked
   # Test a component inside a test host component
 
@@ -1015,7 +1015,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#routed-component
+#routed-component
 :marked
   # Test a routed component
 
@@ -1041,7 +1041,7 @@ a#routed-component
   The following test clicks the displayed hero and confirms (with the help of a spy) that `Router.navigateByUrl` is called with the expected url.
 +makeExample('testing/ts/app/dashboard/dashboard.component.spec.ts', 'navigate-test', 'app/dashboard/dashboard.component.spec.ts (navigate test)')(format='.')
 
-a#inject
+#inject
 :marked
   ## The _inject_ function
 
@@ -1083,7 +1083,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#routed-component-w-param
+#routed-component-w-param
 :marked
   # Test a routed component with parameters
   
@@ -1117,7 +1117,7 @@ a#routed-component-w-param
   By now you know how to stub the `Router` and a data service.
   Stubbing the `ActivatedRoute` would follow the same pattern except for a complication:
   the `ActivatedRoute.params` is an _Observable_.
-a#stub-observable
+#stub-observable
 :marked
   ### _Observable_ test double
 
@@ -1148,7 +1148,7 @@ a#stub-observable
   :marked
     The router stubs in this chapter are meant to inspire you. Create your own stubs to fit your testing needs.
 
-a#observable-tests
+#observable-tests
 :marked
   ### _Observable_ tests
   Here's a test demonstrating the component's behavior when the observed `id` refers to an existing hero:
@@ -1177,7 +1177,7 @@ a#observable-tests
 
 .l-hr
 
-a#page-object
+#page-object
 :marked
   # Use a _page_ object to simplify setup
 
@@ -1214,24 +1214,23 @@ figure.image-display
 a(href="#top").to-top Back to top
 .l-hr
 
-a#router-outlet-component
+#router-outlet-component
 :marked
   # Test a _RouterOutlet_ component
 
   The `AppComponent` displays routed components in a `<router-outlet>`.
   It also displays a navigation bar with anchors and their `RouterLink` directives.
-a#app-component-html
+#app-component-html
 +makeExample('testing/ts/app/app.component.html', '', 'app/app.component.html')(format='.')
 :marked
   The component class does nothing.
 +makeExample('testing/ts/app/app.component.ts', '', 'app/app.component.ts')(format='.')
-.l-sub-section
-  :marked
-    This component may not seem worth testing but it's instructive to show how to test it.
+
 :marked
   Unit tests can confirm that the anchors are wired properly without engaging the router.
+  See why this is worth doing [below](#why-stubbed-routerlink-tests).
 
-a#stub-component
+#stub-component
 :marked
   ### Stubbing unneeded components
 
@@ -1251,7 +1250,7 @@ a#stub-component
   The component stubs are essential. 
   Without them, the Angular compiler doesn't recognize the `<app-welcome>` and `<router-outlet>` tags 
   and throws an error. 
-a#router-link-stub
+#router-link-stub
 :marked
   ### Stubbing the _RouterLink_
 
@@ -1263,8 +1262,8 @@ a#router-link-stub
   Clicking the anchor should trigger the `onClick` method which sets the telltale `navigatedTo` property.
   Tests can inspect that property to confirm the expected _click-to-navigation_ behavior.
 
-a#by-directive
-a#inject-directive
+#by-directive
+#inject-directive
 :marked
   ### _By.directive_ and injected directives
 
@@ -1278,7 +1277,7 @@ a#inject-directive
   1. You can use the component's dependency injector to get an attached directive because 
   Angular always adds attached directives to the component's injector.
 
-a#app-component-tests
+#app-component-tests
 :marked
   Here are some tests that leverage this setup:
 +makeExample('testing/ts/app/app.component.spec.ts', 'tests', 'app/app.component.spec.ts (selected tests)')(format='.')
@@ -1295,10 +1294,28 @@ a#app-component-tests
     This is a skill you may need to test a more sophisticated component, one that changes the display,
     re-calculates parameters, or re-arranges navigation options when the user clicks the link.
 
+#why-stubbed-routerlink-tests
+:marked
+  ### What good are these tests?
+
+  Stubbed `RouterLink` tests can confirm that a component with links and an outlet is setup properly,
+  that the component has the links it should have and 
+  that they are all pointing in the expected direction.
+  These tests do not concern whether the app will succeed in navigating to the target component when the user clicks a link.
+
+  Stubbing the RouterLink and RouterOutlet is the best option for such limited testing goals.
+  Relying on the real router would make them brittle.
+  They could fail for reasons unrelated to the component. 
+  For example, a navigation guard could prevent an unauthorized user from visiting the `HeroListComponent`.
+  That's not the fault of the `AppComponent` and no change to that component could cure the failed test.
+
+  A _different_ battery of tests can explore whether the application navigates as expected
+  in the presence of conditions that influence guards such as whether the user is authenticated and authorized.
+  A future chapter update will explain how to write such tests with the `RouterTestingModule`.
 a(href="#top").to-top Back to top
 .l-hr
 
-a#shallow-component-test
+#shallow-component-test
 :marked
   # "Shallow component tests" with *NO\_ERRORS\_SCHEMA*
 
@@ -1332,7 +1349,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#attribute-directive
+#attribute-directive
 :marked
   # Test an attribute directive
 
@@ -1392,8 +1409,8 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#isolated-tests
-a#testing-without-atp
+#isolated-tests
+#testing-without-atp
 :marked
   # Testing without the Angular Testing Platform
 
@@ -1423,7 +1440,7 @@ a#testing-without-atp
     Write _Angular_ tests to validate the part as it interacts with Angular,
     updates the DOM, and collaborates with the rest of the application.
 
-a#isolated-service-tests
+#isolated-service-tests
 :marked
   ## Services
   Services are good candidates for isolated unit testing. 
@@ -1474,7 +1491,7 @@ a#isolated-service-tests
   Use the Angular Testing Platform when writing tests that validate how a service interacts with components
   _within the Angular runtime environment_.
 
-a#isolated-pipe-tests
+#isolated-pipe-tests
 :marked
   ## Pipes
   Pipes are easy to test without the Angular Testing Platform (ATP).
@@ -1500,7 +1517,7 @@ a#isolated-pipe-tests
   Consider adding ATP component tests such as this one.
 +makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'title-case-pipe', 'app/hero/hero-detail.component.spec.ts (pipe test)')
 
-a#isolated-component-tests
+#isolated-component-tests
 :marked
   ## Components
 
@@ -1537,7 +1554,7 @@ a(href="#top").to-top Back to top
 
 .l-hr
 
-a#atp-api
+#atp-api
 :marked
   # Angular Testing Platform APIs
 
@@ -1629,7 +1646,7 @@ table
 
 .l-hr
 
-a#testbed-class-summary
+#testbed-class-summary
 :marked
   # _TestBed_ Class Summary
   The `TestBed` class is a principle feature of the _Angular Testing Platform_. 
@@ -1659,7 +1676,7 @@ code-example(format="." language="javascript").
   };
 
 :marked
-a#testbed-methods
+#testbed-methods
 :marked
   The `TestBed` API consists of static class methods that either update or reference a _global_ instance of the`TestBed`.
   
@@ -1677,7 +1694,7 @@ table
     td
       :marked
         The testing shims (`karma-test-shim`, `browser-test-shim`) 
-        establish the [initial test environment](#a#testbed-initTestEnvironment) and a default testing module.
+        establish the [initial test environment](##testbed-initTestEnvironment) and a default testing module.
         The default testing module is configured with basic declaratives and some Angular service substitutes (e.g. `DebugDomRender`) 
         that every tester needs.
         
@@ -1771,7 +1788,7 @@ table
   A few of the `TestBed` instance methods are not covered by static `TestBed` _class_ methods.
   These are rarely needed.
 
-a#component-fixture-api-summary
+#component-fixture-api-summary
 :marked
   ## The _ComponentFixture_
 
@@ -1782,7 +1799,7 @@ a#component-fixture-api-summary
   The `ComponentFixture` properties and methods provide access to the component, 
   its DOM representation, and aspects of its Angular environment. 
 
-a#component-fixture-properties
+#component-fixture-properties
 :marked
   ### _ComponentFixture_ properties
 
@@ -1820,7 +1837,7 @@ table
         component that has the `ChangeDetectionStrategy.OnPush`
         or the component's change detection is under your programmatic control.
 
-a#component-fixture-methods
+#component-fixture-methods
 :marked
   ### _ComponentFixture_ methods
 
@@ -1887,7 +1904,7 @@ table
       :marked
         Trigger component destruction.
 
-a#debug-element-details
+#debug-element-details
 :marked
   ### _DebugElement_
 
@@ -2003,7 +2020,7 @@ table
         Dictionary of objects associated with template local variables (e.g. `#foo`),
         keyed by the local variable name.
 
-a#query-predicate
+#query-predicate
 :marked
   The `DebugElement.query(predicate)` and `DebugElement.queryAll(predicate)` methods take a
   predicate that filters the source element's subtree for matching `DebugElement`.
@@ -2020,7 +2037,7 @@ a#query-predicate
 
 +makeExample('testing/ts/app/hero/hero-list.component.spec.ts', 'by', 'app/hero/hero-list.component.spec.ts')(format=".")
 
-a#renderer-tests
+#renderer-tests
 :marked
   Many custom application directives inject the `Renderer` and call one of its `set...` methods.
 
@@ -2068,7 +2085,7 @@ a(href="#top").to-top Back to top
 
 .l.hr
 
-  a#faq 
+  #faq 
   .l-main-section
   :marked
     ## FAQ: Frequently Asked Questions
@@ -2106,7 +2123,7 @@ a(href="#top").to-top Back to top
 
   .l-hr
 
-a#q-spec-file-location
+#q-spec-file-location
 :marked
   ### Why put specs next to the things they test?
 
@@ -2120,7 +2137,7 @@ a#q-spec-file-location
 
 .l-hr
 
-a#q-specs-in-test-folder
+#q-specs-in-test-folder
 :marked
   ### When would I put specs in a test folder?
 

From 7252bd15534e530e03ed7e1d0e4ca41e26118638 Mon Sep 17 00:00:00 2001
From: Kapunahele Wong <kapunahelewong@gmail.com>
Date: Tue, 20 Sep 2016 17:31:48 -0400
Subject: [PATCH 27/42] docs(animations): update copy (#2379)

* docs(animations): update copy
---
 public/docs/ts/latest/guide/animations.jade | 222 ++++++++++----------
 1 file changed, 107 insertions(+), 115 deletions(-)

diff --git a/public/docs/ts/latest/guide/animations.jade b/public/docs/ts/latest/guide/animations.jade
index 8fc54b914c..80262bedee 100644
--- a/public/docs/ts/latest/guide/animations.jade
+++ b/public/docs/ts/latest/guide/animations.jade
@@ -1,138 +1,132 @@
 include ../_util-fns
 
 :marked
-  Motion is an important aspect in the design of modern web applications. We want our
-  user interfaces to have smooth transitions between states, and engaging animations
+  Motion is an important aspect in the design of modern web applications. Good
+  user interfaces transition smoothly between states with engaging animations
   that call attention where it's needed. Well-designed animations can make a UI not only
   more fun but also easier to use.
 
-  Angular's animation system gives us what we need to make the kinds of animations we want.
-  We can build animations that run with the same kind of native performance that we're used
-  to with pure CSS animations. But we can also have our animation logic tightly integrated
-  with the rest of our application code, where they can be easily triggered and controlled.
+  Angular's animation system lets you build animations that run with the same kind of native
+  performance found in pure CSS animations. You can also tightly integrate your
+  animation logic with the rest of your application code, for ease of control.
 
 .alert.is-helpful
   :marked
     Angular animations are built on top of the standard [Web Animations API](https://w3c.github.io/web-animations/)
-    and they run natively on [browsers that support it](http://caniuse.com/#feat=web-animation).
+    and run natively on [browsers that support it](http://caniuse.com/#feat=web-animation).
 
     For other browsers, a polyfill is required. Grab
-    [`web-animations.min.js` from here](https://github.com/web-animations/web-animations-js) and
+    [`web-animations.min.js` from GitHub](https://github.com/web-animations/web-animations-js) and
     add it to your page.
 
-    A more lightweight polyfill maintained by the Angular team is coming soon.
 
 :marked
-  # Table of Contents
+  # Contents
 
-  * [Quickstart Example: Transitioning Between Two States](#example-transitioning-between-states)
-  * [States and Transitions](#states-and-transitions)
-  * [Example: Entering and Leaving](#example-entering-and-leaving)
-  * [Example: Entering and Leaving from Different States](#example-entering-and-leaving-from-different-states)
-  * [Animatable Properties and Units](#animatable-properties-and-units)
-  * [Automatic Property Calculation](#automatic-property-calculation)
-  * [Animation Timing](#animation-timing)
-  * [Multi-Step Animations with Keyframes](#multi-step-animations-with-keyframes)
-  * [Parallel Animation Groups](#parallel-animation-groups)
-  * [Animation callbacks](#animation-callbacks)
+  * [Example: Transitioning between two states](#example-transitioning-between-states).
+  * [States and transitions](#states-and-transitions).
+  * [Example: Entering and leaving](#example-entering-and-leaving).
+  * [Example: Entering and leaving from different states](#example-entering-and-leaving-from-different-states).
+  * [Animatable properties and units](#animatable-properties-and-units).
+  * [Automatic property calculation](#automatic-property-calculation).
+  * [Animation timing](#animation-timing).
+  * [Multi-step animations with keyframes](#multi-step-animations-with-keyframes).
+  * [Parallel animation groups](#parallel-animation-groups).
+  * [Animation callbacks](#animation-callbacks).
 
 .l-sub-section
   :marked
-      The examples referenced in this chapter are available as a <live-example></live-example>.
+      The examples in this page are available as a <live-example></live-example>.
 
 a(id="example-transitioning-between-states")
 .l-main-section
 :marked
-  ## Quickstart Example: Transitioning Between Two States
+  ## Quickstart example: Transitioning between two states
 figure
   img(src="/resources/images/devguide/animations/animation_basic_click.gif" alt="A simple transition animation" align="right" style="width:220px;margin-left:20px" )
 :marked
-  Let's build a simple animation that transitions an element between two states
+  You can build a simple animation that transitions an element between two states
   driven by a model attribute.
 
-  Animations are defined inside `@Component` metadata. Before we can add some, we need
+  Animations are defined inside `@Component` metadata. Before you can add animations, you need
   to import a few animation-specific functions:
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts', 'imports')(format=".")
 
 :marked
-  With these we can now define an *animation trigger* called `heroState` in the component
-  metadata. It has animated transitions between two states: `active` and `inactive`. When a
-  hero is active, we display the element in a slightly larger size and lighter color.
+  With these, you can define an *animation trigger* called `heroState` in the component
+  metadata. It uses animations to transition between two states: `active` and `inactive`. When a
+  hero is active, the element appears in a slightly larger size and lighter color.
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts', 'animationdef')(format=".")
 
 .alert.is-helpful
   :marked
-    In this example we are defining animation styles (color and transform) inline in the
-    animation metadata. In an upcoming release of Angular, support will be added for pulling
-    the styles in from the component CSS stylesheet instead.
+    In this example, you are defining animation styles (color and transform) inline in the
+    animation metadata.
 
 :marked
-  We now have an animation defined but it is not yet used anywhere. We can change that by
-  attaching it to one or more elements in the component's template using the "`[@triggerName]`"
-  syntax:
+  Now, using the `[@triggerName]` syntax, attach the animation that you just defined to
+  one or more elements in the component's template.
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts', 'template')(format=".")
 
 :marked
-  Here we've applied the animation trigger to every element repeated by an `ngFor`. Each of
-  the repeated elements will animate independently. We're binding the value of the
-  attribute to the expression `hero.state`. We expect it to always be either `inactive`
-  or `active`, since that's what we have defined animation states for.
+  Here, the animation trigger applies to every element repeated by an `ngFor`. Each of
+  the repeated elements animates independently. The value of the
+  attribute is bound to the expression `hero.state` and is always either `active` or `inactive`.
 
-  With this setup, an animated transition is shown whenever a hero object changes state!
+  With this setup, an animated transition appears whenever a hero object changes state.
   Here's the full component implementation:
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts')
 
 :marked
-  ## States and Transitions
+  ## States and transitions
 
-  Angular animations are defined in terms of logical **states** and **transitions**
+  Angular animations are defined as logical **states** and **transitions**
   between states.
 
-  An animation state is a string value that we define in our application code. In the example
-  above we used the states `'active'` and `'inactive'` based on the logical state of
-  hero objects. The source of the state can be a simple object attribute as it was in this case,
-  or it can be a value computed in a method. The important thing is that we can read it into the
+  An animation state is a string value that you define in your application code. In the example
+  above, the states `'active'` and `'inactive'` are based on the logical state of
+  hero objects. The source of the state can be a simple object attribute, as it was in this case,
+  or it can be a value computed in a method. The important thing is that you can read it into the
   component's template.
 
-  We can define *styles* for each animation state:
+  You can define *styles* for each animation state:
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts', 'states')(format=".")
 
 :marked
   These `state` definitions specify the *end styles* of each state.
-  They are applied to the element once it has transitioned to that state, and will stay
-  *as long as it remains in that state*. In that sense, we are defining more than just
-  animations here. We're actually defining what styles the element has in different states.
+  They are applied to the element once it has transitioned to that state, and stay
+  *as long as it remains in that state*. In effect, you're defining what styles the element has in different states.
 
-  Once we have states, we can define *transitions* between the states. Each transition
+  After you define states, you can define *transitions* between the states. Each transition
   controls the timing of switching between one set of styles and the next:
 
 +makeExample('animations/ts/app/hero-list-basic.component.ts', 'transitions')(format=".")
 
 figure.image-display
-  img(src="/resources/images/devguide/animations/ng_animate_transitions_inactive_active.png" alt="In Angular animations we defines states and transitions between states" width="400")
+  img(src="/resources/images/devguide/animations/ng_animate_transitions_inactive_active.png" alt="In Angular animations you define states and transitions between states" width="400")
 
 :marked
-  If we have the same timing configuration for several transitions, we can combine
+  If several transitions have the same timing configuration, you can combine
   them into the same `transition` definition:
 
 +makeExample('animations/ts/app/hero-list-combined-transitions.component.ts', 'transitions')(format=".")
 
 :marked
-  When we have the same timing for both directions of a transition, as we do in the previous
-  example, we can use the `<=>` shorthand syntax:
+  When both directions of a transition have the same timing, as in the previous
+  example, you can use the shorthand syntax `<=>`:
 
 +makeExample('animations/ts/app/hero-list-twoway.component.ts', 'transitions')(format=".")
 
 :marked
-  Sometimes we have styles that we want to apply during an animation but not keep around
-  after it finishes. We can define such styles inline in the `transition`. In this example,
+  You can also apply a style during an animation but not keep it around
+  after the animation finishes. You can define such styles inline, in the `transition`. In this example,
   the element receives one set of styles immediately and is then animated to the next.
-  When the transition finishes, none of these styles will be kept because they're not
+  When the transition finishes, none of these styles are kept because they're not
   defined in a `state`.
 
 +makeExample('animations/ts/app/hero-list-inline-styles.component.ts', 'transitions')(format=".")
@@ -141,7 +135,7 @@ figure.image-display
   ### The wildcard state `*`
 
   The `*` ("wildcard") state matches *any* animation state. This is useful for defining styles and
-  transitions that should apply regardless of which state the animation is in. For example:
+  transitions that apply regardless of which state the animation is in. For example:
 
   * The `active => *` transition applies when the element's state changes from `active` to anything else.
   * The `* => *` transition applies when *any* change between two states takes place.
@@ -153,10 +147,10 @@ figure.image-display
 :marked
   ### The `void` state
 
-  There's one special state called `void` that may apply to any animation. It applies
-  when the element is *not* attached to a view. This may be because it has not yet been
-  added or because it has been removed. The `void` state is useful for defining "enter" and
-  "leave" animations.
+  The special state called `void` can apply to any animation. It applies
+  when the element is *not* attached to a view, perhaps because it has not yet been
+  added or because it has been removed. The `void` state is useful for defining enter and
+  leave animations.
 
   For example the `* => void` transition applies when the element leaves the view,
   regardless of what state it was in before it left.
@@ -167,11 +161,11 @@ figure.image-display
 :marked
   The wildcard state `*` also matches `void`.
 
-  ## Example: Entering and Leaving
+  ## Example: Entering and leaving
 figure
   img(src="/resources/images/devguide/animations/animation_enter_leave.gif" alt="Enter and leave animations" align="right" style="width:250px;" )
 :marked
-  Using the `void` and `*` states we can define transitions that animate the
+  Using the `void` and `*` states you can define transitions that animate the
   entering and leaving of elements:
 
   * Enter: `void => *`
@@ -180,17 +174,17 @@ figure
 +makeExample('animations/ts/app/hero-list-enter-leave.component.ts', 'animationdef')(format=".")
 
 :marked
-  Note that in this case we have the styles applied to the void state directly in the
-  transition definitions, and not in a separate `state(void)` definition. We do this because
-  we want the transforms to be different on enter and leave: The element enters from the left
+  Note that in this case the styles are applied to the void state directly in the
+  transition definitions, and not in a separate `state(void)` definition. Thus, the transforms
+  are different on enter and leave: the element enters from the left
   and leaves to the right.
 
-  ## Example: Entering and Leaving from Different States
+  ## Example: Entering and leaving from different states
 figure
   img(src="/resources/images/devguide/animations/animation_enter_leave_states.gif" alt="Enter and leave animations combined with state animations" align="right" style="width:200px" )
 :marked
-  We can also combine this animation with the earlier state transition animation by
-  using the hero state as the animation state. What this will let us do is configure
+  You can also combine this animation with the earlier state transition animation by
+  using the hero state as the animation state. This lets you configure
   different transitions for entering and leaving based on what the state of the hero
   is:
 
@@ -199,7 +193,7 @@ figure
   * Inactive hero leave: `inactive => void`
   * Active hero leave: `active => void`
 
-  We now have fine-grained control over each transition:
+  This gives you fine-grained control over each transition:
 
 figure.image-display
   img(src="/resources/images/devguide/animations/ng_animate_transitions_inactive_active_void.png" alt="This example transitions between active, inactive, and void states" width="400")
@@ -208,54 +202,53 @@ figure.image-display
 +makeExample('animations/ts/app/hero-list-enter-leave-states.component.ts', 'animationdef')(format=".")
 
 :marked
-  ## Animatable Properties and Units
+  ## Animatable properties and units
 
-  Since Angular's animation support builds on top of Web Animations, we can animate any property
+  Since Angular's animation support builds on top of Web Animations, you can animate any property
   that the browser considers *animatable*. This includes positions, sizes, transforms, colors,
-  borders and many others. The W3C maintains
-  [a list of animatable properties](https://www.w3.org/TR/css3-transitions/#animatable-properties).
+  borders, and many others. The W3C maintains
+  [a list of animatable properties](https://www.w3.org/TR/css3-transitions/#animatable-properties)
+  on its [CSS Transitions page](https://www.w3.org/TR/css3-transitions).
 
-  For positional properties that have a numeric value, we can define a unit by providing
+  For positional properties that have a numeric value, you can define a unit by providing
   the value as a string with the appropriate suffix:
 
   * `'50px'`
   * `'3em'`
   * `'100%'`
 
-  For most dimensional properties we can also just define a number which is then assumed to be
-  in pixels:
+  If you don't provide a unit when specifying dimension, Angular assumes the default of `px`:
 
   * `50` is the same as saying `'50px'`
 
-  ## Automatic Property Calculation
+  ## Automatic property calculation
 figure
   img(src="/resources/images/devguide/animations/animation_auto.gif" alt="Animation with automated height calculation" align="right" style="width:220px;margin-left:20px" )
 :marked
-  Sometimes the value of a dimensional style property that we want to
-  animate is not known until at runtime. For example, it is quite common for elements
-  to have widths and heights that depend on their content and the screen size. These
-  properties are often tricky to animate with CSS.
+  Sometimes you don't know the value of a dimensional style property until runtime.
+  For example, elements often have widths and heights that
+  depend on their content and the screen size. These properties are often tricky
+  to animate with CSS.
 
-  With Angular we can use a special `*` property value in these cases. What it means
-  is that the value of this property will be computed at runtime and then plugged into
-  the animation.
+  In these cases, you can use a special `*` property value so that the value of the
+  property is computed at runtime and then plugged into the animation.
 
-  The "leave" animation in this example takes whatever height the element has before it
+  In this example, the leave animation takes whatever height the element has before it
   leaves and animates from that height to zero:
 
 +makeExample('animations/ts/app/hero-list-auto.component.ts', 'animationdef')(format=".")
 
 :marked
-  ## Animation Timing
+  ## Animation timing
 
-  There are three timing properties we can tune for every animated transition:
-  The duration, the delay, and the easing function. They are all combined into
+  There are three timing properties you can tune for every animated transition:
+  the duration, the delay, and the easing function. They are all combined into
   a single transition *timing string*.
 
   ### Duration
 
   The duration controls how long the animation takes to run from start to finish.
-  We can define a duration in three ways:
+  You can define a duration in three ways:
 
   * As a plain number, in milliseconds: `100`
   * In a string, as milliseconds: `'100ms'`
@@ -263,8 +256,8 @@ figure
 
   ### Delay
 
-  The delay controls how long to wait after an animation triggers before the
-  transition actually begins. We can define one by adding it in the same string
+  The delay controls the length of time between the animation trigger and the beginning
+  of the transition. You can define one by adding it to the same string
   following the duration. It also has the same format options as the duration:
 
   * Wait for 100ms and then run for 200ms: `'0.2s 100ms'`
@@ -272,8 +265,8 @@ figure
   ### Easing
 
   The [easing function](http://easings.net/) controls how the animation accelerates
-  and decelerates during its runtime. For example, using an `ease-in` function means
-  the animation begins relatively slowly but then picks up speed as it progresses. We
+  and decelerates during its runtime. For example, an `ease-in` function causes
+  the animation to begin relatively slowly but pick up speed as it progresses. You
   can control the easing by adding it as a *third* value in the string after the duration
   and the delay (or as the *second* value when there is no delay):
 
@@ -285,67 +278,66 @@ figure
 :marked
   ### Example
 
-  Here are a couple of custom timings in action. Both "enter" and "leave" last for
+  Here are a couple of custom timings in action. Both enter and leave last for
   200 milliseconds but they have different easings. The leave begins after a
   slight delay:
 
 +makeExample('animations/ts/app/hero-list-timings.component.ts', 'animationdef')(format=".")
 
 :marked
-  ## Multi-Step Animations with Keyframes
+  ## Multi-step animations with keyframes
 figure
   img(src="/resources/images/devguide/animations/animation_multistep.gif" alt="Animations with some bounce implemented with keyframes" align="right" style="width:220px;margin-left:20px" )
 :marked
-  With animation *keyframes* we can go beyond a simple transition between two
-  sets of styles to a more intricate animation that goes through one or more
-  intermediate styles in between.
+  Animation *keyframes* go beyond a simple transition to a more intricate animation
+  that goes through one or more intermediate styles when transitioning between two sets of styles.
 
-  For each keyframe, we can specify an *offset* that defines at which point
+  For each keyframe, you specify an *offset* that defines at which point
   in the animation that keyframe applies. The offset is a number between zero,
   which marks the beginning of the animation, and one, which marks the end.
 
-  In this example we add some "bounce" to our enter and leave animations with
+  This example adds some "bounce" to the enter and leave animations with
   keyframes:
 
 +makeExample('animations/ts/app/hero-list-multistep.component.ts', 'animationdef')(format=".")
 
 :marked
   Note that the offsets are *not* defined in terms of absolute time. They are relative
-  measures from 0 to 1. The final timeline of the animation will based on the combination
+  measures from zero to one. The final timeline of the animation is based on the combination
   of keyframe offsets, duration, delay, and easing.
 
-  Defining offsets for keyframes is optional. If we omit them, offsets with even
+  Defining offsets for keyframes is optional. If you omit them, offsets with even
   spacing are automatically assigned. For example, three keyframes without predefined
-  offsets will receive offsets `0`, `0.5`, and `1`.
+  offsets receive offsets `0`, `0.5`, and `1`.
 
 :marked
-  ## Parallel Animation Groups
+  ## Parallel animation groups
 figure
   img(src="/resources/images/devguide/animations/animation_groups.gif" alt="Parallel animations with different timings, implemented with groups" align="right" style="width:220px;margin-left:20px" )
 :marked
-  We've already seen how we can animate multiple style properties at the same time:
-  Just put all of them into the same `style()` definition!
+  You've seen how to animate multiple style properties at the same time:
+  just put all of them into the same `style()` definition.
 
-  But we may also want to configure different *timings* for animations that happen
-  in parallel. For example, we may want to animate two CSS properties but use a
+  But you may also want to configure different *timings* for animations that happen
+  in parallel. For example, you may want to animate two CSS properties but use a
   different easing function for each one.
 
-  For this we can use animation *groups*. In this example we use groups both on
-  enter and leave so that we can use two different timing configurations. Both
-  are applied to the same element in parallel, but run independent of each other:
+  For this you can use animation *groups*. In this example, using groups both on
+  enter and leave allows for two different timing configurations. Both
+  are applied to the same element in parallel, but run independently of each other:
 
 +makeExample('animations/ts/app/hero-list-groups.component.ts', 'animationdef')(format=".")
 
 :marked
-  One group animates the element transform and width. The other animates the opacity.
+  One group animates the element transform and width; the other group animates the opacity.
 
 :marked
   ## Animation callbacks
 
   A callback is fired when an animation is started and also when it is done.
 
-  In the keyframes example, we have a `trigger` called `@flyInOut`. There we can hook
-  those callbacks like:
+  In the keyframes example, you have a `trigger` called `@flyInOut`. There you can hook
+  those callbacks like this:
 
 +makeExample('animations/ts/app/hero-list-multistep.component.ts', 'template')(format=".")
 

From 5a203d6b364e743f2c454ff3221ff3fce42794c5 Mon Sep 17 00:00:00 2001
From: Eric Jimenez <eric.jimenez.dev@gmail.com>
Date: Tue, 20 Sep 2016 20:54:39 -0400
Subject: [PATCH 28/42] boost transparency of sidenav

---
 public/resources/css/module/_side-nav.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/resources/css/module/_side-nav.scss b/public/resources/css/module/_side-nav.scss
index 30b2ee99cc..c77098c113 100644
--- a/public/resources/css/module/_side-nav.scss
+++ b/public/resources/css/module/_side-nav.scss
@@ -10,7 +10,7 @@
 */
 
 $sidenav: '.sidenav'; // Classname
-$sidenav-background: rgba($blue-grey-50, .56);
+$sidenav-background: rgba($blue-grey-50, 1);
 $sidenav-background-dark: $blue-grey-200;
 $sidenav-color: $blue-grey-500;
 $sidenav-color-selected: $blue-700;

From fe220a5cab5e375378ce6d69fb7891b7cac90e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Wed, 21 Sep 2016 14:19:22 +0200
Subject: [PATCH 29/42] chore: fix zone.js for plunkers (#2421)

---
 tools/plunker-builder/indexHtmlTranslator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js
index 4644532822..dea281f4f2 100644
--- a/tools/plunker-builder/indexHtmlTranslator.js
+++ b/tools/plunker-builder/indexHtmlTranslator.js
@@ -45,7 +45,7 @@ var _rxData = [
   {
     pattern: 'script',
     from: 'node_modules/zone.js/dist/zone.js',
-    to:   'https://unpkg.com/zone.js@0.6.23?main=browser'
+    to:   'https://unpkg.com/zone.js@0.6.25?main=browser'
   },
   {
     pattern: 'script',

From fdf517ee6b488378605d67856fe795d61940c1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= <Foxandxss@gmail.com>
Date: Wed, 21 Sep 2016 14:53:43 +0200
Subject: [PATCH 30/42] docs(upgrade): temporary fix broken regions (#2424)

---
 ...ipe.spec.ts.disabled => checkmark.pipe.spec.ts} |  0
 ...vice.spec.ts.disabled => phone.service.spec.ts} |  0
 ....ts.disabled => phone-detail.component.spec.ts} |  0
 ...ec.ts.disabled => phone-list.component.spec.ts} |  0
 ...ipe.spec.ts.disabled => checkmark.pipe.spec.ts} |  0
 ...vice.spec.ts.disabled => phone.service.spec.ts} |  0
 ....ts.disabled => phone-detail.component.spec.ts} |  0
 ...ec.ts.disabled => phone-list.component.spec.ts} |  0
 public/docs/ts/latest/guide/upgrade.jade           | 14 ++++++++++++--
 9 files changed, 12 insertions(+), 2 deletions(-)
 rename public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/checkmark/{checkmark.pipe.spec.ts.disabled => checkmark.pipe.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/phone/{phone.service.spec.ts.disabled => phone.service.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/{phone-detail.component.spec.ts.disabled => phone-detail.component.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-list/{phone-list.component.spec.ts.disabled => phone-list.component.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/checkmark/{checkmark.pipe.spec.ts.disabled => checkmark.pipe.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/phone/{phone.service.spec.ts.disabled => phone.service.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-detail/{phone-detail.component.spec.ts.disabled => phone-detail.component.spec.ts} (100%)
 rename public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-list/{phone-list.component.spec.ts.disabled => phone-list.component.spec.ts} (100%)

diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/checkmark/checkmark.pipe.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/checkmark/checkmark.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/checkmark/checkmark.pipe.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/checkmark/checkmark.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/phone/phone.service.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/phone/phone.service.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/phone/phone.service.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/core/phone/phone.service.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/phone-detail.component.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/phone-detail.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/phone-detail.component.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-detail/phone-detail.component.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-list/phone-list.component.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-list/phone-list.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-list/phone-list.component.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/phone-list/phone-list.component.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/checkmark/checkmark.pipe.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/checkmark/checkmark.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/checkmark/checkmark.pipe.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/checkmark/checkmark.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/phone/phone.service.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/phone/phone.service.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/phone/phone.service.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-3-final/ts/app/core/phone/phone.service.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-detail/phone-detail.component.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-detail/phone-detail.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-detail/phone-detail.component.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-detail/phone-detail.component.spec.ts
diff --git a/public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-list/phone-list.component.spec.ts.disabled b/public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-list/phone-list.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-list/phone-list.component.spec.ts.disabled
rename to public/docs/_examples/upgrade-phonecat-3-final/ts/app/phone-list/phone-list.component.spec.ts
diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade
index 85b5a09bd6..438ede147e 100644
--- a/public/docs/ts/latest/guide/upgrade.jade
+++ b/public/docs/ts/latest/guide/upgrade.jade
@@ -1578,12 +1578,22 @@ code-example(format="").
   that use WebDriver's generic URL APIs instead. The first of these is
   the redirection spec:
 
-+makeExample('upgrade-phonecat-3-final/e2e-spec.ts', 'redirect', 'e2e-tests/scenarios.ts')
+.alert.is-important
+  :marked
+    This guide is still in the process of being updated to RC5 and it's samples
+    may not work correctly.
+
+//- +makeExample('upgrade-phonecat-3-final/e2e-spec.ts', 'redirect', 'e2e-tests/scenarios.ts')
 
 :marked
   And the second is the phone links spec:
+  
+.alert.is-important
+  :marked
+    This guide is still in the process of being updated to RC5 and it's samples
+    may not work correctly.
 
-+makeExample('upgrade-phonecat-3-final/e2e-spec.ts', 'links', 'e2e-tests/scenarios.ts')
+//- +makeExample('upgrade-phonecat-3-final/e2e-spec.ts', 'links', 'e2e-tests/scenarios.ts')
 
 
 

From 8d756808b9fd20ee0a13218c7e3f7dd6926d3aab Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Wed, 21 Sep 2016 08:47:09 -0700
Subject: [PATCH 31/42] docs(toh-6): remove BrowserClient provider comment
 (#2431)

Fixes #2347
---
 public/docs/_examples/toh-6/dart/web/main.dart | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/docs/_examples/toh-6/dart/web/main.dart b/public/docs/_examples/toh-6/dart/web/main.dart
index 614e95be10..89f2225150 100644
--- a/public/docs/_examples/toh-6/dart/web/main.dart
+++ b/public/docs/_examples/toh-6/dart/web/main.dart
@@ -23,9 +23,6 @@ void main() {
   bootstrap(AppComponent, [
     provide(BrowserClient, useFactory: () => new BrowserClient(), deps: [])
   ]);
-  // Simplify bootstrap provider list to [BrowserClient]
-  // once there is a fix for:
-  // https://github.com/dart-lang/angular2/issues/37
 }
 // #enddocregion v1
 */

From 36a3ea2c2180013645439f82150aee4dd0ba3717 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Wed, 21 Sep 2016 08:48:38 -0700
Subject: [PATCH 32/42] docs(user-input): misc fixes (#2430)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove nonexistent `<important>` “element” since it causes problems
for ng2.io. This is probably a typo. It was more likely meant to be an
anchor name than an element name.
- Fix two PENDING links.
---
 public/docs/dart/latest/guide/user-input.jade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/docs/dart/latest/guide/user-input.jade b/public/docs/dart/latest/guide/user-input.jade
index bd73ed73da..10e02bc436 100644
--- a/public/docs/dart/latest/guide/user-input.jade
+++ b/public/docs/dart/latest/guide/user-input.jade
@@ -23,7 +23,7 @@ include ../_util-fns
 :marked
   The `(click)` to the left of the equal sign identifies the button's click event as the **target of the binding**.
   The text within quotes on the right is the **template statement** in which we
-  respond to the click event by calling the component's `onClickMe` method. A template statement <!-- PENDING: link to ./template-syntax.html#template-statements --> is a subset
+  respond to the click event by calling the component's `onClickMe` method. A [template statement](./template-syntax.html#template-statements) is a subset
   of Dart with restrictions and a few added tricks.
 
   When writing a binding we must be aware of a template statement's **execution context**.
@@ -49,7 +49,6 @@ include ../_util-fns
   which we pass to the component's `onKey()` method.
   The user data we want is in that variable somewhere.
 
-important
 .callout.is-important
   header $event vs. \$event
   :marked
@@ -67,7 +66,7 @@ important
 
   The `onKey()` component method is where we extract the user's input
   from the event object, adding that input to the list of user data that we're accumulating in the component's `values` property.
-  We then use interpolation <!-- PENDING: link to ./template-syntax.html#interpolation) -->
+  We then use [interpolation](./template-syntax.html#interpolation)
   to display the accumulating `values` property back on screen.
 
   Enter the letters "abc", and then backspace to remove them.

From af4dabb41312a33d52c204fc7c5f7bc59c74bc48 Mon Sep 17 00:00:00 2001
From: Eric Jimenez <eric.jimenez.dev@gmail.com>
Date: Wed, 21 Sep 2016 11:56:19 -0400
Subject: [PATCH 33/42] only apply transparency changes on mobile

---
 public/resources/css/module/_side-nav.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/resources/css/module/_side-nav.scss b/public/resources/css/module/_side-nav.scss
index c77098c113..74734a2240 100644
--- a/public/resources/css/module/_side-nav.scss
+++ b/public/resources/css/module/_side-nav.scss
@@ -10,7 +10,8 @@
 */
 
 $sidenav: '.sidenav'; // Classname
-$sidenav-background: rgba($blue-grey-50, 1);
+$sidenav-background: rgba($blue-grey-50, .56);
+$sidenav-background-mobile: rgba($blue-grey-50, 1);
 $sidenav-background-dark: $blue-grey-200;
 $sidenav-color: $blue-grey-500;
 $sidenav-color-selected: $blue-700;
@@ -32,6 +33,7 @@ $sidenav-width: 240px;
 
   // MOBILE STYLE FOR DROPDOWN & TOGGLE
   @include respond-to('mobile') {
+    background: $sidenav-background-mobile;
     box-shadow: 0px 3px 6px rgba($black, .24);
     width: auto;
     left: 0;

From 4c71a32e36361bd73c873f21e13e85f9eb781eb8 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Wed, 21 Sep 2016 11:27:11 -0700
Subject: [PATCH 34/42] docs(testing): import test module and override
 component providers (#2428)

---
 .../ts/app/hero/hero-detail.component.spec.ts | 198 +++++++++++++++---
 .../ts/app/hero/hero-detail.component.ts      |  14 +-
 .../ts/app/hero/hero-detail.service.ts        |   5 +
 .../testing/ts/app/model/hero.service.ts      |   9 +-
 .../_examples/testing/ts/browser-test-shim.js |   2 +-
 public/docs/ts/latest/guide/testing.jade      | 158 +++++++++++++-
 6 files changed, 346 insertions(+), 40 deletions(-)

diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
index 272d69f579..68f8d17582 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
@@ -7,16 +7,13 @@ import { By }           from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
 import {
-  addMatchers, newEvent,
-  ActivatedRoute, ActivatedRouteStub, Router, RouterStub
+  ActivatedRoute, ActivatedRouteStub, newEvent, Router, RouterStub
 } from '../../testing';
 
-import { HEROES, FakeHeroService } from '../model/testing';
-
-import { HeroModule }          from './hero.module';
+import { Hero }                from '../model';
 import { HeroDetailComponent } from './hero-detail.component';
 import { HeroDetailService }   from './hero-detail.service';
-import { Hero, HeroService }   from '../model';
+import { HeroModule }          from './hero.module';
 
 ////// Testing Vars //////
 let activatedRoute: ActivatedRouteStub;
@@ -24,20 +21,117 @@ let comp: HeroDetailComponent;
 let fixture: ComponentFixture<HeroDetailComponent>;
 let page: Page;
 
-//////////  Tests  ////////////////////
-
+////// Tests //////
 describe('HeroDetailComponent', () => {
+  beforeEach(() => {
+    activatedRoute = new ActivatedRouteStub();
+  });
+  describe('with HeroModule setup', heroModuleSetup);
+  describe('when override its provided HeroDetailService', overrideSetup);
+  describe('with FormsModule setup', formsModuleSetup);
+  describe('with SharedModule setup', sharedModuleSetup);
+});
+
+////////////////////
+function overrideSetup() {
+  // #docregion stub-hds
+  class StubHeroDetailService {
+    testHero = new Hero(42, 'Test Hero');
+
+    getHero(id: number | string): Promise<Hero>  {
+      return Promise.resolve(true).then(() => Object.assign({}, this.testHero) );
+    }
+
+    saveHero(hero: Hero): Promise<Hero> {
+      return Promise.resolve(true).then(() => Object.assign(this.testHero, hero) );
+    }
+  }
+  // #enddocregion stub-hds
+
+  // the `id` value is irrelevant because ignored by service stub
+  beforeEach(() => activatedRoute.testParams = { id: 99999 } );
+
+  // #docregion setup-override
+  beforeEach( async(() => {
+    TestBed.configureTestingModule({
+      imports:   [ HeroModule ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router,         useClass: RouterStub},
+  // #enddocregion setup-override
+        // HeroDetailService at this level is IRRELEVANT!
+        { provide: HeroDetailService, useValue: {} }
+  // #docregion setup-override
+      ]
+    })
+
+    // Override component's own provider
+    // #docregion override-component-method
+    .overrideComponent(HeroDetailComponent, {
+      set: {
+        providers: [
+          { provide: HeroDetailService, useClass: StubHeroDetailService }
+        ]
+      }
+    })
+    // #enddocregion override-component-method
+
+    .compileComponents();
+  }));
+  // #enddocregion setup-override
+
+  // #docregion override-tests
+  let hds: StubHeroDetailService;
 
   beforeEach( async(() => {
-    addMatchers();
-    activatedRoute = new ActivatedRouteStub();
+    createComponent();
+    // get the component's injected StubHeroDetailService
+    hds = fixture.debugElement.injector.get(HeroDetailService);
+  }));
 
-    TestBed.configureTestingModule({
-      imports: [ HeroModule ],
+  it('should display stub hero\'s name', () => {
+    expect(page.nameDisplay.textContent).toBe(hds.testHero.name);
+  });
 
-      // DON'T RE-DECLARE because already declared in HeroModule
-      // declarations: [HeroDetailComponent, TitleCasePipe], // No!
+  it('should save stub hero change', fakeAsync(() => {
+    const origName = hds.testHero.name;
+    const newName = 'New Name';
 
+    page.nameInput.value = newName;
+    page.nameInput.dispatchEvent(newEvent('input')); // tell Angular
+
+    expect(comp.hero.name).toBe(newName, 'component hero has new name');
+    expect(hds.testHero.name).toBe(origName, 'service hero unchanged before save');
+
+    page.saveBtn.triggerEventHandler('click', null);
+    tick(); // wait for async save to complete
+    expect(hds.testHero.name).toBe(newName, 'service hero has new name after save');
+    expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
+  }));
+  // #enddocregion override-tests
+
+  it('fixture injected service is not the component injected service',
+    inject([HeroDetailService], (service: HeroDetailService) => {
+
+    expect(service).toEqual({}, 'service injected from fixture');
+    expect(hds).toBeTruthy('service injected into component');
+  }));
+}
+
+////////////////////
+import { HEROES, FakeHeroService } from '../model/testing';
+import { HeroService }             from '../model';
+
+const firstHero = HEROES[0];
+
+function heroModuleSetup() {
+  // #docregion setup-hero-module
+  beforeEach( async(() => {
+     TestBed.configureTestingModule({
+      imports:   [ HeroModule ],
+  // #enddocregion setup-hero-module
+  //  declarations: [ HeroDetailComponent ], // NO!  DOUBLE DECLARATION
+  // #docregion setup-hero-module
       providers: [
         { provide: ActivatedRoute, useValue: activatedRoute },
         { provide: HeroService,    useClass: FakeHeroService },
@@ -46,13 +140,14 @@ describe('HeroDetailComponent', () => {
     })
     .compileComponents();
   }));
+  // #enddocregion setup-hero-module
 
   // #docregion route-good-id
-  describe('when navigate to hero id=' + HEROES[0].id, () => {
+  describe('when navigate to existing hero', () => {
     let expectedHero: Hero;
 
     beforeEach( async(() => {
-      expectedHero = HEROES[0];
+      expectedHero = firstHero;
       activatedRoute.testParams = { id: expectedHero.id };
       createComponent();
     }));
@@ -76,7 +171,7 @@ describe('HeroDetailComponent', () => {
 
     it('should navigate when click save and save resolves', fakeAsync(() => {
       page.saveBtn.triggerEventHandler('click', null);
-      tick(); // wait for async save to "complete" before navigating
+      tick(); // wait for async save to complete
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     }));
 
@@ -91,8 +186,7 @@ describe('HeroDetailComponent', () => {
       // dispatch a DOM event so that Angular learns of input value change.
       page.nameInput.dispatchEvent(newEvent('input'));
 
-      // detectChanges() makes [(ngModel)] push input value to component property
-      // and Angular updates the output span through the title pipe
+      // Tell Angular to update the output span through the title pipe
       fixture.detectChanges();
 
       expect(page.nameDisplay.textContent).toBe(titleCaseName);
@@ -131,10 +225,8 @@ describe('HeroDetailComponent', () => {
   });
   // #enddocregion route-bad-id
 
-  ///////////////////////////
-
   // Why we must use `fixture.debugElement.injector` in `Page()`
-  it('cannot use `inject` to get component\'s provided service', () => {
+  it('cannot use `inject` to get component\'s provided HeroDetailService', () => {
     let service: HeroDetailService;
     fixture = TestBed.createComponent(HeroDetailComponent);
     expect(
@@ -148,7 +240,64 @@ describe('HeroDetailComponent', () => {
     service = fixture.debugElement.injector.get(HeroDetailService);
     expect(service).toBeDefined('debugElement.injector');
   });
-});
+}
+
+/////////////////////
+import { FormsModule }         from '@angular/forms';
+import { TitleCasePipe }       from '../shared/title-case.pipe';
+
+function formsModuleSetup() {
+ // #docregion setup-forms-module
+  beforeEach( async(() => {
+     TestBed.configureTestingModule({
+      imports:      [ FormsModule ],
+      declarations: [ HeroDetailComponent, TitleCasePipe ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: HeroService,    useClass: FakeHeroService },
+        { provide: Router,         useClass: RouterStub},
+      ]
+    })
+    .compileComponents();
+  }));
+  // #enddocregion setup-forms-module
+
+  it('should display 1st hero\'s name', fakeAsync(() => {
+    const expectedHero = firstHero;
+    activatedRoute.testParams = { id: expectedHero.id };
+    createComponent().then(() => {
+      expect(page.nameDisplay.textContent).toBe(expectedHero.name);
+    });
+  }));
+}
+
+///////////////////////
+import { SharedModule }        from '../shared/shared.module';
+
+function sharedModuleSetup() {
+  // #docregion setup-shared-module
+  beforeEach( async(() => {
+    TestBed.configureTestingModule({
+      imports:      [ SharedModule ],
+      declarations: [ HeroDetailComponent ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: HeroService,    useClass: FakeHeroService },
+        { provide: Router,         useClass: RouterStub},
+      ]
+    })
+    .compileComponents();
+  }));
+  // #enddocregion setup-shared-module
+
+  it('should display 1st hero\'s name', fakeAsync(() => {
+    const expectedHero = firstHero;
+    activatedRoute.testParams = { id: expectedHero.id };
+    createComponent().then(() => {
+      expect(page.nameDisplay.textContent).toBe(expectedHero.name);
+    });
+  }));
+}
 
 /////////// Helpers /////
 
@@ -185,9 +334,10 @@ class Page {
     const compInjector = fixture.debugElement.injector;
     const hds          = compInjector.get(HeroDetailService);
     const router       = compInjector.get(Router);
+
     this.gotoSpy       = spyOn(comp, 'gotoList').and.callThrough();
-    this.saveSpy       = spyOn(hds, 'saveHero').and.callThrough();
     this.navSpy        = spyOn(router, 'navigate');
+    this.saveSpy       = spyOn(hds, 'saveHero').and.callThrough();
   }
 
   /** Add page elements after hero arrives */
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
index 1cbf5389b9..32a59ef2c2 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.ts
@@ -1,3 +1,5 @@
+/* tslint:disable:member-ordering */
+// #docplaster
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute, Router }   from '@angular/router';
 import 'rxjs/add/operator/pluck';
@@ -5,22 +7,24 @@ import 'rxjs/add/operator/pluck';
 import { Hero }              from '../model';
 import { HeroDetailService } from './hero-detail.service';
 
+// #docregion prototype
 @Component({
-  selector: 'app-hero-detail',
+  selector:    'app-hero-detail',
   templateUrl: 'app/hero/hero-detail.component.html',
   styleUrls:  ['app/hero/hero-detail.component.css'],
   providers:  [ HeroDetailService ]
 })
 export class HeroDetailComponent implements OnInit {
-  @Input() hero: Hero;
-
   // #docregion ctor
   constructor(
     private heroDetailService: HeroDetailService,
-    private route: ActivatedRoute,
+    private route:  ActivatedRoute,
     private router: Router) {
   }
   // #enddocregion ctor
+// #enddocregion prototype
+
+  @Input() hero: Hero;
 
   // #docregion ng-on-init
   ngOnInit(): void {
@@ -50,4 +54,6 @@ export class HeroDetailComponent implements OnInit {
   gotoList() {
     this.router.navigate(['../'], {relativeTo: this.route});
   }
+// #docregion prototype
 }
+// #enddocregion prototype
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.service.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.service.ts
index 970cb1b98b..6239ae5b80 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.service.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.service.ts
@@ -2,10 +2,13 @@ import { Injectable } from '@angular/core';
 
 import { Hero, HeroService } from '../model';
 
+// #docregion prototype
 @Injectable()
 export class HeroDetailService {
   constructor(private heroService: HeroService) {  }
+// #enddocregion prototype
 
+  // Returns a clone which caller may modify safely
   getHero(id: number | string): Promise<Hero> {
     if (typeof id === 'string') {
       id = parseInt(id as string, 10);
@@ -18,4 +21,6 @@ export class HeroDetailService {
   saveHero(hero: Hero) {
     return this.heroService.updateHero(hero);
   }
+// #docregion prototype
 }
+// #enddocregion prototype
diff --git a/public/docs/_examples/testing/ts/app/model/hero.service.ts b/public/docs/_examples/testing/ts/app/model/hero.service.ts
index 7f2931a7f6..667d47312b 100644
--- a/public/docs/_examples/testing/ts/app/model/hero.service.ts
+++ b/public/docs/_examples/testing/ts/app/model/hero.service.ts
@@ -4,7 +4,7 @@ import { Hero }       from './hero';
 import { HEROES }     from './test-heroes';
 
 @Injectable()
-/** Dummy HeroService that pretends to be real */
+/** Dummy HeroService. Pretend it makes real http requests */
 export class HeroService {
   getHeroes() {
     return Promise.resolve(HEROES);
@@ -21,9 +21,10 @@ export class HeroService {
 
   updateHero(hero: Hero): Promise<Hero> {
     return this.getHero(hero.id).then(h => {
-      return h ?
-        Object.assign(h, hero) :
-        Promise.reject(`Hero ${hero.id} not found`) as any as Promise<Hero>;
+      if (!h) {
+        throw new Error(`Hero ${hero.id} not found`);
+      }
+      return Object.assign(h, hero);
     });
   }
 }
diff --git a/public/docs/_examples/testing/ts/browser-test-shim.js b/public/docs/_examples/testing/ts/browser-test-shim.js
index 1573c72ebd..1cbabc3f64 100644
--- a/public/docs/_examples/testing/ts/browser-test-shim.js
+++ b/public/docs/_examples/testing/ts/browser-test-shim.js
@@ -9,7 +9,7 @@ Error.stackTraceLimit = 0; // "No stacktrace"" is usually best for app testing.
 // Uncomment to get full stacktrace output. Sometimes helpful, usually not.
 // Error.stackTraceLimit = Infinity; //
 
-jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 3000;
 
 var baseURL = document.baseURI;
 baseURL = baseURL + baseURL[baseURL.length-1] ? '' : '/';
diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index dc4e9e873a..ac38744aa6 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -52,6 +52,10 @@ block includes
     - [_Observable_ test double](#stub-observable)
   1. [Use a _page_ object to simplify setup](#page-object)
   <br><br>
+  1. [Setup with module imports](#import-module)
+  <br><br>
+  1. [Override component providers](#component-override)
+  <br><br>
   1. [Test a _RouterOutlet_ component](#router-outlet-component)
     - [stubbing unneeded components](#stub-component)
     - [Stubbing the _RouterLink_](#router-link-stub)
@@ -446,6 +450,7 @@ a(href="#top").to-top Back to top
   This chapter tests a cut-down version of the _Tour of Heroes_ [tutorial app](../tutorial).
   
   The following live example shows how it works and provides the complete source code.
+  Give it some time to load and warm up.
 <live-example embedded img="devguide/testing/app-plunker.png"></live-example>
 <br><br>
 :marked
@@ -1210,7 +1215,151 @@ figure.image-display
   There are no distractions: no waiting for promises to resolve and no searching the DOM for element values to compare.
   Here are a few more `HeroDetailComponent` tests to drive the point home.
 +makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'selected-tests', 'app/hero/hero-detail.component.spec.ts (selected tests)')(format='.')
+
+a(href="#top").to-top Back to top
+.l-hr
+
+#import-module
 :marked
+  # Setup with module imports
+  Earlier component tests configured the testing module with a few `declarations` like this:
++makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'compile-components', 'app/dashboard/dashboard-hero.component.spec.ts (config)')(format='.')
+:marked
+  The `DashboardComponent` is simple. It needs no help.
+  But more complex components often depend on other components, directives, pipes, and providers
+  and these must be added to the testing module too.
+
+  Fortunately, the `TestBed.configureTestingModule` parameter parallels
+  the metadata passed to the `@NgModule` decorator 
+  which means you can also specify `providers` and `imports.
+
+  The `HeroDetailComponent` requires a lot of help despite its small size and simple construction. 
+  In addition to the support it receives from the default testing module `CommonModule`, it needs:
+  * `NgModel` and friends in the `FormsModule` enable two-way data binding
+  * The `TitleCasePipe` from the `shared` folder
+  * Router services (which these tests are stubbing)
+  * Hero data access services (also stubbed)
+
+  One approach is to configure the testing module from the individual pieces as in this example:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'setup-forms-module', 'app/hero/hero-detail.component.spec.ts (FormsModule setup)')(format='.')
+:marked
+  Because many app components need the `FormsModule` and the `TitleCasePipe`, the developer created 
+  a `SharedModule` to combine these and other frequently requested parts.
+  The test configuration can use the `SharedModule` too as seen in this alternative setup:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'setup-shared-module', 'app/hero/hero-detail.component.spec.ts (SharedModule setup)')(format='.')
+:marked
+  It's a bit tighter and smaller, with fewer import statements (not shown).
+
+#feature-module-import
+:marked
+  ### Import the feature module
+  The `HeroDetailComponent` is part of the `HeroModule` [Feature Module](ngmodule.html#feature-modules) that aggregates more of the interdependent pieces
+  including the `SharedModule`.
+  Try a test configuration that imports the `HeroModule` like this one:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'setup-hero-module', 'app/hero/hero-detail.component.spec.ts (HeroModule setup)')(format='.')
+:marked
+  That's _really_ crisp. Only the _test doubles_ in the `providers` remain. Even the `HeroDetailComponent` declaration is gone.
+.l-sub-section
+  :marked
+    In fact, if you try to declare it, Angular throws an error because
+    `HeroDetailComponent` is declared in both the `HeroModule` and the `DynamicTestModule` (the testing module).
+
+.alert.is-helpful
+  :marked
+    Importing the component's feature module is often the easiest way to configure the tests,
+    especially when the feature module is small and mostly self-contained ... as feature modules should be.
+:marked
+
+a(href="#top").to-top Back to top
+.l-hr
+
+#component-override
+:marked
+  # Override component providers
+
+  The `HeroDetailComponent` provides its own `HeroDetailService`.
++makeExample('testing/ts/app/hero/hero-detail.component.ts', 'prototype', 'app/hero/hero-detail.component.ts (prototype)')(format='.')
+:marked
+  It's not possible to stub the component's `HeroDetailService` in the `providers` of the `TestBed.configureTestingModule`. 
+  Those are providers for the _testing module_, not the component. They prepare the dependency injector at the _fixture level_.
+
+  Angular creates the component with its _own_ injector which is a _child_ of the fixture injector.
+  It registers the component's providers (the `HeroDetailService` in this case) with the child injector. 
+  A test cannot get to child injector services from the fixture injector.
+  And `TestBed.configureTestingModule` can't configure them either.
+
+  Angular has been creating new instances of the real `HeroDetailService` all along!
+
+.l-sub-section
+  :marked
+    These tests could fail or timeout if the `HeroDetailService` made its own XHR calls to a remote server.
+    There might not be a remote server to call.
+
+    Fortunately, the `HeroDetailService` delegates responsibility for remote data access to an injected `HeroService`.
+
+  +makeExample('testing/ts/app/hero/hero-detail.service.ts', 'prototype', 'app/hero/hero-detail.service.ts (prototype)')(format='.')
+  :marked
+    The [previous test configuration](#feature-module-import) replaces the real `HeroService` with a `FakeHeroService` 
+    that intercepts server requests and fakes their responses.
+
+:marked
+  What if you aren't so lucky. What if faking the `HeroService` is hard? 
+  What if `HeroDetailService` makes its own server requests? 
+  
+  The `TestBed.overrideComponent` method can replace the component's `providers` with easy-to-manage _test doubles_
+  as seen in the following setup variation:
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'setup-override', 'app/hero/hero-detail.component.spec.ts (Override setup)')(format='.')
+:marked
+  Notice that `TestBed.configureTestingModule` no longer provides a (fake) `HeroService` because it's [not needed](#stub-hero-detail-service).
+
+#override-component-method
+:marked
+  ### The _overrideComponent_ method
+
+  Focus on the `overrideComponent` method.
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'override-component-method', 'app/hero/hero-detail.component.spec.ts (overrideComponent)')(format='.')
+:marked
+  It takes two arguments: the component type to override (`HeroDetailComponent`) and an override metadata object.
+  The [overide metadata object](#metadata-override-object) is a generic defined as follows:
+
+code-example(format="." language="javascript").
+  type MetadataOverride<T> = {
+    add?: T;
+    remove?: T;
+    set?: T;
+  };
+:marked
+  A metadata override object can either add-and-remove elements in metadata properties or completely reset those properties.
+  This example resets the component's `providers` metadata.
+
+  The type parameter, `T`,  is the kind of metadata you'd pass to the `@Component` decorator:
+code-example(format="." language="javascript").
+    selector?: string;
+    template?: string;
+    templateUrl?: string;
+    providers?: any[];
+    ...
+
+#stub-hero-detail-service
+:marked
+  ### _StubHeroDetailService_
+
+  This example completely replaces the component's `providers` with an array containing the `StubHeroDetailService`.
+  The `StubHeroDetailService` is dead simple. It doesn't need a `HeroService` (fake or otherwise).
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'stub-hds', 'app/hero/hero-detail.component.spec.ts (StubHeroDetailService)')(format='.')
+:marked
+  ### The override tests
+
+  Now the tests can control the component's hero directly by manipulating the stub's `testHero`.
++makeExample('testing/ts/app/hero/hero-detail.component.spec.ts', 'override-tests', 'app/hero/hero-detail.component.spec.ts (override tests)')(format='.')
+:marked
+  ### More overrides
+  The `TestBed.overrideComponent` method can be called multiple times for the same or different components.
+  The `TestBed` offers similar `overrideDirective`, `overrideModule`, and `overridePipe` methods
+  for digging into and replacing parts of these other classes.
+  
+  Explore the options and combinations on your own.
+
 a(href="#top").to-top Back to top
 .l-hr
 
@@ -1299,8 +1448,7 @@ a(href="#top").to-top Back to top
   ### What good are these tests?
 
   Stubbed `RouterLink` tests can confirm that a component with links and an outlet is setup properly,
-  that the component has the links it should have and 
-  that they are all pointing in the expected direction.
+  that the component has the links it should have, and that they are all pointing in the expected direction.
   These tests do not concern whether the app will succeed in navigating to the target component when the user clicks a link.
 
   Stubbing the RouterLink and RouterOutlet is the best option for such limited testing goals.
@@ -1664,6 +1812,7 @@ code-example(format="." language="javascript").
     schemas?: Array&lt;SchemaMetadata | any[]&gt;;
   };
 
+#metadata-override-object
 :marked
   Each overide method takes a `MetadataOverride<T>` where `T` is the kind of metadata
   appropriate to the method, the parameter of an `@NgModule`, `@Component`, `@Directive`, or `@Pipe`.
@@ -1913,11 +2062,6 @@ table
   From the test root component's `DebugElement`, returned by `fixture.debugElement`, 
   you can walk (and query) the fixture's entire element and component sub-trees.
 
-.alert.is-important
-  :marked
-    The _DebugElement_ is officially _experimental_ and thus subject to change.
-    Consult the [API reference](../api/core/index/DebugElement-class.html) for the latest status.
-:marked
   Here are the most useful `DebugElement` members for testers in approximate order of utility.
 
 table

From c5e02f27a025ed33f8677cf0d36fb278827d4ec4 Mon Sep 17 00:00:00 2001
From: Marc Laval <mlaval@amadeus.com>
Date: Wed, 21 Sep 2016 20:30:03 +0200
Subject: [PATCH 35/42] docs(browser-support): add Safari 10 (#2433)

---
 .../docs/ts/latest/guide/browser-support.jade  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/public/docs/ts/latest/guide/browser-support.jade b/public/docs/ts/latest/guide/browser-support.jade
index 461aecc93c..377d43927c 100644
--- a/public/docs/ts/latest/guide/browser-support.jade
+++ b/public/docs/ts/latest/guide/browser-support.jade
@@ -21,8 +21,8 @@ table
     td latest
     td 14
     td 11
-    td 9
-    td 9
+    td 10
+    td 10
     td Marshmallow (6.0)
     td 11
   tr
@@ -30,8 +30,8 @@ table
     td
     td 13
     td 10
-    td 8
-    td 8
+    td 9
+    td 9
     td Lollipop<br>(5.0, 5.1)
     td
   tr
@@ -39,8 +39,8 @@ table
     td
     td
     td 9
-    td 7
-    td 7
+    td 8
+    td 8
     td KitKat<br>(4.4)
     td
   tr
@@ -48,8 +48,8 @@ table
     td
     td
     td
-    td
-    td
+    td 7
+    td 7
     td Jelly Bean<br>(4.1, 4.2, 4.3)
     td
     
@@ -137,7 +137,7 @@ table
     td
       :marked
         [Intl API](#intl)
-    td All but Chrome, Firefox, Edge and IE11
+    td All but Chrome, Firefox, Edge, IE11 and Safari 10
   tr(style="vertical-align: top") 
     td 
       a(href="../api/common/index/NgClass-directive.html" target="_blank") NgClass

From 36c7224ff9193a8a2d3c3ba025460b3374e55ae0 Mon Sep 17 00:00:00 2001
From: Prashant Mahajan <prashantma@hotmail.com>
Date: Wed, 21 Sep 2016 14:32:07 -0400
Subject: [PATCH 36/42] Update visual-studio-2015.jade (#2416)

* Update visual-studio-2015.jade

In Step 7 (Build and Run App), there needs to be instruction to set index.html as start page, so that when Run button or F5 is pressed to run the application, browser shows index.html

* Update visual-studio-2015.jade
---
 public/docs/ts/latest/cookbook/visual-studio-2015.jade | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/docs/ts/latest/cookbook/visual-studio-2015.jade b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
index cef858b9e6..04ac13f15b 100644
--- a/public/docs/ts/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
@@ -130,6 +130,8 @@ h2#edit-config Step 6: Edit the TypeScript configuration file
 h2#build-and-run Step 7: Build and run the app
 
 :marked
+  To set index.html as start page, right-click `index.html` in Solution Explorer and select option `Set As Start Page`.
+  
   Click the Run button or press F5 to build and run the application.
   
   This launches the default browser and runs the QuickStart sample application.

From c8121d61dd7ccd0e0ea861ffba8c8254a0efc9d0 Mon Sep 17 00:00:00 2001
From: Tomas Echeverri Valencia <tomechval@gmail.com>
Date: Wed, 21 Sep 2016 13:32:36 -0500
Subject: [PATCH 37/42] docs(quickstart): Change Npm to npm (#2398)

---
 public/docs/js/latest/quickstart.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade
index 86df565921..7c3f31ed14 100644
--- a/public/docs/js/latest/quickstart.jade
+++ b/public/docs/js/latest/quickstart.jade
@@ -460,7 +460,7 @@ code-example(format="").
 .l-main-section
 :marked
   <a id="npm-errors"></a>
-  ### Appendix: Npm errors and warnings
+  ### Appendix: npm errors and warnings
   
   All is well if there are no console messages starting with `npm ERR!` *at the end* of **npm install**. 
   There might be a few `npm WARN` messages along the way &mdash; and that is perfectly fine.

From 8870f30a3d1491818f7f612c55d82600b060d32e Mon Sep 17 00:00:00 2001
From: Daniel Karp <danielkarp@gmail.com>
Date: Wed, 21 Sep 2016 14:33:39 -0400
Subject: [PATCH 38/42] docs(typescript): Fix name of typings config file
 (#2378)

I believe name of the typings config file is typings.json, not typings.config.
---
 public/docs/ts/latest/guide/typescript-configuration.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/guide/typescript-configuration.jade b/public/docs/ts/latest/guide/typescript-configuration.jade
index 3b30797b59..0988738d79 100644
--- a/public/docs/ts/latest/guide/typescript-configuration.jade
+++ b/public/docs/ts/latest/guide/typescript-configuration.jade
@@ -111,7 +111,7 @@ code-example(format="").
   npm run typings list
 :marked
   The following command installs or updates the typings file for the Jasmine test library from the *DefinitelyTyped* repository,
-  and updates the `typings.config` file so you receive it automatically the next time you install typings.
+  and updates the `typings.json` file so you receive it automatically the next time you install typings.
 code-example(format="").
   npm run typings -- install dt~jasmine --save --global
 .l-sub-section

From 1c87bd67d821410edd1979dc73f46cca6c47345d Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Wed, 21 Sep 2016 20:01:44 -0700
Subject: [PATCH 39/42] docs(testing): explain DebugElement.triggerEventHandler
 (#2438)

---
 .../ts/app/app.component.router.spec.ts       |  9 +--
 .../_examples/testing/ts/app/bag/bag.spec.ts  |  8 +--
 .../dashboard-hero.component.spec.ts          | 19 ++++--
 .../app/dashboard/dashboard.component.spec.ts |  8 +--
 .../ts/app/hero/hero-detail.component.spec.ts | 10 ++--
 .../_examples/testing/ts/testing/index.ts     | 30 ++++++++--
 public/docs/ts/latest/guide/testing.jade      | 59 +++++++++++++++----
 7 files changed, 105 insertions(+), 38 deletions(-)

diff --git a/public/docs/_examples/testing/ts/app/app.component.router.spec.ts b/public/docs/_examples/testing/ts/app/app.component.router.spec.ts
index 36e34a983e..db0effd427 100644
--- a/public/docs/_examples/testing/ts/app/app.component.router.spec.ts
+++ b/public/docs/_examples/testing/ts/app/app.component.router.spec.ts
@@ -7,9 +7,7 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick,
 import { RouterTestingModule } from '@angular/router/testing';
 import { SpyLocation }         from '@angular/common/testing';
 
-// tslint:disable:no-unused-variable
-import { newEvent } from '../testing';
-// tslint:enable:no-unused-variable
+import { click }               from '../testing';
 
 // r - for relatively obscure router symbols
 import * as r                         from  '@angular/router';
@@ -48,9 +46,8 @@ describe('AppComponent & RouterTestingModule', () => {
 
   it('should navigate to "About" on click', fakeAsync(() => {
     createComponent();
-    // page.aboutLinkDe.triggerEventHandler('click', null); // fails
-    // page.aboutLinkDe.nativeElement.dispatchEvent(newEvent('click')); // fails
-    page.aboutLinkDe.nativeElement.click(); // fails in phantom
+    click(page.aboutLinkDe);
+    // page.aboutLinkDe.nativeElement.click(); // ok but fails in phantom
 
     advance();
     expectPathToBe('/about');
diff --git a/public/docs/_examples/testing/ts/app/bag/bag.spec.ts b/public/docs/_examples/testing/ts/app/bag/bag.spec.ts
index 1fede16bd7..d67bf66fd0 100644
--- a/public/docs/_examples/testing/ts/app/bag/bag.spec.ts
+++ b/public/docs/_examples/testing/ts/app/bag/bag.spec.ts
@@ -26,7 +26,7 @@ import { NgModel, NgControl } from '@angular/forms';
 import { async, ComponentFixture, fakeAsync, inject, TestBed, tick
 } from '@angular/core/testing';
 
-import { addMatchers, newEvent } from '../../testing';
+import { addMatchers, newEvent, click } from '../../testing';
 
 beforeEach( addMatchers );
 
@@ -180,7 +180,7 @@ describe('TestBed Component Tests', () => {
     const comp = fixture.componentInstance;
     const hero = comp.heroes[0];
 
-    heroes[0].triggerEventHandler('click', null);
+    click(heroes[0]);
     fixture.detectChanges();
 
     const selected = fixture.debugElement.query(By.css('p'));
@@ -213,7 +213,7 @@ describe('TestBed Component Tests', () => {
     fixture.detectChanges();
     expect(span.textContent).toMatch(/is off/i, 'before click');
 
-    btn.triggerEventHandler('click', null);
+    click(btn);
     fixture.detectChanges();
     expect(span.textContent).toMatch(/is on/i, 'after click');
   });
@@ -610,7 +610,7 @@ describe('Lifecycle hooks w/ MyIfParentComp', () => {
     getChild();
 
     const btn = fixture.debugElement.query(By.css('button'));
-    btn.triggerEventHandler('click', null);
+    click(btn);
 
     fixture.detectChanges();
     expect(child.ngOnDestroyCalled).toBe(true);
diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts
index 86e0a88d2e..0ae563a831 100644
--- a/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard-hero.component.spec.ts
@@ -4,7 +4,7 @@ import { async, ComponentFixture, TestBed
 import { By }           from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
-import { addMatchers }  from '../../testing';
+import { addMatchers, click } from '../../testing';
 
 import { Hero } from '../model/hero';
 import { DashboardHeroComponent } from './dashboard-hero.component';
@@ -53,10 +53,22 @@ describe('DashboardHeroComponent when tested directly', () => {
     let selectedHero: Hero;
     comp.selected.subscribe((hero: Hero) => selectedHero = hero);
 
+  // #docregion trigger-event-handler
     heroEl.triggerEventHandler('click', null);
+  // #enddocregion trigger-event-handler
     expect(selectedHero).toBe(expectedHero);
   });
   // #enddocregion click-test
+
+  // #docregion click-test-2
+  it('should raise selected event when clicked', () => {
+    let selectedHero: Hero;
+    comp.selected.subscribe((hero: Hero) => selectedHero = hero);
+
+    click(heroEl);   // triggerEventHandler helper
+    expect(selectedHero).toBe(expectedHero);
+  });
+  // #enddocregion click-test-2
 });
 
 //////////////////
@@ -89,7 +101,7 @@ describe('DashboardHeroComponent when inside a test host', () => {
   });
 
   it('should raise selected event when clicked', () => {
-    heroEl.triggerEventHandler('click', null);
+    click(heroEl);
     // selected hero should be the same data bound hero
     expect(testHost.selectedHero).toBe(testHost.hero);
   });
@@ -102,8 +114,7 @@ import { Component } from '@angular/core';
 // #docregion test-host
 @Component({
   template: `
-    <dashboard-hero  [hero]="hero"  (selected)="onSelected($event)">
-    </dashboard-hero>`
+    <dashboard-hero  [hero]="hero"  (selected)="onSelected($event)"></dashboard-hero>`
 })
 class TestHostComponent {
   hero = new Hero(42, 'Test Name');
diff --git a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
index f783899143..0b0f9e213a 100644
--- a/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/dashboard/dashboard.component.spec.ts
@@ -2,9 +2,9 @@
 import { async, inject, ComponentFixture, TestBed
 } from '@angular/core/testing';
 
-import { addMatchers }     from '../../testing';
-import { HeroService }     from '../model';
-import { FakeHeroService } from '../model/testing';
+import { addMatchers, click } from '../../testing';
+import { HeroService }        from '../model';
+import { FakeHeroService }    from '../model/testing';
 
 import { By }     from '@angular/platform-browser';
 import { Router } from '@angular/router';
@@ -39,7 +39,7 @@ describe('DashboardComponent (deep)', () => {
   function clickForDeep() {
     // get first <div class="hero"> DebugElement
     const heroEl = fixture.debugElement.query(By.css('.hero'));
-    heroEl.triggerEventHandler('click', null);
+    click(heroEl);
   }
 });
 
diff --git a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
index 68f8d17582..03eb393c33 100644
--- a/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
+++ b/public/docs/_examples/testing/ts/app/hero/hero-detail.component.spec.ts
@@ -7,7 +7,7 @@ import { By }           from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
 import {
-  ActivatedRoute, ActivatedRouteStub, newEvent, Router, RouterStub
+  ActivatedRoute, ActivatedRouteStub, click, newEvent, Router, RouterStub
 } from '../../testing';
 
 import { Hero }                from '../model';
@@ -103,7 +103,7 @@ function overrideSetup() {
     expect(comp.hero.name).toBe(newName, 'component hero has new name');
     expect(hds.testHero.name).toBe(origName, 'service hero unchanged before save');
 
-    page.saveBtn.triggerEventHandler('click', null);
+    click(page.saveBtn);
     tick(); // wait for async save to complete
     expect(hds.testHero.name).toBe(newName, 'service hero has new name after save');
     expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
@@ -159,18 +159,18 @@ function heroModuleSetup() {
   // #enddocregion route-good-id
 
     it('should navigate when click cancel', () => {
-      page.cancelBtn.triggerEventHandler('click', null);
+      click(page.cancelBtn);
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     });
 
     it('should save when click save but not navigate immediately', () => {
-      page.saveBtn.triggerEventHandler('click', null);
+      click(page.saveBtn);
       expect(page.saveSpy.calls.any()).toBe(true, 'HeroDetailService.save called');
       expect(page.navSpy.calls.any()).toBe(false, 'router.navigate not called');
     });
 
     it('should navigate when click save and save resolves', fakeAsync(() => {
-      page.saveBtn.triggerEventHandler('click', null);
+      click(page.saveBtn);
       tick(); // wait for async save to complete
       expect(page.navSpy.calls.any()).toBe(true, 'router.navigate called');
     }));
diff --git a/public/docs/_examples/testing/ts/testing/index.ts b/public/docs/_examples/testing/ts/testing/index.ts
index 907b968c0c..e3de5164ca 100644
--- a/public/docs/_examples/testing/ts/testing/index.ts
+++ b/public/docs/_examples/testing/ts/testing/index.ts
@@ -1,9 +1,17 @@
+import { DebugElement }           from '@angular/core';
 import { tick, ComponentFixture } from '@angular/core/testing';
 
 export * from './jasmine-matchers';
 export * from './router-stubs';
 
-// Short utilities
+///// Short utilities /////
+
+/** Wait a tick, then detect changes */
+export function advance(f: ComponentFixture<any>): void {
+  tick();
+  f.detectChanges();
+}
+
 /**
  * Create custom DOM event the old fashioned way
  *
@@ -16,8 +24,20 @@ export function newEvent(eventName: string, bubbles = false, cancelable = false)
   return evt;
 }
 
-/** Wait a tick, then detect changes */
-export function advance(f: ComponentFixture<any>): void {
-  tick();
-  f.detectChanges();
+// See https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button
+// #docregion click-event
+/** Button events to pass to `DebugElement.triggerEventHandler` for RouterLink event handler */
+export const ButtonClickEvents = {
+   left:  { button: 0 },
+   right: { button: 2 }
+};
+
+/** Simulate element click. Defaults to mouse left-button click event. */
+export function click(el: DebugElement | HTMLElement, eventObj: any = ButtonClickEvents.left): void {
+  if (el instanceof HTMLElement) {
+    el.click();
+  } else {
+    el.triggerEventHandler('click', eventObj);
+  }
 }
+// #enddocregion click-event
diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index ac38744aa6..54f61f369f 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -43,7 +43,7 @@ block includes
     - [_async_](#async-in-before-each) in `beforeEach`
     - [_compileComponents_](#compile-components)
   1. [Test a component with inputs and outputs](#component-with-inputs-output)
-  <br><br>
+    - [_triggerEventHandler_](#trigger-event-handler)
   1. [Test a component inside a test host component](#component-inside-test-host)
   <br><br>
   1. [Test a routed component](#routed-component)
@@ -965,14 +965,51 @@ a(href="#top").to-top Back to top
 :marked
   The component exposes an `EventEmitter` property. The test subscribes to it just as the host component would do.
 
-  The Angular `DebugElement.triggerEventHandler` lets the test raise _any data-bound event_.
-  In this example, the component's template binds to the hero `<div>`.
-
-  The test has a reference to that `<div>` in `heroEl` so triggering the `heroEl` click event should cause Angular
-  to call `DashboardHeroComponent.click`. 
+  The `heroEl` is a `DebugElement` that represents the hero `<div>`. 
+  The test calls `triggerEventHandler` with the "click" event name.
+  The "click" event binding responds by calling `DashboardHeroComponent.click()`. 
   
-  If the component behaves as expected, its `selected` property should emit the `hero` object,
-  the test detects that emission through its subscription, and the test will pass.
+  If the component behaves as expected, `click()` tells the component's `selected` property to emit the `hero` object,
+  the test detects that value through its subscription to `selected`, and the test should pass.
+  
+#trigger-event-handler
+:marked
+  ### _triggerEventHandler_
+
+  The Angular `DebugElement.triggerEventHandler` can raise _any data-bound event_ by its _event name_.
+  The second parameter is the event object passed to the handler.
+
+  In this example, the test triggers a "click" event with a null event object.
+
++makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'trigger-event-handler')(format='.')
+:marked
+  The test assumes (correctly in this case) that the runtime event handler &mdash; the component's `click()` method &mdash;
+  doesn't care about the event object.
+  
+  Other handlers will be less forgiving. 
+  For example, the `RouterLink` directive expects an object with a `button` property indicating the mouse button that was pressed. 
+  The directive throws an error if the event object doesn't do this correctly.
+
+#click-helper
+:marked
+  Clicking a button, an anchor, or an arbitrary HTML element is a common test task.
+  Make that easy by encapsulating the _click-triggering_ process in a helper such as the `click` function below:
++makeExample('testing/ts/testing/index.ts', 'click-event', 'testing/index.ts (click helper)')(format='.')
+:marked
+  The first parameter is the _element-to-click_. You can pass a custom event object as the second parameter if you wish. The default is a (partial) 
+  <a href="https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button" target="_blank">left-button mouse event object</a> 
+  accepted by many handlers including the `RouterLink` directive.
+
+.callout.is-critical
+  header click() is not an ATP function
+  :marked
+    The `click()` helper function is **not** part of the _Angular Testing Platform_. 
+    It's a function defined in _this chapter's sample code_ and used by all of the sample tests. 
+    If you like it, add it to your own collection of helpers.
+:marked
+  Here's the previous test, rewritten using this click helper.
++makeExample('testing/ts/app/dashboard/dashboard-hero.component.spec.ts', 'click-test-2', 'app/dashboard/dashboard-hero.component.spec.ts (click test revised)')(format='.')
+
 
 .l-hr
 
@@ -2135,8 +2172,10 @@ table
       :marked
         Triggers the event by its name if there is a corresponding listener 
         in the element's `listeners` collection.
-        
-        If the event lacks a listner or there's some other problem, 
+        The second parameter is the _event object_ expected by the handler.
+        See [above](#trigger-event-handler).
+
+        If the event lacks a listener or there's some other problem, 
         consider calling `nativeElement.dispatchEvent(eventObject)`
 
   tr

From aab6d8c523e627935d1b2399fcd5532e5fffdda7 Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Thu, 22 Sep 2016 17:40:35 +0800
Subject: [PATCH 40/42] docs(vs2015): remove duplicated word (#2441)

---
 public/docs/ts/latest/cookbook/visual-studio-2015.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/cookbook/visual-studio-2015.jade b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
index 04ac13f15b..de4462f280 100644
--- a/public/docs/ts/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
@@ -102,7 +102,7 @@ h2#restore Step 5: Restore the required packages
   * Ignore the warnings.
   * When the restore is finished, a message should say: `npm command completed with exit code 0`.
   * Click the `Refresh` icon in Solution Explorer.
-  * **Do not** include the `node_modules` folder in the project. Let it be a hidden project project folder.
+  * **Do not** include the `node_modules` folder in the project. Let it be a hidden project folder.
 .alert.is-important
   :marked
     An error such as "*@angular/compiler is not in the npm registry*" suggests that Visual Studio 2015

From 6bf7db584cdc1f2fcf1848ecf0de7a21c59d0546 Mon Sep 17 00:00:00 2001
From: Trotyl Yu <trotyl@qq.com>
Date: Thu, 22 Sep 2016 17:42:16 +0800
Subject: [PATCH 41/42] docs(vs2015): fix typo (#2440)

---
 public/docs/ts/latest/cookbook/visual-studio-2015.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/cookbook/visual-studio-2015.jade b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
index de4462f280..91a0a247bd 100644
--- a/public/docs/ts/latest/cookbook/visual-studio-2015.jade
+++ b/public/docs/ts/latest/cookbook/visual-studio-2015.jade
@@ -2,7 +2,7 @@ include ../_util-fns
 
 <a id="top"></a>
 :marked
-   Some developers prefer Visual Studio as their Interactive Development Environment (IDE).
+   Some developers prefer Visual Studio as their Integrated Development Environment (IDE).
 
    This cookbook describes the steps required to set up and use the
    Angular QuickStart files in Visual Studio 2015 within an ASP.NET 4.x project.

From 74644d2b3e6b6dd1eeb6de6c2d4fd5d946998ff3 Mon Sep 17 00:00:00 2001
From: Patrice Chalin <chalin@users.noreply.github.com>
Date: Thu, 22 Sep 2016 09:48:22 -0700
Subject: [PATCH 42/42] docs(testing): use marked Jade filter (#2444)

When the testing page is rendered the following warning is generated:
```
Transformers.markdown is deprecated, you must replace the :markdown
jade filter, with :marked and install jstransformer-marked before you
update to jade@2.0.0.
```
---
 public/docs/ts/latest/guide/testing.jade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/docs/ts/latest/guide/testing.jade b/public/docs/ts/latest/guide/testing.jade
index 54f61f369f..7889cb668b 100644
--- a/public/docs/ts/latest/guide/testing.jade
+++ b/public/docs/ts/latest/guide/testing.jade
@@ -518,7 +518,7 @@ a(href="#top").to-top Back to top
   ### The tests
   Jasmine runs this `beforeEach` before each test of which there are two
 +makeExample('testing/ts/app/banner.component.spec.ts', 'tests', 'app/banner.component.spec.ts (tests)')(format='.')
-:markdown
+:marked
   These tests ask the `DebugElement` for the native HTML element to satisfy their expectations.
 
 #detect-changes