diff --git a/public/docs/_examples/cb-ajs-quick-reference/ts/src/app/movie-list.component.ts b/public/docs/_examples/cb-ajs-quick-reference/ts/src/app/movie-list.component.ts
index 2481710bb1..c194bc50bd 100644
--- a/public/docs/_examples/cb-ajs-quick-reference/ts/src/app/movie-list.component.ts
+++ b/public/docs/_examples/cb-ajs-quick-reference/ts/src/app/movie-list.component.ts
@@ -11,7 +11,6 @@ import { MovieService } from './movie.service';
   moduleId: module.id,
   selector: 'movie-list',
   templateUrl: './movie-list.component.html',
-// #enddocregion component
 // #docregion style-url
   styleUrls: [ './movie-list.component.css' ],
 // #enddocregion style-url
diff --git a/public/docs/_examples/cb-dependency-injection/ts/src/app/runners-up.ts b/public/docs/_examples/cb-dependency-injection/ts/src/app/runners-up.ts
index 0bc3069883..6eb8b195d0 100644
--- a/public/docs/_examples/cb-dependency-injection/ts/src/app/runners-up.ts
+++ b/public/docs/_examples/cb-dependency-injection/ts/src/app/runners-up.ts
@@ -7,7 +7,7 @@ import { HeroService } from './hero.service';
 
 // #docregion runners-up
 export const RUNNERS_UP = new OpaqueToken('RunnersUp');
-// #docregion runners-up
+// #enddocregion runners-up
 
 // #docregion factory-synopsis
 export function runnersUpFactory(take: number) {
diff --git a/public/docs/_examples/cb-form-validation/ts/src/app/reactive/hero-form-reactive.component.ts b/public/docs/_examples/cb-form-validation/ts/src/app/reactive/hero-form-reactive.component.ts
index d4924e7ef9..4bbefadb96 100644
--- a/public/docs/_examples/cb-form-validation/ts/src/app/reactive/hero-form-reactive.component.ts
+++ b/public/docs/_examples/cb-form-validation/ts/src/app/reactive/hero-form-reactive.component.ts
@@ -33,7 +33,7 @@ export class HeroFormReactiveComponent implements OnInit {
   // to be removed/re-added in a tick via NgIf
   // TODO: Workaround until NgForm has a reset method (#6822)
   active = true;
-// #docregion
+// #docregion class
   // #docregion add-hero
   addHero() {
     this.hero = new Hero(42, '', '');
diff --git a/public/docs/_examples/cb-form-validation/ts/src/app/shared/forbidden-name.directive.ts b/public/docs/_examples/cb-form-validation/ts/src/app/shared/forbidden-name.directive.ts
index a8f6c03d33..870f514842 100644
--- a/public/docs/_examples/cb-form-validation/ts/src/app/shared/forbidden-name.directive.ts
+++ b/public/docs/_examples/cb-form-validation/ts/src/app/shared/forbidden-name.directive.ts
@@ -39,5 +39,5 @@ export class ForbiddenValidatorDirective implements Validator, OnChanges {
     return this.valFn(control);
   }
 }
-// #docregion directive
+// #enddocregion directive
 
diff --git a/public/docs/_examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6 b/public/docs/_examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6
index 092cd1a1ce..b06701ee8d 100644
--- a/public/docs/_examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6
+++ b/public/docs/_examples/cb-ts-to-js/js-es6/src/app/hero-host.component.es6
@@ -46,5 +46,5 @@ HeroHostComponent.annotations = [
     styles: ['.active {background-color: yellow;}']
   })
 ];
-// #docregion metadata
+// #enddocregion metadata
 // #enddocregion
diff --git a/public/docs/_examples/forms/js/src/app/hero-form.component.html b/public/docs/_examples/forms/js/src/app/hero-form.component.html
index fbe6ee917f..279ded0866 100644
--- a/public/docs/_examples/forms/js/src/app/hero-form.component.html
+++ b/public/docs/_examples/forms/js/src/app/hero-form.component.html
@@ -81,6 +81,7 @@
 
 <!-- ====================================================  -->
 <hr>
