diff --git a/public/docs/ts/latest/cookbook/dependency-injection.jade b/public/docs/ts/latest/cookbook/dependency-injection.jade
index e29174b83f..4c57634d4e 100644
--- a/public/docs/ts/latest/cookbook/dependency-injection.jade
+++ b/public/docs/ts/latest/cookbook/dependency-injection.jade
@@ -697,7 +697,8 @@ a(id="find-parent")
 
   This section describes some techniques for doing that.
 
-  <a id="known-parent"></a>
+a#known-parent
+:marked
   ### Find a parent component of known type
 
   You use standard class injection to acquire a parent component whose type you know.
@@ -715,7 +716,8 @@ a(id='alex')
   the <live-example name="cb-dependency-injection"></live-example>
   confirms that the `alex` parameter is set.
 
-  <a id="base-parent"></a>
+a#base-parent
+:marked
   ### Cannot find a parent by its base class
 
   What if you *don't* know the concrete parent component class?
@@ -752,7 +754,9 @@ a(id='alex')
   confirms that the `alex` parameter is null.
   *You cannot inject a parent by its base class.*
 
-  <a id="class-interface-parent"></a>
+
+a#class-interface-parent
+:marked
   ### Find a parent by its class-interface
 
   You can find a parent component with a [class-interface](#class-interface).
diff --git a/public/docs/ts/latest/guide/ngmodule.jade b/public/docs/ts/latest/guide/ngmodule.jade
index 2a4ca49823..0a0194e76f 100644
--- a/public/docs/ts/latest/guide/ngmodule.jade
+++ b/public/docs/ts/latest/guide/ngmodule.jade
@@ -558,7 +558,8 @@ a#feature-modules
   In the next section, you'll carve the contact functionality out of the root module
   and into a dedicated feature module.
 
-  <a id="contact-module-v1"></a>
+a#contact-module-v1
+:marked
   ### Make _Contact_ a feature module
   <!-- CF: Is "Contact" a proper noun in this context? -->
 
@@ -860,7 +861,8 @@ a#shared-module
   The `TitleComponent` is used only once by the `AppComponent`.
   There's no point in sharing it.
 
-  <a id="no-shared-module-providers"></a>
+a#no-shared-module-providers
+:marked
   ### Why _UserService_ isn't shared
 
   While many components share the same service instances,
diff --git a/public/docs/ts/latest/guide/pipes.jade b/public/docs/ts/latest/guide/pipes.jade
index feabf455d1..1ff8f9a773 100644
--- a/public/docs/ts/latest/guide/pipes.jade
+++ b/public/docs/ts/latest/guide/pipes.jade
@@ -311,7 +311,8 @@ figure.image-display
   With that concern in mind, implement an impure pipe with great care.
   An expensive, long-running pipe could destroy the user experience.
 
-  <a id="impure-flying-heroes"></a>
+a#impure-flying-heroes
+:marked
   ### An impure *FlyingHeroesPipe*
 
   A flip of the switch turns the `FlyingHeroesPipe` into a `FlyingHeroesImpurePipe`.
diff --git a/public/docs/ts/latest/guide/security.jade b/public/docs/ts/latest/guide/security.jade
index 5318a11437..a73c20eb60 100644
--- a/public/docs/ts/latest/guide/security.jade
+++ b/public/docs/ts/latest/guide/security.jade
@@ -131,7 +131,8 @@ figure.image-display
   [An Introduction to Content Security Policy](http://www.html5rocks.com/en/tutorials/security/content-security-policy/)
   on the HTML5Rocks website.
 
-  <a id="offline-template-compiler"></a>
+a#offline-template-compiler
+:marked
   ### Use the offline template compiler
 
   The offline template compiler prevents a whole class of vulnerabilities called template injection,
diff --git a/public/docs/ts/latest/guide/server-communication.jade b/public/docs/ts/latest/guide/server-communication.jade
index 49e466e549..68b47b7da2 100644
--- a/public/docs/ts/latest/guide/server-communication.jade
+++ b/public/docs/ts/latest/guide/server-communication.jade
@@ -14,6 +14,7 @@ block includes
   [Fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API).
 
   The Angular HTTP library simplifies application programming with the **XHR** and **JSONP** APIs.
+  
   # Contents
 
   * [Demos](#demos)
@@ -581,7 +582,8 @@ block wikipedia-jsonp+
     In this example, the app must always display the results for the *http* search
     no matter which response arrives first.
 
-    <a id="more-observables"></a>
+  a#more-observables
+  :marked
     ## More fun with Observables
 
     You could make changes to the `WikipediaService`, but for a better
diff --git a/public/docs/ts/latest/guide/typescript-configuration.jade b/public/docs/ts/latest/guide/typescript-configuration.jade
index 955b600871..9a54073991 100644
--- a/public/docs/ts/latest/guide/typescript-configuration.jade
+++ b/public/docs/ts/latest/guide/typescript-configuration.jade
@@ -29,7 +29,8 @@ a(id="tsconfig")
 :marked
   This file contains options and flags that are essential for Angular applications.
 
-  <a id="noImplicitAny"></a>
+a#noImplicitAny
+:marked
   ### *noImplicitAny* and *suppressImplicitAnyIndexErrors*
 
   TypeScript developers disagree about whether the `noImplicitAny` flag should be `true` or `false`.
diff --git a/public/docs/ts/latest/guide/webpack.jade b/public/docs/ts/latest/guide/webpack.jade
index 9ac5cee868..87d3c961bc 100644
--- a/public/docs/ts/latest/guide/webpack.jade
+++ b/public/docs/ts/latest/guide/webpack.jade
@@ -13,7 +13,8 @@ style.
   It's an excellent alternative to the *SystemJS* approach used elsewhere in the documentation.
   This guide offers a taste of Webpack and explains how to use it with Angular applications.
 
-  <a id="top"></a>
+a#top
+:marked
   # Contents
 
   * [What is Webpack?](#what-is-webpack)
diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade
index aeb7624997..41cbde93a2 100644
--- a/public/docs/ts/latest/tutorial/toh-pt6.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt6.jade
@@ -426,8 +426,8 @@ h1 Providing HTTP Services
 
   Each call to `search()` puts a new string into this subject's _observable_ stream by calling `next()`.
 
+a#ngoninit
 :marked
-  <a id="ngoninit"></a>
   #### Initialize the *heroes* property (*ngOnInit*)
 
   A `Subject` is also an `Observable`.