docs(quickstart): incorporates Igor 11/16 feedback

Author: wardbell

public/docs/_examples/quickstart/ts/app/app.module.ts

@@ -3,10 +3,10 @@ import { Component, NgModule } from '@angular/core';
 import { BrowserModule }       from '@angular/platform-browser';
 
 @Component({
-  template: `<h1>Hello Angular</h1>`,
+  template: `<h1>Hello {{title}}</h1>`,
   selector: 'my-app'
 })
-class AppComponent { }
+class AppComponent { title = 'Angular'; }
 
 @NgModule({
   imports:      [ BrowserModule ],

public/docs/_examples/setup/ts/app/app.component.ts

@@ -2,7 +2,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-    selector: 'my-app',
-    template: `<h1>Hello Angular</h1>`
+  template: `<h1>Hello {{title}}</h1>`,
+  selector: 'my-app'
 })
-export class AppComponent { }
+export class AppComponent { title = 'Angular'; }

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

@@ -15,14 +15,6 @@
     "basics": true
   },
 
-  "setup": {
-    "title": "Setup for local development",
-    "navTitle": "Setup",
-    "intro": "Setup a local development environment",
-    "nextable": true,
-    "basics": true
-  },
-
   "architecture": {
     "title": "Architecture Overview",
     "navTitle": "Architecture",
@@ -152,6 +144,12 @@
     "intro": "Developing for content security in Angular applications"
   },
 
