diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade index b515479ba0..e354758d51 100644 --- a/public/docs/ts/latest/guide/upgrade.jade +++ b/public/docs/ts/latest/guide/upgrade.jade @@ -389,7 +389,7 @@ figure.image-display ### Using UpgradeModule with Angular 2 _NgModules_ Both Angular 1 and Angular 2 have their own concept of modules - to help organize an application into cohesive blocks of funcionality. + to help organize an application into cohesive blocks of functionality. Their details are quite different in architecture and implementation. In Angular 1, you add Angular assets to the `angular.module` property. @@ -585,7 +585,7 @@ figure .alert.is-helpful :marked - Upgraded componentes are Angular 2 **directives**, instead of **components**, because Angular 2 + Upgraded components are Angular 2 **directives**, instead of **components**, because Angular 2 is unaware that Angular 1 will create elements under it. As far as Angular 2 knows, the upgraded component is just a directive - a tag - and Angular 2 doesn't have to concern itself with it's children. @@ -1099,7 +1099,7 @@ code-example(format=""). attached to the `` element of the host page. This will no longer work with Angular 2. We should switch to a JavaScript-driven bootstrap instead. - So, remove the `ng-app` attribute from `index.html`, and instead boostrap via `app/main.ts`. + So, remove the `ng-app` attribute from `index.html`, and instead bootstrap via `app/main.ts`. This file has been configured as the application entrypoint in `systemjs.config.js`, so it is already being loaded by the browser. @@ -1312,7 +1312,7 @@ code-example(format=""). to make `$routeParams` an Angular 2 provider. Do that in `app.module.ts`: -+makeExample('upgrade-phonecat-2-hybrid/ts/app/app.module.ts', 'routeparams', 'app/app.module.ts ($routeParms)')(format='.') ++makeExample('upgrade-phonecat-2-hybrid/ts/app/app.module.ts', 'routeparams', 'app/app.module.ts ($routeParams)')(format='.') :marked Convert the phone detail component template into Angular 2 syntax as follows: @@ -1523,7 +1523,7 @@ code-example(format=""). we don't change how the application behaves from the user's point of view. During TypeScript conversion, there is nothing we have to do to keep E2E tests - working. It is only when we change our bootstrap to that of an Hybrid app that we need to + working. It is only when we change our bootstrap to that of a Hybrid app that we need to make some changes. The following change is needed in `protractor-conf.js` to sync with hybrid apps: