diff --git a/README.md b/README.md index a9d982cd3b..c291cccc6e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Angular.io [![Build Status][travis-badge]][travis-badge-url] -Angular.io is site for Angular 2 **documentation** . +Angular.io is site for Angular **documentation** . This site also includes links to other helpful angular resources including Angular 2, Angular 1, Angular Material, and AngularFire. @@ -77,7 +77,7 @@ Such code resides in the `public/docs/_examples` directory, under page-specific For example, the TypeScript QuickStart sample is in `public/docs/_examples/quickstart/ts`. -All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular 2. +All samples are in a consistent directory structure using the same styles and the same npm packages, including the latest release of Angular. This consistency is possible in part thanks to gulp-driven tooling. To run the samples locally and confirm that they work properly, take the following extra steps to prepare the environment: diff --git a/gulpfile.js b/gulpfile.js index 36185cfb30..80b6839cde 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -461,7 +461,7 @@ gulp.task('_copy-example-boilerplate', function (done) { return argv.fast ? done() : buildStyles(copyExampleBoilerplate, done); }); -//Builds Angular 2 Docs CSS file from Bootstrap npm LESS source +//Builds Angular Docs CSS file from Bootstrap npm LESS source //and copies the result to the _examples folder to be included as //part of the example boilerplate. function buildStyles(cb, done){ diff --git a/harp.json b/harp.json index 38277fcd4a..4a8328d35e 100644 --- a/harp.json +++ b/harp.json @@ -85,7 +85,7 @@ "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.", + "bio": "Tobias Bosch is a software engineer at Google. He is part of the Angular core team and works on Angular.", "type": "Google" }, @@ -184,7 +184,7 @@ "picture": "/resources/images/bios/hansl.jpg", "twitter": "hanslatwork", "website": "http://www.codingatwork.com/", - "bio": "Hans is a software engineer at Google on the Angular team and was previously at Slack. He works everyday to help make it easier for everyone to create beautiful, consistent web applications using Angular2, using Material Design components and the CLI tool.", + "bio": "Hans is a software engineer at Google on the Angular team and was previously at Slack. He works everyday to help make it easier for everyone to create beautiful, consistent web applications using Angular, using Material Design components and the CLI tool.", "type": "Google" }, @@ -360,7 +360,7 @@ "picture": "/resources/images/bios/marclaval.jpg", "twitter": "marclaval", "website": "https://github.com/mlaval", - "bio": "Marc is a manager at Amadeus where he leads the team in charge of developing and recommending UI frameworks for the company. He is also an open source developer and a contributor to Angular 2.", + "bio": "Marc is a manager at Amadeus where he leads the team in charge of developing and recommending UI frameworks for the company. He is also an open source developer and a contributor to Angular.", "type": "Community" }, @@ -378,7 +378,7 @@ "picture": "/resources/images/bios/patrick-stapleton.jpg", "twitter": "gdi2290", "website": "https://angularclass.com", - "bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular2, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular 2 server-side rendering as Universal Angular 2 and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.", + "bio": "Also know as PatrickJS where JS stands for his middle and last names. Patrick is very active in Open-Source with over 4,300+ contributions in the last year alone on projects such as Angular2, AngularJS, FalcorJS, Docker, Bootstrap, gulp, and redis to name a few. He is also working on the development of Angular server-side rendering as Universal Angular and teaching Modern Web Development at AngularClass. He was previously the CTO of Keychain Logistics, a HackReactor Instructor and Alum.", "type": "Community" }, diff --git a/package.json b/package.json index 71125dcd07..5ab4ceea6d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "angular.io", "version": "0.0.0", "private": true, - "description": "Angular 2 documentation", + "description": "Angular documentation", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade index 659591edb8..62a9e97016 100644 --- a/public/_includes/_footer.jade +++ b/public/_includes/_footer.jade @@ -17,7 +17,7 @@ else h3.text-headline RESOURCES ul.text-body - // TODO: (ericjim) make a libraries page to showcase all angular 2 libraries + // TODO: (ericjim) make a libraries page to showcase all angular libraries //li Libraries li About li Books & Training diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade index 2e46febe96..a0c7429fa1 100644 --- a/public/_includes/_head-include.jade +++ b/public/_includes/_head-include.jade @@ -12,7 +12,7 @@ if title == "Angular" else if language title #{title} - #{language} else - title #{title} - Angular 2 + title #{title} - Angular meta(charset="utf-8") meta(http-equiv="X-UA-Compatible" content="IE=edge") @@ -22,14 +22,14 @@ meta(name="robots" content="all") meta(name="referrer" content="origin") meta(name="viewport" id="viewport" content="width=device-width, initial-scale=1") -meta(property="og:title" content="Angular 2") +meta(property="og:title" content="Angular") meta(property="og:image" content="/resources/images/logos/standard/shield-large.png") meta(property="og:image:type" content="image/png") meta(property="og:image:width" content="184") meta(property="og:image:height" content="200") meta(property="og:description" content="#{description}") -meta(itemprop="name" content="Angular 2") +meta(itemprop="name" content="Angular") meta(itemprop="description" content="#{description}") meta(itemprop="image" content="https://angular.io/resources/images/logos/standard/shield-large.png") @@ -57,4 +57,4 @@ link(rel="stylesheet" href="/resources/css/main.css") - \ No newline at end of file + diff --git a/public/_includes/_version-dropdown.jade b/public/_includes/_version-dropdown.jade index 5d61619ae7..2b5162b391 100644 --- a/public/_includes/_version-dropdown.jade +++ b/public/_includes/_version-dropdown.jade @@ -44,20 +44,20 @@ mixin tree(directory, urlPrefix, name, latest) //- BUTTON TITLE GENERATION if language == 'ts' if version == "latest" - - var title = 'Angular 2 for TypeScript' + - var title = 'Angular for TypeScript' else - var title = 'Angular ' + version + ' for TypeScript' if language == 'js' if version == "latest" - - var title = 'Angular 2 for JavaScript' + - var title = 'Angular for JavaScript' else - var title = 'Angular ' + version + ' for JavaScript' if language == 'dart' if version == "latest" - - var title = 'Angular 2 for Dart' + - var title = 'Angular for Dart' else - var title = 'Angular ' + version + ' for Dart' @@ -69,8 +69,8 @@ nav.dropdown ul(class="dropdown-menu" ng-class="appCtrl.showMenu ? 'is-visible' : ''") - mixin tree(public.docs.ts, "/docs/ts", "Angular 2 for TypeScript") - mixin tree(public.docs.js, "/docs/js", "Angular 2 for JavaScript") + mixin tree(public.docs.ts, "/docs/ts", "Angular for TypeScript") + mixin tree(public.docs.js, "/docs/js", "Angular for JavaScript") //- Disable cross-language link for API entry pages (but keep for top API search page): if ! (current.path[3] === 'api' && public.docs[current.path[1]][current.path[2]][current.path[3]][current.path[4]]) - mixin tree(public.docs.dart, "/docs/dart", "Angular 2 for Dart") + mixin tree(public.docs.dart, "/docs/dart", "Angular for Dart") diff --git a/public/contribute.jade b/public/contribute.jade index 002c8da4a1..994d46a36d 100644 --- a/public/contribute.jade +++ b/public/contribute.jade @@ -3,11 +3,11 @@ p We'd love for you to contribute to our source code and to make Angular projects even better. .l-sub-section - h3 Angular 2 + h3 Angular - p Angular 2 is a next generation mobile and desktop application development platform. + p Angular is a next generation mobile and desktop application development platform. - a(href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular 2 + a(href="https://github.com/angular/angular/blob/master/CONTRIBUTING.md" class="button" md-button) Contribute to Angular .l-sub-section h3 Angular for JavaScript or Dart diff --git a/public/docs/_examples/_protractor/protractor.config.js b/public/docs/_examples/_protractor/protractor.config.js index fc68f03b98..2452bea764 100644 --- a/public/docs/_examples/_protractor/protractor.config.js +++ b/public/docs/_examples/_protractor/protractor.config.js @@ -26,7 +26,7 @@ exports.config = { // Framework to use. Jasmine is recommended. framework: 'jasmine', - // For angular2 tests + // For angular tests useAllAngular2AppRoots: true, // Base URL for application server diff --git a/public/docs/_examples/animations/e2e-spec.ts b/public/docs/_examples/animations/e2e-spec.ts index 9b6319db66..31eefbf345 100644 --- a/public/docs/_examples/animations/e2e-spec.ts +++ b/public/docs/_examples/animations/e2e-spec.ts @@ -4,7 +4,7 @@ * The tests here basically just checking that the end styles * of each animation are in effect. * - * Relies on the Angular 2 testability only becoming stable once + * Relies on the Angular testability only becoming stable once * animation(s) have finished. * * Ideally we'd use https://developer.mozilla.org/en-US/docs/Web/API/Document/getAnimations diff --git a/public/docs/_examples/animations/ts/plnkr.json b/public/docs/_examples/animations/ts/plnkr.json index 5a4139282b..4fface319e 100644 --- a/public/docs/_examples/animations/ts/plnkr.json +++ b/public/docs/_examples/animations/ts/plnkr.json @@ -1,5 +1,5 @@ { - "description": "Angular 2 Animations", + "description": "Angular Animations", "files":[ "!**/*.d.ts", "!**/*.js" diff --git a/public/docs/_examples/architecture/dart/web/index.html b/public/docs/_examples/architecture/dart/web/index.html index a422e64542..840f107c53 100644 --- a/public/docs/_examples/architecture/dart/web/index.html +++ b/public/docs/_examples/architecture/dart/web/index.html @@ -1,7 +1,7 @@ - Architecture of Angular 2 + Architecture of Angular diff --git a/public/docs/_examples/architecture/e2e-spec.ts b/public/docs/_examples/architecture/e2e-spec.ts index 54bf9be8f2..0bdcdd0069 100644 --- a/public/docs/_examples/architecture/e2e-spec.ts +++ b/public/docs/_examples/architecture/e2e-spec.ts @@ -10,7 +10,7 @@ class Hero { describe('Architecture', () => { - const expectedTitle = 'Architecture of Angular 2'; + const expectedTitle = 'Architecture of Angular'; const expectedH2 = ['Hero List', 'Sales Tax Calculator']; beforeAll(() => browser.get('')); diff --git a/public/docs/_examples/architecture/ts/app/mini-app.ts b/public/docs/_examples/architecture/ts/app/mini-app.ts index 8a35a607a2..b064428be3 100644 --- a/public/docs/_examples/architecture/ts/app/mini-app.ts +++ b/public/docs/_examples/architecture/ts/app/mini-app.ts @@ -13,7 +13,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'my-app', - template: 'Welcome to Angular 2' + template: 'Welcome to Angular' }) export class AppComponent { constructor(logger: Logger) { diff --git a/public/docs/_examples/architecture/ts/index.html b/public/docs/_examples/architecture/ts/index.html index e365c39f02..090bd17c7b 100644 --- a/public/docs/_examples/architecture/ts/index.html +++ b/public/docs/_examples/architecture/ts/index.html @@ -1,7 +1,7 @@ - Architecture of Angular 2 + Architecture of Angular diff --git a/public/docs/_examples/architecture/ts/mini-app.html b/public/docs/_examples/architecture/ts/mini-app.html index a17a191e90..ecb7dd21ae 100644 --- a/public/docs/_examples/architecture/ts/mini-app.html +++ b/public/docs/_examples/architecture/ts/mini-app.html @@ -1,7 +1,7 @@ - Architecture of Angular 2 + Architecture of Angular diff --git a/public/docs/_examples/architecture/ts/plnkr.json b/public/docs/_examples/architecture/ts/plnkr.json index 3acf69014c..9a4180a9d4 100644 --- a/public/docs/_examples/architecture/ts/plnkr.json +++ b/public/docs/_examples/architecture/ts/plnkr.json @@ -1,5 +1,5 @@ { - "description": "Intro to Angular2", + "description": "Intro to Angular", "files":[ "!**/*.d.ts", "!**/*.js", diff --git a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts index 1f7c00704c..fe72681ee3 100644 --- a/public/docs/_examples/cb-aot-compiler/e2e-spec.ts +++ b/public/docs/_examples/cb-aot-compiler/e2e-spec.ts @@ -9,7 +9,7 @@ describe('AOT Compilation', function () { it('should load page and click button', function (done) { let headingSelector = element.all(by.css('h1')).get(0); - expect(headingSelector.getText()).toEqual('My First Angular 2 App'); + expect(headingSelector.getText()).toEqual('My First Angular App'); expect(element.all(by.xpath('//div[text()="Magneta"]')).get(0).isPresent()).toBe(true); expect(element.all(by.xpath('//div[text()="Bombasto"]')).get(0).isPresent()).toBe(true); diff --git a/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html b/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html index c6a7babb8b..4d7dd8c63f 100644 --- a/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html +++ b/public/docs/_examples/cb-aot-compiler/ts/app/app.component.html @@ -1,6 +1,6 @@ -

