From f8f675614397d19c332c82a16969182a613a2d2a Mon Sep 17 00:00:00 2001
From: Massimo Hamilton <massimo.hamilton@outlook.com>
Date: Mon, 25 Jul 2016 17:13:52 +0100
Subject: [PATCH] docs(router): Minor content update for Heroes tutorial

- Delete routerLinkActive from the earliest code example as it is not relevant to what the user is trying to achieve at that point in the tutorial
---
 public/docs/_examples/toh-5/ts/app/app.component.3.ts       | 6 ++----
 public/docs/_examples/toh-5/ts/app/app.component.ts         | 2 ++
 public/docs/ts/latest/tutorial/toh-pt5.jade                 | 4 ++--
 tools/api-builder/links-package/inline-tag-defs/linkDocs.js | 2 +-
 tools/doc-shredder/processors/shredMapProcessor.js          | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/docs/_examples/toh-5/ts/app/app.component.3.ts b/public/docs/_examples/toh-5/ts/app/app.component.3.ts
index ff64e27ab1..ad99fca721 100644
--- a/public/docs/_examples/toh-5/ts/app/app.component.3.ts
+++ b/public/docs/_examples/toh-5/ts/app/app.component.3.ts
@@ -11,10 +11,8 @@ import { HeroService } from './hero.service';
   template: `
     <h1>{{title}}</h1>
     <nav>
-      // #docregion router-link-active
-      <a [routerLink]="['/dashboard']" routerLinkActive="active">Dashboard</a>
-      <a [routerLink]="['/heroes']" routerLinkActive="active">Heroes</a>
-      // #enddocregion router-link-active
+      <a [routerLink]="['/dashboard']">Dashboard</a>
+      <a [routerLink]="['/heroes']">Heroes</a>
     </nav>
     <router-outlet></router-outlet>
   `,
diff --git a/public/docs/_examples/toh-5/ts/app/app.component.ts b/public/docs/_examples/toh-5/ts/app/app.component.ts
index 3f3e758dcf..f83faa8e62 100644
--- a/public/docs/_examples/toh-5/ts/app/app.component.ts
+++ b/public/docs/_examples/toh-5/ts/app/app.component.ts
@@ -11,8 +11,10 @@ import { HeroService } from './hero.service';
   template: `
     <h1>{{title}}</h1>
     <nav>
+      // #docregion router-link-active
       <a [routerLink]="['/dashboard']" routerLinkActive="active">Dashboard</a>
       <a [routerLink]="['/heroes']" routerLinkActive="active">Heroes</a>
+      // #enddocregion router-link-active
     </nav>
     <router-outlet></router-outlet>
   `,
diff --git a/public/docs/ts/latest/tutorial/toh-pt5.jade b/public/docs/ts/latest/tutorial/toh-pt5.jade
index 243a92d7e1..cc74878b10 100644
--- a/public/docs/ts/latest/tutorial/toh-pt5.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt5.jade
@@ -265,7 +265,7 @@ code-example(language="bash").
 :marked
   Finally, add a dashboard navigation link to the template, just above the *Heroes* link.
 
-+makeExample('toh-5/ts/app/app.component.ts','template', 'app/app.component.ts (template)')(format=".")
++makeExample('toh-5/ts/app/app.component.3.ts','template', 'app/app.component.ts (template)')(format=".")
 .l-sub-section
   :marked
     We nestled the two links within `<nav>` tags.
@@ -626,7 +626,7 @@ figure.image-display
     The Angular Router provides a `routerLinkActive` directive we can use to
     add a class to the HTML navigation element whose route matches the active route.
     All we have to do is define the style for it. Sweet!
-+makeExample('toh-5/ts/app/app.component.3.ts', 'router-link-active', 'app/app.component.ts (active router links)')(format=".")
++makeExample('toh-5/ts/app/app.component.ts', 'router-link-active', 'app/app.component.ts (active router links)')(format=".")
 :marked
   Set the `AppComponent`’s `styleUrls` property to this CSS file.
 +makeExample('toh-5/ts/app/app.component.ts','style-urls', 'app/app.component.ts (styleUrls)')(format=".")
diff --git a/tools/api-builder/links-package/inline-tag-defs/linkDocs.js b/tools/api-builder/links-package/inline-tag-defs/linkDocs.js
index 6254fc2d2f..32171223d5 100644
--- a/tools/api-builder/links-package/inline-tag-defs/linkDocs.js
+++ b/tools/api-builder/links-package/inline-tag-defs/linkDocs.js
@@ -45,7 +45,7 @@ module.exports = function linkDocsInlineTagDef(parseArgString, createDocMessage,
         var vers = _self.vers;
         var prevUri = uri;
         uri = path.join(lang, vers, uri);
-        log.info('Ajusted linkDocs chapter-relative uri (' + doc.fileInfo.baseName + '): ' + prevUri + ' -> ' + uri);
+        log.info('Adjusted linkDocs chapter-relative uri (' + doc.fileInfo.baseName + '): ' + prevUri + ' -> ' + uri);
       }
 
       var isValid = false;
diff --git a/tools/doc-shredder/processors/shredMapProcessor.js b/tools/doc-shredder/processors/shredMapProcessor.js
index 569ba5511d..3af9a1cb0a 100644
--- a/tools/doc-shredder/processors/shredMapProcessor.js
+++ b/tools/doc-shredder/processors/shredMapProcessor.js
@@ -43,7 +43,7 @@ module.exports = function shredMapProcessor(log, createDocMessage) {
             mixinPath = appProjDirName + '/' + lang + '/' + mixinPath;
             fragInfo = makeFragInfo(options.fragmentsDir, fullExamplePath, fragItem, mixinPath);
             if (fragInfo.exists) {
-              log.info('Ajusted example path (' + doc.fileInfo.baseName + '): ' + appProjRelPath + ' -> ' + mixinPath);
+              log.info('Adjusted example path (' + doc.fileInfo.baseName + '): ' + appProjRelPath + ' -> ' + mixinPath);
             } else {
                 fragInfo = savedFragInfo;
             }