+<!-- #docregion  phase1-->
 <style>
  .no-style .ng-valid {
  border-left: 1px  solid #CCC
diff --git a/public/docs/_examples/forms/ts/src/app/hero-form.component.html b/public/docs/_examples/forms/ts/src/app/hero-form.component.html
index bf02bb195e..2efb9bc7dd 100644
--- a/public/docs/_examples/forms/ts/src/app/hero-form.component.html
+++ b/public/docs/_examples/forms/ts/src/app/hero-form.component.html
@@ -102,6 +102,7 @@
 
 <!-- ====================================================  -->
 <hr>
+<!-- #docregion  phase1-->
 <style>
   .no-style .ng-valid {
   border-left: 1px  solid #CCC
diff --git a/public/docs/_examples/ngmodule/ts/src/app/app.module.1.ts b/public/docs/_examples/ngmodule/ts/src/app/app.module.1.ts
index 59750a4d5f..f9f50e18d0 100644
--- a/public/docs/_examples/ngmodule/ts/src/app/app.module.1.ts
+++ b/public/docs/_examples/ngmodule/ts/src/app/app.module.1.ts
@@ -43,7 +43,7 @@ import {
     AwesomePipe,
     ContactComponent,
     ContactHighlightDirective
-// #docregion declarations, directive, component
+// #docregion directive, component
   ],
 // #enddocregion declarations, directive, component
 // #docregion providers
diff --git a/public/docs/_examples/ngmodule/ts/src/app/app.module.ts b/public/docs/_examples/ngmodule/ts/src/app/app.module.ts
index 549525df82..da03420804 100644
--- a/public/docs/_examples/ngmodule/ts/src/app/app.module.ts
+++ b/public/docs/_examples/ngmodule/ts/src/app/app.module.ts
@@ -20,7 +20,6 @@ import { AppRoutingModule } from './app-routing.module';
     BrowserModule,
     ContactModule,
 // #enddocregion v4
-// #enddocregion
 // #enddocregion import-for-root
 /*
 // #docregion v4
@@ -28,7 +27,6 @@ import { AppRoutingModule } from './app-routing.module';
 // #enddocregion v4
 */
 // #docregion import-for-root
-// #docregion
     CoreModule.forRoot({userName: 'Miss Marple'}),
 // #docregion v4
     AppRoutingModule
diff --git a/public/docs/_examples/pipes/ts/src/app/flying-heroes.component.ts b/public/docs/_examples/pipes/ts/src/app/flying-heroes.component.ts
index 5e7e4bd3f9..295620310b 100644
--- a/public/docs/_examples/pipes/ts/src/app/flying-heroes.component.ts
+++ b/public/docs/_examples/pipes/ts/src/app/flying-heroes.component.ts
@@ -60,4 +60,4 @@ export class FlyingHeroesComponent {
 export class FlyingHeroesImpureComponent extends FlyingHeroesComponent {
   title = 'Flying Heroes (impure pipe)';
 }
-// #docregion impure-component
+// #enddocregion impure-component
diff --git a/public/docs/_examples/router/ts/src/app/admin/admin-routing.module.2.ts b/public/docs/_examples/router/ts/src/app/admin/admin-routing.module.2.ts
index dc3f28b5c4..d945201afe 100644
--- a/public/docs/_examples/router/ts/src/app/admin/admin-routing.module.2.ts
+++ b/public/docs/_examples/router/ts/src/app/admin/admin-routing.module.2.ts
@@ -8,7 +8,7 @@ import { AdminDashboardComponent }  from './admin-dashboard.component';
 import { ManageCrisesComponent }    from './manage-crises.component';
 import { ManageHeroesComponent }    from './manage-heroes.component';
 
-// #docregion admin-route, can-activate-child
+// #docregion admin-route
 import { AuthGuard }                from '../auth-guard.service';
 
 const adminRoutes: Routes = [
@@ -25,7 +25,6 @@ const adminRoutes: Routes = [
           { path: '', component: AdminDashboardComponent }
         ],
         // #enddocregion admin-route
-        // #docregion can-activate-child
         canActivateChild: [AuthGuard]
         // #docregion admin-route
       }
diff --git a/public/docs/_examples/router/ts/src/app/app.component.3.ts b/public/docs/_examples/router/ts/src/app/app.component.3.ts
index 7067e42cf2..6013df6321 100644
--- a/public/docs/_examples/router/ts/src/app/app.component.3.ts
+++ b/public/docs/_examples/router/ts/src/app/app.component.3.ts
@@ -5,7 +5,6 @@ import { Router }    from '@angular/router';
 
 @Component({
   selector: 'my-app',
-// #enddocregion
   /* Typical link
   // #docregion h-anchor
   <a [routerLink]="['/heroes']">Heroes</a>
diff --git a/public/docs/_examples/router/ts/src/app/app.module.4.ts b/public/docs/_examples/router/ts/src/app/app.module.4.ts
index 7d927167a7..4825572361 100644
--- a/public/docs/_examples/router/ts/src/app/app.module.4.ts
+++ b/public/docs/_examples/router/ts/src/app/app.module.4.ts
@@ -10,9 +10,8 @@ import { PageNotFoundComponent }   from './not-found.component';
 
 import { AppRoutingModule }        from './app-routing.module';
 import { HeroesModule }            from './heroes/heroes.module';
-// #docregion crisis-center-module
 import { CrisisCenterModule }      from './crisis-center/crisis-center.module';
-// #enddocregion crisis-center-module
+// #enddocregion crisis-center-module, admin-module
 import { ComposeMessageComponent } from './compose-message.component';
 // #docregion admin-module
 import { AdminModule }             from './admin/admin.module';
@@ -27,7 +26,6 @@ import { DialogService }           from './dialog.service';
     HeroesModule,
     CrisisCenterModule,
 // #enddocregion crisis-center-module
-// #enddocregion admin-module
     AdminModule,
 // #docregion crisis-center-module
     AppRoutingModule
diff --git a/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center-routing.module.2.ts b/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center-routing.module.2.ts
index c86fa01c00..9e9b514968 100644
--- a/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center-routing.module.2.ts
+++ b/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center-routing.module.2.ts
@@ -58,7 +58,7 @@ const crisisCenterRoutes: Routes = [
       }
     ]
   }
-  // #docregion routes
+  // #enddocregion routes
 ];
 
 @NgModule({
@@ -70,4 +70,3 @@ const crisisCenterRoutes: Routes = [
   ]
 })
 export class CrisisCenterRoutingModule { }
-// #enddocregion
diff --git a/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center.module.ts b/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center.module.ts
index 483dda20d5..4061ceac60 100644
--- a/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center.module.ts
+++ b/public/docs/_examples/router/ts/src/app/crisis-center/crisis-center.module.ts
@@ -28,7 +28,6 @@ import { CrisisCenterRoutingModule } from './crisis-center-routing.module';
   providers: [
     CrisisService
   ]
-  // #enddocregion crisis-detail-resolver
 })
 // #docregion crisis-center-module-export
 export class CrisisCenterModule {}
diff --git a/public/docs/_examples/router/ts/src/app/crisis-center/crisis.service.ts b/public/docs/_examples/router/ts/src/app/crisis-center/crisis.service.ts
index 99272fe767..e7fd34d387 100644
--- a/public/docs/_examples/router/ts/src/app/crisis-center/crisis.service.ts
+++ b/public/docs/_examples/router/ts/src/app/crisis-center/crisis.service.ts
@@ -14,7 +14,6 @@ const CRISES = [
 
 let crisesPromise = Promise.resolve(CRISES);
 
-// #docregion
 import { Injectable } from '@angular/core';
 
 @Injectable()
diff --git a/public/docs/_examples/router/ts/src/app/heroes/hero-list.component.ts b/public/docs/_examples/router/ts/src/app/heroes/hero-list.component.ts
index d418d0731f..c7dcc3877e 100644
--- a/public/docs/_examples/router/ts/src/app/heroes/hero-list.component.ts
+++ b/public/docs/_examples/router/ts/src/app/heroes/hero-list.component.ts
@@ -39,7 +39,6 @@ export class HeroListComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router
   ) {}
-  // #enddocregion ctor
 
   ngOnInit() {
     this.heroes = this.route.params
diff --git a/public/docs/_examples/testing/ts/src/app/app.component.spec.ts b/public/docs/_examples/testing/ts/src/app/app.component.spec.ts
index 2f10eec6d5..20c40767c0 100644
--- a/public/docs/_examples/testing/ts/src/app/app.component.spec.ts
+++ b/public/docs/_examples/testing/ts/src/app/app.component.spec.ts
@@ -144,5 +144,5 @@ function tests() {
 
     expect(heroesLink.navigatedTo).toBe('/heroes');
   });
-  // #docregion tests
+  // #enddocregion tests
 }
diff --git a/public/docs/_examples/toh-5/ts/src/app/app.module.3.ts b/public/docs/_examples/toh-5/ts/src/app/app.module.3.ts
index 152401f132..306d9958f0 100644
--- a/public/docs/_examples/toh-5/ts/src/app/app.module.3.ts
+++ b/public/docs/_examples/toh-5/ts/src/app/app.module.3.ts
@@ -34,7 +34,6 @@ import { HeroService }         from './hero.service';
         component: HeroDetailComponent
       },
       // #enddocregion hero-detail
-      // #docregion heroes
       // #docregion heroes, routing
       {
         path: 'heroes',
diff --git a/public/docs/_examples/toh-6/ts/src/app/hero.service.ts b/public/docs/_examples/toh-6/ts/src/app/hero.service.ts
index f84061055c..18af476123 100644
--- a/public/docs/_examples/toh-6/ts/src/app/hero.service.ts
+++ b/public/docs/_examples/toh-6/ts/src/app/hero.service.ts
@@ -75,7 +75,7 @@ export class HeroService {
       .then(() => hero)
       .catch(this.handleError);
   }
-  // #enddocregion put, update
+  // #enddocregion update
 
   // #docregion getHeroes, handleError
   private handleError(error: any): Promise<any> {
diff --git a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/app.module.ts b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/app.module.ts
index 7e97d1844f..ea570e3cbf 100644
--- a/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/app.module.ts
+++ b/public/docs/_examples/upgrade-phonecat-2-hybrid/ts/app/app.module.ts
@@ -54,7 +54,6 @@ import { PhoneDetailComponent } from './phone-detail/phone-detail.component';
     PhoneListComponent,
     // #enddocregion phonelist
     PhoneDetailComponent
-    // #enddocregion phonedetail
   ],
   // #docregion phone, routeparams
   providers: [
@@ -64,7 +63,7 @@ import { PhoneDetailComponent } from './phone-detail/phone-detail.component';
     // #docregion phone
   ]
   // #enddocregion routeparams
-// #docregion bare, upgrademodule, httpmodule, phone, phonelist
+// #docregion bare, upgrademodule, httpmodule, phonelist
 })
 export class AppModule {
   // #enddocregion bare
diff --git a/public/docs/_examples/upgrade-phonecat-3-router/ts/index.html b/public/docs/_examples/upgrade-phonecat-3-router/ts/index.html
index 9b3b847fd5..572c80d315 100644
--- a/public/docs/_examples/upgrade-phonecat-3-router/ts/index.html
+++ b/public/docs/_examples/upgrade-phonecat-3-router/ts/index.html
@@ -40,5 +40,5 @@
   <body>
     <phonecat-app></phonecat-app>
   </body>
-  <!-- #docregion appcomponent -->
+  <!-- #enddocregion appcomponent -->
 </html>
diff --git a/public/docs/_examples/upgrade-phonecat-4-final/ts/index.html b/public/docs/_examples/upgrade-phonecat-4-final/ts/index.html
index 4d8c2a8ccd..fee59370e6 100644
--- a/public/docs/_examples/upgrade-phonecat-4-final/ts/index.html
+++ b/public/docs/_examples/upgrade-phonecat-4-final/ts/index.html
@@ -31,6 +31,6 @@
   <body>
     <phonecat-app></phonecat-app>
   </body>
-  <!-- #docregion appcomponent -->
+  <!-- #enddocregion appcomponent -->
 </html>
 <!-- #enddocregion full -->
diff --git a/public/docs/_examples/webpack/ts-snippets/webpack.config.snippets.ts b/public/docs/_examples/webpack/ts-snippets/webpack.config.snippets.ts
index 251e1b8ed8..2a3c596359 100644
--- a/public/docs/_examples/webpack/ts-snippets/webpack.config.snippets.ts
+++ b/public/docs/_examples/webpack/ts-snippets/webpack.config.snippets.ts
@@ -56,4 +56,3 @@ plugins: [
   new webpack.optimize.UglifyJsPlugin()
 ]
 // #enddocregion plugins
-// #enddocregion