diff --git a/harp.json b/harp.json
index 28de6983db..595b5469c9 100644
--- a/harp.json
+++ b/harp.json
@@ -3,161 +3,249 @@
"title": "Angular",
"description": "Angular is a development platform for building mobile and desktop web applications",
"siteURL": "http://angular.io",
- "jsLatest": "2.0.0-alpha.11",
+ "jsLatest": "2.0.0-alpha.12",
"dartLatest": "2.0.0-alpha.6",
"bios": {
- "misko": {
- "name": "Miško Hevery",
- "picture": "/resources/images/bios/misko.jpg",
- "twitter": "mhevery",
- "website": "http://misko.hevery.com",
- "bio": "Miško Hevery is the creator of AngularJS framework. He has passion for making complex things simple. He currently works at Google, but has previously worked at Adobe, Sun Microsystems, Intel, and Xerox, where he became an expert in building web applications in web related technologies such as Java, JavaScript, Flex and ActionScript."
- },
+ "misko": {
+ "name": "Miško Hevery",
+ "picture": "/resources/images/bios/misko.jpg",
+ "twitter": "mhevery",
+ "website": "http://misko.hevery.com",
+ "bio": "Miško Hevery is the creator of AngularJS framework. He has passion for making complex things simple. He currently works at Google, but has previously worked at Adobe, Sun Microsystems, Intel, and Xerox, where he became an expert in building web applications in web related technologies such as Java, JavaScript, Flex and ActionScript."
+ },
- "igor": {
- "name": "Igor Minar",
- "picture": "/resources/images/bios/igor-minar.jpg",
- "twitter": "IgorMinar",
- "website": "https://google.com/+IgorMinar",
- "bio": "Igor is a software engineer at Google. He is a lead on the Angular project, practitioner of test driven development, open source enthusiast, hacker. In his free time, Igor enjoys spending time with his wife and two kids, doing outdoor activities (including but not limited to sports, gardening and building retaining walls)."
- },
+ "igor": {
+ "name": "Igor Minar",
+ "picture": "/resources/images/bios/igor-minar.jpg",
+ "twitter": "IgorMinar",
+ "website": "https://google.com/+IgorMinar",
+ "bio": "Igor is a software engineer at Google. He is a lead on the Angular project, practitioner of test driven development, open source enthusiast, hacker. In his free time, Igor enjoys spending time with his wife and two kids, doing outdoor activities (including but not limited to sports, gardening and building retaining walls)."
+ },
- "jelbourn": {
- "name": "Jeremy Elbourn",
- "picture": "/resources/images/bios/jelbourn.jpg",
- "twitter": "jelbourn",
- "website": "https://plus.google.com/+JeremyElbourn/",
- "bio": "FE Engineer @ Google specializing in AngularJS, component design, and the cleanest of code."
- },
+ "jelbourn": {
+ "name": "Jeremy Elbourn",
+ "picture": "/resources/images/bios/jelbourn.jpg",
+ "twitter": "jelbourn",
+ "website": "https://plus.google.com/+JeremyElbourn/",
+ "bio": "FE Engineer @ Google specializing in AngularJS, component design, and the cleanest of code."
+ },
- "brad": {
- "name": "Brad Green",
- "picture": "/resources/images/bios/brad-green.jpg",
- "twitter": "bradlygreen",
- "website": "https://plus.google.com/+BradGreen",
- "bio": "Brad Green works at Google as an engineering director. Brad manages the Google Sales Platform suite of projects as well as the AngularJS framework. Prior to Google, Brad worked on the early mobile web at AvantGo, founded and sold startups, and spent a few hard years toiling as a caterer. Brad's first job out of school was as lackey to Steve Jobs at NeXT Computer writing demo software and designing his slide presentations. Brad lives in Mountain View, CA with his wife and two children."
- },
+ "brad": {
+ "name": "Brad Green",
+ "picture": "/resources/images/bios/brad-green.jpg",
+ "twitter": "bradlygreen",
+ "website": "https://plus.google.com/+BradGreen",
+ "bio": "Brad Green works at Google as an engineering director. Brad manages the Google Sales Platform suite of projects as well as the AngularJS framework. Prior to Google, Brad worked on the early mobile web at AvantGo, founded and sold startups, and spent a few hard years toiling as a caterer. Brad's first job out of school was as lackey to Steve Jobs at NeXT Computer writing demo software and designing his slide presentations. Brad lives in Mountain View, CA with his wife and two children."
+ },
- "victorsavkin": {
- "name": "Victor Savkin",
- "picture": "/resources/images/bios/victor.jpg",
- "twitter": "victorsavkin",
- "website": "BLANK",
- "bio": "Victor works on Angular at Google. He is interested in functional programming and client-side applications. Being a language nerd he spends a lot of his time playing with TypeScript, Dart, Elm, Haskell, and Clojure."
- },
+ "victorsavkin": {
+ "name": "Victor Savkin",
+ "picture": "/resources/images/bios/victor.jpg",
+ "twitter": "victorsavkin",
+ "website": "BLANK",
+ "bio": "Victor works on Angular at Google. He is interested in functional programming and client-side applications. Being a language nerd he spends a lot of his time playing with TypeScript, Dart, Elm, Haskell, and Clojure."
+ },
- "tobias": {
- "name": "Tobias Bosch",
- "picture": "/resources/images/bios/tobias.jpg",
- "twitter": "tbosch1009",
- "website": "https://plus.google.com/+TobiasBosch",
- "bio": "Tobias Bosch is a software engineer at Google. He is part of the Angular core team and works on Angular 2."
- },
+ "tobias": {
+ "name": "Tobias Bosch",
+ "picture": "/resources/images/bios/tobias.jpg",
+ "twitter": "tbosch1009",
+ "website": "https://plus.google.com/+TobiasBosch",
+ "bio": "Tobias Bosch is a software engineer at Google. He is part of the Angular core team and works on Angular 2."
+ },
- "brianford": {
- "name": "Brian Ford",
- "picture": "/resources/images/bios/brian-ford.jpg",
- "twitter": "briantford",
- "website": "BLANK",
- "bio": "Brian works on the AngularJS core team at Google where he tries his very best to make computers do the right thing."
- },
+ "brianford": {
+ "name": "Brian Ford",
+ "picture": "/resources/images/bios/brian-ford.jpg",
+ "twitter": "briantford",
+ "website": "BLANK",
+ "bio": "Brian works on the AngularJS core team at Google where he tries his very best to make computers do the right thing."
+ },
- "rado": {
- "name": "Rado Kirov",
- "picture": "/resources/images/bios/rado.jpg",
- "twitter": "radokirov",
- "website": "https://plus.sandbox.google.com/+RadoslavKirov",
- "bio": "Rado has been on the Angular Core team since Summer 2014. Before Angular, he worked on the Adsense serving stack, responsible for serving billions of ads daily. Being passionate about open source, he made contributions to Angular as a Google-20% project, before making the fulltime jump. He is a recovering academic; ask him about error-correcting codes from algebraic curves (or don't)."
- },
+ "rado": {
+ "name": "Rado Kirov",
+ "picture": "/resources/images/bios/rado.jpg",
+ "twitter": "radokirov",
+ "website": "https://plus.sandbox.google.com/+RadoslavKirov",
+ "bio": "Rado has been on the Angular Core team since Summer 2014. Before Angular, he worked on the Adsense serving stack, responsible for serving billions of ads daily. Being passionate about open source, he made contributions to Angular as a Google-20% project, before making the fulltime jump. He is a recovering academic; ask him about error-correcting codes from algebraic curves (or don't)."
+ },
- "chirayu": {
- "name": "Chirayu Krishnappa",
- "picture": "/resources/images/bios/chirayu.jpg",
- "twitter": "chirayuk",
- "website": "https://plus.google.com/+chirayuk",
- "bio": "Chirayu is currently working on making localizing Angular apps rock. In the past, he has contributed to AngularJS security, AngularDart, and Protractor."
- },
+ "chirayu": {
+ "name": "Chirayu Krishnappa",
+ "picture": "/resources/images/bios/chirayu.jpg",
+ "twitter": "chirayuk",
+ "website": "https://plus.google.com/+chirayuk",
+ "bio": "Chirayu is currently working on making localizing Angular apps rock. In the past, he has contributed to AngularJS security, AngularDart, and Protractor."
+ },
- "davideast": {
- "name": "David East",
- "picture": "/resources/images/bios/david-east.jpg",
- "twitter": "_davideast",
- "website": "BLANK",
- "bio": "David East is a Developer Programs Engineer at Google. He works full-time on the Firebase team and part-time on the Angular core team."
- },
+ "davideast": {
+ "name": "David East",
+ "picture": "/resources/images/bios/david-east.jpg",
+ "twitter": "_davideast",
+ "website": "BLANK",
+ "bio": "David East is a Developer Programs Engineer at Google. He works full-time on the Firebase team and part-time on the Angular core team."
+ },
- "jeffcross": {
- "name": "Jeff Cross",
- "picture": "/resources/images/bios/jeff-cross.jpg",
- "twitter": "jeffbcross",
- "website": "https://twitter.com/jeffbcross",
- "bio": "Jeff is a member of the Angular core team at Google, focusing on data access and application performance. Jeff's has an extensive background in open source software, marketing, and user experience design. When not in front of a computer, he spends his time doing whatever his kids tell him to do, which usually involves playing music or making gadgets."
- },
+ "jeffcross": {
+ "name": "Jeff Cross",
+ "picture": "/resources/images/bios/jeff-cross.jpg",
+ "twitter": "jeffbcross",
+ "website": "https://twitter.com/jeffbcross",
+ "bio": "Jeff is a member of the Angular core team at Google, focusing on data access and application performance. Jeff's has an extensive background in open source software, marketing, and user experience design. When not in front of a computer, he spends his time doing whatever his kids tell him to do, which usually involves playing music or making gadgets."
+ },
- "alexeagle": {
- "name": "Alex Eagle",
- "picture": "/resources/images/bios/alex-eagle.jpg",
- "twitter": "jakeherringbone",
- "website": "http://google.com/+alexeagle",
- "bio": "Alex works on language tooling for JavaScript and AtScript. Previously Alex spent five years in Google's developer testing tools. He has developed systems including Google's continuous integration service, capturing build&test failures, and explaining them to developers. Before Google, Alex worked at startups including Opower, and consulted for large government IT. In his 20% time, he created the Error-Prone static analysis tool, which detects common Java programming mistakes and reports them as compile errors."
- },
+ "alexeagle": {
+ "name": "Alex Eagle",
+ "picture": "/resources/images/bios/alex-eagle.jpg",
+ "twitter": "jakeherringbone",
+ "website": "http://google.com/+alexeagle",
+ "bio": "Alex works on language tooling for JavaScript and AtScript. Previously Alex spent five years in Google's developer testing tools. He has developed systems including Google's continuous integration service, capturing build&test failures, and explaining them to developers. Before Google, Alex worked at startups including Opower, and consulted for large government IT. In his 20% time, he created the Error-Prone static analysis tool, which detects common Java programming mistakes and reports them as compile errors."
+ },
- "martinprobst": {
- "name": "Martin Probst",
- "picture": "/resources/images/bios/martin-probst.jpg",
- "twitter": "martin_probst",
- "website": "http://probst.io",
- "bio": "Martin is a software engineer at Google in the AngularJS team. He holds a MSc in Software Engineering from HPI in Potsdam, Germany. Before joining the AngularJS team at Google, he worked at a database startup in the Netherlands, at EMC, at SAP, and as a freelancer. In his free time, he likes to cook and sail, not necessarily at the same time."
- },
+ "martinprobst": {
+ "name": "Martin Probst",
+ "picture": "/resources/images/bios/martin-probst.jpg",
+ "twitter": "martin_probst",
+ "website": "http://probst.io",
+ "bio": "Martin is a software engineer at Google in the AngularJS team. He holds a MSc in Software Engineering from HPI in Potsdam, Germany. Before joining the AngularJS team at Google, he worked at a database startup in the Netherlands, at EMC, at SAP, and as a freelancer. In his free time, he likes to cook and sail, not necessarily at the same time."
+ },
- "yegor": {
- "name": "Yegor Jbanov",
- "picture": "/resources/images/bios/yegor.jpg",
- "twitter": "AngularJS",
- "website": "http://google.com/+YegorJbanov",
- "bio": "I'm Yegor and I work on Angular 2 for Dart and performance."
- },
+ "yegor": {
+ "name": "Yegor Jbanov",
+ "picture": "/resources/images/bios/yegor.jpg",
+ "twitter": "BLANK",
+ "website": "http://google.com/+YegorJbanov",
+ "bio": "I'm Yegor and I work on Angular 2 for Dart and performance."
+ },
- "julieralph": {
- "name": "Julie Ralph",
- "picture": "/resources/images/bios/julie-ralph.jpg",
- "twitter": "SomeJulie",
- "website": "https://plus.google.com/+JulieRalph",
- "bio": "Julie Ralph works as a Software Engineer in Test at Google in Seattle and is the lead developer on the Angular end-to-end testing framework Protractor."
- },
+ "julieralph": {
+ "name": "Julie Ralph",
+ "picture": "/resources/images/bios/julie-ralph.jpg",
+ "twitter": "SomeJulie",
+ "website": "https://plus.google.com/+JulieRalph",
+ "bio": "Julie Ralph works as a Software Engineer in Test at Google in Seattle and is the lead developer on the Angular end-to-end testing framework Protractor."
+ },
- "alexrickabaugh": {
- "name": "Alex Rickabaugh",
- "picture": "/resources/images/bios/alex-rickabaugh.jpg",
- "twitter": "synalx",
- "website": "https://plus.google.com/+AlexRickabaugh/about",
- "bio": "I am a new member of the Angular team, solving challenges of data access and RPC for applications of any scale."
- },
+ "alexrickabaugh": {
+ "name": "Alex Rickabaugh",
+ "picture": "/resources/images/bios/alex-rickabaugh.jpg",
+ "twitter": "synalx",
+ "website": "https://plus.google.com/+AlexRickabaugh/about",
+ "bio": "I am a new member of the Angular team, solving challenges of data access and RPC for applications of any scale."
+ },
- "naomi": {
- "name": "Naomi Black",
- "picture": "/resources/images/bios/naomi.jpg",
- "twitter": "naomitraveller",
- "website": "http://google.com/+NaomiBlack",
- "bio": "Naomi is the Technical Program Manager for Angular, including Angular Material and AngularDart. An unrepentant generalist, she's been at Google since 2006, leading projects ranging from Accessibility to Google Transit. She fights daleks in her spare time."
- },
+ "naomi": {
+ "name": "Naomi Black",
+ "picture": "/resources/images/bios/naomi.jpg",
+ "twitter": "naomitraveller",
+ "website": "http://google.com/+NaomiBlack",
+ "bio": "Naomi is the Technical Program Manager for Angular, including Angular Material and AngularDart. An unrepentant generalist, she's been at Google since 2006, leading projects ranging from Accessibility to Google Transit. She fights daleks in her spare time."
+ },
- "alexwolfe": {
- "name": "Alex Wolfe",
- "picture": "/resources/images/bios/alex-wolfe.jpg",
- "twitter": "alexwolfe",
- "website": "https://github.com/alexwolfe",
- "bio": "Alex is the Head of UX for Firebase at Google. He has been designing and building products for over 15 years and has helped grow over 10 startups in the valley. Prior to joining Firebase he was the the Head of UX/UI for AdRoll. Alex is an avid tennis player and a former Street Fighter 2 World Champion."
- },
+ "alexwolfe": {
+ "name": "Alex Wolfe",
+ "picture": "/resources/images/bios/alex-wolfe.jpg",
+ "twitter": "alexwolfe",
+ "website": "https://github.com/alexwolfe",
+ "bio": "Alex is the Head of UX for Firebase at Google. He has been designing and building products for over 15 years and has helped grow over 10 startups in the valley. Prior to joining Firebase he was the the Head of UX/UI for AdRoll. Alex is an avid tennis player and a former Street Fighter 2 World Champion."
+ },
- "berlinjohnson": {
- "name": "Ali Johnson",
- "picture": "/resources/images/bios/ali.jpg",
- "twitter": "berlinjohnson",
- "website": "http://www.berlinjohnson.com/",
- "bio": "I am a designer, illustrator, and biomedical engineer who loves combining creativity and science. Previously, I worked as a Cardiovascular Modeling and Simulation engineer where I built complex 3D and computational models of the human cardiovascular system based on patient-specific medical imaging data."
- }
+ "berlinjohnson": {
+ "name": "Ali Johnson",
+ "picture": "/resources/images/bios/ali.jpg",
+ "twitter": "berlinjohnson",
+ "website": "http://www.berlinjohnson.com/",
+ "bio": "I am a designer, illustrator, and biomedical engineer who loves combining creativity and science. Previously, I worked as a Cardiovascular Modeling and Simulation engineer where I built complex 3D and computational models of the human cardiovascular system based on patient-specific medical imaging data."
+ },
+
+ "matias": {
+ "name": "Matias Niemela",
+ "picture": "/resources/images/bios/matias.jpg",
+ "twitter": "yearofmoo",
+ "website": "http://yearofmoo.com",
+ "bio": "Matias Niemela is a fullstack web developer who has been programming & building websites for over 10 years, and a core team member of AngularJS for two years. In the spring of 2015 Matias will be moving to California to work on AngularJS full time at Google. In his free time Matias loves to build complex things and is always up for public speaking, travelling and tweaking his current Vim setup."
+ },
+
+ "marcy": {
+ "name": "Marcy Sutton",
+ "picture": "/resources/images/bios/marcy.jpg",
+ "twitter": "marcysutton",
+ "website": "http://marcysutton.com",
+ "bio": "Marcy Sutton is a developer at Substantial in Seattle working on Angular accessibility and Material Design. She is a primary contributor to ngAria, the accessibility module, as well as the author of a new accessibility plug-in for Protractor. She's also in love with riding bicycles."
+ },
+
+ "caitp": {
+ "name": "Caitlin Potter",
+ "picture": "/resources/images/bios/caitp-kitten.jpg",
+ "twitter": "caitp88",
+ "website": "BLANK",
+ "bio": "Prolific hacker, maker, breaker, and baker. Aims to make the web a viable and comfortable platform to work on."
+ },
+
+ "shahar": {
+ "name": "Shahar Talmi",
+ "picture": "/resources/images/bios/shahar.jpg",
+ "twitter": "shahata",
+ "website": "https://plus.google.com/+ShaharTalmi",
+ "bio": "Shahar is a full-stack architect at Wix, leading Wix Angular and client infrastructure. He has been writing software ranging between kernel drivers, massive servers and casual games for the better part of his life. In the last couple of years he's developed a major crush on web applications development and specifically on Angular. Shahar is a big fan of TDD and is doing his best to promote it within the javascript community."
+ },
+
+ "lucas": {
+ "name": "Lucas Mirelmann",
+ "picture": "/resources/images/bios/lucas-kitten.jpg",
+ "twitter": "lgalfaso",
+ "website": "BLANK",
+ "bio": "Lucas works as a Software Engineer at Google and is a core Angular contributor."
+ },
+
+ "thomas": {
+ "name": "Thomas Burleson",
+ "picture": "/resources/images/bios/thomas.jpg",
+ "twitter": "ThomasBurleson",
+ "website": "http://www.solutionOptimist.com",
+ "bio": "Thomas is a software Architect for commercial & open-source web solutions. Thomas is passionate about IoC, architecture patterns, and software excellence, and distributed team-development. Currently, he is the team lead for Angular Material and helps deliver the Angular Material reference implementation for Material Design. Check out the team's amazing work at http://material.angularjs.org."
+ },
+
+ "pete": {
+ "name": "Pete Bacon Darwin",
+ "picture": "/resources/images/bios/pete.jpg",
+ "twitter": "petebd",
+ "website": "http://www.bacondarwin.com",
+ "bio": "AngularJS 1.x Team Lead. Pete has been working on the core team since 2012 and became the team lead for the 1.x branch in November 2014. He has co-authored a book on AngularJS and regularly talks about and teaches Angular."
+ },
+
+ "tonyc": {
+ "name": "Tony Childs",
+ "picture": "/resources/images/bios/tonyc.jpg",
+ "twitter": "javatricks",
+ "website": "http://www.stupidjavatricks.com",
+ "bio": "Tony Childs is a consultant working for Google. He is a contributor to the Angular Material project and is responsible for the md-icon component."
+ },
+
+ "ryan": {
+ "name": "Ryan Schmukler",
+ "picture": "/resources/images/bios/ryan.jpg",
+ "twitter": "rschmukler",
+ "website": "http://slingingcode.com",
+ "bio": "Developer on ngMaterial. Full-stack JavaScript hacker. Open-source contributor with libraries totaling over 225K downloads."
+ },
+
+ "rmesserle": {
+ "name": "Robert Messerle",
+ "picture": "/resources/images/bios/rmesserle.jpg",
+ "twitter": "Bobbo_O",
+ "website": "BLANK",
+ "bio": "Robert is a software engineer on the Angular team at Google, working primarily on the Angular Material project."
+ },
+
+ "kathy": {
+ "name": "Kathy Walrath",
+ "picture": "/resources/images/bios/kathy.jpg",
+ "twitter": "kwalrath",
+ "website": "https://plus.google.com/+KathyWalrath",
+ "bio": "Kathy writes and edits docs about Dart and related technologies. Before Google, she worked at Sun, NeXT, and HP. Long ago, Kathy co-created and maintained The Java Tutorial."
+ }
}
}
}
diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade
index 08d00c34ba..89f75ec86b 100644
--- a/public/_includes/_footer.jade
+++ b/public/_includes/_footer.jade
@@ -9,8 +9,8 @@
ul.text-body
li Angular 2.0
- li Angular JS 1.X
- li Angular Dart 1.X
+ li Angular for JavaScript 1.X
+ li Angular for Dart 1.X
li Angular Material
li AngularFire
diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade
index 249f8a2786..bf95ba6e47 100644
--- a/public/_includes/_version-dropdown.jade
+++ b/public/_includes/_version-dropdown.jade
@@ -21,16 +21,16 @@ mixin tree(directory, urlPrefix, name, latest)
if language == 'js'
if version == "latest"
- title = 'JavaScript ' + jsLatest
+ title = 'Angular 2 for JavaScript'
else
- title = 'JavaScript ' + version
+ title = 'Angular ' + version + ' for JavaScript'
if language == 'dart'
if version == "latest"
- title = 'Dart ' + dartLatest
+ title = 'Angular 2 for Dart'
else
- title = 'Dart ' + version
+ title = 'Angular ' + version + ' for Dart'
@@ -40,8 +40,8 @@ nav.hero-subtitle.text-subhead.dropdown
div(class="dropdown-menu ng-hide" ng-show="showMenu")
- mixin tree(public.docs.js, "/docs/js", "JavaScript", jsLatest)
- mixin tree(public.docs.dart, "/docs/dart", "Dart", dartLatest)
+ mixin tree(public.docs.js, "/docs/js", "Angular 2 for JavaScript")
+ mixin tree(public.docs.dart, "/docs/dart", "Angular 2 for Dart")
ul
- li #{name} Angular 1.X
- li #{name} AngularDart 1.X
+ li #{name} Angular 1.X for JavaScript
+ li #{name} Angular 1.X for Dart
diff --git a/public/contribute.jade b/public/contribute.jade
index 3c276617a6..a59dfabdf2 100644
--- a/public/contribute.jade
+++ b/public/contribute.jade
@@ -3,22 +3,22 @@
p We'd love for you to contribute to our source code and to make Angular projects even better.
.l-sub-section
- h3 Angular JS
+ h3 Angular for JavaScript
p Angular is a development platform for building mobile and desktop web applications.
- a(href="https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular JS
+ a(href="https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular for JavaScript
.l-sub-section
h3 Angular Material
- p Our goal is to deliver a lean, lightweight set of AngularJS-native UI elements that implement the material design specification for use in Angular single-page applications (SPAs).
+ p Our goal is to deliver a lean, lightweight set of Angular-based UI elements that implement the material design specification for use in Angular single-page applications (SPAs).
a(href="https://github.com/angular/material/blob/master/docs/guides/CONTRIBUTING.md" class="button" md-button) Contribute to Angular Material
.l-sub-section
h3 AngularFire
- p AngularFire is the officially supported AngularJS binding for Firebase. Firebase is a full backend so you don't need servers to build your Angular app.
+ p AngularFire is the officially supported Angular binding for Firebase. Firebase is a full backend so you don't need servers to build your Angular app.
a(href="https://github.com/firebase/angularFire" class="button" md-button) Contribute to AngularFire
diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json
index 9e45c45384..625f3be00a 100644
--- a/public/docs/dart/latest/_data.json
+++ b/public/docs/dart/latest/_data.json
@@ -3,7 +3,7 @@
"icon": "home",
"title": "Angular Docs",
"menuTitle": "Docs Home",
- "banner": "Angular 2 is currently in Alpha Preview. We recommend using AngularDart 1.X for production applications."
+ "banner": "Angular 2 is currently in Alpha Preview. We recommend using Angular for Dart for production applications."
},
"quickstart": {
diff --git a/public/download/_data.json b/public/download/_data.json
index eacf067dd4..106d102900 100644
--- a/public/download/_data.json
+++ b/public/download/_data.json
@@ -1,25 +1,23 @@
{
"index": {
"title": "Setup & Install Angular",
- "subtitle": "Choose from our list of Frameworks",
+ "subtitle": "Choose from our list of frameworks",
"downloads": {
"Angular_2": {
- "description": "Angular 2.0 is currently in alpha preview. Angular 2 is a development platform for building mobile and desktop web applications",
- "2.0.0-alpha.11": {
+ "description": "Angular 2 is currently in Alpha Preview for JavaScript and Dart.",
+ "2.0.0-alpha for JavaScript": {
"npm": "https://www.npmjs.com/package/angular2"
+ },
+ "2.0.0-alpha for Dart": {
+ "pub": "https://pub.dartlang.org/packages/angular2#installing"
}
},
- "AngularDart_2": {
- "description": "AngularDart 2.0 is currently in alpha preview. AngularDart 2.0 is a development platform for building mobile and desktop web applications",
- "2.0.0-alpha.12": {
- "npm": "https://pub.dartlang.org/packages/angular2"
- }
- },
+
"Angular_1.X": {
- "description": "The production ready version of Angular JS",
+ "description": "The production ready version of Angular for JavaScript",
"1.X": {
"file": "https://code.angularjs.org/"
@@ -27,7 +25,7 @@
},
"AngularDart_1.X": {
- "description": "The production ready version of AngularDart",
+ "description": "The production ready version of Angular for Dart",
"1.X": {
"file": "https://angulardart.org/"
@@ -35,7 +33,7 @@
},
"AngularFire_1.X": {
- "description": "AngularFire is the officially supported AngularJS binding for Firebase.",
+ "description": "AngularFire is the officially supported Angular binding for Firebase.",
"1.X": {
"file": "https://www.firebase.com/docs/web/libraries/angular/index.html"
}
diff --git a/public/download/index.jade b/public/download/index.jade
index 0c55be8b63..7009223790 100644
--- a/public/download/index.jade
+++ b/public/download/index.jade
@@ -19,5 +19,8 @@
li Download for #{name}
if version.npm
- li NPM installion for #{name}
+ li NPM installation for #{name}
+
+ if version.pub
+ li Pub installation for #{name}
diff --git a/public/features.jade b/public/features.jade
index b95063e3c0..f4f8dd234f 100644
--- a/public/features.jade
+++ b/public/features.jade
@@ -14,7 +14,7 @@
.sticker
.c7
h3.text-headline.text-uppercase Future Ready
- p.text-body Angular 2 is written in written in ECMAScript 6, with the addition of TypeScript types and annotations. ES6 allows us to benefit from the best of JavaScript, while writing clean and easy-to-read code.
+ p.text-body Angular 2 is written in written in ECMAScript 6, with the addition of types and annotations. ES6 allows us to benefit from the best of JavaScript, while writing clean and easy-to-read code.
diff --git a/public/resources/images/bios/caitp-kitten.jpg b/public/resources/images/bios/caitp-kitten.jpg
new file mode 100644
index 0000000000..749e2bd476
Binary files /dev/null and b/public/resources/images/bios/caitp-kitten.jpg differ
diff --git a/public/resources/images/bios/kathy.jpg b/public/resources/images/bios/kathy.jpg
new file mode 100644
index 0000000000..e6787b1cbf
Binary files /dev/null and b/public/resources/images/bios/kathy.jpg differ
diff --git a/public/resources/images/bios/lucas-kitten.jpg b/public/resources/images/bios/lucas-kitten.jpg
new file mode 100644
index 0000000000..08ff63da2f
Binary files /dev/null and b/public/resources/images/bios/lucas-kitten.jpg differ
diff --git a/public/resources/images/bios/marcy.jpg b/public/resources/images/bios/marcy.jpg
new file mode 100644
index 0000000000..ea4fff5e83
Binary files /dev/null and b/public/resources/images/bios/marcy.jpg differ
diff --git a/public/resources/images/bios/matias.jpg b/public/resources/images/bios/matias.jpg
new file mode 100644
index 0000000000..3e707e4dda
Binary files /dev/null and b/public/resources/images/bios/matias.jpg differ
diff --git a/public/resources/images/bios/pete.jpg b/public/resources/images/bios/pete.jpg
new file mode 100644
index 0000000000..704a3cde5c
Binary files /dev/null and b/public/resources/images/bios/pete.jpg differ
diff --git a/public/resources/images/bios/rmesserle.jpg b/public/resources/images/bios/rmesserle.jpg
new file mode 100644
index 0000000000..5eb0ba8386
Binary files /dev/null and b/public/resources/images/bios/rmesserle.jpg differ
diff --git a/public/resources/images/bios/ryan.jpg b/public/resources/images/bios/ryan.jpg
new file mode 100644
index 0000000000..09d1e58b4c
Binary files /dev/null and b/public/resources/images/bios/ryan.jpg differ
diff --git a/public/resources/images/bios/shahar.jpg b/public/resources/images/bios/shahar.jpg
new file mode 100644
index 0000000000..172b9d2d7e
Binary files /dev/null and b/public/resources/images/bios/shahar.jpg differ
diff --git a/public/resources/images/bios/thomas.jpg b/public/resources/images/bios/thomas.jpg
new file mode 100644
index 0000000000..3f54b8c133
Binary files /dev/null and b/public/resources/images/bios/thomas.jpg differ
diff --git a/public/resources/images/bios/tonyc.jpg b/public/resources/images/bios/tonyc.jpg
new file mode 100644
index 0000000000..93cfbfa8af
Binary files /dev/null and b/public/resources/images/bios/tonyc.jpg differ