Skip to content

Commit da41a95

Browse files
IgorMinarmhevery
authored andcommitted
docs: branding fixes (angular#14132)
Angular 1.x -> AngularJS Angular 1 -> AngularJS Angular1 -> AngularJS Angular 2+ -> Angular Angular 2.0 -> Angular Angular2 -> Angular I have deliberately not touched any of the symbol names as that would cause big merge collisions with Tobias's work. All the renames are in .md, .json, and inline comments and jsdocs. PR Close angular#14132
1 parent 5a997ef commit da41a95

File tree

70 files changed

+235
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+235
-244
lines changed

CHANGELOG.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ Note: 4.0.0-beta.0 release also contains all the changes present in the 2.3.1 re
363363
* **selector:** SelectorMatcher match elements with :not selector ([#12977](https://github.com/angular/angular/issues/12977)) ([392c9ac](https://github.com/angular/angular/commit/392c9ac))
364364
* **tsc-wrapped:** generate metadata for exports without module specifier ([cd03c77](https://github.com/angular/angular/commit/cd03c77)), closes [#13327](https://github.com/angular/angular/issues/13327)
365365
* **upgrade:** fix downgrade content projection and injector inheritance ([86c5098](https://github.com/angular/angular/commit/86c5098)), closes [#6629](https://github.com/angular/angular/issues/6629) [#7727](https://github.com/angular/angular/issues/7727) [#8729](https://github.com/angular/angular/issues/8729) [#9643](https://github.com/angular/angular/issues/9643) [#9649](https://github.com/angular/angular/issues/9649) [#12675](https://github.com/angular/angular/issues/12675)
366-
* **upgrade:** enable Angular 1 unit testing of upgrade module ([2fc0560](https://github.com/angular/angular/commit/2fc0560)), closes [#5462](https://github.com/angular/angular/issues/5462) [#12675](https://github.com/angular/angular/issues/12675)
366+
* **upgrade:** enable AngularJS unit testing of upgrade module ([2fc0560](https://github.com/angular/angular/commit/2fc0560)), closes [#5462](https://github.com/angular/angular/issues/5462) [#12675](https://github.com/angular/angular/issues/12675)
367367

368368

369369
### Performance Improvements
@@ -402,7 +402,7 @@ We are adding more tests to our test suite to catch these kinds of problems befo
402402
* **router:** fix skipLocationChanges on RouterLink directives ([f562cbf](https://github.com/angular/angular/commit/f562cbf)), closes [#13156](https://github.com/angular/angular/issues/13156)
403403
* **router:** make setUpLocationChangeListener idempotent ([25e5b2f](https://github.com/angular/angular/commit/25e5b2f))
404404
* **router:** runs guards every time when unsuccessfully navigating to the same url over and over again ([#13209](https://github.com/angular/angular/issues/13209)) ([d46b8de](https://github.com/angular/angular/commit/d46b8de))
405-
* **router:** throw a better error message when angular 1 is not bootstraped ([c767df0](https://github.com/angular/angular/commit/c767df0))
405+
* **router:** throw a better error message when AngularJS is not bootstraped ([c767df0](https://github.com/angular/angular/commit/c767df0))
406406
* **router:** validate nested routes ([#13224](https://github.com/angular/angular/issues/13224)) ([2893c2c](https://github.com/angular/angular/commit/2893c2c)), closes [#12827](https://github.com/angular/angular/issues/12827)
407407
* **tsc-wrapped:** have UserError display the actual error ([393c100](https://github.com/angular/angular/commit/393c100))
408408

@@ -2030,7 +2030,7 @@ The likelihood of anyone actually depending on this property is very low.
20302030
### Known Issues
20312031
20322032
*** SECURITY WARNING ***
2033-
Contextual escaping is not yet implemented in Angular 2. This will be fixed in the upcoming RC.
2033+
Contextual escaping is not yet implemented in Angular. This will be fixed in the upcoming RC.
20342034
In the meantime make sure to correctly escape all values that go into the DOM.
20352035
*** SECURITY WARNING ***
20362036
@@ -2393,7 +2393,7 @@ it('should wait for returned promises', async(() => {
23932393
* **payload:** increase payload size limit temporarily ([28e657d](https://github.com/angular/angular/commit/28e657d))
23942394
* **RouterLink:** ignore optional parameters when checking for active routes ([5e2bc5c](https://github.com/angular/angular/commit/5e2bc5c)), closes [#6459](https://github.com/angular/angular/issues/6459) [#7834](https://github.com/angular/angular/issues/7834)
23952395
* **select:** set value individually from ngModel ([e1e44a9](https://github.com/angular/angular/commit/e1e44a9)), closes [#7975](https://github.com/angular/angular/issues/7975) [#7978](https://github.com/angular/angular/issues/7978)
2396-
* **upgrade:** make upgradeAdapter upgrade angular 1 components correctly ([247964a](https://github.com/angular/angular/commit/247964a)), closes [#7951](https://github.com/angular/angular/issues/7951)
2396+
* **upgrade:** make upgradeAdapter upgrade AngularJS components correctly ([247964a](https://github.com/angular/angular/commit/247964a)), closes [#7951](https://github.com/angular/angular/issues/7951)
23972397
23982398
### Features
23992399
@@ -2970,7 +2970,7 @@ setBaseTestProviders(TEST_BROWSER_PLATFORM_PROVIDERS,
29702970
* `angular2.umd.js` -> `angular2-all.umd.js`
29712971
* `angular2-testing.umd.js` -> `angular2-all-testing.umd.js`
29722972
2973-
* RxJS used to be bundled with Angular 2 code and this is not the case
2973+
* RxJS used to be bundled with Angular code and this is not the case
29742974
any more. RxJS needs to be loaded explicitly.
29752975
29762976
* Previously `angular2.js`, `angular2.min.js` and `angular2.dev.js` bundles
@@ -4137,8 +4137,8 @@ class HelloCmp implements OnInit {
41374137
* **docs:** export type info for var and const exports ([9262727](https://github.com/angular/angular/commit/9262727)), closes [#3700](https://github.com/angular/angular/issues/3700)
41384138
* **facade:** add maximum method for ListWrapper ([b5c4d8b](https://github.com/angular/angular/commit/b5c4d8b))
41394139
* **http:** xhr error listener invokes throw on EventEmitter ([f2d3bdb](https://github.com/angular/angular/commit/f2d3bdb)), closes [#2667](https://github.com/angular/angular/issues/2667)
4140-
* **router:** add angular 1.x router ([fde026a](https://github.com/angular/angular/commit/fde026a))
4141-
* **router:** add reuse support for angular 1.x router ([ddb62fe](https://github.com/angular/angular/commit/ddb62fe)), closes [#3698](https://github.com/angular/angular/issues/3698)
4140+
* **router:** add AngularJS router ([fde026a](https://github.com/angular/angular/commit/fde026a))
4141+
* **router:** add reuse support for AngularJS router ([ddb62fe](https://github.com/angular/angular/commit/ddb62fe)), closes [#3698](https://github.com/angular/angular/issues/3698)
41424142
* **url_resolver:** Allow a developer to customize their package prefix ([9cc1cd2](https://github.com/angular/angular/commit/9cc1cd2)), closes [#3794](https://github.com/angular/angular/issues/3794)
41434143
41444144

COMMITTER.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Pushing changes into the Angular 2 tree
1+
# Pushing changes into the Angular tree
22

33
Please see [Using git with Angular repositories](https://docs.google.com/document/d/1h8nijFSaa1jG_UE8v4WP7glh5qOUXnYtAtJh_gwOQHI/edit)
44
for details about how we maintain a linear commit history, and the rules for committing.

NAMING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Naming Conventions in Angular2
1+
Naming Conventions in Angular
22
---
33

4-
In general Angular2 should follow TypeScript naming conventions.
4+
In general Angular should follow TypeScript naming conventions.
55
See: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
66

77

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
[![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
66
[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
77

8-
[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
8+
[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
99
*Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [BrowserStack][browserstack].*
1010

1111
Angular
1212
=========
1313

14-
Angular is a development platform for building mobile and desktop web applications. This is the
15-
repository for [Angular 2][ng2] Typescript/JavaScript (JS).
16-
17-
Angular2 for [Dart][dart] can be found at [dart-lang/angular2][ng2dart].
14+
Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript (JS) and other languages.
1815

1916

2017
## Quickstart
@@ -29,9 +26,5 @@ guidelines for [contributing][contributing] and then check out one of our issues
2926

3027
[browserstack]: https://www.browserstack.com/
3128
[contributing]: http://github.com/angular/angular/blob/master/CONTRIBUTING.md
32-
[dart]: http://www.dartlang.org
3329
[quickstart]: https://angular.io/docs/ts/latest/quickstart.html
34-
[ng2]: http://angular.io
35-
[ngDart]: http://angulardart.org
36-
[ngJS]: http://angularjs.org
37-
[ng2dart]: https://github.com/dart-lang/angular2
30+
[ng]: http://angular.io

TOOLS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Developer Tools for Angular 2
1+
# Developer Tools for Angular
22

33
Here you will find a collection of tools and tips for keeping your application
44
perform well and contain fewer bugs.

TRIAGE_AND_LABELS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Triage Process and Github Labels for Angular 2
1+
# Triage Process and Github Labels for Angular
22

33
This document describes how the Angular team uses labels and milestones
44
to triage issues on github. The basic idea of the process is that
@@ -71,7 +71,7 @@ issues within the component will be resolved.
7171

7272
Several owners have adopted the issue categorization based on
7373
[user pain](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html)
74-
used by Angular 1. In this system every issue is assigned frequency and
74+
used by AngularJS. In this system every issue is assigned frequency and
7575
severity based on which the total user pain score is calculated.
7676

7777
Following is the definition of various frequency and severity levels:

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "angular2",
2+
"name": "angular",
33
"dependencies": {
44
"polymer": "Polymer/polymer#^1.6.0"
55
}

modules/@angular/benchpress/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Benchpress is a framework for e2e performance tests.
44
See [here for an example project](https://github.com/angular/benchpress-tree).
55

6-
The sources for this package are in the main [Angular2](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.
6+
The sources for this package are in the main [Angular](https://github.com/angular/angular) repo. Please file issues and pull requests against that repo.
77

88
License: MIT
99

modules/@angular/compiler-cli/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,19 @@ This program mimics the TypeScript tsc command line. It accepts a `-p` flag whic
105105
This CLI is intended for demos, prototyping, or for users with simple build systems
106106
that run bare `tsc`.
107107

108-
Users with a build system should expect an Angular 2 template plugin. Such a plugin would be
108+
Users with a build system should expect an Angular template plugin. Such a plugin would be
109109
based on the `index.ts` in this directory, but should share the TypeScript compiler instance
110110
with the one already used in the plugin for TypeScript typechecking and emit.
111111

112112
## Design
113113
At a high level, this program
114-
- collects static metadata about the sources using the `tsc-wrapped` package in angular2
115-
- uses the `OfflineCompiler` from `angular2/src/compiler/compiler` to codegen additional `.ts` files
114+
- collects static metadata about the sources using the `tsc-wrapped` package
115+
- uses the `OfflineCompiler` from `@angular/compiler` to codegen additional `.ts` files
116116
- these `.ts` files are written to the `genDir` path, then compiled together with the application.
117117

118118
## For developers
119119
```
120-
# Build angular2 and the compiler
120+
# Build Angular and the compiler
121121
./build.sh
122122
123123
# Copy over the package so we can test the compiler tests

modules/@angular/compiler-cli/src/codegen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {PathMappedCompilerHost} from './path_mapped_compiler_host';
2222
const GENERATED_META_FILES = /\.json$/;
2323

2424
const PREAMBLE = `/**
25-
* @fileoverview This file is generated by the Angular 2 template compiler.
25+
* @fileoverview This file is generated by the Angular template compiler.
2626
* Do not edit.
2727
* @suppress {suspiciousCode,uselessCode,missingProperties}
2828
*/

0 commit comments

Comments
 (0)