Skip to content

Commit 4cc7701

Browse files
petebacondarwinNarretz
petebacondarwin
authored and
Narretz
committed
docs(*): ensure naming is correct for Angular(JS) versions
This was originally done on the master branch in commit 0304383, but never back-ported to 1.6.x. That wasn't a big deal because docs.angularjs.org served the master snapshot docs. However, now we serve the 1.6.x snapshot docs, and it looks strange that the official docs have the wrong branding :).
1 parent 5dc0766 commit 4cc7701

File tree

169 files changed

+889
-885
lines changed

Some content is hidden

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

169 files changed

+889
-885
lines changed

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ If you find a bug in the source code, you can help us by submitting an issue to
4949
**Special Note for Localization Issues:** AngularJS uses the [Google Closure I18N library] to
5050
generate its own I18N files (the ngLocale module). This means that any changes to these files
5151
would be lost the next time that we import the library.
52+
5253
Since the Closure library i18n data is itself auto-generated from the data of the
5354
[Common Locale Data Repository (CLDR)] project, errors in the data should
5455
be reported there. See also the [Closure guide to i18n changes].
@@ -164,7 +165,6 @@ restarted.
164165
* Re-run the AngularJS test suite to ensure tests are still passing.
165166
* Commit your changes to your branch (e.g. `my-fix-branch`).
166167
* Push the changes to your GitHub repository (this will update your Pull Request).
167-
168168
You can also amend the initial commits and force push them to the branch.
169169

170170
```shell

‎README.closure.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ in its `contrib/externs` directory.
77
The definitions contain externs for use with the Closure compiler (aka
88
JSCompiler). Passing these files to the --externs parameter of a compiler
99
pass allows using type annotations for AngularJS objects. For example,
10-
Angular's $scope objects can be annotated as:
10+
AngularJS's $scope objects can be annotated as:
1111
```js
1212
/** @type {angular.Scope} */
1313
var scope = $scope;

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ piece of cake. Best of all? It makes development fun!
2020
* Core Development: [DEVELOPERS.md](DEVELOPERS.md)
2121
* Dashboard: https://dashboard.angularjs.org
2222

23-
##### Looking for Angular 2? Go here: https://github.com/angular/angular
23+
##### Looking for the new Angular? Go here: https://github.com/angular/angular
2424

2525
Documentation
2626
--------------------
@@ -72,7 +72,7 @@ HTML is also used to determine the wiring of the app. Special attributes in the
7272
to load the app, which components or controllers to use for each element, etc. We specify "what"
7373
gets loaded, but not "how". This declarative approach greatly simplifies app development in a sort
7474
of WYSIWYG way. Rather than spending time on how the program flows and orchestrating the various
75-
moving parts, we simply define what we want and Angular will take care of the dependencies.
75+
moving parts, we simply define what we want and AngularJS will take care of the dependencies.
7676

7777
#### Data Handling made simple
7878
Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties

‎TRIAGING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Triage new issues/PRs on github
22

