diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json
index ed0da1adeb..6df95afdc8 100644
--- a/public/docs/_examples/package.json
+++ b/public/docs/_examples/package.json
@@ -25,17 +25,18 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@angular/common": "2.0.0-rc.3",
-    "@angular/compiler": "2.0.0-rc.3",
-    "@angular/core": "2.0.0-rc.3",
-    "@angular/forms": "0.1.1",
-    "@angular/http": "2.0.0-rc.3",
-    "@angular/platform-browser": "2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
-    "@angular/router": "3.0.0-alpha.8",
+
+    "@angular/common": "2.0.0-rc.4",
+    "@angular/compiler": "2.0.0-rc.4",
+    "@angular/core": "2.0.0-rc.4",
+    "@angular/forms": "0.2.0",
+    "@angular/http": "2.0.0-rc.4",
+    "@angular/platform-browser": "2.0.0-rc.4",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.4",
+    "@angular/router": "3.0.0-beta.1",
     "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.3",
-    "angular2-in-memory-web-api": "0.0.13",
+    "@angular/upgrade": "2.0.0-rc.4",
+    "angular2-in-memory-web-api": "0.0.14",
     "bootstrap": "^3.3.6",
     "core-js": "^2.4.0",
     "reflect-metadata": "^0.1.3",
diff --git a/public/docs/_examples/template-syntax/ts/app/app.component.html b/public/docs/_examples/template-syntax/ts/app/app.component.html
index fbe3527362..ebd9981e1a 100644
--- a/public/docs/_examples/template-syntax/ts/app/app.component.html
+++ b/public/docs/_examples/template-syntax/ts/app/app.component.html
@@ -589,18 +589,9 @@ bindon-ngModel
   <div *ngFor="let hero of heroes trackBy:trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
-<p>with <i>*ngForTrackBy</i></p>
-<div class="box">
-  <!-- #docregion NgForTrackBy-2 -->
-  <div *ngFor="let hero of heroes" *ngForTrackBy="trackByHeroes">({{hero.id}}) {{hero.fullName}}</div>
-  <!-- #enddocregion NgForTrackBy-2 -->
-</div>
-
 <p>with <i>generic</i> trackById function</p>
 <div class="box">
-  <!-- #docregion NgForTrackBy-3 -->
-  <div *ngFor="let hero of heroes" *ngForTrackBy="trackById">({{hero.id}}) {{hero.fullName}}</div>
-  <!-- #enddocregion NgForTrackBy-3 -->
+  <div *ngFor="let hero of heroes, trackBy:trackById">({{hero.id}}) {{hero.fullName}}</div>
 </div>
 
 <a class="to-toc" href="#toc">top</a>
diff --git a/public/docs/ts/latest/guide/template-syntax.jade b/public/docs/ts/latest/guide/template-syntax.jade
index 5e594e3db5..42225b411d 100644
--- a/public/docs/ts/latest/guide/template-syntax.jade
+++ b/public/docs/ts/latest/guide/template-syntax.jade
@@ -1139,7 +1139,6 @@ block dart-no-truthy-falsey
 +makeExample('template-syntax/ts/app/app.component.ts', 'trackByHeroes')(format=".")
 :marked
   Now set the `NgForTrackBy` directive to that *tracking* function.
-  Angular offers a variety of equivalent syntax choices including these two:
 +makeExample('template-syntax/ts/app/app.component.html', 'NgForTrackBy-2')(format=".")
 :marked
   The *tracking* function doesn't eliminate all DOM changes.