+  "setup": {
+    "title": "Setup for local development",
+    "navTitle": "Setup",
+    "intro": "Install the Angular QuickStart seed for faster, more efficient development on your machine"
+  },
+
   "setup-systemjs-anatomy": {
     "title": "Setup Anatomy",
     "intro": "Inside the local development environment for SystemJS"

public/docs/ts/latest/guide/change-log.jade

@@ -5,7 +5,13 @@ block includes
   The Angular documentation is a living document with continuous improvements.
   This log calls attention to recent significant changes.
 
-<<<<<<< 8f28349aed0a6cd7430fc42ffc8674cf8eb5c6c2
+  ## QuickStart Rewrite (2016-11-17)
+  The QuickStart is completely rewritten so that it actually is quick.
+  It references a minimal "Hello Angular" app running in Plunker.
+  The new [Setup](setup.html) page tells you how to install a local development environment
+  by downloading (or cloning) the QuickStart github repository.
+  You are no longer asked to copy-and-paste code into setup files that were not explained anyway.
+
   ## Sync with Angular v.2.2.0 (2016-11-14)
   Docs and code samples updated and tested with Angular v.2.2.0 
 
@@ -19,14 +25,6 @@ block includes
   now explains how to write apps in ES6/7
   by translating the common idioms in the TypeScript documentation examples
   (and elsewhere on the web) to ES6/7 and ES5.
-=======
-  ## QuickStart Rewrite (2016-11-08)
-  The QuickStart is completely rewritten so that it actually is quick.
-  It references a minimal "Hello Angular" app running in Plunker.
-  The new [Setup](setup.html) page tells you how to install a local development environment
-  by downloading (or cloning) the QuickStart github repository.
-  You are no longer asked to copy-and-paste code into setup files that were not explained anyway.
->>>>>>> docs(quickstart): setup links to previous QS point to setup.html
 
   ## Sync with Angular v.2.1.1 (2016-10-21)
   Docs and code samples updated and tested with Angular v.2.1.0 

public/docs/ts/latest/guide/displaying-data.jade

@@ -36,7 +36,7 @@ figure.image-display
 
 
   Follow the [setup](setup.html) instructions for creating a new project
-  named <ngio-ex path= <ngio-ex path="displaying-data"></ngio-ex>.
+  named <ngio-ex path="displaying-data"></ngio-ex>.
 
 :marked
   Then modify the <ngio-ex path="app.component.ts"></ngio-ex> file by

public/docs/ts/latest/guide/learning-angular.jade

@@ -11,14 +11,11 @@ figure
   Those new to Angular may wish to follow this popular learning path.
   <br clear="all">
 :marked
-  1. Try the [QuickStart](../quickstart.html)'s live coding example, "Hello, Angular".
-
-  1. [Setup](setup.html) your local enviroment for efficient application development
-  both online and offline.
-
-  1. Take the *Tour of Heroes* [tutorial](../tutorial), which picks up where QuickStart leaves off,
-  and builds a simple data-driven app. The app demonstrates the essential characteristics of a professional application:
-  a sensible project structure, data binding, master/detail, services, dependency injection, navigation, and remote data access.
+  1. Take the [*Tour of Heroes* tutorial](../tutorial "Tour of Heroes"). 
+  
+    The *Tour of Heroes* takes you step-by-step from the [QuickStart](../quickstart.html) 
+    to a full-featured example that demonstrates the essential characteristics of a professional application:
+    a sensible project structure, data binding, master/detail, services, dependency injection, navigation, and remote data access.
 
   1. Read the [Architecture](architecture.html) overview for the big picture.
 

public/docs/ts/latest/guide/setup-systemjs-anatomy.jade

@@ -45,7 +45,6 @@ table(width="100%")
   tr
     td
       code.
-        .dockerignore<br>
         .editorconfig<br>
         .git/...<br>
         .gitignore<br>
@@ -60,14 +59,6 @@ table(width="100%")
       :marked
         The history of changes to the _QuickStart_ repository.
         Delete or ignore.
-  tr
-    td <code>Dockerfile</code>
-    td
-      :marked
-        A Docker configuration file.
-        Delete or ignore unless you know and use 
-        <a href="https://www.docker.com/" target="_blank" title="Docker software containerization">docker</a>
-        to build and ship your application.
   tr
     td <code>favicon.ico</code>
     td
@@ -127,9 +118,7 @@ table(width="100%")
     td <code>styles.css</code>
     td
       :marked
-        The <a href="https://github.com/angular/angular.io/blob/master/public/docs/_examples/_boilerplate/styles.css"
-        target="_blank" title="CSS styles for Angular documentation samples">master CSS styles</a>
-        shared by all documentation samples.
+        Global styles for the application. Initialized with an `<h1>` style for the QuickStart demo.
 
   tr
     td <code>systemjs<br>.config.js</code>
@@ -162,9 +151,3 @@ table(width="100%")
 
         This file defines linting rules favored by the 
         [Angular style guide](style-guide.html) and by the authors of the documentation.
-  tr
-    td <code>wallaby.js</code>
-    td
-      :marked
-        Configuration for the <a href="https://wallabyjs.com/" target="_blank" title="Wallaby integrated testing tool">wallaby</a>
-        unit test runner extension, available for many code editors.

public/docs/ts/latest/guide/setup.jade

@@ -10,46 +10,54 @@ block includes
 
   As much fun as this is
   * you can't ship your app in plunker
-  * development in the browser is slow
-  * you aren't always online
+  * you aren't always online when writing code
+  * transpiling TypeScript in the browser is slow
   * the type support, refactoring, and code completion only work in your local IDE
 
   # Setup a local development environment
 
-  Fortunately, setting up a local development environment is quick and easy:
-  1. `git clone` the [**QuickStart** repository](https://github.com/angular/quickstart "Clone the github QuickStart repo") 
-  into an empty project file (e.g., `my-project`)
+  Fortunately, setting up a new project in your local development environment is quick and easy
+  with the [**QuickStart seed**](https://github.com/angular/quickstart "Install the github QuickStart repo"),
+  a repository on github. 
+
+  Make sure you have [node and npm installed](#install-node "What if you don't have node?").
+  Then ...
+  1. [clone](#clone) or [download](#download) the **QuickStart seed repository**.
   1. [install the `npm` packages](#install-node "What if you don't have node?")
-  1. run it
+  1. run `npm start` to launch the sample application
+
+a#clone
+:marked
+  ### Clone
+
+  Perform the _clone-to-launch_ steps with these terminal commands.
 
 code-example(language="sh" class="code-shell").
   git clone https://github.com/angular/quickstart.git my-project
   cd my-project
   npm install
   npm start
 
+a#download
 :marked
-  ### No git? Download the zip!
-
-  If you don't have `git`, you can download and unzip the repository contents.
+  ### Download
+  <a href="https://github.com/angular/quickstart/archive/master.zip" title="Download the QuickStart seed repository">Download the QuickStart seed</a>
+  and unzip it into your project folder. Then perform the remaining steps with these terminal commands.
 
-  1. open [`https://github.com/angular/quickstart`](https://github.com/angular/quickstart) in a browser
-  1. click the <span style="color: green;">green <b>"Clone or download"</b></span> button, 
-  then the <span style="color: blue;">blue <b>"Download zip"</b></span> button
-  1. move the downloaded zip file to the `my-project` folder and unzip it
-  1. [install the `npm` packages](#install-node "What if you don't have node?")
-  1. run it
+code-example(language="sh" class="code-shell").
+  cd my-project
+  npm install
+  npm start
 
-  ## What's different about the setup?
+.l-main-section
+:marked
+  ## What's different about the QuickStart Seed?
 
-  The setup (zip or clone) delivers the same application as the [QuickStart](../quickstart.html "Angular QuickStart"),
-  a fact you can confirm with the <live-example></live-example>.
+  The QuickStart seed contains the same application as the <live-example><i>live code</i> QuickStart</live-example>.
+  But there are _many more files_ in the project folder on your machine, 
+  most of which you can [learn about later](setup-systemjs-anatomy.html "Setup Anatomy").
 
-  But there are _many more files_ in the project folder on your machine. 
-  Ignore all but three of them for now and 
-  [learn about the others later](setup-systemjs-anatomy.html "Setup Anatomy").
-  
-  Focus on these three TypeScript (`.ts`) files in the **`/app`** folder.
+  Focus on the following three TypeScript (`.ts`) files in the **`/app`** folder.
 
 .filetree
   .file app
@@ -99,10 +107,16 @@ table(width="100%")
         That's the only choice when running in the live-coding browser environment.
         You'll learn about other compiling and deployment options later in the documentation.
 
-#install-node
 .l-main-section
 :marked
-  ## Prerequisites: _node_ and _npm_
+  ## Next Step
+
+  If you're new to Angular, try the recommended [learning path](learning-path.html).
+
+a#install-node
+.l-main-section
+:marked
+  ## Appendix: _node_ and _npm_
 
     Node.js and npm are essential to modern web development with Angular and other platforms.
     Node powers client development and build tools.
@@ -118,3 +132,4 @@ table(width="100%")
     We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of node and npm. 
     You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that 
     use other versions of node and npm.
+

public/docs/ts/latest/tutorial/toh-pt1.jade

@@ -3,6 +3,8 @@ include ../_util-fns
 :marked
   Every story starts somewhere. Our story starts where the [QuickStart](../quickstart.html) ends.
 
+  ## Setup to develop locally
+  
   Follow the [setup](../guide/setup.html) instructions for creating a new project
   named <ngio-ex path="angular-tour-of-heroes"></ngio-ex>
   after which the file structure should look like this:
@@ -41,13 +43,13 @@ code-example(language="sh" class="code-shell").
     ## Show our Hero
     We want to display Hero data in our app
 
-    Let's add two properties to our `AppComponent`, a `title` property for the application name and a `hero` property
+    Update the `AppComponent` so it has two properties: &nbsp; a `title` property for the application name and a `hero` property
     for a hero named "Windstorm".
 
   +makeExample('toh-1/ts-snippets/app.component.snippets.pt1.ts', 'app-component-1', 'app.component.ts (AppComponent class)')(format=".")
 
   :marked
-    Now we update the template in the `@Component` decoration with data bindings to these new properties.
+    Now update the template in the `@Component` decoration with data bindings to these new properties.
 
   +makeExample('toh-1/ts-snippets/app.component.snippets.pt1.ts', 'show-hero')