My First Angular 2 App

+

My First Angular App

List of Heroes

{{hero}}
diff --git a/public/docs/_examples/cb-set-document-title/ts/plnkr.json b/public/docs/_examples/cb-set-document-title/ts/plnkr.json index 0131610c20..1863d49471 100644 --- a/public/docs/_examples/cb-set-document-title/ts/plnkr.json +++ b/public/docs/_examples/cb-set-document-title/ts/plnkr.json @@ -1,5 +1,5 @@ { - "description": "Set The Document Title In Angular 2", + "description": "Set The Document Title In Angular", "files": [ "!**/*.d.ts", "!**/*.js", diff --git a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled index f214b75d93..ef30b01ec1 100644 --- a/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled +++ b/public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled @@ -7,6 +7,6 @@ describe('cli-quickstart App', () => { it('should display message saying app works', () => { let pageTitle = element(by.css('cli-quickstart-app h1')).getText(); - expect(pageTitle).toEqual('My First Angular 2 App'); + expect(pageTitle).toEqual('My First Angular App'); }); }); diff --git a/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts b/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts index 5510df7476..8c6b3a43cc 100644 --- a/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts +++ b/public/docs/_examples/cli-quickstart/ts/src/app/cli-quickstart.component.ts @@ -12,6 +12,6 @@ import { Component } from '@angular/core'; // #enddocregion metadata // #docregion title, class export class CliQuickstartAppComponent { - title = 'My First Angular 2 App'; + title = 'My First Angular App'; } // #enddocregion title, class diff --git a/public/docs/_examples/homepage-hello-world/ts/index.1.html b/public/docs/_examples/homepage-hello-world/ts/index.1.html index aa342316ab..5637880406 100644 --- a/public/docs/_examples/homepage-hello-world/ts/index.1.html +++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html @@ -2,7 +2,7 @@ - Angular 2 Hello World + Angular Hello World diff --git a/public/docs/_examples/homepage-hello-world/ts/index.html b/public/docs/_examples/homepage-hello-world/ts/index.html index 794935d3bb..283343ace7 100644 --- a/public/docs/_examples/homepage-hello-world/ts/index.html +++ b/public/docs/_examples/homepage-hello-world/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Hello World + Angular Hello World diff --git a/public/docs/_examples/homepage-tabs/ts/index.1.html b/public/docs/_examples/homepage-tabs/ts/index.1.html index 600739b704..6ff25956dc 100644 --- a/public/docs/_examples/homepage-tabs/ts/index.1.html +++ b/public/docs/_examples/homepage-tabs/ts/index.1.html @@ -2,7 +2,7 @@ - Angular 2 Tabs + Angular Tabs diff --git a/public/docs/_examples/homepage-tabs/ts/index.html b/public/docs/_examples/homepage-tabs/ts/index.html index 1fe2ebc8ba..66ce8f3ecc 100644 --- a/public/docs/_examples/homepage-tabs/ts/index.html +++ b/public/docs/_examples/homepage-tabs/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Tabs + Angular Tabs diff --git a/public/docs/_examples/homepage-todo/ts/index.1.html b/public/docs/_examples/homepage-todo/ts/index.1.html index 181cf44ce2..26800d3e05 100644 --- a/public/docs/_examples/homepage-todo/ts/index.1.html +++ b/public/docs/_examples/homepage-todo/ts/index.1.html @@ -2,7 +2,7 @@ - Angular 2 Todos + Angular Todos diff --git a/public/docs/_examples/homepage-todo/ts/index.html b/public/docs/_examples/homepage-todo/ts/index.html index 2bddce017c..8839065224 100644 --- a/public/docs/_examples/homepage-todo/ts/index.html +++ b/public/docs/_examples/homepage-todo/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Todos + Angular Todos diff --git a/public/docs/_examples/lifecycle-hooks/ts/index.html b/public/docs/_examples/lifecycle-hooks/ts/index.html index 6fa866c6e6..07cf7d4a03 100644 --- a/public/docs/_examples/lifecycle-hooks/ts/index.html +++ b/public/docs/_examples/lifecycle-hooks/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Lifecycle Hooks + Angular Lifecycle Hooks diff --git a/public/docs/_examples/plunker.README.md b/public/docs/_examples/plunker.README.md index 5bcc99414d..fa2e46f47a 100644 --- a/public/docs/_examples/plunker.README.md +++ b/public/docs/_examples/plunker.README.md @@ -1,2 +1,2 @@ -### Angular 2 Documentation Example +### Angular Documentation Example diff --git a/public/docs/_examples/quickstart/e2e-spec.ts b/public/docs/_examples/quickstart/e2e-spec.ts index 4a6d169756..5a1c683cfd 100644 --- a/public/docs/_examples/quickstart/e2e-spec.ts +++ b/public/docs/_examples/quickstart/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; describe('QuickStart E2E Tests', function () { - let expectedMsg = 'My First Angular 2 App'; + let expectedMsg = 'My First Angular App'; beforeEach(function () { browser.get(''); diff --git a/public/docs/_examples/quickstart/js/app/app.component.js b/public/docs/_examples/quickstart/js/app/app.component.js index f86b3bde46..69d3e9127e 100644 --- a/public/docs/_examples/quickstart/js/app/app.component.js +++ b/public/docs/_examples/quickstart/js/app/app.component.js @@ -10,7 +10,7 @@ ng.core.Component({ // #enddocregion ng-namespace-funcs selector: 'my-app', - template: '

My First Angular 2 App

' + template: '

My First Angular App

' // #docregion ng-namespace-funcs }) // #enddocregion component diff --git a/public/docs/_examples/quickstart/js/index.html b/public/docs/_examples/quickstart/js/index.html index 551e4fb134..03fcbb37c4 100644 --- a/public/docs/_examples/quickstart/js/index.html +++ b/public/docs/_examples/quickstart/js/index.html @@ -2,7 +2,7 @@ - Angular 2 QuickStart JS + Angular QuickStart JS diff --git a/public/docs/_examples/quickstart/ts/app/app.component.ts b/public/docs/_examples/quickstart/ts/app/app.component.ts index ea76b32116..e6c635440b 100644 --- a/public/docs/_examples/quickstart/ts/app/app.component.ts +++ b/public/docs/_examples/quickstart/ts/app/app.component.ts @@ -6,7 +6,7 @@ import { Component } from '@angular/core'; // #docregion metadata @Component({ selector: 'my-app', - template: '

My First Angular 2 App

' + template: '

My First Angular App

' }) // #enddocregion metadata // #docregion class diff --git a/public/docs/_examples/quickstart/ts/index.html b/public/docs/_examples/quickstart/ts/index.html index fef30ef98b..4ee082433c 100644 --- a/public/docs/_examples/quickstart/ts/index.html +++ b/public/docs/_examples/quickstart/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 QuickStart + Angular QuickStart diff --git a/public/docs/_examples/quickstart/ts/package.1.json b/public/docs/_examples/quickstart/ts/package.1.json index 4fe519331e..35efebb2c2 100644 --- a/public/docs/_examples/quickstart/ts/package.1.json +++ b/public/docs/_examples/quickstart/ts/package.1.json @@ -1,5 +1,5 @@ { - "name": "angular2-quickstart", + "name": "angular-quickstart", "version": "1.0.0", "scripts": { "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ", diff --git a/public/docs/_examples/quickstart/ts/systemjs.config.1.js b/public/docs/_examples/quickstart/ts/systemjs.config.1.js index d92e1361d0..852c46168d 100644 --- a/public/docs/_examples/quickstart/ts/systemjs.config.1.js +++ b/public/docs/_examples/quickstart/ts/systemjs.config.1.js @@ -1,6 +1,6 @@ // #docregion /** - * System configuration for Angular 2 samples + * System configuration for Angular samples * Adjust as necessary for your application needs. */ (function (global) { diff --git a/public/docs/_examples/server-communication/ts/index.html b/public/docs/_examples/server-communication/ts/index.html index c2d2656c84..d265bef2f9 100644 --- a/public/docs/_examples/server-communication/ts/index.html +++ b/public/docs/_examples/server-communication/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Http Demo + Angular Http Demo diff --git a/public/docs/_examples/structural-directives/ts/index.html b/public/docs/_examples/structural-directives/ts/index.html index da815d8e69..2dc2548cc4 100644 --- a/public/docs/_examples/structural-directives/ts/index.html +++ b/public/docs/_examples/structural-directives/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Structural Directives + Angular Structural Directives diff --git a/public/docs/_examples/styleguide/e2e-spec.ts b/public/docs/_examples/styleguide/e2e-spec.ts index 6dc2753038..321e86c8a1 100644 --- a/public/docs/_examples/styleguide/e2e-spec.ts +++ b/public/docs/_examples/styleguide/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; describe('Documentation StyleGuide E2E Tests', function() { - let expectedMsg = 'My First Angular 2 App'; + let expectedMsg = 'My First Angular App'; beforeEach(function () { browser.get(''); diff --git a/public/docs/_examples/styleguide/js/app.js b/public/docs/_examples/styleguide/js/app.js index 61a0f2ae31..d38669cd78 100644 --- a/public/docs/_examples/styleguide/js/app.js +++ b/public/docs/_examples/styleguide/js/app.js @@ -8,7 +8,7 @@ app.AppComponent = selector: 'my-app', // #enddocregion // #docregion view - template: '

My First Angular 2 App

' + template: '

My First Angular App

' }) // #enddocregion // #docregion class @@ -48,7 +48,7 @@ app.AppComponent = function AppComponent () {} app.AppComponent.annotations = [ new ng.core.Component({ selector: 'my-app', - template: '

My First Angular 2 App

' + template: '

My First Angular App

' }) ]; // #enddocregion diff --git a/public/docs/_examples/styleguide/ts/app/app.component.ts b/public/docs/_examples/styleguide/ts/app/app.component.ts index 7659920b9f..8b71f6ddc4 100644 --- a/public/docs/_examples/styleguide/ts/app/app.component.ts +++ b/public/docs/_examples/styleguide/ts/app/app.component.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'my-app', - template: '

My First Angular 2 App

' + template: '

My First Angular App

' }) export class AppComponent { } diff --git a/public/docs/_examples/systemjs.config.js b/public/docs/_examples/systemjs.config.js index fa3e0cc61f..cc06fc9422 100644 --- a/public/docs/_examples/systemjs.config.js +++ b/public/docs/_examples/systemjs.config.js @@ -1,5 +1,5 @@ /** - * System configuration for Angular 2 samples + * System configuration for Angular samples * Adjust as necessary for your application needs. */ (function (global) { diff --git a/public/docs/_examples/systemjs.config.plunker.build.js b/public/docs/_examples/systemjs.config.plunker.build.js index 5334adf005..36ad2c7d16 100644 --- a/public/docs/_examples/systemjs.config.plunker.build.js +++ b/public/docs/_examples/systemjs.config.plunker.build.js @@ -1,7 +1,7 @@ /** * PLUNKER VERSION FOR CURRENT ANGULAR BUILD * (based on systemjs.config.js in angular.io) - * System configuration for Angular 2 samples + * System configuration for Angular samples * Adjust as necessary for your application needs. * * UNTESTED ! diff --git a/public/docs/_examples/systemjs.config.plunker.js b/public/docs/_examples/systemjs.config.plunker.js index 26b8a17aab..ccfee00019 100644 --- a/public/docs/_examples/systemjs.config.plunker.js +++ b/public/docs/_examples/systemjs.config.plunker.js @@ -1,7 +1,7 @@ /** * PLUNKER VERSION * (based on systemjs.config.js in angular.io) - * System configuration for Angular 2 samples + * System configuration for Angular samples * Adjust as necessary for your application needs. */ (function (global) { diff --git a/public/docs/_examples/toh-1/e2e-spec.ts b/public/docs/_examples/toh-1/e2e-spec.ts index 51a935acab..11e51e4df9 100644 --- a/public/docs/_examples/toh-1/e2e-spec.ts +++ b/public/docs/_examples/toh-1/e2e-spec.ts @@ -4,7 +4,7 @@ type WPromise = webdriver.promise.Promise; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; class Hero { id: number; diff --git a/public/docs/_examples/toh-1/ts/index.html b/public/docs/_examples/toh-1/ts/index.html index e9c099696b..4445befc9a 100644 --- a/public/docs/_examples/toh-1/ts/index.html +++ b/public/docs/_examples/toh-1/ts/index.html @@ -1,7 +1,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/toh-2/e2e-spec.ts b/public/docs/_examples/toh-2/e2e-spec.ts index 617ca38a1f..cde9e93edf 100644 --- a/public/docs/_examples/toh-2/e2e-spec.ts +++ b/public/docs/_examples/toh-2/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; diff --git a/public/docs/_examples/toh-2/ts/index.html b/public/docs/_examples/toh-2/ts/index.html index e9c099696b..4445befc9a 100644 --- a/public/docs/_examples/toh-2/ts/index.html +++ b/public/docs/_examples/toh-2/ts/index.html @@ -1,7 +1,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/toh-3/e2e-spec.ts b/public/docs/_examples/toh-3/e2e-spec.ts index 0f9c747b90..f1e51f5b39 100644 --- a/public/docs/_examples/toh-3/e2e-spec.ts +++ b/public/docs/_examples/toh-3/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; diff --git a/public/docs/_examples/toh-3/ts/index.html b/public/docs/_examples/toh-3/ts/index.html index e9c099696b..4445befc9a 100644 --- a/public/docs/_examples/toh-3/ts/index.html +++ b/public/docs/_examples/toh-3/ts/index.html @@ -1,7 +1,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/toh-4/e2e-spec.ts b/public/docs/_examples/toh-4/e2e-spec.ts index 8c109167af..456297b6d2 100644 --- a/public/docs/_examples/toh-4/e2e-spec.ts +++ b/public/docs/_examples/toh-4/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; const expectedH2 = 'My Heroes'; const targetHero = { id: 16, name: 'RubberMan' }; const nameSuffix = 'X'; diff --git a/public/docs/_examples/toh-4/ts/index.html b/public/docs/_examples/toh-4/ts/index.html index e9c099696b..4445befc9a 100644 --- a/public/docs/_examples/toh-4/ts/index.html +++ b/public/docs/_examples/toh-4/ts/index.html @@ -1,7 +1,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/toh-5/e2e-spec.ts b/public/docs/_examples/toh-5/e2e-spec.ts index 2ae0d5b93b..6935ff19a2 100644 --- a/public/docs/_examples/toh-5/e2e-spec.ts +++ b/public/docs/_examples/toh-5/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; const targetHero = { id: 15, name: 'Magneta' }; const targetHeroDashboardIndex = 3; const nameSuffix = 'X'; diff --git a/public/docs/_examples/toh-5/ts/index.html b/public/docs/_examples/toh-5/ts/index.html index 4df64edba1..f8383d0c94 100644 --- a/public/docs/_examples/toh-5/ts/index.html +++ b/public/docs/_examples/toh-5/ts/index.html @@ -5,7 +5,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/toh-6/e2e-spec.ts b/public/docs/_examples/toh-6/e2e-spec.ts index 3b4ec4c805..8152ac308c 100644 --- a/public/docs/_examples/toh-6/e2e-spec.ts +++ b/public/docs/_examples/toh-6/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; const expectedH1 = 'Tour of Heroes'; -const expectedTitle = `Angular 2 ${expectedH1}`; +const expectedTitle = `Angular ${expectedH1}`; const targetHero = { id: 15, name: 'Magneta' }; const targetHeroDashboardIndex = 3; const nameSuffix = 'X'; diff --git a/public/docs/_examples/toh-6/ts/index.html b/public/docs/_examples/toh-6/ts/index.html index 8bbbc6123d..41faa36c28 100644 --- a/public/docs/_examples/toh-6/ts/index.html +++ b/public/docs/_examples/toh-6/ts/index.html @@ -2,7 +2,7 @@ - Angular 2 Tour of Heroes + Angular Tour of Heroes diff --git a/public/docs/_examples/webpack/e2e-spec.ts b/public/docs/_examples/webpack/e2e-spec.ts index 59bf5c5708..1e88bfccf1 100644 --- a/public/docs/_examples/webpack/e2e-spec.ts +++ b/public/docs/_examples/webpack/e2e-spec.ts @@ -2,7 +2,7 @@ 'use strict'; describe('QuickStart E2E Tests', function () { - let expectedMsg = 'Hello from Angular 2 App with Webpack'; + let expectedMsg = 'Hello from Angular App with Webpack'; beforeEach(function () { browser.get(''); diff --git a/public/docs/_examples/webpack/ts/package.webpack.json b/public/docs/_examples/webpack/ts/package.webpack.json index ff8477675c..3995e724db 100644 --- a/public/docs/_examples/webpack/ts/package.webpack.json +++ b/public/docs/_examples/webpack/ts/package.webpack.json @@ -1,7 +1,7 @@ { "name": "angular2-webpack", "version": "1.0.0", - "description": "A webpack starter for angular 2", + "description": "A webpack starter for Angular", "scripts": { "start": "webpack-dev-server --inline --progress --port 8080", "test": "karma start", diff --git a/public/docs/_examples/webpack/ts/src/app/app.component.html b/public/docs/_examples/webpack/ts/src/app/app.component.html index a333a7a72f..b06ff16d11 100644 --- a/public/docs/_examples/webpack/ts/src/app/app.component.html +++ b/public/docs/_examples/webpack/ts/src/app/app.component.html @@ -1,6 +1,6 @@
-

Hello from Angular 2 App with Webpack

+

Hello from Angular App with Webpack

diff --git a/public/docs/_examples/webpack/ts/src/vendor.ts b/public/docs/_examples/webpack/ts/src/vendor.ts index ede1e2717d..8ffd09240a 100644 --- a/public/docs/_examples/webpack/ts/src/vendor.ts +++ b/public/docs/_examples/webpack/ts/src/vendor.ts @@ -1,5 +1,5 @@ // #docregion -// Angular 2 +// Angular import '@angular/platform-browser'; import '@angular/platform-browser-dynamic'; import '@angular/core'; diff --git a/public/docs/_includes/styleguide/_code-examples.jade b/public/docs/_includes/styleguide/_code-examples.jade index 8291c74e59..2d6c6e74dd 100644 --- a/public/docs/_includes/styleguide/_code-examples.jade +++ b/public/docs/_includes/styleguide/_code-examples.jade @@ -116,7 +116,7 @@ include ../../../_includes/_util-fns selector: 'my-app', // #enddocregion component // #docregion view - template: '

My First Angular 2 App

' + template: '

My First Angular App

' }) // #enddocregion view // #docregion class @@ -143,7 +143,7 @@ include ../../../_includes/_util-fns // #enddocregion twoparts, import @Component({ selector: 'my-app', - template: '

My first Angular 2 App

' + template: '

My first Angular App

' }) class AppComponent { } diff --git a/public/docs/dart/latest/guide/architecture.jade b/public/docs/dart/latest/guide/architecture.jade index 9bf1256210..c72080b6e9 100644 --- a/public/docs/dart/latest/guide/architecture.jade +++ b/public/docs/dart/latest/guide/architecture.jade @@ -6,7 +6,7 @@ block includes - var _at_angular = 'angular2' :marked - Angular 2 is a framework to help us build client applications in HTML and + Angular is a framework to help us build client applications in HTML and either JavaScript or a language (like Dart or TypeScript) that compiles to JavaScript. block angular-parts diff --git a/public/docs/dart/latest/guide/forms.jade b/public/docs/dart/latest/guide/forms.jade index 863ee5e9bd..3eaa3ae40e 100644 --- a/public/docs/dart/latest/guide/forms.jade +++ b/public/docs/dart/latest/guide/forms.jade @@ -89,7 +89,7 @@ figure.image-display :marked ## Setup - Create a new project folder (`angular2_forms`) and create 3 files: + Create a new project folder (`angular_forms`) and create 3 files: `pubspec.yaml`, `web/index.html`, and `web/main.dart`. (These files should be familiar from the [QuickStart](../quickstart.html).) Put these contents in the files: @@ -160,7 +160,7 @@ figure.image-display There’s nothing special about this component, nothing form-specific, nothing to distinguish it from any component we've written before. - Understanding this component requires only the Angular 2 concepts covered in previous chapters. + Understanding this component requires only the Angular concepts covered in previous chapters. 1. The code imports a standard set of symbols from the Angular library. @@ -629,7 +629,7 @@ figure.image-display :marked ## Conclusion - The Angular 2 form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation, and more: + The Angular form discussed in this chapter takes advantage of the following framework features to provide support for data modification, validation, and more: - An Angular HTML form template. - A form component class with a `Component` decorator. diff --git a/public/docs/dart/latest/guide/server-communication.jade b/public/docs/dart/latest/guide/server-communication.jade index ef79633e6d..5dd2f5bace 100644 --- a/public/docs/dart/latest/guide/server-communication.jade +++ b/public/docs/dart/latest/guide/server-communication.jade @@ -17,7 +17,7 @@ block http-providers Actually, it is unnecessary to include `BrowserClient` in the list of providers. ***But*** as is mentioned in the *Angular 2 Dart Transformer* [wiki page][ng2dtri], the template compiler _generates_ dependency injection code, hence all the - identifiers used in DI have to be collected by the Angular 2 transformer + identifiers used in DI have to be collected by the Angular transformer so that the libraries containing these identifiers can be transformed. Unless special steps are taken, Dart libraries like `http` diff --git a/public/docs/dart/latest/guide/template-syntax.jade b/public/docs/dart/latest/guide/template-syntax.jade index b754481889..bee8fc97a7 100644 --- a/public/docs/dart/latest/guide/template-syntax.jade +++ b/public/docs/dart/latest/guide/template-syntax.jade @@ -82,7 +82,7 @@ block dart-no-truthy-falsey the value `true`; all other values are `false`. TypeScript and JavaScript, on the other hand, treat many values (including non-null objects) as true. - A TypeScript Angular 2 program, for example, often has code like + A TypeScript Angular program, for example, often has code like `*ngIf="currentHero"` where a Dart program has code like `*ngIf="currentHero != null"`. @@ -109,7 +109,7 @@ block dart-safe-nav-op :marked The safe navigation operator (`?.`) is part of the Dart language. It's considered a template expression operator because - Angular 2 supports `?.` even in TypeScript and JavaScript apps. + Angular supports `?.` even in TypeScript and JavaScript apps. block json-pipe //- TODO: explain alternative in Dart diff --git a/public/docs/index.jade b/public/docs/index.jade index 61725df2c8..77690d7ed6 100644 --- a/public/docs/index.jade +++ b/public/docs/index.jade @@ -2,11 +2,11 @@ .l-sub-section h3 TypeScript - p: Angular 2 TS - Latest Version + p: Angular TS - Latest Version h3 JavaScript - p Angular 2 JS - Latest Version + p Angular JS - Latest Version h3 Dart diff --git a/public/docs/js/latest/cookbook/ts-to-js.jade b/public/docs/js/latest/cookbook/ts-to-js.jade index 1880cf6537..580a628f50 100644 --- a/public/docs/js/latest/cookbook/ts-to-js.jade +++ b/public/docs/js/latest/cookbook/ts-to-js.jade @@ -1,15 +1,15 @@ include ../../../../_includes/_util-fns :marked - Everything that we can do in Angular 2 in TypeScript, we can also do + Everything that we can do in Angular in TypeScript, we can also do in JavaScript. Translating from one language to the other is mostly a matter of changing the way we organize our code and the way we access - Angular 2 APIs. + Angular APIs. - Since TypeScript is a popular language option in Angular 2, many of the + Since TypeScript is a popular language option in Angular, many of the code examples you see on the Internet as well as on this site are written in TypeScript. This cookbook contains recipes for translating these kinds of - code examples to ES5, so that they can be applied to Angular 2 JavaScript + code examples to ES5, so that they can be applied to Angular JavaScript applications. @@ -44,19 +44,19 @@ table(width="100%") tr(style=top) td :marked - ### Importing Angular 2 Code + ### Importing Angular Code - In TypeScript code, Angular 2 classes, functions, and other members + In TypeScript code, Angular classes, functions, and other members are imported with TypeScript `import` statements: +makeExample('cb-ts-to-js/ts/app/main.ts', 'ng2import')(format="." ) td :marked - ### Accessing Angular 2 Code through the ng global + ### Accessing Angular Code through the ng global In JavaScript code, when using - [the Angular 2 packages](../glossary.html#!#scoped-package), + [the Angular packages](../glossary.html#!#scoped-package), we can access Angular code through the global `ng` object. In the nested members of this object we'll find everything we would import from `@angular` in TypeScript: @@ -68,7 +68,7 @@ table(width="100%") :marked ### Importing and Exporting Application Code - Each file in an Angular 2 TypeScript application constitutes a + Each file in an Angular TypeScript application constitutes a TypeScript module. When we want to make something from a module available to other modules, we `export` it. @@ -84,7 +84,7 @@ table(width="100%") :marked ### Sharing Application Code - In an Angular 2 JavaScript application, we load each file to the page + In an Angular JavaScript application, we load each file to the page using a `