Merge branch 'master' into style-guide

harp.json

@@ -266,6 +266,20 @@
         "twitter": "rodyhaddad",
         "website": "http://rodyhaddad.com",
         "bio": "Rodric is a developer working on tooling for the Angular project. He started as an intern on the team and is currently working remotely from Montreal, Canada."
+      },
+
+      "michal": {
+        "name": "Michał Gołębiowski",
+        "picture": "/resources/images/bios/michal.jpg",
+        "twitter": "m_gol",
+        "website": "https://plus.google.com/u/0/103101124310040612163/",
+        "bio": "Front-end developer at Laboratorium EE, core contributor to Angular & jQuery. Makes sure Angular 1 & jQuery work fine together. Interested in new JavaScript standards."
+      },
+
+      "jbedard": {
+        "name": "Jason Bedard",
+        "picture": "/resources/images/bios/jbedard.jpg",
+        "bio": "Jason Bedard is a software engineer at Allocadia Software where he leads the front end development using Angular. In his spare time Jason enjoys contributing to projects such as Angular, drinking coffee and being in the outdoors with his wife."
       }
     }
   }

public/about/_data.json

@@ -1,6 +1,6 @@
 {
   "index": {
-    "title": "Moving the Web Foward",
+    "title": "Moving the Web Forward",
     "subtitle": "The Angular Core Team"
   },
 

public/docs/dart/latest/_data.json

@@ -14,7 +14,7 @@
   "resources": {
     "icon": "play-circle-fill",
     "title": "Angular Resources",
-    "banner": "Angular 2 is currently in Alpha Preview. For AngularDart 1.X please visit <a href='https://angulardart.org/'>angulardart.org</a>."
+    "banner": "Angular 2 is currently in Alpha Preview. For AngularDart 1.X resources, visit <a href='https://angulardart.org/'>angulardart.org</a>."
   },
 
   "api": {

public/docs/dart/latest/quickstart.jade

@@ -1,8 +1,14 @@
+p.
+  <strong>Angular 2 is currently in Alpha Preview.</strong>
+  We recommend using
+  <a href='https://angulardart.org'>Angular for Dart</a>
+  for production applications.
+
 p.
   These instructions assume that you already have the Dart SDK
   and any tools you like to use with Dart.
   If not, go
-  <a href="https://www.dartlang.org/tools/download.html">download Dart</a>.
+  <a href="https://www.dartlang.org/downloads/">download Dart</a>.
   Then return here.
 
 // STEP 1 - Create a project ##########################
@@ -37,21 +43,21 @@ p.
   pre.prettyprint.lang-basic
     code.
       &gt; pub get
-      Resolving dependencies... (7.3s)
+      Resolving dependencies... (2.7s)
-      + angular2 2.0.0-alpha.6
+      + analyzer 0.24.1 (0.25.0-dev.3 available)
-      + browser 0.10.0+2
+      ... more messages ...
-      + path 1.3.3
+      Changed 21 dependencies!
-      + stack_trace 1.2.3
+      Precompiling dependencies...
-      Changed 4 dependencies!
+      Loading source assets...
+      Precompiled dart_style.
 
   // PENDING: Create template? Link to pub/pubspec docs?
   // Is browser really needed?
 
   .alert.is-helpful.
-    If you're using Dart's Dev channel, then your version of angular2
+    Depending on your version of Dart and the latest version of angular2,
-    will be higher than alpha 6. That's fine.
+    your messages are probably going to be different from what's shown above.
-
+    That's fine.
-  // PENDING: Update once 1.9 is on stable channel.
 
 
 // STEP 2 - Import Angular ##########################
@@ -230,16 +236,20 @@ p.
     You have several options for running your app.
     The quickest and easiest, for now,
     is to open your project in <b>Dart Editor</b>,
-    right-click <code>web/index.html</code>,
+    right-click <b>web/index.html</b>,
     and choose <b>Open in Dartium</b>.
+    This starts a web server
+    and opens your app in an experimental browser that contains the Dart VM.
 
   // TODO: screenshot? embedded app?
 
   p.
     Another option is to build and serve the app using <code>pub serve</code>,
-    and then run it by visiting http://localhost:8080/index.html in a browser.
+    and then run it by visiting <b>http://localhost:8080</b> in a browser.
-    The JavaScript generated using this option is large, for now;
+    Generating the JavaScript takes a few seconds when you first visit the page,
-    it'll be much better soon, when Angular's transformer becomes available.
+    and the generated JavaScript is currently large.
+    The generated JavaScript will be smaller once
+    Angular's transformer becomes available.
 
   // [PENDING: Update when transformer is working!]
 
@@ -248,14 +258,7 @@ p.
   h2#section-transpile Great job! Next step...
 
   p.
-    To try out the latest Angular 2 APIs,
+    We plan to add a developer guide soon.
-    first download the <b>Dev channel</b> of Dart from the
+    Until then, check out <a href="resources.html">Angular Resources</a>.
-    <a href="https://www.dartlang.org/tools/download-archive/">Dart
+    To learn more about Dart, go to
-    Download Archive</a>.
+    <a href="https://www.dartlang.org">dartlang.org</a>.
-
-  p.
-    Once you have the Dart Dev channel, use <b>pub upgrade</b>
-    to get the latest version of Angular 2.
-
-
-  // [PENDING: Perhaps point to dartlang.org.]

public/docs/dart/latest/resources.jade

@@ -2,6 +2,7 @@
 .l-main-section
   h2 Victor Savkin's Blog Posts
   ul
+    li <a href="http://victorsavkin.com/post/114168430846/two-phases-of-angular-2-applications">Two Phases of Angular 2 Applications</a>
     li <a href="http://angularjs.blogspot.com/2015/03/forms-in-angular-2.html">Forms in Angular 2</a>
     li <a href="http://victorsavkin.com/post/110170125256/change-detection-in-angular-2">Change detection</a>
     li <a href="http://victorsavkin.com/post/108837493941/better-support-for-functional-programming-in">Functional programming </a>

public/docs/js/latest/resources.jade

@@ -2,6 +2,7 @@
 .l-main-section
   h2 Victor Savkin's Blog Posts
   ul
+    li <a href="http://victorsavkin.com/post/114168430846/two-phases-of-angular-2-applications">Two Phases of Angular 2 Applications</a>
     li <a href="http://angularjs.blogspot.com/2015/03/forms-in-angular-2.html">Forms in Angular 2</a>
     li <a href="http://victorsavkin.com/post/110170125256/change-detection-in-angular-2">Change detection</a>
     li <a href="http://victorsavkin.com/post/108837493941/better-support-for-functional-programming-in">Functional programming </a>