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

Commit def227e

Browse files
committed
docs(quickstart): Jesus's, Deb's, and John's suggestions.
1 parent 5f71170 commit def227e

File tree

16 files changed

+30
-32
lines changed

16 files changed

+30
-32
lines changed

public/docs/_examples/cb-aot-compiler/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('AOT Compilation', function () {
1111

1212
it('should load page and click button', function (done) {
1313
let headingSelector = element.all(by.css('h1')).get(0);
14-
expect(headingSelector.getText()).toEqual('Hello Angular!');
14+
expect(headingSelector.getText()).toEqual('Hello Angular');
1515

1616
expect(element.all(by.xpath('//div[text()="Magneta"]')).get(0).isPresent()).toBe(true);
1717
expect(element.all(by.xpath('//div[text()="Bombasto"]')).get(0).isPresent()).toBe(true);

public/docs/_examples/cb-aot-compiler/ts/app/app.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- #docregion -->
22
<button (click)="toggleHeading()">Toggle Heading</button>
3-
<h1 *ngIf="showHeading">Hello Angular!</h1>
3+
<h1 *ngIf="showHeading">Hello Angular</h1>
44

55
<h3>List of Heroes</h3>
66
<div *ngFor="let hero of heroes">{{hero}}</div>

public/docs/_examples/quickstart/dart/lib/app_component.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:angular2/core.dart';
55
// #docregion metadata
66
@Component(
77
selector: 'my-app',
8-
template: '<h1>Hello Angular!</h1>')
8+
template: '<h1>Hello Angular</h1>')
99
// #enddocregion metadata
1010
// #docregion class
1111
class AppComponent {}

public/docs/_examples/quickstart/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { browser, element, by } from 'protractor';
44

55
describe('QuickStart E2E Tests', function () {
66

7-
let expectedMsg = 'Hello Angular!';
7+
let expectedMsg = 'Hello Angular';
88

99
beforeEach(function () {
1010
browser.get('');

public/docs/_examples/quickstart/js/app/app.component.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
ng.core.Component({
1111
// #enddocregion ng-namespace-funcs
1212
selector: 'my-app',
13-
template: '<h1>Hello Angular!</h1>'
13+
template: '<h1>Hello Angular</h1>'
1414
// #docregion ng-namespace-funcs
1515
})
1616
// #enddocregion component

public/docs/_examples/quickstart/ts/app/app.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { Component, NgModule } from '@angular/core';
33
import { BrowserModule } from '@angular/platform-browser';
44

55
@Component({
6-
template: `<h1>Hello Angular!</h1>`,
6+
template: `<h1>Hello Angular</h1>`,
77
selector: 'my-app'
88
})
9-
export class AppComponent { }
9+
class AppComponent { }
1010

1111
@NgModule({
1212
imports: [ BrowserModule ],

public/docs/_examples/quickstart/ts/app/main.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
22

33
import { AppModule } from './app.module';
44

5-
const platform = platformBrowserDynamic();
6-
platform.bootstrapModule(AppModule);
5+
platformBrowserDynamic().bootstrapModule(AppModule);

public/docs/_examples/setup/e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { browser, element, by } from 'protractor';
44

55
describe('QuickStart E2E Tests', function () {
66

7-
let expectedMsg = 'Hello Angular!';
7+
let expectedMsg = 'Hello Angular';
88

99
beforeEach(function () {
1010
browser.get('');

public/docs/_examples/setup/ts/app/app.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ import { Component } from '@angular/core';
33

44
@Component({
55
selector: 'my-app',
6-
template: `<h1>Hello Angular!</h1>`
6+
template: `<h1>Hello Angular</h1>`
77
})
88
export class AppComponent { }

public/docs/js/latest/quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ code-example(format="").
208208
:marked
209209
The `template` property holds the component's companion template.
210210
A template is a form of HTML that tells Angular how to render a view.
211-
Our template is a single line of HTML announcing "Hello Angular!".
211+
Our template is a single line of HTML announcing "Hello Angular".
212212

213213
Now we need something to tell Angular to load this component.
214214

public/docs/ts/_cache/quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ p.
290290
The **template** specifies the component's companion template,
291291
written in an enhanced form of HTML that tells Angular how to render this component's view.
292292

293-
>Our template is a single line of HTML announcing "Hello Angular!".
293+
>Our template is a single line of HTML announcing "Hello Angular".
294294

295295
>A more advanced template could contain data bindings to component properties
296296
and might identify other application components which have their own templates.

public/docs/ts/latest/cli-quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ h3#component-decorator @Component decorator
199199
+makeExample('src/app/cli-quickstart.component.html', null, 'src/app/cli-quickstart.component.html')(format='.')
200200
:marked
201201
The `{{title}}` is an _interpolation_ binding that causes Angular to display the component's
202-
`title` property. After out edit, Angular displays "Hello Angular!".
202+
`title` property. After out edit, Angular displays "Hello Angular".
203203
We'll learn more about data binding as we read through the documentation.
204204

205205
The **styleUrls** array specifies the location(s) of the component's private CSS style file(s).

public/docs/ts/latest/guide/learning-angular.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ figure
1111
Those new to Angular may wish to follow this popular learning path.
1212
<br clear="all">
1313
:marked
14-
1. Try the [QuickStart](../quickstart.html)'s live coding example, "Hello, Angular!".
14+
1. Try the [QuickStart](../quickstart.html)'s live coding example, "Hello, Angular".
1515

1616
1. [Setup](setup.html) your local enviroment for efficient application development
1717
both online and offline.

public/docs/ts/latest/guide/setup.jade

+12-13
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ block includes
99
play with the code, share your changes with friends, and download and run the code on your own machine.
1010

1111
As much fun as this is
12-
* you can't ship your app in plunker.
13-
* development in the browser is slow.
12+
* you can't ship your app in plunker
13+
* development in the browser is slow
1414
* you aren't always online
15-
* the type support, refactoring, and code completion only work in your local IDE.
15+
* the type support, refactoring, and code completion only work in your local IDE
1616

17-
# Setup a local develoment environment
17+
# Setup a local development environment
1818

1919
Fortunately, setting up a local development environment is quick and easy:
2020
1. `git clone` the [**QuickStart** repository](https://github.com/angular/quickstart "Clone the github QuickStart repo")
@@ -40,9 +40,9 @@ code-example(language="sh" class="code-shell").
4040
1. [install the `npm` packages](#install-node "What if you don't have node?")
4141
1. run it
4242

43-
## What's different?
43+
## What's different about the setup?
4444

45-
The setup delivers the same application as the [QuickStart](../quickstart.html "Angular QuickStart"),
45+
The setup (zip or clone) delivers the same application as the [QuickStart](../quickstart.html "Angular QuickStart"),
4646
a fact you can confirm with the <live-example></live-example>.
4747

4848
But there are _many more files_ in the project folder on your machine.
@@ -104,7 +104,9 @@ table(width="100%")
104104
:marked
105105
## Prerequisites: _node_ and _npm_
106106

107-
Node.js and npm are essential tools in modern web development. Angular developers need them too.
107+
Node.js and npm are essential to modern web development with Angular and other platforms.
108+
Node powers client development and build tools.
109+
The _npm_ package manager, itself a _node_ application, installs JavaScript libraries.
108110

109111
<a href="https://docs.npmjs.com/getting-started/installing-node" target="_blank" title="Installing Node.js and updating npm">
110112
Get them now</a> if they're not already installed on your machine.
@@ -113,9 +115,6 @@ table(width="100%")
113115
by running the commands `node -v` and `npm -v` in a terminal/console window.
114116
Older versions produce errors.
115117

116-
We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of node and npm. You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that use other versions of node and npm.
117-
118-
.l-sub-section
119-
:marked
120-
### Next step
121-
[The _Tour of Heroes_ tutorial](../tutorial)
118+
We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of node and npm.
119+
You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that
120+
use other versions of node and npm.

public/docs/ts/latest/guide/template-syntax.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ block includes
4646
The [QuickStart](../quickstart.html) application has a template that is pure HTML:
4747

4848
code-example(language="html" escape="html").
49-
<h1>Hello Angular!</h1>
49+
<h1>Hello Angular</h1>
5050

5151
:marked
5252
Almost all HTML syntax is valid template syntax. The `<script>` element is a notable exception; it is forbidden, eliminating the risk of script injection attacks. (In practice, `<script>` is simply ignored.)

public/docs/ts/latest/quickstart.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ nter
1212

1313
+makeExample('app/app.module.ts','','app/app.module.ts')(format='.')
1414
:marked
15-
The `AppComponent` template renders a "Hello Angular!" header into a custom `<my-app>` element.
15+
The `AppComponent` template renders a "Hello Angular" header into a custom `<my-app>` element.
1616

1717
The `AppModule` tells Angular<br>
18-
&nbsp;&nbsp;***what you need*** &mdash; _imports_ the `BrowserModule` to display the application in the browser.<br>
18+
&nbsp;&nbsp;***what you need*** &mdash; _imports_ the `BrowserModule` to run the application in the browser.<br>
1919
&nbsp;&nbsp;***what you created*** &mdash; _declares_ the `AppComponent`.<br>
2020
&nbsp;&nbsp;***what to show*** &mdash; _bootstrap_ the `AppComponent` onto the `index.html` web page within the `<my-app>` tag.
2121

2222
+makeExample('index.html','my-app','index.html (body)')(format='.')
2323
:marked
2424
You'll find more _live code examples_ like this one on almost every documentation page.
25-
25+
2626
# TypeScript
2727
This example is written in <a href="http://www.typescriptlang.org/" target="_blank" title="TypeScript">TypeScript</a>,
2828
a strongly-typed, super-set of the latest JavaScript.

0 commit comments

Comments
 (0)