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

Commit 02f2818

Browse files
ChrisAntakiFoxandxss
authored andcommitted
docs(upgrade): fix a few typos (#2955)
1 parent e469929 commit 02f2818

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ figure.image-display
389389
### Using UpgradeModule with Angular 2 _NgModules_
390390

391391
Both Angular 1 and Angular 2 have their own concept of modules
392-
to help organize an application into cohesive blocks of funcionality.
392+
to help organize an application into cohesive blocks of functionality.
393393

394394
Their details are quite different in architecture and implementation.
395395
In Angular 1, you add Angular assets to the `angular.module` property.
@@ -585,7 +585,7 @@ figure
585585

586586
.alert.is-helpful
587587
:marked
588-
Upgraded componentes are Angular 2 **directives**, instead of **components**, because Angular 2
588+
Upgraded components are Angular 2 **directives**, instead of **components**, because Angular 2
589589
is unaware that Angular 1 will create elements under it. As far as Angular 2 knows, the upgraded
590590
component is just a directive - a tag - and Angular 2 doesn't have to concern itself with
591591
it's children.
@@ -1099,7 +1099,7 @@ code-example(format="").
10991099
attached to the `<html>` element of the host page. This will no longer work with
11001100
Angular 2. We should switch to a JavaScript-driven bootstrap instead.
11011101

1102-
So, remove the `ng-app` attribute from `index.html`, and instead boostrap via `app/main.ts`.
1102+
So, remove the `ng-app` attribute from `index.html`, and instead bootstrap via `app/main.ts`.
11031103
This file has been configured as the application entrypoint in `systemjs.config.js`,
11041104
so it is already being loaded by the browser.
11051105

@@ -1312,7 +1312,7 @@ code-example(format="").
13121312
to make `$routeParams` an Angular 2 provider.
13131313
Do that in `app.module.ts`:
13141314

1315-
+makeExample('upgrade-phonecat-2-hybrid/ts/app/app.module.ts', 'routeparams', 'app/app.module.ts ($routeParms)')(format='.')
1315+
+makeExample('upgrade-phonecat-2-hybrid/ts/app/app.module.ts', 'routeparams', 'app/app.module.ts ($routeParams)')(format='.')
13161316

13171317
:marked
13181318
Convert the phone detail component template into Angular 2 syntax as follows:
@@ -1523,7 +1523,7 @@ code-example(format="").
15231523
we don't change how the application behaves from the user's point of view.
15241524

15251525
During TypeScript conversion, there is nothing we have to do to keep E2E tests
1526-
working. It is only when we change our bootstrap to that of an Hybrid app that we need to
1526+
working. It is only when we change our bootstrap to that of a Hybrid app that we need to
15271527
make some changes.
15281528

15291529
The following change is needed in `protractor-conf.js` to sync with hybrid apps:

0 commit comments

Comments
 (0)