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

chore: more "angular2" to "angular" cleanup #2417

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
7 changes: 3 additions & 4 deletions public/docs/_includes/styleguide/_code-examples.jade
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ include ../../../_includes/_util-fns
code-example(format="linenums" language="html").
<!-- #docregion -->
...
<script src="https://code.angularjs.org/2.0.0-beta.7/angular2.sfx.dev.js"></script>
<script src="app.js"></script>
...

Expand Down Expand Up @@ -285,9 +284,9 @@ include ../../../_includes/_util-fns
Styling selected portions of the json is also supported.

code-example(format="" language="js").
+makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]})
+makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*zone.*)/, /(\Score-js.*)/, /(\Ssystem.*)/ ]})

+makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*traceur.*)/, /(\Sangular2.*)/, /(\Ssystem.*)/ ]})
+makeJson('styleguide/package.1.json', {paths: 'dependencies'}, "package.json dependencies", { pnk: [/(\S*zone.*)/, /(\Score-js.*)/, /(\Ssystem.*)/ ]})

:marked
As well as styling across multiple lines.
Expand Down Expand Up @@ -422,7 +421,7 @@ include ../../../_includes/_util-fns
.alert.is-important.
The '@example' and '@exampleTabs' inline tags MUST always appear at the beginning of a line.

Example files referenced by inline tags are all assumed to be in the 'modules/angular2' folder in the angular/angular repo.
Example files referenced by inline tags are all assumed to be in the 'modules/@angular' folder in the angular/angular repo.

:marked
#### @example inline tag parameters
Expand Down
5 changes: 2 additions & 3 deletions public/docs/ts/latest/guide/architecture.jade
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,5 @@ code-example().
> [**Router**](router.html): Navigate from page to page within the client
application and never leave the browser.

> [**Testing**](testing.html): Run unit tests with Angular's
[testing library](https://pub.dartlang.org/packages/angular2_testing)
on your application parts as they interact with the Angular framework.
> [**Testing**](testing.html): Run unit tests on your application parts as they interact with the Angular framework
using the _Angular Testing Platform_.
Binary file modified public/resources/images/devguide/quickstart/my-first-app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tools/doc-shredder/_test/test_jade/guides/setupAlt2.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include ../../../../_includes/_util-fns

.l-main-section
:marked
## Install Angular2
## Install Angular
There are four steps to create any Angular app:

1. Create an entry point HTML file where users will start
Expand Down
2 changes: 1 addition & 1 deletion tools/doc-shredder/_test/test_jade/setupAlt.jade
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include ../../../../_includes/_util-fns

.l-main-section
:marked
## Install Angular2
## Install Angular
There are four steps to create any Angular app:

1. Create an entry point HTML file where users will start
Expand Down