3-
This document shows the steps the Angular team is using to triage issues.
3+
This document shows the steps the AngularJS team is using to triage issues.
44
The labels are used later on for [planning releases](#assigning-work).
55

66

@@ -45,12 +45,12 @@ This process based on the idea of minimizing user pain
4545
1. Label `frequency: *` – How often does this issue come up? How many developers does this affect? Chose just one of the following:
4646
* low - obscure issue affecting a handful of developers
4747
* moderate - impacts a common usage pattern
48-
* high - impacts most or all Angular apps
48+
* high - impacts most or all AngularJS apps
4949
1. Label `severity: *` - How bad is the issue? Chose just one of the following:
5050
* security issue
5151
* regression
5252
* memory leak
53-
* broken expected use - it's hard or impossible for a developer using Angular to accomplish something that Angular should be able to do
53+
* broken expected use - it's hard or impossible for a developer using AngularJS to accomplish something that AngularJS should be able to do
5454
* confusing - unexpected or inconsistent behavior; hard-to-debug
5555
* inconvenience - causes ugly/boilerplate code in apps
5656
1. Label `component: *`

‎docs/config/templates/app/indexPage.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
212212
Super-powered by Google ©2010-2018
213213
(<a id="version"
214214
ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
215-
ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
215+
ng-bind-template="v{{version}}" title="Changelog of this version of AngularJS">
216216
</a>)
217217
</p>
218218
<p>

‎docs/content/api/index.ngdoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ These components are {@link guide/directive directives}, {@link guide/services s
1111
There is also a {@link guide/index guide} with articles on various topics, and a list of external resources.
1212

1313
<div class="alert alert-info">
14-
**Angular Prefixes `$` and `$$`**:
14+
**AngularJS Prefixes `$` and `$$`**:
1515

1616
To prevent accidental name collisions with your code,
17-
Angular prefixes names of public objects with `$` and names of private objects with `$$`.
17+
AngularJS prefixes names of public objects with `$` and names of private objects with `$$`.
1818
Please do not use the `$` or `$$` prefix in your code.
1919
</div>
2020

21-
## Angular Modules
21+
## AngularJS Modules
2222

2323

2424
## {@link ng ng (core module)}
@@ -83,7 +83,7 @@ This module is provided by default and contains the core components of AngularJS
8383
</td>
8484
<td>
8585
<p>
86-
The core global API functions are attached to the angular object. These core functions are useful for low level JavaScript operations within your application.
86+
The core global API functions are attached to the `angular` object. These core functions are useful for low level JavaScript operations within your application.
8787
</p>
8888
<p>
8989
Some examples include:
@@ -130,7 +130,7 @@ Use ngRoute to enable URL routing to your application. The ngRoute module suppor
130130

131131
## {@link ngAnimate ngAnimate}
132132

133-
Use ngAnimate to enable animation features within your application. Various core ng directives will provide
133+
Use ngAnimate to enable animation features within your application. Various core AngularJS directives will provide
134134
animation hooks into your application when ngAnimate is included. Animations are defined by using CSS transitions/animations
135135
or JavaScript callbacks.
136136

‎docs/content/error/$compile/infchng.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
This error occurs when the application's model becomes unstable because some `$onChanges` hooks are causing updates which then trigger
77
further calls to `$onChanges` that can never complete.
8-
Angular detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
8+
AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
99

1010
For example, the situation can occur by setting up a `$onChanges()` hook which triggers an event on the component, which subsequently
1111
triggers the component's bound inputs to be updated:

‎docs/content/error/$http/badjsonp.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ value is `JSON_CALLBACK`.
1111
parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam`
1212
property. You must not provide your own parameter with this name in the configuratio of the request.
1313

14-
In previous versions of Angular, you specified where to add the callback parameter value via the
14+
In previous versions of AngularJS, you specified where to add the callback parameter value via the
1515
`JSON_CALLBACK` placeholder. This is no longer allowed.
1616

1717
To resolve this error, remove any parameters that have the same name as the `jsonpCallbackParam`;

‎docs/content/error/$injector/modulerr.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module.
1515
If you are getting this error after upgrading to `1.2.x` or later, be sure that you've
1616
installed {@link ngRoute `ngRoute`}.
1717

18-
### Monkey-patching Angular's `ng` module
18+
### Monkey-patching AngularJS's `ng` module
1919

2020
This error can also occur if you have tried to add your own components to the `ng` module.
2121
This has never been supported and from `1.3.0` it will actually trigger this error.

‎docs/content/error/$interpolate/badexpr.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@fullName Expecting end operator
44
@description
55

6-
The Angular expression is missing the corresponding closing operator.
6+
The AngularJS expression is missing the corresponding closing operator.

‎docs/content/error/$interpolate/dupvalue.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ extension in your interpolation expression. The different choices have to be un
88

99
For more information about the MessageFormat syntax in interpolation
1010
expressions, please refer to MessageFormat extensions section at
11-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
11+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/logicbug.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ bug mentioning the exact version of AngularJS used and we will fix it!
99

1010
For more information about the MessageFormat syntax in interpolation
1111
expressions, please refer to MessageFormat extensions section at
12-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
12+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/nochgmustache.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ future commit and the github issue will help gauge urgency.
1414

1515
For more information about the MessageFormat syntax in interpolation
1616
expressions, please refer to MessageFormat extensions section at
17-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
17+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/reqarg.ngdoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
@description
55

66
You must specify the MessageFormat function that you're using right after the
7-
comma following the Angular expression. Currently, the supported functions are
7+
comma following the AngularJS expression. Currently, the supported functions are
88
"plural" and "select" (for gender selections.)
99

1010
For more information about the MessageFormat syntax in interpolation
1111
expressions, please refer to MessageFormat extensions section at
12-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
12+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/reqcomma.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ extension keyword in the extended interpolation syntax.
88

99
For more information about the MessageFormat syntax in interpolation
1010
expressions, please refer to MessageFormat extensions section at
11-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
11+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/reqendbrace.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ brace to mark the end of the message.
88

99
For more information about the MessageFormat syntax in interpolation
1010
expressions, please refer to MessageFormat extensions section at
11-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
11+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/reqopenbrace.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ braces.
99

1010
For more information about the MessageFormat syntax in interpolation
1111
expressions, please refer to MessageFormat extensions section at
12-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
12+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/reqother.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ extensions require that you provide a message for the selection "other".
1010

1111
For more information about the MessageFormat syntax in interpolation
1212
expressions, please refer to MessageFormat extensions section at
13-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
13+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/unknarg.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ unsupported or invalid.
99

1010
For more information about the MessageFormat syntax in interpolation
1111
expressions, please refer to MessageFormat extensions section at
12-
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
12+
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}

‎docs/content/error/$interpolate/unsafe.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ You have attempted to use a MessageFormat extension in your interpolation expres
77

88
Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
99
(SCE)} and about the MessageFormat extensions at {@link
10-
guide/i18n#MessageFormat Angular i18n MessageFormat}.
10+
guide/i18n#MessageFormat AngularJS i18n MessageFormat}.

‎docs/content/error/$interpolate/untermstr.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
@fullName Unterminated string literal
44
@description
55

6-
The string literal was not terminated in your Angular expression.
6+
The string literal was not terminated in your AngularJS expression.

‎docs/content/error/$location/nobase.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ URL of the subcontext:
4040
</head>
4141
```
4242

43-
Before Angular 1.3 we didn't have this hard requirement and it was easy to write apps that worked
43+
Before AngularJS 1.3 we didn't have this hard requirement and it was easy to write apps that worked
4444
when deployed in the root context but were broken when moved to a sub-context because in the
4545
sub-context all absolute urls would resolve to the root context of the app. To prevent this,
4646
use relative URLs throughout your app:

‎docs/content/error/$parse/lexerr.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ Occurs when an expression has a lexical error, for example a malformed number (0
77

88
The error message contains a more precise error.
99

10-
To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
10+
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.

‎docs/content/error/$parse/syntax.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
Occurs when there is a syntax error in an expression. These errors are thrown while compiling the expression.
77
The error message contains a more precise description of the error, including the location (column) in the expression where the error occurred.
88

9-
To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
9+
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.

‎docs/content/error/$parse/ueoe.ngdoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ Occurs when an expression is missing tokens at the end of the expression.
88
For example, forgetting to close a bracket or failing to properly escape quotes in an expression
99
will trigger this error.
1010

11-
To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and
11+
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and
1212
fix the expression's syntax.

‎docs/content/error/$rootScope/infdig.ngdoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@description
55

66
This error occurs when the application's model becomes unstable and each `$digest` cycle triggers a state change and subsequent `$digest` cycle.
7-
Angular detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
7+
AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
88

99
For example, the situation can occur by setting up a watch on a path and subsequently updating the same path when the value changes.
1010

@@ -26,7 +26,7 @@ $scope.getUsers = function() {
2626
};
2727
```
2828

29-
Since `getUsers()` returns a new array, Angular determines that the model is different on each `$digest`
29+
Since `getUsers()` returns a new array, AngularJS determines that the model is different on each `$digest`
3030
cycle, resulting in the error. The solution is to return the same array object if the elements have
3131
not changed:
3232

0 commit comments

Comments
 (0)