diff --git a/README.md b/README.md index 37462abe29..cf1296f0a2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Angular.io -Angular.io is currently the preview site for Angular 2. This site also includes links to other helpful angular resources including Angular 1.X, Angular Material, and AngularFire. +Angular.io is currently the preview site for Angular 2. This site also includes links to other helpful angular resources including Angular 1, Angular Material, and AngularFire. ## How you can help - [File an issue on github](https://github.com/angular/angular.io/issues) diff --git a/harp.json b/harp.json index 1f8a7b4111..99d20df193 100644 --- a/harp.json +++ b/harp.json @@ -45,7 +45,7 @@ "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." + "bio": "Angular 1 for JS Team Lead. Pete has been working on the core team since 2012 and became the team lead for the Angular 1 for JS branch in November 2014. He has co-authored a book on AngularJS and regularly talks about and teaches Angular." }, "victorsavkin": { @@ -106,7 +106,7 @@ "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." + "bio": "Alex works on language tooling for JavaScript and TypeScript. 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": { diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade index 80d77a15bf..1a175e9d2b 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 1 for JS + li Angular 1 for Dart li Angular Material li AngularFire diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade index 4fd77b376b..bd8235d47e 100644 --- a/public/_includes/_version-dropdown.jade +++ b/public/_includes/_version-dropdown.jade @@ -50,5 +50,5 @@ nav.hero-subtitle.text-subhead.dropdown 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 for JavaScript - li #{name} Angular 1.X for Dart + li #{name} Angular 1 for JavaScript + li #{name} Angular 1 for Dart diff --git a/public/docs/dart/latest/_data.json b/public/docs/dart/latest/_data.json index 82ecace6b1..38c95d62d6 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 Angular for Dart for production applications." + "banner": "Angular 2 is currently in Developer Preview. We recommend using Angular for Dart for production applications." }, "quickstart": { @@ -14,7 +14,7 @@ "guide": { "icon": "list", "title": "Step By Step Guide", - "banner": "Angular 2 is currently in Alpha Preview. For AngularDart 1.X resources, visit angulardart.org." + "banner": "Angular 2 is currently in Developer Preview. For AngularDart 1.X resources, visit angulardart.org." }, "api": { @@ -25,7 +25,7 @@ "resources": { "icon": "play-circle-fill", "title": "Angular Resources", - "banner": "Angular 2 is currently in Alpha Preview. For Angular 1.X Resources please visit Angularjs.org." + "banner": "Angular 2 is currently in Developer Preview. For AngularDart 1.X resources, visit angulardart.org." }, "help": { diff --git a/public/docs/dart/latest/api/index.jade b/public/docs/dart/latest/api/index.jade index b23313ae2e..367ee3c38d 100644 --- a/public/docs/dart/latest/api/index.jade +++ b/public/docs/dart/latest/api/index.jade @@ -10,7 +10,7 @@ Angular 2 API Preview (JavaScript) .l-sub-section - h3 Angular 1.X for Production + h3 Angular 1 for Production p. If you're building a production app today, please use AngularDart 1.X. diff --git a/public/docs/dart/latest/quickstart.jade b/public/docs/dart/latest/quickstart.jade index 854af5e90d..ffbddb8cd4 100644 --- a/public/docs/dart/latest/quickstart.jade +++ b/public/docs/dart/latest/quickstart.jade @@ -1,5 +1,5 @@ .callout.is-helpful - header Angular 2 is currently in Alpha Preview + header Angular 2 is currently in Developer Preview p. We recommend using Angular for Dart diff --git a/public/docs/js/latest/_data.json b/public/docs/js/latest/_data.json index be0f486eb8..1db7291142 100644 --- a/public/docs/js/latest/_data.json +++ b/public/docs/js/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 Angular 1.X for production applications." + "banner": "Angular 2 is currently in Developer Preview. We recommend using Angular 1.X for production applications." }, "quickstart": { @@ -14,7 +14,7 @@ "guide": { "icon": "list", "title": "Step By Step Guide", - "banner": "Angular 2 is currently in Alpha Preview. For Angular 1.X Resources please visit Angularjs.org." + "banner": "Angular 2 is currently in Developer Preview. For Angular 1.X Resources please visit Angularjs.org." }, "api": { @@ -25,7 +25,7 @@ "resources": { "icon": "play-circle-fill", "title": "Angular Resources", - "banner": "Angular 2 is currently in Alpha Preview. For Angular 1.X Resources please visit Angularjs.org." + "banner": "Angular 2 is currently in Developer Preview. For Angular 1.X Resources please visit Angularjs.org." }, "help": { diff --git a/public/docs/js/latest/quickstart.jade b/public/docs/js/latest/quickstart.jade index e946e3a462..0de9dabb79 100644 --- a/public/docs/js/latest/quickstart.jade +++ b/public/docs/js/latest/quickstart.jade @@ -1,9 +1,9 @@ .callout.is-helpful - header Angular is in alpha + header Angular is in developer preview p. This quickstart does not reflect the final development process for Angular. The following setup is for those who - want to try out Angular while it is in alpha. + want to try out Angular while it is in developer preview. // STEP 1 - Create a project ########################## .l-main-section @@ -11,7 +11,7 @@ p. This quickstart shows how to write your Angular components in TypeScript. You could instead choose - another language such as Dart, ES5, or ES6. + another language such as Dart, ES5, or ES6. p. The goal of this quickstart is to write a component in TypeScript that prints a string. diff --git a/public/download/_data.json b/public/download/_data.json index 106d102900..35e900d502 100644 --- a/public/download/_data.json +++ b/public/download/_data.json @@ -5,7 +5,7 @@ "downloads": { "Angular_2": { - "description": "Angular 2 is currently in Alpha Preview for JavaScript and Dart.", + "description": "Angular 2 is currently in Developer Preview for JavaScript and Dart.", "2.0.0-alpha for JavaScript": { "npm": "https://www.npmjs.com/package/angular2" }, @@ -40,7 +40,7 @@ }, "AngularMaterial_1.X": { - "description": "The Angular Material project is an implementation of Material Design in Angular.js.", + "description": "The Angular Material project is an implementation of Material Design in Angular 1 for JS.", "1.X": { "file": "https://material.angularjs.org/#/getting-started" }