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

CHANGELOG.md

@@ -363,7 +363,7 @@ Note: 4.0.0-beta.0 release also contains all the changes present in the 2.3.1 re
 * **selector:** SelectorMatcher match elements with :not selector ([#12977](https://github.com/angular/angular/issues/12977)) ([392c9ac](https://github.com/angular/angular/commit/392c9ac))
 * **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)
 * **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)
-* **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)
+* **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)
 
 
 ### Performance Improvements
@@ -402,7 +402,7 @@ We are adding more tests to our test suite to catch these kinds of problems befo
 * **router:** fix skipLocationChanges on RouterLink directives ([f562cbf](https://github.com/angular/angular/commit/f562cbf)), closes [#13156](https://github.com/angular/angular/issues/13156)
 * **router:** make setUpLocationChangeListener idempotent ([25e5b2f](https://github.com/angular/angular/commit/25e5b2f))
 * **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))
-* **router:** throw a better error message when angular 1 is not bootstraped ([c767df0](https://github.com/angular/angular/commit/c767df0))
+* **router:** throw a better error message when AngularJS is not bootstraped ([c767df0](https://github.com/angular/angular/commit/c767df0))
 * **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)
 * **tsc-wrapped:** have UserError display the actual error ([393c100](https://github.com/angular/angular/commit/393c100))
 
@@ -2030,7 +2030,7 @@ The likelihood of anyone actually depending on this property is very low.
 ### Known Issues
 
 *** SECURITY WARNING ***
-Contextual escaping is not yet implemented in Angular 2. This will be fixed in the upcoming RC.
+Contextual escaping is not yet implemented in Angular. This will be fixed in the upcoming RC.
 In the meantime make sure to correctly escape all values that go into the DOM.
 *** SECURITY WARNING ***
 
@@ -2393,7 +2393,7 @@ it('should wait for returned promises', async(() => {
 * **payload:** increase payload size limit temporarily ([28e657d](https://github.com/angular/angular/commit/28e657d))
 * **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)
 * **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)
-* **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)
+* **upgrade:** make upgradeAdapter upgrade AngularJS components correctly ([247964a](https://github.com/angular/angular/commit/247964a)), closes [#7951](https://github.com/angular/angular/issues/7951)
 
 ### Features
 
@@ -2970,7 +2970,7 @@ setBaseTestProviders(TEST_BROWSER_PLATFORM_PROVIDERS,
   * `angular2.umd.js` -> `angular2-all.umd.js`
   * `angular2-testing.umd.js` -> `angular2-all-testing.umd.js`
 
-* RxJS used to be bundled with Angular 2 code and this is not the case
+* RxJS used to be bundled with Angular code and this is not the case
 any more. RxJS needs to be loaded explicitly.
 
 * Previously `angular2.js`, `angular2.min.js` and `angular2.dev.js` bundles
@@ -4137,8 +4137,8 @@ class HelloCmp implements OnInit {
 * **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)
 * **facade:** add maximum method for ListWrapper ([b5c4d8b](https://github.com/angular/angular/commit/b5c4d8b))
 * **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)
-* **router:** add angular 1.x router ([fde026a](https://github.com/angular/angular/commit/fde026a))
-* **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)
+* **router:** add AngularJS router ([fde026a](https://github.com/angular/angular/commit/fde026a))
+* **router:** add reuse support for AngularJS router ([ddb62fe](https://github.com/angular/angular/commit/ddb62fe)), closes [#3698](https://github.com/angular/angular/issues/3698)
 * **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)
 
 

COMMITTER.md

@@ -1,4 +1,4 @@
-# Pushing changes into the Angular 2 tree
+# Pushing changes into the Angular tree
 
 Please see [Using git with Angular repositories](https://docs.google.com/document/d/1h8nijFSaa1jG_UE8v4WP7glh5qOUXnYtAtJh_gwOQHI/edit)
 for details about how we maintain a linear commit history, and the rules for committing.

NAMING.md

@@ -1,7 +1,7 @@
-Naming Conventions in Angular2
+Naming Conventions in Angular
 ---
 
-In general Angular2 should follow TypeScript naming conventions.
+In general Angular should follow TypeScript naming conventions.
 See: https://github.com/Microsoft/TypeScript/wiki/Coding-guidelines
 
 

README.md

@@ -5,16 +5,13 @@
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
 [![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
 
-[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)  
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
 *Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [BrowserStack][browserstack].*
 
 Angular
 =========
 
-Angular is a development platform for building mobile and desktop web applications. This is the
-repository for [Angular 2][ng2] Typescript/JavaScript (JS).
-
-Angular2 for [Dart][dart] can be found at [dart-lang/angular2][ng2dart].
+Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript (JS) and other languages.
 
 
 ## Quickstart
@@ -29,9 +26,5 @@ guidelines for [contributing][contributing] and then check out one of our issues
 
 [browserstack]: https://www.browserstack.com/
 [contributing]: http://github.com/angular/angular/blob/master/CONTRIBUTING.md
-[dart]: http://www.dartlang.org
 [quickstart]: https://angular.io/docs/ts/latest/quickstart.html
-[ng2]: http://angular.io
-[ngDart]: http://angulardart.org
-[ngJS]: http://angularjs.org
-[ng2dart]: https://github.com/dart-lang/angular2
+[ng]: http://angular.io

TOOLS.md

@@ -1,4 +1,4 @@
-# Developer Tools for Angular 2
+# Developer Tools for Angular
 
 Here you will find a collection of tools and tips for keeping your application
 perform well and contain fewer bugs.

TRIAGE_AND_LABELS.md

@@ -1,4 +1,4 @@
-# Triage Process and Github Labels for Angular 2
+# Triage Process and Github Labels for Angular
 
 This document describes how the Angular team uses labels and milestones 
 to triage issues on github. The basic idea of the process is that
@@ -71,7 +71,7 @@ issues within the component will be resolved.
 
 Several owners have adopted the issue categorization based on
 [user pain](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html)
-used by Angular 1. In this system every issue is assigned frequency and
+used by AngularJS. In this system every issue is assigned frequency and
 severity based on which the total user pain score is calculated.
 
 Following is the definition of various frequency and severity levels:

bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "angular2",
+  "name": "angular",
   "dependencies": {
     "polymer": "Polymer/polymer#^1.6.0"
   }

modules/@angular/benchpress/README.md

@@ -3,7 +3,7 @@
 Benchpress is a framework for e2e performance tests.
 See [here for an example project](https://github.com/angular/benchpress-tree).
 
-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.
+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.
 
 License: MIT
 

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

@@ -105,19 +105,19 @@ This program mimics the TypeScript tsc command line. It accepts a `-p` flag whic
 This CLI is intended for demos, prototyping, or for users with simple build systems
 that run bare `tsc`.
 
-Users with a build system should expect an Angular 2 template plugin. Such a plugin would be
+Users with a build system should expect an Angular template plugin. Such a plugin would be
 based on the `index.ts` in this directory, but should share the TypeScript compiler instance
 with the one already used in the plugin for TypeScript typechecking and emit.
 
 ## Design
 At a high level, this program
-- collects static metadata about the sources using the `tsc-wrapped` package in angular2
-- uses the `OfflineCompiler` from `angular2/src/compiler/compiler` to codegen additional `.ts` files
+- collects static metadata about the sources using the `tsc-wrapped` package
+- uses the `OfflineCompiler` from `@angular/compiler` to codegen additional `.ts` files
 - these `.ts` files are written to the `genDir` path, then compiled together with the application.
 
 ## For developers
 ```
-# Build angular2 and the compiler
+# Build Angular and the compiler
 ./build.sh
 
 # Copy over the package so we can test the compiler tests

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

@@ -22,7 +22,7 @@ import {PathMappedCompilerHost} from './path_mapped_compiler_host';
 const GENERATED_META_FILES = /\.json$/;
 
 const PREAMBLE = `/**
- * @fileoverview This file is generated by the Angular 2 template compiler.
+ * @fileoverview This file is generated by the Angular template compiler.
  * Do not edit.
  * @suppress {suspiciousCode,uselessCode,missingProperties}
  */

modules/@angular/compiler/src/aot/static_symbol_resolver.ts

@@ -23,7 +23,7 @@ export class ResolvedStaticSymbol {
 export interface StaticSymbolResolverHost {
   /**
    * Return a ModuleMetadata for the given module.
-   * Angular 2 CLI will produce this metadata for a module whenever a .d.ts files is
+   * Angular CLI will produce this metadata for a module whenever a .d.ts files is
    * produced and the module has exported variables or classes with decorators. Module metadata can
    * also be produced directly from TypeScript sources by using MetadataCollector in tools/metadata.
    *

modules/@angular/core/src/linker/compiler.ts

@@ -88,7 +88,7 @@ export class Compiler {
    * Exposes the CSS-style selectors that have been used in `ngContent` directives within
    * the template of the given component.
    * This is used by the `upgrade` library to compile the appropriate transclude content
-   * in the Angular 1 wrapper component.
+   * in the AngularJS wrapper component.
    */
   getNgContentSelectors(component: Type<any>): string[] { throw _throwError(); }
 

modules/@angular/docs/di/di.md

@@ -1,6 +1,6 @@
 # Dependency Injection (DI): Documentation
 
-This document describes in detail how the DI module works in Angular 2.
+This document describes in detail how the DI module works in Angular.
 
 ## Core Abstractions
 

modules/@angular/docs/di/di_advanced.md

@@ -28,7 +28,7 @@ Every key has an id, which we utilize to store providers and instances. So Injec
 
 ### ProtoInjector and Injector
 
-Often there is a need to create multiple instances of essentially the same injector. In Angular 2, for example, every component element type gets an injector configured in the same way.
+Often there is a need to create multiple instances of essentially the same injector. In Angular, for example, every component element type gets an injector configured in the same way.
 
 Doing the following would be very inefficient.
 
@@ -148,9 +148,9 @@ parent.get(Car); // this works
 regularChild.get(Car); // this works
 ```
 
-## Angular 2 and DI
+## Angular and DI
 
-Now let's see how Angular 2 uses DI behind the scenes.
+Now let's see how Angular uses DI behind the scenes.
 
 The right mental model is to think that every DOM element has an Injector. (In practice, only interesting elements containing directives will have an injector, but this is a performance optimization)
 

modules/@angular/docs/web_workers/web_workers.md

@@ -1,16 +1,16 @@
-# WebWorkers in Angular 2: Documentation
+# WebWorkers in Angular: Documentation
 
-Angular 2 includes native support for writing applications which live in a
+Angular includes native support for writing applications which live in a
 WebWorker. This document describes how to write applications that take advantage
 of this feature.
 It also provides a detailed description of the underlying messaging
 infrastructure that angular uses to communicate between the main process and the
 worker. This infrastructure can be modified by an application developer to
-enable driving an angular 2 application from an iFrame, different window / tab,
+enable driving an Angular application from an iFrame, different window / tab,
 server, etc..
 
 ## Introduction
-WebWorker support in Angular2 is designed to make it easy to leverage parallelization in your web application.
+WebWorker support in Angular is designed to make it easy to leverage parallelization in your web application.
 When you choose to run your application in a WebWorker angular runs both your application's logic and the
 majority of the core angular framework in a WebWorker.
 By offloading as much code as possible to the WebWorker we keep the UI thread
@@ -20,7 +20,7 @@ better framerate and UX for applications.
 ## Bootstrapping a WebWorker Application
 Bootstrapping a WebWorker application is not much different than bootstrapping a normal application.
 The main difference is that you need to do the bootstrap process on both the worker and render thread.
-Unlike in a standard Angular2 application you don't bootstrap your main component on the render thread.
+Unlike in a standard Angular application you don't bootstrap your main component on the render thread.
 Instead you initialize a new application injector with the WORKER_APP_PLATFORM providers and provide the name
 of your WebWorker script. See the example below for details:
 
@@ -79,13 +79,13 @@ run specifically on the UI or Worker. Additionally, they contain the core messag
 communicate between the Worker and the UI. This messaging code is not in the standard angular2.js file.
 * We pass `loader.js` to our application injector using the WORKER_SCRIPT symbol. This tells angular that our WebWorkers's init script is located at `loader.js`.
 You can think of `loader.js` as the index.html file for the WebWorker.
-Since WebWorkers share no memory with the UI we need to reload the angular2 dependencies before
+Since WebWorkers share no memory with the UI we need to reload the Angular dependencies before
 bootstrapping our application. We do this with `importScripts`. Additionally, we need to do this in a different
 file than `app.ts` because our module loader (System.js in this example) has not been loaded yet, and `app.ts`
 will be compiled with a `System.define` call at the top.
-* The HelloWorld Component looks exactly like a normal Angular2 HelloWorld Component! The goal of WebWorker
+* The HelloWorld Component looks exactly like a normal Angular HelloWorld Component! The goal of WebWorker
 support was to allow as much of Angular to live in the worker as possible.
-As such, *most* angular2 components can be bootstrapped in a WebWorker with minimal to no changes required.
+As such, *most* Angular components can be bootstrapped in a WebWorker with minimal to no changes required.
 
 For reference, here's the same HelloWorld example in Dart.
 ```HTML
@@ -140,13 +140,13 @@ can communicate with the Isolate that spawned it. You need to provide this `Send
 so that Angular can communicate with the UI.
 * You need to set up `ReflectionCapabilities` on both the UI and Worker. Just like writing non-concurrent
 Angular2 Dart applications you need to set up the reflector. You should not use Reflection in production,
-but should use the angular 2 transformer to remove it in your final JS code. Note there's currently a bug
+but should use the Angular transformer to remove it in your final JS code. Note there's currently a bug
 with running the transformer on your UI code (#3971). You can (and should) pass the file where you call
 `bootstrap` as an entry point to the transformer, but you should not pass your UI index file
 to the transformer until that bug is fixed.
 
 ## Writing WebWorker Compatible Components
-You can do almost everything in a WebWorker component that you can do in a typical Angular 2 Component.
+You can do almost everything in a WebWorker component that you can do in a typical Angular Component.
 The main exception is that there is **no** DOM access from a WebWorker component. In Dart this means you can't
 import anything from `dart:html` and in JavaScript it means you can't use `document` or `window`. Instead you
 should use data bindings and if needed you can inject the `Renderer` along with your component's `ElementRef`