Merge branch 'master' into code-cleanup

public/docs/dart/latest/guide/_data.json

@@ -1,23 +1,26 @@
 {
   "_listtype": "ordered",
 
-  "setup": {
-    "title": "Getting Started"
-  },
-
   "index": {
     "title": "Step By Step Guide"
   },
 
+  "setup": {
+    "title": "Getting Started"
+  },
+
   "displaying-data": {
     "title": "Displaying Data",
-    "intro": "Displaying data is job number one for any good application. In Angular, you bind data to elements in HTML templates, and Angular automatically updates the UI as data changes."
+    "intro": "Displaying data is job number one for any good application. In Angular, you bind data to elements in HTML templates and Angular automatically updates the UI as data changes."
   },
 
   "user-input": {
-    "title": "User Input"
+    "title": "User Input",
+    "intro": "DOM events drive user input in Angular. You can use the native events like click, mouseover, and keyup. Angular uses a special syntax to register events to DOM elements. This section covers all the ins and outs of using the event syntax."
   },
+
   "making-components": {
-    "title": "Making Components"
+    "title": "Making Components",
+    "intro": "Angular applications are a tree of nested components. You always begin with a top-level component. You add child components by including them in the parent's template."
   }
-}
+}

public/docs/dart/latest/guide/_layout.jade

@@ -5,7 +5,7 @@ html(lang="en" ng-app="angularIOApp")
 
   body(class="l-offset-nav l-offset-side-nav"  ng-controller="AppCtrl")
     != partial("../../../../_includes/_main-nav")
-    != partial("../../../../_includes/_docs-nav")
+    != partial("../../../_includes/sidenav/_primary")
     != partial("../../../../_includes/_hero")
     != partial("../../../../_includes/_banner")
 

public/docs/js/latest/quickstart.jade

@@ -26,6 +26,13 @@
     <a href="https://github.com/angular/ts-quickstart"> <code>quickstart</code> GitHub repository</a>.
     This repository provides a faster start than building from <code>npm</code>.
     This repository includes the Angular distribution and type definitions for TypeScript.
+    
+  p.
+    Create two files, <code>index.html</code> and
+    <code>app.ts</code>, both at the root of the project:
+
+  pre.prettyprint
+      $ touch app.ts index.html
 
 // STEP 2 - Start the TypeScript compiler ##########################
 .l-main-section
@@ -49,14 +56,6 @@
 .l-main-section
   h2#section-transpile 3. Import Angular
 
-  p.
-    Create two files, <code>index.html</code> and
-    <code>app.ts</code>, both at the root of the project:
-
-  pre.prettyprint
-    $ touch index.html
-    $ touch app.ts
-
   p Inside of <code>app.ts</code>, import the type definitions from Angular:
   pre.prettyprint
     code /&#47;/ &lt;reference path="typings/angular2/angular2.d.ts" /&gt;