Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

chore: rename Angular 2 to simply Angular #2402

Merged
merged 1 commit into from
Sep 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
8 changes: 4 additions & 4 deletions harp.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},

Expand Down Expand Up @@ -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"
},

Expand Down Expand Up @@ -354,7 +354,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"
},

Expand All @@ -372,7 +372,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"
},

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion public/_includes/_footer.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a href="/libraries.html">Libraries</a>
li <a href="/about/">About</a>
li <a href="/resources/">Books & Training</a>
Expand Down
8 changes: 4 additions & 4 deletions public/_includes/_head-include.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")

Expand Down Expand Up @@ -57,4 +57,4 @@ link(rel="stylesheet" href="/resources/css/main.css")
<link rel="icon" type="image/png" href="/resources/images/favicons/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="/resources/images/favicons/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="/resources/images/favicons/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="/resources/images/favicons/manifest.json">
<link rel="manifest" href="/resources/images/favicons/manifest.json">
12 changes: 6 additions & 6 deletions public/_includes/_version-dropdown.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -69,8 +69,8 @@ nav.dropdown

<!-- DROPDOWN MENU -->
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")
6 changes: 3 additions & 3 deletions public/contribute.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/_protractor/protractor.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/animations/e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/animations/ts/plnkr.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Angular 2 Animations",
"description": "Angular Animations",
"files":[
"!**/*.d.ts",
"!**/*.js"
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/dart/web/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Architecture of Angular 2</title>
<title>Architecture of Angular</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(''));
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/ts/app/mini-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/ts/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Architecture of Angular 2</title>
<title>Architecture of Angular</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/ts/mini-app.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Architecture of Angular 2</title>
<title>Architecture of Angular</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/architecture/ts/plnkr.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Intro to Angular2",
"description": "Intro to Angular",
"files":[
"!**/*.d.ts",
"!**/*.js",
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/cb-aot-compiler/e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- #docregion -->
<button (click)="toggleHeading()">Toggle Heading</button>
<h1 *ngIf="showHeading">My First Angular 2 App</h1>
<h1 *ngIf="showHeading">My First Angular App</h1>

<h3>List of Heroes</h3>
<div *ngFor="let hero of heroes">{{hero}}</div>
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/cb-set-document-title/ts/plnkr.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Set The Document Title In Angular 2",
"description": "Set The Document Title In Angular",
"files": [
"!**/*.d.ts",
"!**/*.js",
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/cli-quickstart/e2e-spec.ts.disabled
Original file line number Diff line number Diff line change
Expand Up @@ -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');
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-hello-world/ts/index.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Hello World</title>
<title>Angular Hello World</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-hello-world/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Hello World</title>
<title>Angular Hello World</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-tabs/ts/index.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Tabs</title>
<title>Angular Tabs</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-tabs/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Tabs</title>
<title>Angular Tabs</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-todo/ts/index.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Todos</title>
<title>Angular Todos</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/homepage-todo/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Todos</title>
<title>Angular Todos</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/lifecycle-hooks/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- #docregion -->
<html>
<head>
<title>Angular 2 Lifecycle Hooks</title>
<title>Angular Lifecycle Hooks</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/plunker.README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
### Angular 2 Documentation Example
### Angular Documentation Example

2 changes: 1 addition & 1 deletion public/docs/_examples/quickstart/e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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('');
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/quickstart/js/app/app.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ng.core.Component({
// #enddocregion ng-namespace-funcs
selector: 'my-app',
template: '<h1>My First Angular 2 App</h1>'
template: '<h1>My First Angular App</h1>'
// #docregion ng-namespace-funcs
})
// #enddocregion component
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/quickstart/js/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- #docregion -->
<html>
<head>
<title>Angular 2 QuickStart JS</title>
<title>Angular QuickStart JS</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">

Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/quickstart/ts/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Component } from '@angular/core';
// #docregion metadata
@Component({
selector: 'my-app',
template: '<h1>My First Angular 2 App</h1>'
template: '<h1>My First Angular App</h1>'
})
// #enddocregion metadata
// #docregion class
Expand Down
2 changes: 1 addition & 1 deletion public/docs/_examples/quickstart/ts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- #docregion -->
<html>
<head>
<title>Angular 2 QuickStart</title>
<title>Angular QuickStart</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="styles.css">
Expand Down
Loading