Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
docs(*): ensure naming is correct for Angular(JS) versions
  • Loading branch information
petebacondarwin committed Jan 25, 2017
1 parent d24617b commit 0304383
Show file tree
Hide file tree
Showing 176 changed files with 983 additions and 985 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -20,7 +20,7 @@



**Which versions of Angular, and which browser / OS are affected by this issue? Did this work in previous versions of Angular? Please also test with the latest stable and snapshot (https://code.angularjs.org/snapshot/) versions.**
**Which versions of AngularJS, and which browser / OS are affected by this issue? Did this work in previous versions of AngularJS? Please also test with the latest stable and snapshot (https://code.angularjs.org/snapshot/) versions.**



Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Expand Up @@ -15,7 +15,7 @@ today! Here are the guidelines we'd like you to follow:

## <a name="coc"></a> Code of Conduct

Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][coc].
Help us keep AngularJS open and inclusive. Please read and follow our [Code of Conduct][coc].

## <a name="question"></a> Got a Question or Problem?

Expand All @@ -29,7 +29,7 @@ If you find a bug in the source code or a mistake in the documentation, you can
submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request
with a fix.

**Localization Issues:** Angular.js uses the [Google Closure I18N library] to generate
**Localization Issues:** AngularJS uses the [Google Closure I18N library] to generate
its own I18N files (the ngLocale module). This means that any changes to these files would be lost
the next time that we import the library.
Since the Closure library i18n data is itself auto-generated from the data of the
Expand Down Expand Up @@ -81,7 +81,7 @@ quickly:

* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
* **Motivation for or Use Case** - explain why this is a bug for you
* **Angular Version(s)** - is it a regression?
* **AngularJS Version(s)** - is it a regression?
* **Browsers and Operating System** - is this a problem with all browsers or only specific ones?
* **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
[JSFiddle][jsfiddle]) or an unambiguous set of steps.
Expand All @@ -108,7 +108,7 @@ Before you submit your pull request consider the following guidelines:
* Create your patch, **including appropriate test cases**.
* Follow our [Coding Rules](#rules).
* Run the full Angular test suite, as described in the [developer documentation][dev-doc],
* Run the full AngularJS test suite, as described in the [developer documentation][dev-doc],
and ensure that all tests pass.
* Commit your changes using a descriptive commit message that follows our
[commit message conventions](#commit) and passes our commit message presubmit hook
Expand All @@ -132,11 +132,11 @@ Before you submit your pull request consider the following guidelines:
git push origin my-fix-branch
```
In GitHub, send a pull request to `angular:master`.
In GitHub, send a pull request to `angular.js:master`.
If we suggest changes, then:
* Make the required updates.
* Re-run the Angular test suite to ensure tests are still passing.
* Re-run the AngularJS test suite to ensure tests are still passing.
* Commit your changes to your branch (e.g. `my-fix-branch`).
* Push the changes to your GitHub repository (this will update your Pull Request).
Expand Down Expand Up @@ -189,10 +189,10 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
* All features or bug fixes **must be tested** by one or more [specs][unit-testing].
* All public API methods **must be documented** with ngdoc, an extended version of jsdoc (we added
support for markdown and templating via @ngdoc tag). To see how we document our APIs, please check
out the existing ngdocs and see [this wiki page][ngDocs].
out the existing source code and see [this wiki page][ngDocs].
* With the exceptions listed below, we follow the rules contained in
[Google's JavaScript Style Guide][js-style-guide]:
* **Do not use namespaces**: Instead, wrap the entire angular code base in an anonymous closure and
* **Do not use namespaces**: Instead, wrap the entire AngularJS code base in an anonymous closure and
export our API explicitly rather than implicitly.
* Wrap all code at **100 characters**.
* Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
Expand Down
2 changes: 1 addition & 1 deletion README.closure.md
Expand Up @@ -7,7 +7,7 @@ in its `contrib/externs` directory.
The definitions contain externs for use with the Closure compiler (aka
JSCompiler). Passing these files to the --externs parameter of a compiler
pass allows using type annotations for AngularJS objects. For example,
Angular's $scope objects can be annotated as:
AngularJS's $scope objects can be annotated as:
```js
/** @type {angular.Scope} */
var scope = $scope;
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -19,7 +19,7 @@ piece of cake. Best of all? It makes development fun!
* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
* Dashboard: https://dashboard.angularjs.org

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

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

#### Data Handling made simple
Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties
Expand Down
6 changes: 3 additions & 3 deletions TRIAGING.md
@@ -1,6 +1,6 @@
# Triage new issues/PRs on github

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


Expand Down Expand Up @@ -45,12 +45,12 @@ This process based on the idea of minimizing user pain
1. Label `frequency: *` – How often does this issue come up? How many developers does this affect? Chose just one of the following:
* low - obscure issue affecting a handful of developers
* moderate - impacts a common usage pattern
* high - impacts most or all Angular apps
* high - impacts most or all AngularJS apps
1. Label `severity: *` - How bad is the issue? Chose just one of the following:
* security issue
* regression
* memory leak
* broken expected use - it's hard or impossible for a developer using Angular to accomplish something that Angular should be able to do
* broken expected use - it's hard or impossible for a developer using AngularJS to accomplish something that AngularJS should be able to do
* confusing - unexpected or inconsistent behavior; hard-to-debug
* inconvenience - causes ugly/boilerplate code in apps
1. Label `component: *`
Expand Down
4 changes: 2 additions & 2 deletions docs/config/templates/app/indexPage.template.html
Expand Up @@ -76,7 +76,7 @@
<div class="row">
<div class="col-md-9 header-branding">
<a class="brand navbar-brand" href="http://angularjs.org">
<img width="117" height="30" class="logo" alt="Link to Angular JS Homepage" ng-src="img/angularjs-for-header-only.svg">
<img width="117" height="30" class="logo" alt="Link to AngularJS Homepage" ng-src="img/angularjs-for-header-only.svg">
</a>
<ul class="nav navbar-nav">
<li class="divider-vertical"></li>
Expand Down Expand Up @@ -217,7 +217,7 @@ <h4 class="search-results-group-heading">{{ key }}</h4>
Super-powered by Google ©2010-2017
(<a id="version"
ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
ng-bind-template="v{{version}}" title="Changelog of this version of AngularJS">
</a>)
</p>
<p>
Expand Down
10 changes: 5 additions & 5 deletions docs/content/api/index.ngdoc
Expand Up @@ -11,14 +11,14 @@ These components are {@link guide/directive directives}, {@link guide/services s
There is also a {@link guide/index guide} with articles on various topics, and a list of external resources.

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

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

## Angular Modules
## AngularJS Modules


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

## {@link ngAnimate ngAnimate}

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

Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$animate/nocb.ngdoc
Expand Up @@ -3,7 +3,7 @@
@fullName Do not pass a callback to animate methods
@description

Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
Since AngularJS 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes.

If you are getting this error then you need to update your code to use the promise-based API.
Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$compile/infchng.ngdoc
Expand Up @@ -5,7 +5,7 @@

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

For example, the situation can occur by setting up a `$onChanges()` hook which triggers an event on the component, which subsequently
triggers the component's bound inputs to be updated:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$http/badjsonp.ngdoc
Expand Up @@ -11,7 +11,7 @@ value is `JSON_CALLBACK`.
parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam`
property. You must not provide your own parameter with this name in the configuratio of the request.

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

To resolve this error, remove any parameters that have the same name as the `jsonpCallbackParam`;
Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$injector/modulerr.ngdoc
Expand Up @@ -15,7 +15,7 @@ In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module.
If you are getting this error after upgrading to `1.2.x` or later, be sure that you've
installed {@link ngRoute `ngRoute`}.

### Monkey-patching Angular's `ng` module
### Monkey-patching AngularJS's `ng` module

This error can also occur if you have tried to add your own components to the `ng` module.
This has never been supported and from `1.3.0` it will actually trigger this error.
Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/badexpr.ngdoc
Expand Up @@ -3,4 +3,4 @@
@fullName Expecting end operator
@description

The Angular expression is missing the corresponding closing operator.
The AngularJS expression is missing the corresponding closing operator.
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/dupvalue.ngdoc
Expand Up @@ -8,4 +8,4 @@ extension in your interpolation expression. The different choices have to be un

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/logicbug.ngdoc
Expand Up @@ -9,4 +9,4 @@ bug mentioning the exact version of AngularJS used and we will fix it!

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/nochgmustache.ngdoc
Expand Up @@ -14,4 +14,4 @@ future commit and the github issue will help gauge urgency.

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
4 changes: 2 additions & 2 deletions docs/content/error/$interpolate/reqarg.ngdoc
Expand Up @@ -4,9 +4,9 @@
@description

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

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/reqcomma.ngdoc
Expand Up @@ -8,4 +8,4 @@ extension keyword in the extended interpolation syntax.

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/reqendbrace.ngdoc
Expand Up @@ -8,4 +8,4 @@ brace to mark the end of the message.

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/reqopenbrace.ngdoc
Expand Up @@ -9,4 +9,4 @@ braces.

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/reqother.ngdoc
Expand Up @@ -10,4 +10,4 @@ extensions require that you provide a message for the selection "other".

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/unknarg.ngdoc
Expand Up @@ -9,4 +9,4 @@ unsupported or invalid.

For more information about the MessageFormat syntax in interpolation
expressions, please refer to MessageFormat extensions section at
{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/unsafe.ngdoc
Expand Up @@ -7,4 +7,4 @@ You have attempted to use a MessageFormat extension in your interpolation expres

Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
(SCE)} and about the MessageFormat extensions at {@link
guide/i18n#MessageFormat Angular i18n MessageFormat}.
guide/i18n#MessageFormat AngularJS i18n MessageFormat}.
2 changes: 1 addition & 1 deletion docs/content/error/$interpolate/untermstr.ngdoc
Expand Up @@ -3,4 +3,4 @@
@fullName Unterminated string literal
@description

The string literal was not terminated in your Angular expression.
The string literal was not terminated in your AngularJS expression.
2 changes: 1 addition & 1 deletion docs/content/error/$location/nobase.ngdoc
Expand Up @@ -40,7 +40,7 @@ URL of the subcontext:
</head>
```

Before Angular 1.3 we didn't have this hard requirement and it was easy to write apps that worked
Before AngularJS 1.3 we didn't have this hard requirement and it was easy to write apps that worked
when deployed in the root context but were broken when moved to a sub-context because in the
sub-context all absolute urls would resolve to the root context of the app. To prevent this,
use relative URLs throughout your app:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/error/$parse/lexerr.ngdoc
Expand Up @@ -7,4 +7,4 @@ Occurs when an expression has a lexical error, for example a malformed number (0

The error message contains a more precise error.

To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.
2 changes: 1 addition & 1 deletion docs/content/error/$parse/syntax.ngdoc
Expand Up @@ -6,4 +6,4 @@
Occurs when there is a syntax error in an expression. These errors are thrown while compiling the expression.
The error message contains a more precise description of the error, including the location (column) in the expression where the error occurred.

To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.
2 changes: 1 addition & 1 deletion docs/content/error/$parse/ueoe.ngdoc
Expand Up @@ -8,5 +8,5 @@ Occurs when an expression is missing tokens at the end of the expression.
For example, forgetting to close a bracket or failing to properly escape quotes in an expression
will trigger this error.

To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and
To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and
fix the expression's syntax.
4 changes: 2 additions & 2 deletions docs/content/error/$rootScope/infdig.ngdoc
Expand Up @@ -4,7 +4,7 @@
@description

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

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

Expand All @@ -26,7 +26,7 @@ $scope.getUsers = function() {
};
```

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

Expand Down

0 comments on commit 0304383

Please sign in to comment.