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

docs(upgrade): rename Angular 2 to Angular #3169

Merged
merged 1 commit into from
Jan 31, 2017
Merged
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
6 changes: 3 additions & 3 deletions public/docs/ts/latest/guide/upgrade.jade
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ include ../_util-fns

The `upgrade` module in Angular is a very useful tool for upgrading
anything but the smallest of applications. With it we can mix and match
AngularJS and 2 components in the same application and have them interoperate
AngularJS and Angular components in the same application and have them interoperate
seamlessly. That means we don't have to do the upgrade work all at once,
since there's a natural coexistence between the two frameworks during the
transition period.
Expand Down Expand Up @@ -1115,7 +1115,7 @@ code-example(format="").
that we want to load. Since we're bootstrapping the app through
an `UpgradeModule`, we're actually now running the app as a **hybrid app**.

This means we are now running both AngularJS and 2 at the same time. That's pretty
This means we are now running both AngularJS and Angular at the same time. That's pretty
exciting! We're not running any actual Angular components yet though,
so let's do that next.

Expand Down Expand Up @@ -1210,7 +1210,7 @@ code-example(format="").
Now that we are loading `phone.service.ts` through an import that is resolved
by SystemJS, we should **remove the <script> tag** for the service from `index.html`.
This is something we'll do to all our components as we upgrade them. Simultaneously
with the AngularJS to 2 upgrade we're also migrating our code from scripts to modules.
with the AngularJS to Angular upgrade we're also migrating our code from scripts to modules.

At this point we can switch our two components to use the new service
instead of the old one. We `$inject` it as the downgraded `phone` factory,
Expand Down