docs(CHANGELOG.md): add changes for 1.6.8

The original fix for #16312 included changing how `$location.url(value)`
decoded the special characters passed to it as a setter.
This broke a number of use cases (mostly involving the ui-router).

Further analysis appears to show that we can solve #16312, to prevent
urls being rewritten with decoded values, without modifying the
behaviour of `$location.url`.

This commit reverts changes to `$location.url(value)` so that encoded
chars will once again be decoded and passed to `$location.path(value)`.
In particular it will convert encoded forward slashes, which changes how
the path is updated, since e.g. `a/b/%2Fc%2Fd` will become `a/b/c/d`.
While this is arguably not "correct", it appears that there are too many
use cases relying upon this behaviour.

.editorconfig

@@ -1,4 +1,4 @@
-# https://editorconfig.org
+# http://editorconfig.org
 
 root = true
 

.eslintignore

@@ -1,4 +1,6 @@
+bower_components/**
 build/**
+docs/bower_components/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
 node_modules/**
@@ -7,4 +9,3 @@ src/angular.bind.js
 src/ngParseExt/ucd.js
 i18n/closure/**
 tmp/**
-vendor/**

.eslintrc-node.json

@@ -1,13 +1,8 @@
 {
   "extends": "./.eslintrc-base.json",
+
   "env": {
     "browser": false,
     "node": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 2017
-  },
-  "plugins": [
-    "promise"
-  ]
+  }
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- General PR submission guidelines https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#submit-pr -->
+<!-- General PR submission guidelines https://github.com/angular/angular.js/CONTRIBUTING.md#submit-pr -->
 **What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**
 
 
@@ -16,8 +16,8 @@
 
 
 **Please check if the PR fulfills these requirements**
-- [ ] The commit message follows our [guidelines](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#commits)
-- [ ] Fix/Feature: [Docs](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#documentation) have been added/updated
+- [ ] The commit message follows our [guidelines](../DEVELOPERS.md#commits)
+- [ ] Fix/Feature: [Docs](../DEVELOPERS.md#documentation) have been added/updated
 - [ ] Fix/Feature: Tests have been added; existing tests pass
 
 **Other information**:

.gitignore

@@ -1,5 +1,4 @@
 /build/
-/deploy/
 /benchpress-build/
 .DS_Store
 gen_docs.disable
@@ -11,6 +10,7 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 node_modules/
+bower_components/
 angular.xcodeproj
 .idea
 *.iml
@@ -19,6 +19,7 @@ angular.xcodeproj
 libpeerconnection.log
 npm-debug.log
 /tmp/
+/scripts/bower/bower-*
 .vscode
 *.log
-*.stackdump
+*.stackdump

.travis.yml

@@ -5,6 +5,8 @@ node_js:
 
 cache:
   yarn: true
+  directories:
+    - bower_components
 
 branches:
   except:
@@ -30,8 +32,9 @@ before_install:
   - export PATH="$HOME/.yarn/bin:$PATH"
 
 before_script:
-  - du -sh ./node_modules || true
+  - du -sh ./node_modules ./bower_components/ || true
   - "./scripts/travis/before_build.sh"
+
 script:
   - "./scripts/travis/build.sh"
 
@@ -81,7 +84,6 @@ jobs:
         - provider: firebase
           # the upload folder for firebase is configured in /firebase.json
           skip_cleanup: true
-          project: docs-angularjs-org-9p2
           token:
             secure: $FIREBASE_TOKEN
           on:
@@ -94,7 +96,7 @@ jobs:
           secret_access_key:
             secure: tHIFdSq55qkyZf9zT/3+VkhUrTvOTMuswxXU3KyWaBrSieZqG0UnUDyNm+n3lSfX95zEl/+rJAWbfvhVSxZi13ndOtvRF+MdI1cvow2JynP0aDSiPffEvVrZOmihD6mt2SlMfhskr5FTduQ69kZG6DfLcve1PPDaIwnbOv3phb8=
           bucket: code-angularjs-org-338b8.appspot.com
-          local-dir: deploy/code
+          local-dir: uploadCode
           detect_encoding: true # detects gzip compression
           on:
             repo: angular/angular.js

CODE_OF_CONDUCT.md

@@ -1,3 +0,0 @@
-# Contributor Code of Conduct
-
-The AngularJS project follows the Code of Conduct defined in [the angular/code-of-conduct repository](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md). Please read it.

DEVELOPERS.md

@@ -1,7 +1,6 @@
 # Developing AngularJS
 
 * [Development Setup](#setup)
-* [Running Tests](#tests)
 * [Coding Rules](#rules)
 * [Commit Message Guidelines](#commits)
 * [Writing Documentation](#documentation)
@@ -9,7 +8,7 @@
 ## <a name="setup"> Development Setup
 
 This document describes how to set up your development environment to build and test AngularJS, and
-explains the basic mechanics of using `git`, `node`, `yarn` and `grunt`.
+explains the basic mechanics of using `git`, `node`, `yarn`, `grunt`, and `bower`.
 
 ### Installing Dependencies
 
@@ -19,7 +18,7 @@ machine:
 * [Git](http://git-scm.com/): The [Github Guide to
   Installing Git][git-setup] is a good source of information.
 
-* [Node.js v8.x (LTS)](http://nodejs.org): We use Node to generate the documentation, run a
+* [Node.js v6.x (LTS)](http://nodejs.org): We use Node to generate the documentation, run a
   development web server, run tests, and generate distributable files. Depending on your system,
   you can install Node either from source or as a pre-packaged bundle.
 
@@ -64,10 +63,10 @@ cd angular.js
 # Add the main AngularJS repository as an upstream remote to your repository:
 git remote add upstream "https://github.com/angular/angular.js.git"
 
-# Install JavaScript dependencies:
+# Install node.js dependencies:
 yarn install
 
-# Build AngularJS:
+# Build AngularJS (which will install `bower` dependencies automatically):
 yarn grunt package
 ```
 
@@ -108,8 +107,6 @@ HTTP server. For this purpose, we have made available a local web server based o
    http://localhost:8000/build/docs/
    ```
 
-## <a name="tests"> Running Tests
-
 ### <a name="unit-tests"></a> Running the Unit Test Suite
 
 We write unit and integration tests with Jasmine and execute them with Karma. To run all of the
@@ -119,7 +116,7 @@ tests once on Chrome run:
 yarn grunt test:unit
 ```
 
-To run the tests on other browsers use the command line flag:
+To run the tests on other browsers (Chrome, ChromeCanary, Firefox and Safari are pre-configured) use:
 
 ```shell
 yarn grunt test:unit --browsers=Chrome,Firefox
@@ -128,15 +125,15 @@ yarn grunt test:unit --browsers=Chrome,Firefox
 **Note:** there should be _no spaces between browsers_. `Chrome, Firefox` is INVALID.
 
 If you have a Saucelabs or Browserstack account, you can also run the unit tests on these services
-via our pre-defined customLaunchers. See the [karma config file](/karma-shared.conf.js) for all pre-configured browsers.
+via our pre-defined customLaunchers.
 
-For example, to run the whole unit test suite on selected browsers:
+For example, to run the whole unit test suite:
 
 ```shell
 # Browserstack
-yarn grunt test:unit --browsers=BS_Chrome,BS_Firefox,BS_Safari,BS_IE_9,BS_IE_10,BS_IE_11,BS_EDGE,BS_iOS_10
+yarn grunt test:unit --browsers=BS_Chrome,BS_Firefox,BS_Safari,BS_IE_9,BS_IE_10,BS_IE_11,BS_EDGE,BS_iOS_8,BS_iOS_9,BS_iOS_10
 # Saucelabs
-yarn grunt test:unit --browsers=SL_Chrome,SL_Firefox,SL_Safari,SL_IE_9,SL_IE_10,SL_IE_11,SL_EDGE,SL_iOS_10
+yarn grunt test:unit --browsers=BS_Chrome,BS_Firefox,BS_Safari,BS_IE_9,BS_IE_10,BS_IE_11,BS_EDGE,BS_iOS_8,BS_iOS_9,BS_iOS_10
 ```
 
 Running these commands requires you to set up [Karma Browserstack][karma-browserstack] or
@@ -486,4 +483,4 @@ You can see an example of a well-defined example [in the `ngRepeat` documentatio
 [karma-browserstack]: https://github.com/karma-runner/karma-browserstack-launcher
 [karma-saucelabs]: https://github.com/karma-runner/karma-sauce-launcher
 [unit-testing]: https://docs.angularjs.org/guide/unit-testing
-[yarn-install]: https://yarnpkg.com/en/docs/install
+[yarn-install]: https://yarnpkg.com/en/docs/install

Gruntfile.js

@@ -13,8 +13,6 @@ var semver = require('semver');
 var exec = require('shelljs').exec;
 var pkg = require(__dirname + '/package.json');
 
-var docsScriptFolder = 'scripts/docs.angularjs.org-firebase';
-
 // Node.js version checks
 if (!semver.satisfies(process.version, pkg.engines.node)) {
   reportOrFail('Invalid node version (' + process.version + '). ' +
@@ -164,12 +162,7 @@ module.exports = function(grunt) {
 
     clean: {
       build: ['build'],
-      tmp: ['tmp'],
-      deploy: [
-        'deploy/docs',
-        'deploy/code',
-        docsScriptFolder + '/functions/html'
-      ]
+      tmp: ['tmp']
     },
 
     eslint: {
@@ -180,11 +173,11 @@ module.exports = function(grunt) {
           'docs/**/*.js',
           'lib/**/*.js',
           'scripts/**/*.js',
-          '!scripts/*/*/node_modules/**',
           'src/**/*.js',
           'test/**/*.js',
           'i18n/**/*.js',
           '!docs/app/assets/js/angular-bootstrap/**',
+          '!docs/bower_components/**',
           '!docs/config/templates/**',
           '!src/angular.bind.js',
           '!i18n/closure/**',
@@ -194,6 +187,16 @@ module.exports = function(grunt) {
     },
 
     build: {
+      scenario: {
+        dest: 'build/angular-scenario.js',
+        src: [
+          'bower_components/jquery/dist/jquery.js',
+          util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
+        ],
+        styles: {
+          css: ['css/angular.css', 'css/angular-scenario.css']
+        }
+      },
       angular: {
         dest: 'build/angular.js',
         src: util.wrap([files['angularSrc']], 'angular'),
@@ -279,7 +282,9 @@ module.exports = function(grunt) {
       files: [
         'src/**/*.js',
         'test/**/*.js',
+        '!test/ngScenario/DescribeSpec.js',
         '!src/ng/directive/attrs.js', // legitimate xit here
+        '!src/ngScenario/**/*.js',
         '!test/helpers/privateMocks*.js'
       ],
       options: {
@@ -319,44 +324,19 @@ module.exports = function(grunt) {
           }
         ]
       },
-      deployFirebaseCode: {
-        files: [
-          // copy files that are not handled by compress
-          {
-            cwd: 'build',
-            src: '**/*.{zip,jpg,jpeg,png}',
-            dest: 'deploy/code/' + deployVersion + '/',
-            expand: true
-          }
-        ]
-      },
       deployFirebaseDocs: {
         files: [
           // The source files are needed by the embedded examples in the docs app.
           {
-            src: ['build/angular*.{js,js.map,min.js}', 'build/sitemap.xml'],
-            dest: 'deploy/docs/',
+            src: 'build/angular*.{js.map,min.js}',
+            dest: 'uploadDocs/',
             expand: true,
             flatten: true
           },
           {
             cwd: 'build/docs',
-            src: ['**', '!ptore2e/**', '!index*.html'],
-            dest: 'deploy/docs/',
-            expand: true
-          },
-          {
-            src: 'build/docs/index-production.html',
-            dest: 'deploy/docs/index.html'
-          },
-          {
-            src: 'build/docs/index-production.html',
-            dest: docsScriptFolder + '/functions/content/index.html'
-          },
-          {
-            cwd: 'build/docs',
-            src: 'partials/**',
-            dest: docsScriptFolder + '/functions/content',
+            src: '**',
+            dest: 'uploadDocs/',
             expand: true
           }
         ]
@@ -377,11 +357,10 @@ module.exports = function(grunt) {
         options: {
           mode: 'gzip'
         },
-        // Already compressed files should not be compressed again
-        src: ['**', '!**/*.{zip,png,jpeg,jpg}'],
+        src: ['**'],
         cwd: 'build',
         expand: true,
-        dest: 'deploy/code/' + deployVersion + '/'
+        dest: 'uploadCode/' + deployVersion + '/'
       }
     },
 
@@ -460,12 +439,14 @@ module.exports = function(grunt) {
     'shell:promises-aplus-tests'
   ]);
   grunt.registerTask('minify', [
+    'bower',
     'clean',
     'build',
     'minall'
   ]);
   grunt.registerTask('webserver', ['connect:devserver']);
   grunt.registerTask('package', [
+    'bower',
     'validate-angular-files',
     'clean',
     'buildall',
@@ -481,11 +462,9 @@ module.exports = function(grunt) {
     'merge-conflict',
     'eslint'
   ]);
-  grunt.registerTask('prepareDeploy', [
+  grunt.registerTask('prepareFirebaseDeploy', [
     'package',
     'compress:deployFirebaseCode',
-    'copy:deployFirebaseCode',
-    'firebaseDocsJsonForTravis',
     'copy:deployFirebaseDocs'
   ]);
   grunt.registerTask('default', ['package']);

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2018 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.closure.md

@@ -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,
-AngularJS's $scope objects can be annotated as:
+Angular's $scope objects can be annotated as:
 ```js
 /** @type {angular.Scope} */
 var scope = $scope;

README.md

@@ -12,14 +12,6 @@ It also helps with server-side communication, taming async callbacks with promis
 and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a
 piece of cake. Best of all? It makes development fun!
 
---------------------
-
-##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](https://docs.angularjs.org/misc/version-support-status)
-
-##### Looking for the new Angular? Go here: https://github.com/angular/angular
-
---------------------
-
 * Web site: https://angularjs.org
 * Tutorial: https://docs.angularjs.org/tutorial
 * API Docs: https://docs.angularjs.org/api
@@ -28,6 +20,7 @@ piece of cake. Best of all? It makes development fun!
 * Core Development: [DEVELOPERS.md](DEVELOPERS.md)
 * Dashboard: https://dashboard.angularjs.org
 
+##### Looking for Angular 2? Go here: https://github.com/angular/angular
 
 Documentation
 --------------------
@@ -79,7 +72,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 AngularJS will take care of the dependencies.
+moving parts, we simply define what we want and Angular 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

TRIAGING.md

@@ -1,6 +1,6 @@
 # Triage new issues/PRs on github
 
-This document shows the steps the AngularJS team is using to triage issues.
+This document shows the steps the Angular team is using to triage issues.
 The labels are used later on for [planning releases](#assigning-work).
 
 
@@ -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 AngularJS apps
+    * high - impacts most or all Angular 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 AngularJS to accomplish something that AngularJS should be able to do
+    * broken expected use - it's hard or impossible for a developer using Angular to accomplish something that Angular should be able to do
     * confusing - unexpected or inconsistent behavior; hard-to-debug
     * inconvenience - causes ugly/boilerplate code in apps
 1. Label `component: *`
@@ -95,7 +95,7 @@ You can mention him in the relevant thread like this: `@btford`.
 
 > Thanks for submitting this issue!
 > Unfortunately, we don't think this functionality belongs in core.
-> The good news is that you could easily implement this as a third-party module and publish it to the npm registry.
+> The good news is that you could easily implement this as a third-party module and publish it on Bower and/or to the npm repository.
 
 
 ## Assigning Work

angularFiles.js

@@ -74,7 +74,6 @@ var angularFiles = {
     'src/ng/directive/ngNonBindable.js',
     'src/ng/directive/ngOptions.js',
     'src/ng/directive/ngPluralize.js',
-    'src/ng/directive/ngRef.js',
     'src/ng/directive/ngRepeat.js',
     'src/ng/directive/ngShowHide.js',
     'src/ng/directive/ngStyle.js',
@@ -110,6 +109,7 @@ var angularFiles = {
     ],
     'ngCookies': [
       'src/ngCookies/cookies.js',
+      'src/ngCookies/cookieStore.js',
       'src/ngCookies/cookieWriter.js'
     ],
     'ngMessageFormat': [
@@ -146,6 +146,7 @@ var angularFiles = {
     'ngTouch': [
       'src/ngTouch/touch.js',
       'src/ngTouch/swipe.js',
+      'src/ngTouch/directive/ngClick.js',
       'src/ngTouch/directive/ngSwipe.js'
     ],
     'ngAria': [
@@ -153,8 +154,26 @@ var angularFiles = {
     ]
   },
 
+  'angularScenario': [
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/Application.js',
+    'src/ngScenario/Describe.js',
+    'src/ngScenario/Future.js',
+    'src/ngScenario/ObjectModel.js',
+    'src/ngScenario/Runner.js',
+    'src/ngScenario/SpecRunner.js',
+    'src/ngScenario/dsl.js',
+    'src/ngScenario/matchers.js',
+    'src/ngScenario/output/Html.js',
+    'src/ngScenario/output/Json.js',
+    'src/ngScenario/output/Xml.js',
+    'src/ngScenario/output/Object.js'
+  ],
+
   'angularTest': [
     'test/helpers/*.js',
+    'test/ngScenario/*.js',
+    'test/ngScenario/output/*.js',
     'test/*.js',
     'test/auto/*.js',
     'test/ng/**/*.js',
@@ -171,19 +190,26 @@ var angularFiles = {
   ],
 
   'karma': [
-    'node_modules/jquery/dist/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
     'test/jquery_remove.js',
     '@angularSrc',
     '@angularSrcModules',
+    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaExclude': [
     'test/jquery_alias.js',
     'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
     'src/angular.bind.js'
   ],
 
+  'karmaScenario': [
+    'build/angular-scenario.js',
+    'build/docs/docs-scenario.js'
+  ],
+
   'karmaModules': [
     'build/angular.js',
     '@angularSrcModules',
@@ -202,15 +228,17 @@ var angularFiles = {
   ],
 
   'karmaJquery': [
-    'node_modules/jquery/dist/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
     'test/jquery_alias.js',
     '@angularSrc',
     '@angularSrcModules',
+    '@angularScenario',
     '@angularTest'
   ],
 
   'karmaJqueryExclude': [
     'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
     'test/jquery_remove.js',
     'src/angular.bind.js'
   ]
@@ -220,8 +248,8 @@ var angularFiles = {
   angularFiles['karmaJquery' + jQueryVersion] = []
     .concat(angularFiles.karmaJquery)
     .map(function(path) {
-      if (path.startsWith('node_modules/jquery')) {
-        return path.replace(/^node_modules\/jquery/, 'node_modules/jquery-' + jQueryVersion);
+      if (path.startsWith('bower_components/jquery')) {
+        return path.replace(/^bower_components\/jquery/, 'bower_components/jquery-' + jQueryVersion);
       }
       return path;
     });

benchmarks/animation-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js

benchmarks/largetable-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js

benchmarks/orderby-bp/jquery-noop.js

@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js

benchmarks/parsed-expressions-bp/app.js

@@ -29,16 +29,19 @@ app.directive('bmPeWatch', function() {
   };
 });
 
-//Executes the specified expression as a collection watcher
-app.directive('bmPeWatchCollection', function() {
+//Executes the specified expression as a watcher
+//Adds a simple wrapper method to allow use of $watch instead of $watchCollection
+app.directive('bmPeWatchLiteral', function($parse) {
+  function retZero() {
+    return 0;
+  }
+
   return {
     restrict: 'A',
     compile: function($element, $attrs) {
-      $element.text($attrs.bmPeWatchCollection);
+      $element.text($attrs.bmPeWatchLiteral);
       return function($scope, $element, $attrs) {
-        $scope.$watchCollection($attrs.bmPeWatchCollection, function(val) {
-          $element.text(val);
-        });
+        $scope.$watch($parse($attrs.bmPeWatchLiteral, retZero));
       };
     }
   };
@@ -69,7 +72,8 @@ app.controller('DataController', function($scope, $rootScope) {
       date2: new Date(Math.random() * Date.now()),
       func: function() { return star; },
       obj: data[i - 1],
-      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1]))
+      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1])),
+      constructor: data[i - 1]
     });
   }
 

benchmarks/parsed-expressions-bp/main.html

@@ -16,6 +16,12 @@
           <label for="complexPath">Complex Paths</label>
         </li>
 
+        <li>
+          <input type="radio" ng-model="expressionType" value="constructorPath" id="constructorPath">
+          <label for="constructorPath">Constructor Paths</label>
+          ($parse special cases "constructor" for security)
+        </li>
+
         <li>
           <input type="radio" ng-model="expressionType" value="fieldAccess" id="fieldAccess">
           <label for="fieldAccess">Field Accessors</label>
@@ -60,16 +66,6 @@
           <input type="radio" ng-model="expressionType" value="arrayLiterals" id="arrayLiterals">
           <label for="arrayLiterals">Array Literals</label>
         </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollection" id="watchCollection">
-          <label for="watchCollection">$watchCollection</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollectionLiterals" id="watchCollectionLiterals">
-          <label for="watchCollectionLiterals">$watchCollection Literals</label>
-        </li>
       </ul>
 
       <!--
@@ -92,6 +88,17 @@
           <span bm-pe-watch="row.keys"></span>
         </li>
 
+        <li ng-switch-when="constructorPath" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="row.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+        </li>
+
         <li ng-switch-when="complexPath" ng-repeat="(rowIdx, row) in ::data">
           <span bm-pe-watch="row.index"></span>
           <span bm-pe-watch="row.num0"></span>
@@ -208,44 +215,27 @@
         </li>
 
         <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="{foo: rowIdx}"></span>
-          <span bm-pe-watch="{foo: row, bar: rowIdx}"></span>
-          <span bm-pe-watch="{0: row, 1: rowIdx, 2: 3}"></span>
-          <span bm-pe-watch="{str: 'foo', num: rowIdx, b: true}"></span>
-          <span bm-pe-watch="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
-          <span bm-pe-watch="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: row, bar: rowIdx}"></span>
+          <span bm-pe-watch-literal="{0: row, 1: rowIdx, 2: 3}"></span>
+          <span bm-pe-watch-literal="{str: 'foo', num: rowIdx, b: true}"></span>
+          <span bm-pe-watch-literal="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
+          <span bm-pe-watch-literal="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
         </li>
 
         <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="[rowIdx]"></span>
-          <span bm-pe-watch="[rowIdx, 0]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2, 3]"></span>
-          <span bm-pe-watch="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
-          <span bm-pe-watch="[rowIdx, undefined, null, true, false]"></span>
-          <span bm-pe-watch="[[][0], [0][0], [][rowIdx]]"></span>
-          <span bm-pe-watch="[0, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, 3, rowIdx]"></span>
-        </li>
-
-        <li ng-switch-when="watchCollection" ng-repeat="(rowIdx, row) in data">
-          <span bm-pe-watch-collection="data"></span>
-          <span bm-pe-watch-collection="row.keys"></span>
-          <span bm-pe-watch-collection="thisProbablyDoesntHaveAValue"></span>
-        </li>
-
-        <li ng-switch-when="watchCollectionLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, row, num0, str0, date0, obj, g, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, b: row, c: num0, d: str0, e: date0, f: obj, g: g, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
-
-          <!-- primitive/valueOf-compatible -->
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, num0, str0, date0, date1, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, c: num0, d: str0, e: date0, g: date1, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
+          <span bm-pe-watch-literal="[rowIdx]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2, 3]"></span>
+          <span bm-pe-watch-literal="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
+          <span bm-pe-watch-literal="[rowIdx, undefined, null, true, false]"></span>
+          <span bm-pe-watch-literal="[[][0], [0][0], [][rowIdx]]"></span>
+          <span bm-pe-watch-literal="[0, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, 3, rowIdx]"></span>
         </li>
       </ul>
     </div>

bower.json

@@ -0,0 +1,11 @@
+{
+  "name": "angularjs",
+  "license": "MIT",
+  "devDependencies": {
+    "jquery": "3.2.1",
+    "jquery-2.2": "jquery#2.2.4",
+    "jquery-2.1": "jquery#2.1.4",
+    "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.4/assets/ng-closure-runner.zip"
+  }
+}

css/angular-scenario.css

@@ -13,8 +13,7 @@ body {
   text-align: center;
 }
 
-#json,
-#xml {
+#json, #xml {
   display: none;
 }
 

css/angular.css

@@ -1,11 +1,7 @@
 @charset "UTF-8";
 
-[ng\:cloak],
-[ng-cloak],
-[data-ng-cloak],
-[x-ng-cloak],
-.ng-cloak,
-.x-ng-cloak,
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+.ng-cloak, .x-ng-cloak,
 .ng-hide:not(.ng-hide-animate) {
   display: none !important;
 }

docs/app/assets/css/docs.css

@@ -713,14 +713,14 @@ ul.events > li {
   margin-right: 5px;
 }
 
-@media only screen and (min-width: 768px) {
+@media only screen and (min-width: 769px) {
   [ng-include="partialPath"].ng-hide {
     display: block !important;
     visibility: hidden;
   }
 }
 
-@media only screen and (min-width: 768px) and (max-width: 991px) {
+@media only screen and (min-width: 769px) and (max-width: 991px) {
   .main-body-grid {
     margin-top: 160px;
   }
@@ -729,7 +729,7 @@ ul.events > li {
   }
 }
 
-@media only screen and (max-width: 767px) {
+@media only screen and (max-width : 768px) {
   .picker, .picker select {
     width: auto;
     display: block;
@@ -934,14 +934,6 @@ toc-container > div > toc-tree > ul > li > toc-tree > ul > li toc-tree > ul li {
   font-size: 13px;
 }
 
-.dev-status span {
-  padding: 2px 8px;
-  border-radius: 5px;
-}
-.security span { background-color: orange; }
-.stable span { background-color: green; color: white; }
-.current span { background-color: blue; color: white; }
-
 @media handheld and (max-width:800px), screen and (max-device-width:800px), screen and (max-width:800px) {
   .navbar {
     min-height: auto;

docs/app/assets/robots.txt

@@ -1,4 +0,0 @@
-User-agent: *
-
-# The map files are not required by the app
-Disallow: /*.map$

docs/app/e2e/.eslintrc.json

@@ -9,7 +9,6 @@
   },
 
   "globals": {
-    "angular": false,
     /* testabilityPatch / matchers */
     "inject": false,
     "module": false,

docs/app/e2e/app.scenario.js

@@ -21,9 +21,6 @@ describe('docs.angularjs.org', function() {
         console.log('browser console errors: ' + require('util').inspect(filteredLog));
       }
     });
-
-    browser.ignoreSynchronization = false;
-    browser.clearMockModules();
   });
 
 
@@ -105,66 +102,6 @@ describe('docs.angularjs.org', function() {
       expect(mainHeader.getText()).toEqual('Oops!');
     });
 
-    it('should set "noindex" if the page does not exist', function() {
-      browser.get('build/docs/index-production.html#!/api/does/not/exist');
-      var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-      var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-      expect(robots.isPresent()).toBe(true);
-      expect(googleBot.isPresent()).toBe(true);
-    });
-
-    it('should remove "noindex" if the page exists', function() {
-      browser.get('build/docs/index-production.html#!/api');
-      var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-      var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-      expect(robots.isPresent()).toBe(false);
-      expect(googleBot.isPresent()).toBe(false);
-    });
-
-    describe('template request error', function() {
-      beforeEach(function() {
-        browser.addMockModule('httpMocker', function() {
-          angular.module('httpMocker', ['ngMock'])
-            .run(['$httpBackend', function($httpBackend) {
-              $httpBackend.whenGET('localhost:8000/build/docs/partials/api.html').respond(500, '');
-            }]);
-          });
-      });
-
-      it('should set "noindex" for robots if the request fails', function() {
-        // index-test includes ngMock
-        browser.get('build/docs/index-test.html#!/api');
-        var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-        var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-        expect(robots.isPresent()).toBe(true);
-        expect(googleBot.isPresent()).toBe(true);
-      });
-    });
-
-
-    describe('page bootstrap error', function() {
-      beforeEach(function() {
-        browser.addMockModule('httpMocker', function() {
-          // Require a module that does not exist to break the bootstrapping
-          angular.module('httpMocker', ['doesNotExist']);
-        });
-    });
-
-      it('should have "noindex" for robots if bootstrapping fails', function() {
-        browser.get('build/docs/index.html#!/api').catch(function() {
-          // get() will fail on AngularJS bootstrap, but if we continue here, protractor
-          // will assume the app is ready
-          browser.ignoreSynchronization = true;
-          var robots = element(by.css('meta[name="robots"][content="noindex"]'));
-          var googleBot = element(by.css('meta[name="googlebot"][content="noindex"]'));
-          expect(robots.isPresent()).toBe(true);
-          expect(googleBot.isPresent()).toBe(true);
-        });
-      });
-
-
-    });
-
   });
 
 });

docs/app/e2e/table-of-contents.scenario.js

@@ -8,7 +8,7 @@
 describe('table of contents', function() {
 
   it('on provider pages', function() {
-    browser.get('build/docs/index.html#!/api/ng/provider/$controllerProvider');
+    browser.get('build/docs/index.html#!/api/ng/provider/$interpolateProvider');
 
     var toc = element.all(by.css('toc-container > div > toc-tree'));
     toc.getText().then(function(text) {
@@ -19,7 +19,7 @@ describe('table of contents', function() {
     var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
 
     tocFirstLevel.then(function(match) {
-      expect(match.length).toBe(2);
+      expect(match.length).toBe(3);
 
       expect(match[1].all(by.css('li')).count()).toBe(2);
     });

docs/app/src/docs.js

@@ -8,8 +8,6 @@ angular.module('DocsController', ['currentVersionData'])
   function($scope, $rootScope, $location, $window, $cookies,
               NG_PAGES, NG_NAVIGATION, CURRENT_NG_VERSION) {
 
-  var errorPartialPath = 'Error404.html';
-
   $scope.navClass = function(navItem) {
     return {
       active: navItem.href && this.currentPage && this.currentPage.path,
@@ -18,6 +16,8 @@ angular.module('DocsController', ['currentVersionData'])
     };
   };
 
+
+
   $scope.$on('$includeContentLoaded', function() {
     var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
     $window._gaq.push(['_trackPageview', pagePath]);
@@ -26,7 +26,6 @@ angular.module('DocsController', ['currentVersionData'])
 
   $scope.$on('$includeContentError', function() {
     $scope.loading = false;
-    $scope.loadingError = true;
   });
 
   $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
@@ -36,7 +35,6 @@ angular.module('DocsController', ['currentVersionData'])
     var currentPage = $scope.currentPage = NG_PAGES[path];
 
     $scope.loading = true;
-    $scope.loadingError = false;
 
     if (currentPage) {
       $scope.partialPath = 'partials/' + path + '.html';
@@ -52,22 +50,18 @@ angular.module('DocsController', ['currentVersionData'])
     } else {
       $scope.currentArea = NG_NAVIGATION['api'];
       $scope.breadcrumb = [];
-      $scope.partialPath = errorPartialPath;
+      $scope.partialPath = 'Error404.html';
     }
   });
 
-  $scope.hasError = function() {
-    return $scope.partialPath === errorPartialPath || $scope.loadingError;
-  };
-
   /**********************************
    Initialize
    ***********************************/
 
   $scope.versionNumber = CURRENT_NG_VERSION.full;
   $scope.version = CURRENT_NG_VERSION.full + ' ' + CURRENT_NG_VERSION.codeName;
-  $scope.loading = false;
-  $scope.loadingError = false;
+  $scope.loading = 0;
+
 
   var INDEX_PATH = /^(\/|\/index[^.]*.html)$/;
   if (!$location.path() || INDEX_PATH.test($location.path())) {

docs/config/index.js

@@ -22,7 +22,6 @@ module.exports = new Package('angularjs', [
 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
 .factory(require('./services/deployments/jquery'))
-.factory(require('./services/deployments/test'))
 .factory(require('./services/deployments/production'))
 
 .factory(require('./inline-tag-defs/type'))
@@ -32,7 +31,6 @@ module.exports = new Package('angularjs', [
 .processor(require('./processors/keywords'))
 .processor(require('./processors/pages-data'))
 .processor(require('./processors/versions-data'))
-.processor(require('./processors/sitemap'))
 
 
 .config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
@@ -148,7 +146,6 @@ module.exports = new Package('angularjs', [
 
 .config(function(checkAnchorLinksProcessor) {
   checkAnchorLinksProcessor.base = '/';
-  checkAnchorLinksProcessor.errorOnUnmatchedLinks = true;
   // We are only interested in docs that have an area (i.e. they are pages)
   checkAnchorLinksProcessor.checkDoc = function(doc) { return doc.area; };
 })
@@ -159,14 +156,12 @@ module.exports = new Package('angularjs', [
   generateProtractorTestsProcessor,
   generateExamplesProcessor,
   debugDeployment, defaultDeployment,
-  jqueryDeployment, testDeployment,
-  productionDeployment) {
+  jqueryDeployment, productionDeployment) {
 
   generateIndexPagesProcessor.deployments = [
     debugDeployment,
     defaultDeployment,
     jqueryDeployment,
-    testDeployment,
     productionDeployment
   ];
 

docs/config/processors/error-docs.js

@@ -5,36 +5,18 @@
  * @description
  * Process "error" docType docs and generate errorNamespace docs
  */
-module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrInfo) {
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
   return {
     $runAfter: ['tags-extracted'],
     $runBefore: ['extra-docs-added'],
     $process: function(docs) {
 
-      // Get the extracted min errors to compare with the error docs, and report any mismatch
-      var collectedErrors = require('../../../build/errors.json').errors;
-      var flatErrors = [];
-
-      for (var namespace in collectedErrors) {
-        for (var error in collectedErrors[namespace]) {
-          flatErrors.push(namespace + ':' + error);
-        }
-      }
-
       // Create error namespace docs and attach error docs to each
       docs.forEach(function(doc) {
         var parts, namespaceDoc;
 
         if (doc.docType === 'error') {
 
-          var matchingMinErr = flatErrors.indexOf(doc.name);
-
-          if (matchingMinErr === -1) {
-            log.warn('Error doc: ' + doc.name + ' has no matching min error');
-          } else {
-            flatErrors.splice(matchingMinErr, 1);
-          }
-
           // Parse out the error info from the id
           parts = doc.name.split(':');
           doc.namespace = parts[0];
@@ -59,10 +41,6 @@ module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrIn
         }
       });
 
-      flatErrors.forEach(function(value) {
-        log.warn('No error doc exists for min error: ' + value);
-      });
-
       errorNamespaceMap.forEach(function(errorNamespace) {
         docs.push(errorNamespace);
       });

docs/config/processors/sitemap.js

@@ -1,25 +0,0 @@
-'use strict';
-
-var exclusionRegex = /^index|examples\/|ptore2e\//;
-
-module.exports = function createSitemap() {
-  return {
-    $runAfter: ['paths-computed'],
-    $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.push({
-        id: 'sitemap.xml',
-        path: 'sitemap.xml',
-        outputPath: '../sitemap.xml',
-        template: 'sitemap.template.xml',
-        urls: docs.filter(function(doc) {
-          return doc.path &&
-            doc.outputPath &&
-            !exclusionRegex.test(doc.outputPath);
-        }).map(function(doc) {
-          return doc.path;
-        })
-      });
-    }
-  };
-};

docs/config/processors/versions-data.js

@@ -55,6 +55,9 @@ module.exports = function generateVersionDocProcessor(gitData) {
 
         if (missesCurrentVersion) versions.push(currentVersion.version);
 
+        // Get the stable release with the highest version
+        var highestStableRelease = versions.reverse().find(semverIsStable);
+
         versions = versions
             .filter(function(versionStr) {
               return blacklist.indexOf(versionStr) === -1;
@@ -82,9 +85,6 @@ module.exports = function generateVersionDocProcessor(gitData) {
         var latest = sortObject(latestMap, reverse(semver.compare))
             .map(function(version) { return makeOption(version, 'Latest'); });
 
-        // Get the stable release with the highest version
-        var highestStableRelease = versions.find(semverIsStable);
-
         // Generate master and stable snapshots
         var snapshots = [
           makeOption(
@@ -130,15 +130,14 @@ module.exports = function generateVersionDocProcessor(gitData) {
         return Object.keys(obj).map(function(key) { return obj[key]; }).sort(cmp);
       }
 
-      // Adapted from
       // https://github.com/kaelzhang/node-semver-stable/blob/34dd29842409295d49889d45871bec55a992b7f6/index.js#L25
       function semverIsStable(version) {
-        var semverObj = version.version;
+        var semverObj = semver.parse(version);
         return semverObj === null ? false : !semverObj.prerelease.length;
       }
 
       function createSnapshotStableLabel(version) {
-        var label = version.label.replace(/.$/, 'x') + '-snapshot';
+        var label = 'v' + version.replace(/.$/, 'x') + '-snapshot';
 
         return label;
       }

docs/config/services/deployments/test.js

@@ -1,40 +0,0 @@
-'use strict';
-
-module.exports = function testDeployment(getVersion) {
-  return {
-    name: 'test',
-    examples: {
-      commonFiles: {
-        scripts: ['../../../angular.js']
-      },
-      dependencyPath: '../../../'
-    },
-    scripts: [
-      '../angular.js',
-      '../angular-resource.js',
-      '../angular-route.js',
-      '../angular-cookies.js',
-      '../angular-mocks.js',
-      '../angular-sanitize.js',
-      '../angular-touch.js',
-      '../angular-animate.js',
-      'components/marked-' + getVersion('marked') + '/lib/marked.js',
-      'js/angular-bootstrap/dropdown-toggle.js',
-      'components/lunr-' + getVersion('lunr') + '/lunr.js',
-      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
-      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
-      'js/current-version-data.js',
-      'js/all-versions-data.js',
-      'js/pages-data.js',
-      'js/nav-data.js',
-      'js/docs.js'
-    ],
-    stylesheets: [
-      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
-      'css/prettify-theme.css',
-      'css/angular-topnav.css',
-      'css/docs.css',
-      'css/animations.css'
-    ]
-  };
-};

docs/config/services/getVersion.js

@@ -4,13 +4,14 @@ var path = require('canonical-path');
 /**
  * dgService getVersion
  * @description
- * Find the current version of the node module
+ * Find the current version of the bower component (or node module)
  */
 module.exports = function getVersion(readFilesProcessor) {
-  var sourceFolder = path.resolve(readFilesProcessor.basePath, 'node_modules');
-  var packageFile = 'package.json';
+  var basePath = readFilesProcessor.basePath;
 
-  return function(component) {
-    return require(path.join(sourceFolder, component, packageFile)).version;
+  return function(component, sourceFolder, packageFile) {
+    sourceFolder = path.resolve(basePath, sourceFolder || 'node_modules');
+    packageFile = packageFile || 'package.json';
+    return require(path.join(sourceFolder,component,packageFile)).version;
   };
 };

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

@@ -11,18 +11,6 @@
   <meta name="fragment" content="!">
   <title ng-bind-template="AngularJS: {{ currentArea.name }}: {{ currentPage.name || 'Error: Page not found'}}">AngularJS</title>
 
-  <script type="text/javascript">
-    (function() {
-      // Dynamically, pre-emptively, add `noindex`, which will be removed when the doc is ready and valid
-      ['googlebot', 'robots'].forEach(function(bot) {
-        var tag = document.createElement('meta');
-        tag.name = bot;
-        tag.content = 'noindex';
-        tag.setAttribute('ng-if', 'hasError()');
-        document.head.appendChild(tag);
-      });
-    })();
-  </script>
   <script type="text/javascript">
     // dynamically add base tag as well as css and javascript files.
     // we can't add css/js the usual way, because some browsers (FF) eagerly prefetch resources
@@ -139,7 +127,7 @@
             </ul>
 
           </div>
-          <div class="search-results-container" ng-show="hasResults" ng-cloak>
+          <div class="search-results-container" ng-show="hasResults">
             <div class="container">
               <div class="search-results-frame">
                 <div ng-repeat="(key, value) in results track by key" class="search-results-group" ng-class="colClassName + ' col-group-' + key" ng-show="value.length > 0">
@@ -169,7 +157,7 @@
           </div>
         </div>
       </nav>
-      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element ng-cloak>
+      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element>
         <div class="container main-grid main-header-grid">
           <div class="grid-left">
             <version-picker></version-picker>
@@ -186,7 +174,7 @@
       </nav>
     </header>
 
-    <section role="main" class="container main-body" ng-cloak>
+    <section role="main" class="container main-body">
       <div class="main-grid main-body-grid">
         <div class="grid-left">
           <a class="btn toc-toggle visible-xs" ng-click="toc=!toc">Show / Hide Table of Contents</a>
@@ -210,8 +198,7 @@
           </div>
         </div>
         <div class="grid-right">
-          <div ng-show="loading">Loading &hellip;</div>
-          <div ng-show="loadingError">There was an error loading this resource. Please try again later.</div>
+          <div id="loading" ng-show="loading">Loading...</div>
           <div ng-hide="loading" ng-include="partialPath" toc-collector autoscroll></div>
         </div>
       </div>
@@ -222,10 +209,10 @@
         <p class="pull-right"><a back-to-top>Back to top</a></p>
 
         <p>
-          Super-powered by Google ©2010-2018
+          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 AngularJS">
+               ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
            </a>)
         </p>
         <p>

docs/config/templates/app/sitemap.template.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {%- for url in doc.urls %}
-  <url>
-    <loc>https://docs.angularjs.org/{$ url $}</loc>
-  </url>{% endfor %}
-</urlset>

docs/content/api/index.ngdoc

@@ -3,15 +3,7 @@
 @description
 
 # AngularJS API Docs
-
-<div class="alert alert-warning">
-**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
-</div>
-
-## Welcome to the AngularJS API docs page.
-
-These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
-
+Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
 
 The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
 These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
@@ -19,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">
-**AngularJS Prefixes `$` and `$$`**:
+**Angular Prefixes `$` and `$$`**:
 
 To prevent accidental name collisions with your code,
-AngularJS prefixes names of public objects with `$` and names of private objects with `$$`.
+Angular prefixes names of public objects with `$` and names of private objects with `$$`.
 Please do not use the `$` or `$$` prefix in your code.
 </div>
 
-## AngularJS Modules
+## Angular Modules
 
 
 ## {@link ng ng (core module)}
@@ -91,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:
@@ -138,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 AngularJS directives will provide
+Use ngAnimate to enable animation features within your application. Various core ng directives will provide
 animation hooks into your application when ngAnimate is included. Animations are defined by using CSS transitions/animations
 or JavaScript callbacks.
 
@@ -222,7 +214,11 @@ Use the ngCookies module to handle cookie management within your application.
       {@link ngCookies#service Services / Factories}
     </td>
     <td>
-      The {@link ngCookies.$cookies $cookies} service is a convenient wrapper to store simple data within browser cookies.
+      The following services are used for cookie management:
+      <ul>
+        <li>The {@link ngCookies.$cookies $cookie} service is a convenient wrapper to store simple data within browser cookies.</li>
+        <li>{@link ngCookies.$cookieStore $cookieStore} is used to store more complex data using serialization.</li>
+      </ul>
     </td>
   </tr>
 </table>

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

@@ -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.
-AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
+Angular 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:

docs/content/error/$compile/iscp.ngdoc

@@ -10,15 +10,13 @@ myModule.directive('directiveName', function factory() {
   return {
     ...
     scope: {
-      'localName': '@', // OK
-      'localName2': '&attr', // OK
-      'localName3': '<?attr', // OK
-      'localName4': ' = attr', // OK
-      'localName5': ' =*attr', // OK      
-      'localName6': 'attr',    // ERROR: missing mode @&=<
-      'localName7': 'attr=',   // ERROR: must be prefixed with @&=<
-      'localName8': '=attr?',  // ERROR: ? must come directly after the mode
-      'localName9': '<*'  // ERROR: * is only valid with =
+      'attrName': '@', // OK
+      'attrName2': '=localName', // OK
+      'attrName3': '<?localName', // OK
+      'attrName4': ' = name', // OK
+      'attrName5': 'name',    // ERROR: missing mode @&=
+      'attrName6': 'name=',   // ERROR: must be prefixed with @&=
+      'attrName7': '=name?',  // ERROR: ? must come directly after the mode
     }
     ...
   }

docs/content/error/$compile/missingattr.ngdoc

@@ -3,34 +3,6 @@
 @fullName Missing required attribute
 @description
 
-This error may occur only when {@link $compileProvider#strictComponentBindingsEnabled `$compileProvider.strictComponentBindingsEnabled`} is set to `true`.
-
-If that is the case, then all {@link $compileProvider#component component} controller bindings and
-{@link $compileProvider#directive directive} scope / controller bindings that are non-optional,
-must be provided when the directive is instantiated.
-
-To make a binding optional, add '?' to the definition.
-
-## Example:
-
-```js
-
-app.component('myTest', {
-  bindings: {
-    first: '=?', // optional
-    second: '='
-  },
-  controller: function() {
-    ...
-  },
-  template: '...'
-});
-
-```
-
-This component will throw `missingattr` for the `second` binding when used as follows:
-
-```html
-<my-test></my-test>
-```
-
+This error may occur only when `$compileProvider.strictComponentBindingsEnabled` is set to `true`.
+Then all attributes mentioned in `bindings` without `?` must be set. If one or more aren't set,
+the first one will throw an error.

docs/content/error/$compile/srcset.ngdoc

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:srcset
-@fullName Invalid value passed to `attr.$set('srcset', value)`
-@description
-
-This error occurs if you try to programmatically set the `srcset` attribute with a non-string value.
-
-This can be the case if you tried to avoid the automatic sanitization of the `srcset` value by
-passing a "trusted" value provided by calls to `$sce.trustAsMediaUrl(value)`.
-
-If you want to programmatically set explicitly trusted unsafe URLs, you should use `$sce.trustAsHtml`
-on the whole `img` tag and inject it into the DOM using the `ng-bind-html` directive.

docs/content/error/$compile/tpload.ngdoc

@@ -0,0 +1,11 @@
+@ngdoc error
+@name $compile:tpload
+@fullName Error Loading Template
+@description
+
+This error occurs when {@link ng.$compile `$compile`} attempts to fetch a template from some URL, and the request fails.
+
+To resolve this error, ensure that the URL of the template is spelled correctly and resolves to correct absolute URL.
+The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview) might also be helpful in determining why the request failed.
+
+If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was populated with the template.

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

@@ -9,9 +9,9 @@ value is `JSON_CALLBACK`.
 
 `$http` JSONP requests need to attach a callback query parameter to the URL. The name of this
 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 configuration of the request.
+property. You must not provide your own parameter with this name in the configuratio of the request.
 
-In previous versions of AngularJS, you specified where to add the callback parameter value via the
+In previous versions of Angular, 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`;

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

@@ -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 AngularJS's `ng` module
+### Monkey-patching Angular'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.

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

@@ -3,4 +3,4 @@
 @fullName Expecting end operator
 @description
 
-The AngularJS expression is missing the corresponding closing operator.
+The Angular expression is missing the corresponding closing operator.

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -4,9 +4,9 @@
 @description
 
 You must specify the MessageFormat function that you're using right after the
-comma following the AngularJS expression.  Currently, the supported functions are
+comma following the Angular 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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}

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

@@ -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 AngularJS i18n MessageFormat}.
+guide/i18n#MessageFormat Angular i18n MessageFormat}.

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

@@ -3,4 +3,4 @@
 @fullName Unterminated string literal
 @description
 
-The string literal was not terminated in your AngularJS expression.
+The string literal was not terminated in your Angular expression.

docs/content/error/$interval/badprom.ngdoc

@@ -1,25 +0,0 @@
-@ngdoc error
-@name $interval:badprom
-@fullName Non-$interval promise
-@description
-
-This error occurs when calling {@link ng.$interval#cancel $interval.cancel()} with a promise that
-was not generated by the {@link ng.$interval $interval} service. This can, for example, happen when
-calling {@link ng.$q#the-promise-api then()/catch()} on the returned promise, which creates a new
-promise, and pass that new promise to {@link ng.$interval#cancel $interval.cancel()}.
-
-Example of incorrect usage that leads to this error:
-
-```js
-var promise = $interval(doSomething, 1000, 5).then(doSomethingElse);
-$interval.cancel(promise);
-```
-
-To fix the example above, keep a reference to the promise returned by
-{@link ng.$interval $interval()} and pass that to {@link ng.$interval#cancel $interval.cancel()}:
-
-```js
-var promise = $interval(doSomething, 1000, 5);
-var newPromise = promise.then(doSomethingElse);
-$interval.cancel(promise);
-```

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

@@ -40,7 +40,7 @@ URL of the subcontext:
 </head>
 ```
 
-Before AngularJS 1.3 we didn't have this hard requirement and it was easy to write apps that worked
+Before Angular 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:

docs/content/error/$parse/esc.ngdoc

@@ -1,10 +0,0 @@
-@ngdoc error
-@name $parse:esc
-@fullName Value cannot be escaped
-@description
-
-Occurs when the parser tries to escape a value that is not known.
-
-This should never occur in practice. If it does then that indicates a programming
-error in the AngularJS `$parse` service itself and should be reported as an issue
-at https://github.com/angular/angular.js/issues.

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

@@ -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 AngularJS expressions}, identify the error and fix the expression's syntax.
+To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.

docs/content/error/$parse/lval.ngdoc

@@ -1,13 +0,0 @@
-@ngdoc error
-@name $parse:lval
-@fullName Trying to assign a value to a non l-value
-@description
-
-Occurs when an expression is trying to assign a value to a non-assignable expression.
-
-This can happen if the left side of an assigment is not a valid reference to a variable
-or property. E.g. In the following snippet `1+2` is not assignable.
-
-```
-(1+2) = 'hello';
-```

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

@@ -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 AngularJS expressions}, identify the error and fix the expression's syntax.
+To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.

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

@@ -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 AngularJS expressions}, identify the error and
+To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and 
 fix the expression's syntax.

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

@@ -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.
-AngularJS detects this situation and prevents an infinite loop from causing the browser to become unresponsive.
+Angular 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.
 
@@ -26,7 +26,7 @@ $scope.getUsers = function() {
 };
 ```
 
-Since `getUsers()` returns a new array, AngularJS determines that the model is different on each `$digest`
+Since `getUsers()` returns a new array, Angular 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:
 

docs/content/error/$rootScope/inprog.ngdoc

@@ -10,17 +10,17 @@ the error.
 
 ## Background
 
-AngularJS uses a dirty-checking digest mechanism to monitor and update values of the scope during
+Angular uses a dirty-checking digest mechanism to monitor and update values of the scope during
 the processing of your application.  The digest works by checking all the values that are being
 watched against their previous value and running any watch handlers that have been defined for those
 values that have changed.
 
 This digest mechanism is triggered by calling `$digest` on a scope object.  Normally you do not need
 to trigger a digest manually, because every external action that can trigger changes in your
-application, such as mouse events, timeouts or server responses, wrap the AngularJS application code
+application, such as mouse events, timeouts or server responses, wrap the Angular application code
 in a block of code that will run `$digest` when the code completes.
 
-You wrap AngularJS code in a block that will be followed by a `$digest` by calling `$apply` on a scope
+You wrap Angular code in a block that will be followed by a `$digest` by calling `$apply` on a scope
 object.  So, in pseudo-code, the process looks like this:
 
 ```
@@ -45,20 +45,20 @@ $apply = function(fn) {
 
 ## Digest Phases
 
-AngularJS keeps track of what phase of processing we are in, the relevant ones being `$apply` and
+Angular keeps track of what phase of processing we are in, the relevant ones being `$apply` and
 `$digest`.  Trying to reenter a `$digest` or `$apply` while one of them is already in progress is
-typically a sign of programming error that needs to be fixed. So AngularJS will throw this error when
+typically a sign of programming error that needs to be fixed. So Angular will throw this error when
 that occurs.
 
 In most situations it should be well defined whether a piece of code will be run inside an `$apply`,
 in which case you should not be calling `$apply` or `$digest`, or it will be run outside, in which
-case you should wrap any code that will be interacting with AngularJS scope or services, in a call to
+case you should wrap any code that will be interacting with Angular scope or services, in a call to
 `$apply`.
 
-As an example, all Controller code should expect to be run within AngularJS, so it should have no need
+As an example, all Controller code should expect to be run within Angular, so it should have no need
 to call `$apply` or `$digest`.  Conversely, code that is being trigger directly as a call back to
 some external event, from the DOM or 3rd party library, should expect that it is never called from
-within AngularJS, and so any AngularJS application code that it calls should first be wrapped in a call
+within Angular, and so any Angular application code that it calls should first be wrapped in a call
 to $apply.
 
 ## Common Causes
@@ -84,8 +84,8 @@ function MyController($scope, thirdPartyComponent) {
 }
 ```
 
-We expect that our callback will be called asynchronously, and so from outside AngularJS. Therefore, we
-correctly wrap our application code that interacts with AngularJS in a call to `$apply`.
+We expect that our callback will be called asynchronously, and so from outside Angular. Therefore, we
+correctly wrap our application code that interacts with Angular in a call to `$apply`.
 
 The problem comes if `getData()` decides to call the callback handler synchronously; perhaps it has
 the data already cached in memory and so it immediately calls the callback to return the data,
@@ -116,7 +116,7 @@ that the code will be called in a single `$apply` block.
 ### Triggering Events Programmatically
 
 The other situation that often leads to this error is when you trigger code (such as a DOM event)
-programmatically (from within AngularJS), which is normally called by an external trigger.
+programmatically (from within Angular), which is normally called by an external trigger.
 
 For example, consider a directive that will set focus on an input control when a value in the scope
 is true:
@@ -161,7 +161,7 @@ In this second scenario, we are already inside a `$digest` when the ngFocus dire
 call to `$apply()`, causing this error to be thrown.
 
 It is possible to workaround this problem by moving the call to set the focus outside of the digest,
-by using `$timeout(fn, 0, false)`, where the `false` value tells AngularJS not to wrap this `fn` in an
+by using `$timeout(fn, 0, false)`, where the `false` value tells Angular not to wrap this `fn` in an
 `$apply` block:
 
 ```
@@ -203,7 +203,7 @@ Once you have identified this call you work your way up the stack to see what th
 called from within an `$apply`/`$digest`.  It may be a simple oversight or maybe it fits with the
 sync/async scenario described earlier.
 
-* If the second call was made inside an AngularJS directive then it is likely that it matches the second
+* If the second call was made inside an Angular directive then it is likely that it matches the second
 programmatic event trigger scenario described earlier.  In this case you may need to look further up
 the tree to what triggered the event in the first place.
 
@@ -259,11 +259,11 @@ $get.g.$apply angular.js:12742                   <--- $apply
 q angular.js:320
 ```
 
-We can see (even though the AngularJS code is minified) that there were two calls to `$apply`, first
+We can see (even though the Angular code is minified) that there were two calls to `$apply`, first
 on line `19833`, then on line `12738` of `angular.js`.
 
 It is this second call that caused the error.  If we look at the angular.js code, we can see that
-this call is made by an AngularJS directive.
+this call is made by an Angular directive.
 
 ```
 var ngEventDirectives = {};
@@ -308,5 +308,5 @@ We can now see that the second `$apply` was caused by us programmatically trigge
 `$timeout` as described above.
 
 ## Further Reading
-To learn more about AngularJS processing model please check out the
+To learn more about Angular processing model please check out the
 {@link guide/concepts concepts doc} as well as the {@link ng.$rootScope.Scope api} doc.

docs/content/error/$route/norout.ngdoc

@@ -1,8 +0,0 @@
-@ngdoc error
-@name $route:norout
-@fullName Tried updating route with no current route
-@description
-
-Occurs when an attempt is made to update the parameters on the current route when
-there is no current route. This can happen if you try to call `$route.updateParams();`
-before the first route transition has completed.

docs/content/error/$sanitize/noinert.ngdoc

@@ -7,4 +7,4 @@ This error occurs when `$sanitize` sanitizer determines that `document.implement
 
 This api is necessary for safe parsing of HTML strings into DOM trees and without it the sanitizer can't sanitize the input.
 
-The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that AngularJS's `$sanitize` is being used on an unsupported platform.
+The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that Angular's `$sanitize` is being used on an unsupported platform.

docs/content/error/$sce/insecurl.ngdoc

@@ -5,10 +5,10 @@
 
 AngularJS' {@link ng.$sce Strict Contextual Escaping (SCE)} mode (enabled by default) has blocked loading a resource from an insecure URL.
 
-Typically, this would occur if you're attempting to load an AngularJS template from an untrusted source.
+Typically, this would occur if you're attempting to load an Angular template from an untrusted source.
 It's also possible that a custom directive threw this error for a similar reason.
 
-AngularJS only loads templates from trusted URLs (by calling {@link ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl} on the template URL).
+Angular only loads templates from trusted URLs (by calling {@link ng.$sce#getTrustedResourceUrl $sce.getTrustedResourceUrl} on the template URL).
 
 By default, only URLs that belong to the same origin are trusted. These are urls with the same domain, protocol and port as the application document.
 

docs/content/error/$sce/unsafe.ngdoc

@@ -5,10 +5,10 @@
 
 The value provided for use in a specific context was not found to be safe/trusted for use.
 
-AngularJS's {@link ng.$sce Strict Contextual Escaping (SCE)} mode
+Angular's {@link ng.$sce Strict Contextual Escaping (SCE)} mode
 (enabled by default), requires bindings in certain
 contexts to result in a value that is trusted as safe for use in such a context.  (e.g. loading an
-AngularJS template from a URL requires that the URL is one considered safe for loading resources.)
+Angular template from a URL requires that the URL is one considered safe for loading resources.)
 
 This helps prevent XSS and other security issues.  Read more at
 {@link ng.$sce Strict Contextual Escaping (SCE)}

docs/content/error/$templateRequest/tpload.ngdoc

@@ -1,18 +0,0 @@
-@ngdoc error
-@name $templateRequest:tpload
-@fullName Error Loading Template
-@description
-
-This error occurs when {@link $templateRequest} attempts to fetch a template from some URL, and
-the request fails.
-
-The template URL might be defined in a directive/component definition, an instance of `ngInclude`,
-an instance of `ngMessagesInclude` or a templated route in a `$route` route definition.
-
-To resolve this error, ensure that the URL of the template is spelled correctly and resolves to
-correct absolute URL.
-The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview)
-might also be helpful in determining why the request failed.
-
-If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was
-populated with the template.

docs/content/error/$timeout/badprom.ngdoc

@@ -1,25 +0,0 @@
-@ngdoc error
-@name $timeout:badprom
-@fullName Non-$timeout promise
-@description
-
-This error occurs when calling {@link ng.$timeout#cancel $timeout.cancel()} with a promise that
-was not generated by the {@link ng.$timeout $timeout} service. This can, for example, happen when
-calling {@link ng.$q#the-promise-api then()/catch()} on the returned promise, which creates a new
-promise, and pass that new promise to {@link ng.$timeout#cancel $timeout.cancel()}.
-
-Example of incorrect usage that leads to this error:
-
-```js
-var promise = $timeout(doSomething, 1000).then(doSomethingElse);
-$timeout.cancel(promise);
-```
-
-To fix the example above, keep a reference to the promise returned by
-{@link ng.$timeout $timeout()} and pass that to {@link ng.$timeout#cancel $timeout.cancel()}:
-
-```js
-var promise = $timeout(doSomething, 1000);
-var newPromise = promise.then(doSomethingElse);
-$timeout.cancel(promise);
-```

docs/content/error/jqLite/nosel.ngdoc

@@ -3,9 +3,9 @@
 @fullName Unsupported Selector Lookup
 @description
 
-In order to keep AngularJS small, AngularJS implements only a subset of the selectors in {@link angular.element#angularjs-s-jqlite jqLite}.
+In order to keep Angular small, Angular implements only a subset of the selectors in {@link angular.element#angular-s-jqlite jqLite}.
 This error occurs when a jqLite instance is invoked with a selector other than this subset.
 
 In order to resolve this error, rewrite your code to only use tag name selectors and manually traverse the DOM using the APIs provided by jqLite.
 
-Alternatively, you can include a full version of jQuery, which AngularJS will automatically use and that will make all selectors available.
+Alternatively, you can include a full version of jQuery, which Angular will automatically use and that will make all selectors available.

docs/content/error/ng/test.ngdoc

@@ -3,7 +3,7 @@
 @fullName Testability Not Found
 @description
 
-AngularJS's testability helper, getTestability, requires a root element to be
-passed in. This helps differentiate between different AngularJS apps on the same
+Angular's testability helper, getTestability, requires a root element to be
+passed in. This helps differentiate between different Angular apps on the same
 page. This error is thrown when no injector is found for root element. It is
 often because the root element is outside of the ng-app.

docs/content/error/ngModel/datefmt.ngdoc

@@ -5,7 +5,7 @@
 
 All date-related inputs like `<input type="date">` require the model to be a `Date` object.
 If the model is something else, this error will be thrown.
-AngularJS does not set validation errors on the `<input>` in this case
+Angular does not set validation errors on the `<input>` in this case
 as those errors are shown to the user, but the erroneous state was
 caused by incorrect application logic and not by the user.
 

docs/content/error/ngModel/numfmt.ngdoc

@@ -7,7 +7,7 @@ The `input[number]` and `input[range]` directives require the model to be a `num
 
 If the model is something else, this error will be thrown.
 
-AngularJS does not set validation errors on the `<input>` in this case
+Angular does not set validation errors on the `<input>` in this case
 as this error is caused by incorrect application logic and not by bad input from the user.
 
 If your model does not contain actual numbers then it is up to the application developer

docs/content/error/ngRef/noctrl.ngdoc

@@ -1,17 +0,0 @@
-@ngdoc error
-@name ngRef:noctrl
-@fullName A controller for the value of `ngRefRead` could not be found on the element.
-@description
-
-This error occurs when the {@link ng.ngRef ngRef directive} specifies
-a value in `ngRefRead` that cannot be resolved to a directive / component controller.
-
-Causes for this error can be:
-
-1. Your `ngRefRead` value has a typo.
-2. You have a typo in the *registered* directive / component name.
-3. The directive / component does not have a controller.
-
-Note that `ngRefRead` takes the name of the component / directive, not the name of controller, and
-also not the combination of directive and 'Controller'. For example, for a directive called 'myDirective',
-the correct declaration is `<div ng-ref="$ctrl.ref" ng-ref-read="myDirective">`.

docs/content/error/ngRef/nonassign.ngdoc

@@ -1,27 +0,0 @@
-@ngdoc error
-@name ngRef:nonassign
-@fullName Non-Assignable Expression
-@description
-
-This error occurs when ngRef defines an expression that is not-assignable.
-
-In order for ngRef to work, it must be possible to write the reference into the path defined with the expression.
-
-For example, the following expressions are non-assignable:
-
-```
-<my-directive ng-ref="{}"></my-directive>
-
-<my-directive ng-ref="myFn()"></my-directive>
-
-<!-- missing attribute value is also invalid -->
-<my-directive ng-ref></my-directive>
-
-```
-
-To resolve this error, use a path expression that is assignable:
-
-```
-<my-directive ng-ref="$ctrl.reference"></my-directive>
-
-```

docs/content/guide/$location.ngdoc

@@ -48,7 +48,7 @@ changes to `$location` are reflected into the browser address bar.
   </tr>
 
   <tr>
-    <td class="head">integration with AngularJS application life-cycle</td>
+    <td class="head">integration with angular application life-cycle</td>
     <td>none</td>
     <td>knows about all internal life-cycle phases, integrates with {@link ng.$rootScope.Scope#$watch $watch}, ...</td>
   </tr>
@@ -224,7 +224,7 @@ facilitate the browser URL change and history management.
 ## Hashbang mode (default mode)
 
 In this mode, `$location` uses Hashbang URLs in all browsers.
-AngularJS also does not intercept and rewrite links in this mode. I.e. links work
+Angular also does not intercept and rewrite links in this mode. I.e. links work
 as expected and also perform full page reloads when other parts of the url
 than the hash fragment was changed.
 
@@ -267,7 +267,7 @@ having to worry about whether the browser displaying your app supports the histo
 - Opening a regular URL in a legacy browser -> redirects to a hashbang URL
 - Opening hashbang URL in a modern browser -> rewrites to a regular URL
 
-Note that in this mode, AngularJS intercepts all links (subject to the "Html link rewriting" rules below)
+Note that in this mode, Angular intercepts all links (subject to the "Html link rewriting" rules below)
 and updates the url in a way that never performs a full page reload.
 
 
@@ -363,7 +363,7 @@ Note that [attribute name normalization](guide/directive#normalization) does not
 
 ### Relative links
 
-Be sure to check all relative links, images, scripts etc. AngularJS requires you to specify the url
+Be sure to check all relative links, images, scripts etc. Angular requires you to specify the url
 base in the head of your main html file (`<base href="/my-base/index.html">`) unless `html5Mode.requireBase`
 is set to `false` in the html5Mode definition object passed to `$locationProvider.html5Mode()`. With
 that, relative urls will always be resolved to this base url, even if the initial url of the
@@ -378,7 +378,7 @@ to anchors on the same page without needing to know on which page the user curre
 
 Using this mode requires URL rewriting on server side, basically you have to rewrite all your links
 to entry point of your application (e.g. index.html). Requiring a `<base>` tag is also important for
-this case, as it allows AngularJS to differentiate between the part of the url that is the application
+this case, as it allows Angular to differentiate between the part of the url that is the application
 base and the path that should be handled by the application.
 
 ### Base href constraints
@@ -391,7 +391,7 @@ called `/base`). The URL `/base` is actually outside the application (it refers
 in the root `/` folder).
 
 If you wish to be able to navigate to the application via a URL such as `/base` then you should ensure that
-your server is setup to redirect such requests to `/base/`.
+you server is setup to redirect such requests to `/base/`.
 
 See https://github.com/angular/angular.js/issues/14018 for more information.
 
@@ -728,14 +728,14 @@ use a lower level API, {@link ng.$window $window.location.href}.
 
 ## Using $location outside of the scope life-cycle
 
-`$location` knows about AngularJS's {@link ng.$rootScope.Scope scope} life-cycle. When a URL changes in
+`$location` knows about Angular's {@link ng.$rootScope.Scope scope} life-cycle. When a URL changes in
 the browser it updates the `$location` and calls `$apply` so that all
 {@link ng.$rootScope.Scope#$watch $watchers} /
 {@link ng.$compile.directive.Attributes#$observe $observers} are notified.
 When you change the `$location` inside the `$digest` phase everything is ok; `$location` will
 propagate this change into browser and will notify all the {@link ng.$rootScope.Scope#$watch $watchers} /
 {@link ng.$compile.directive.Attributes#$observe $observers}.
-When you want to change the `$location` from outside AngularJS (for example, through a DOM Event or
+When you want to change the `$location` from outside Angular (for example, through a DOM Event or
 during testing) - you must call `$apply` to propagate the changes.
 
 ## $location.path() and ! or / prefixes
@@ -787,7 +787,7 @@ describe('serviceUnderTest', function() {
 
 # Migrating from earlier AngularJS releases
 
-In earlier releases of AngularJS, `$location` used `hashPath` or `hashSearch` to process path and
+In earlier releases of Angular, `$location` used `hashPath` or `hashSearch` to process path and
 search methods. With this release, the `$location` service processes path and search methods and
 then uses the information it obtains to compose hashbang URLs (such as
 `http://server.com/#!/path?search=a`), when necessary.

docs/content/guide/accessibility.ngdoc

@@ -6,7 +6,7 @@
 
 # Accessibility with ngAria
 
-The goal of ngAria is to improve AngularJS's default accessibility by enabling common
+The goal of ngAria is to improve Angular's default accessibility by enabling common
 [ARIA](http://www.w3.org/TR/wai-aria/) attributes that convey state or semantic information for
 assistive technologies used by persons with disabilities.
 
@@ -109,11 +109,11 @@ attributes (if they have not been explicitly specified by the developer):
           function isEmpty(value) {
             return !value;
           }
-
+          
           function render() {
             elem[ctrl.$viewValue ? 'addClass' : 'removeClass']('checked');
           }
-
+     
           function toggleCheckbox() {
             ctrl.$setViewValue(!ctrl.$viewValue);
             ctrl.$render();
@@ -420,7 +420,7 @@ tell ngAria to ignore the attribute globally.
 
 ## Common Accessibility Patterns
 
-Accessibility best practices that apply to web apps in general also apply to AngularJS.
+Accessibility best practices that apply to web apps in general also apply to Angular.
 
  * **Text alternatives**: Add alternate text content to make visual information accessible using
  [these W3C guidelines](http://www.w3.org/TR/html-alt-techniques/). The appropriate technique

docs/content/guide/animations.ngdoc

@@ -66,7 +66,7 @@ You may also want to setup a separate CSS file for defining CSS-based animations
 ## How they work
 
 Animations in AngularJS are completely based on CSS classes. As long as you have a CSS class
-attached to an HTML element within your application, you can apply animations to it. Let's say for
+attached to a HTML element within your application, you can apply animations to it. Lets say for
 example that we have an HTML template with a repeater like so:
 
 ```html
@@ -222,26 +222,22 @@ triggered:
 
 | Directive                                                                     | Supported Animations                                                      |
 |-------------------------------------------------------------------------------|---------------------------------------------------------------------------|
-| {@link ng.directive:form#animations form / ngForm}                            | add and remove ({@link ng.directive:form#css-classes various classes})    |
-| {@link ngAnimate.directive:ngAnimateSwap#animations ngAnimateSwap}            | enter and leave                                                           |
-| {@link ng.directive:ngClass#animations ngClass / {{class}​}}  | add and remove                                                            |
-| {@link ng.directive:ngClassEven#animations ngClassEven}                       | add and remove                                                            |
-| {@link ng.directive:ngClassOdd#animations ngClassOdd}                         | add and remove                                                            |
-| {@link ng.directive:ngHide#animations ngHide}                                 | add and remove (the `ng-hide` class)                                      |
-| {@link ng.directive:ngIf#animations ngIf}                                     | enter and leave                                                           |
-| {@link ng.directive:ngInclude#animations ngInclude}                           | enter and leave                                                           |
-| {@link module:ngMessages#animations ngMessage / ngMessageExp}                 | enter and leave                                                           |
-| {@link module:ngMessages#animations ngMessages}                               | add and remove (the `ng-active`/`ng-inactive` classes)                    |
-| {@link ng.directive:ngModel#animations ngModel}                               | add and remove ({@link ng.directive:ngModel#css-classes various classes}) |
 | {@link ng.directive:ngRepeat#animations ngRepeat}                             | enter, leave, and move                                                    |
-| {@link ng.directive:ngShow#animations ngShow}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngIf#animations ngIf}                                     | enter and leave                                                           |
 | {@link ng.directive:ngSwitch#animations ngSwitch}                             | enter and leave                                                           |
+| {@link ng.directive:ngInclude#animations ngInclude}                           | enter and leave                                                           |
 | {@link ngRoute.directive:ngView#animations ngView}                            | enter and leave                                                           |
-
-(More information can be found by visiting the documentation associated with each directive.)
+| {@link module:ngMessages#animations ngMessage / ngMessageExp}                 | enter and leave                                                           |
+| {@link ng.directive:ngClass#animations ngClass / {{class}​}}  | add and remove                                                            |
+| {@link ng.directive:ngClass#animations ngClassEven / ngClassOdd}              | add and remove                                                            |
+| {@link ng.directive:ngHide#animations ngHide}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngShow#animations ngShow}                                 | add and remove (the `ng-hide` class)                                      |
+| {@link ng.directive:ngModel#animations ngModel}                          | add and remove ({@link ng.directive:ngModel#css-classes various classes}) |
+| {@link ng.directive:form#animations form / ngForm}                       | add and remove ({@link ng.directive:form#css-classes various classes})    |
+| {@link module:ngMessages#animations ngMessages}                               | add and remove (the `ng-active`/`ng-inactive` classes)                    |
 
 For a full breakdown of the steps involved during each animation event, refer to the
-{@link ng.$animate `$animate` API docs}.
+{@link ng.$animate API docs}.
 
 ## How do I use animations in my own directives?
 

docs/content/guide/bootstrap.ngdoc

@@ -5,13 +5,13 @@
 
 # Bootstrap
 
-This page explains the AngularJS initialization process and how you can manually initialize AngularJS
+This page explains the Angular initialization process and how you can manually initialize Angular
 if necessary.
 
 
-## AngularJS `<script>` Tag
+## Angular `<script>` Tag
 
-This example shows the recommended path for integrating AngularJS with what we call automatic
+This example shows the recommended path for integrating Angular with what we call automatic
 initialization.
 
 
@@ -35,7 +35,7 @@ initialization.
     * Choose: `angular-[version].min.js` for a compressed and obfuscated file, suitable for use in
       production.
   2. Place `ng-app` to the root of your application, typically on the `<html>` tag if you want
-    AngularJS to auto-bootstrap your application.
+    angular to auto-bootstrap your application.
 
         <html ng-app>
 
@@ -51,16 +51,16 @@ initialization.
 
 <img class="pull-right" style="padding-left: 3em;" src="img/guide/concepts-startup.png">
 
-AngularJS initializes automatically upon `DOMContentLoaded` event or when the `angular.js` script is
-evaluated if at that time `document.readyState` is set to `'complete'`. At this point AngularJS looks
+Angular initializes automatically upon `DOMContentLoaded` event or when the `angular.js` script is
+evaluated if at that time `document.readyState` is set to `'complete'`. At this point Angular looks
 for the {@link ng.directive:ngApp `ngApp`} directive which designates your application root.
-If the {@link ng.directive:ngApp `ngApp`} directive is found then AngularJS will:
+If the {@link ng.directive:ngApp `ngApp`} directive is found then Angular will:
 
   * load the {@link guide/module module} associated with the directive.
   * create the application {@link auto.$injector injector}
   * compile the DOM treating the {@link ng.directive:ngApp
     `ngApp`} directive as the root of the compilation. This allows you to tell it to treat only a
-    portion of the DOM as an AngularJS application.
+    portion of the DOM as an Angular application.
 
 
 ```html
@@ -96,9 +96,9 @@ for more.
 
 If you need to have more control over the initialization process, you can use a manual
 bootstrapping method instead. Examples of when you'd need to do this include using script loaders
-or the need to perform an operation before AngularJS compiles a page.
+or the need to perform an operation before Angular compiles a page.
 
-Here is an example of manually initializing AngularJS:
+Here is an example of manually initializing Angular:
 
 ```html
 <!doctype html>

docs/content/guide/compiler.ngdoc

@@ -10,15 +10,15 @@
 
 If you're just getting started, we recommend the {@link tutorial/ tutorial} first.
 If you just want to create custom directives, we recommend the {@link guide/directive directives guide}.
-If you want a deeper look into AngularJS's compilation process, you're in the right place.
+If you want a deeper look into Angular's compilation process, you're in the right place.
 </div>
 
 
 ## Overview
 
-AngularJS's {@link ng.$compile HTML compiler} allows the developer to teach the
+Angular's {@link ng.$compile HTML compiler} allows the developer to teach the
 browser new HTML syntax. The compiler allows you to attach behavior to any HTML element or attribute
-and even create new HTML elements or attributes with custom behavior. AngularJS calls these behavior
+and even create new HTML elements or attributes with custom behavior. Angular calls these behavior
 extensions {@link ng.$compileProvider#directive directives}.
 
 HTML has a lot of constructs for formatting the HTML for static documents in a declarative fashion.
@@ -31,7 +31,7 @@ However, the declarative language is also limited, as it does not allow you to t
 syntax. For example, there is no easy way to get the browser to align the text at 1/3 the position
 instead of 1/2. What is needed is a way to teach the browser new HTML syntax.
 
-AngularJS comes pre-bundled with common directives which are useful for building any app. We also
+Angular comes pre-bundled with common directives which are useful for building any app. We also
 expect that you will create directives that are specific to your app. These extensions become a
 Domain Specific Language for building your application.
 
@@ -41,7 +41,7 @@ involved.
 
 ## Compiler
 
-Compiler is an AngularJS service which traverses the DOM looking for attributes. The compilation
+Compiler is an Angular service which traverses the DOM looking for attributes. The compilation
 process happens in two phases.
 
   1. **Compile:** traverse the DOM and collect all of the directives. The result is a linking
@@ -142,16 +142,16 @@ This means that any changes to the data need to be re-merged with the template a
 3. managing the whole update process
 4. lack of behavior expressiveness
 
-AngularJS is different. The AngularJS compiler consumes the DOM, not string templates.
+Angular is different. The Angular compiler consumes the DOM, not string templates.
 The result is a linking function, which when combined with a scope model results in a live view. The
 view and scope model bindings are transparent. The developer does not need to make any special calls to update
 the view. And because `innerHTML` is not used, you won't accidentally clobber user input.
-Furthermore, AngularJS directives can contain not just text bindings, but behavioral constructs as
+Furthermore, Angular directives can contain not just text bindings, but behavioral constructs as
 well.
 
 <img src="img/Two_Way_Data_Binding.png">
 
-The AngularJS approach produces a stable DOM. The DOM element instance bound to a model
+The Angular approach produces a stable DOM. The DOM element instance bound to a model
 item instance does not change for the lifetime of the binding. This means that the code can get
 hold of the elements and register event handlers and know that the reference will not be destroyed
 by template data merge.
@@ -160,7 +160,7 @@ by template data merge.
 
 ## How directives are compiled
 
-It's important to note that AngularJS operates on DOM nodes rather than strings. Usually, you don't
+It's important to note that Angular operates on DOM nodes rather than strings. Usually, you don't
 notice this restriction because when a page loads, the web browser parses HTML into the DOM automatically.
 
 HTML compilation happens in three phases:
@@ -186,7 +186,7 @@ The result of this is a live binding between the scope and the DOM. So at this p
 a model on the compiled scope will be reflected in the DOM.
 
 Below is the corresponding code using the `$compile` service.
-This should help give you an idea of what AngularJS does internally.
+This should help give you an idea of what Angular does internally.
 
 ```js
   var $compile = ...; // injected into your code

docs/content/guide/component-router.ngdoc

@@ -10,7 +10,7 @@
 We are investigating backporting the new Angular Router to AngularJS, but alternatively, use the {@link ngRoute} module or community developed projects (e.g. [ui-router](https://github.com/angular-ui/ui-router)).
 </div>
 
-This guide describes the Component Router for AngularJS.
+This guide describes the new Component Router for AngularJS 1.5.
 
 <div class="alert alert-info">
   If you are looking for information about the default router for AngularJS have a look at the {@link ngRoute} module.
@@ -28,7 +28,7 @@ Here is a table of the main concepts used in the Component Router.
 | Router                | Displays the Routing Components for the active Route. Manages navigation from one component to the next. |
 | RootRouter            | The top level Router that interacts with the current URL location |
 | RouteConfig           | Configures a Router with RouteDefinitions, each mapping a URL path to a component. |
-| Routing Component     | An AngularJS component with a RouteConfig and an associated Router. |
+| Routing Component     | An Angular component with a RouteConfig and an associated Router. |
 | RouteDefinition       | Defines how the router should navigate to a component based on a URL pattern. |
 | ngOutlet              | The directive (`<ng-outlet>`) that marks where the router should display a view. |
 | ngLink                | The directive (`ng-link="..."`) for binding a clickable HTML element to a route, via a Link Parameters Array. |
@@ -138,7 +138,7 @@ The result is that we end up with a hierarchy of **Routing Components** rendered
 ![Component Hierarchy](img/guide/component-hierarchy.svg)
 
 
-## Example Heroes App
+# Example Heroes App
 
 You can see the complete application running below.
 
@@ -459,12 +459,12 @@ You can see the complete application running below.
 </example>
 
 
-### Getting Started
+# Getting Started
 
 In the following sections we will step through building this application. The finished application has views
 to display list and detail views of Heroes and Crises.
 
-#### Install the libraries
+## Install the libraries
 
 It is easier to use [Yarn](https://yarnpkg.com) or [npm](https://www.npmjs.com) to install the
 **Component Router** module. For this guide we will also install AngularJS itself via Yarn:
@@ -475,9 +475,9 @@ yarn add angular@1.5.x @angular/router@0.2.0
 ```
 
 
-#### Load the scripts
+## Load the scripts
 
-Just like any AngularJS application, we load the JavaScript files into our `index.html`:
+Just like any Angular application, we load the JavaScript files into our `index.html`:
 
 ```html
   <script src="/node_modules/angular/angular.js"></script>
@@ -494,7 +494,7 @@ You also need to include ES6 shims for browsers that do not support ES6 code (In
  <script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
  ```
 
-#### Create the `app` module
+## Create the `app` module
 
 In the app.js file, create the main application module `app` which depends on the `ngComponentRouter`
 module, which is provided by the **Component Router** script.
@@ -528,7 +528,7 @@ Configure the top level routed `App` Component.
 
 Create a very simple App Component to test that the application is working.
 
-We are using the AngularJS {@link $compileProvider#component `.component()`} helper method to create
+We are using the Angular 1.5 {@link $compileProvider#component `.component()`} helper method to create
 all the **Components** in our application. It is perfectly suited to this task.
 
 ```js
@@ -547,9 +547,9 @@ must have a base URL.
   ...
 ```
 
-#### Bootstrap AngularJS
+## Bootstrap AngularJS
 
-Bootstrap the AngularJS application and add the top level App Component.
+Bootstrap the Angular application and add the top level App Component.
 
 ```html
 <body ng-app="app">
@@ -559,7 +559,7 @@ Bootstrap the AngularJS application and add the top level App Component.
 ```
 
 
-### Implementing the AppComponent
+# Implementing the AppComponent
 
 In the previous section we have created a single top level **App Component**. Let's now create some more
 **Routing Components** and wire up **Route Config** for those. We start with a Heroes Feature, which
@@ -577,7 +577,7 @@ We are going to have a `Heroes` Component for the Heroes feature of our applicat
 and `HeroDetail` **Components** that will actually display the two different views.
 
 
-#### App Component
+## App Component
 
 Configure the **App Component** with a template and **Route Config**:
 
@@ -598,7 +598,7 @@ Configure the **App Component** with a template and **Route Config**:
 The **App Component** has an `<ng-outlet>` directive in its template. This is where the child **Components**
 of this view will be rendered.
 
-#### ngLink
+### ngLink
 
 We have used the `ng-link` directive to create a link to navigate to the Heroes Component. By using this
 directive we don't need to know what the actual URL will be. We can let the Router generate that for us.
@@ -607,7 +607,7 @@ We have included a link to the Crisis Center but have not included the `ng-link`
 implemented the CrisisCenter component.
 
 
-#### Non-terminal Routes
+### Non-terminal Routes
 
 We need to tell the **Router** that the `Heroes` **Route Definition** is **non-terminal**, that it should
 continue to match **Routes** in its child **Components**. We do this by adding a **continuation ellipsis
@@ -616,16 +616,16 @@ Without the **continuation ellipsis** the `HeroList` **Route** will never be mat
 stop at the `Heroes` **Routing Component** and not try to match the rest of the URL.
 
 
-### Heroes Feature
+## Heroes Feature
 
 Now we can implement our Heroes Feature which consists of three **Components**: `Heroes`, `HeroList` and
 `HeroDetail`. The `Heroes` **Routing Component** simply provides a template containing the {@link ngOutlet}
 directive and a **Route Config** that defines a set of child **Routes** which delegate through to the
 `HeroList` and `HeroDetail` **Components**.
 
-### HeroesComponent
+## HeroesComponent
 
-Create a new file `heroes.js`, which defines a new AngularJS module for the **Components** of this feature
+Create a new file `heroes.js`, which defines a new Angular module for the **Components** of this feature
 and registers the Heroes **Component**.
 
 ```js
@@ -651,20 +651,20 @@ and also to add the module as a dependency of the `app` module:
 angular.module('app', ['ngComponentRouter', 'heroes'])
 ```
 
-#### Use As Default
+### Use As Default
 The `useAsDefault` property on the `HeroList` **Route Definition**, indicates that if no other **Route
 Definition** matches the URL, then this **Route Definition** should be used by default.
 
-#### Route Parameters
+### Route Parameters
 The `HeroDetail` Route has a named parameter (`id`), indicated by prefixing the URL segment with a colon,
 as part of its `path` property. The **Router** will match anything in this segment and make that value
 available to the HeroDetail **Component**.
 
-#### Terminal Routes
+### Terminal Routes
 Both the Routes in the `HeroesComponent` are terminal, i.e. their routes do not end with `...`. This is
 because the `HeroList` and `HeroDetail` will not contain any child routes.
 
-#### Route Names
+### Route Names
 **What is the difference between the `name` and `component` properties on a Route Definition?**
 
 The `component` property in a **Route Definition** defines the **Component** directive that will be rendered
@@ -676,7 +676,7 @@ The `name` property is used to reference the **Route Definition** when generatin
 that has the `name` property of `"Heroes"`.
 
 
-### HeroList Component
+## HeroList Component
 
 The HeroList **Component** is the first component in the application that actually contains significant
 functionality. It loads up a list of heroes from a `heroService` and displays them using `ng-repeat`.
@@ -705,7 +705,7 @@ The template iterates through each `hero` object of the array in the `$ctrl.hero
 the `$ctrl` property on the scope of the template.*
 
 
-### HeroService
+## HeroService
 
 Our HeroService simulates requesting a list of heroes from a server. In a real application this would be
 making an actual server request, perhaps over HTTP.
@@ -735,7 +735,7 @@ Note that both the `getHeroes()` and `getHero(id)` methods return a promise for
 in real-life we would have to wait for the server to respond with the data.
 
 
-### Router Lifecycle Hooks
+## Router Lifecycle Hooks
 
 **How do I know when my Component is active?**
 
@@ -780,7 +780,7 @@ By returning a promise for the list of heroes from `$routerOnActivate()` we can
 Route until the heroes have arrived successfully. This is similar to how a `resolve` works in {@link ngRoute}.
 
 
-### Route Parameters
+## Route Parameters
 
 **How do I access parameters for the current route?**
 
@@ -811,11 +811,11 @@ by the **Router**. In this code it is used to identify a specific Hero to retrie
 This hero is then attached to the **Component** so that it can be accessed in the template.
 
 
-### Access to the Current Router
+## Access to the Current Router
 
 **How do I get hold of the current router for my component?**
 
-Each component has its own Router. Unlike in the new Angular, we cannot use the dependency injector to get hold of a component's Router.
+Each component has its own Router. Unlike in Angular 2, we cannot use the dependency injector to get hold of a component's Router.
 We can only inject the `$rootRouter`. Instead we use the fact that the `ng-outlet` directive binds the current router to a `$router`
 attribute on our component.
 
@@ -882,7 +882,7 @@ Other options for generating this navigation are:
   ```
   this form gives you the possibility of caching the instruction, but is more verbose.
 
-#### Absolute vs Relative Navigation
+### Absolute vs Relative Navigation
 
 **Why not use `$rootRouter` to do the navigation?**
 
@@ -894,7 +894,7 @@ to the `HeroListComponent` with the `$rootRouter`, we would have to provide a co
 `['App','Heroes','HeroList']`.
 
 
-### Extra Parameters
+## Extra Parameters
 
 We can also pass additional optional parameters to routes, which get encoded into the URL and are again
 available to the `$routerOnActivate(next, previous)` hook. If we pass the current `id` from the
@@ -936,7 +936,7 @@ Finally, we can use this information to highlight the current hero in the templa
 </div>
 ```
 
-### Crisis Center
+## Crisis Center
 
 Let's implement the Crisis Center feature, which displays a list if crises that need to be dealt with by a hero.
 The detailed crisis view has an additional feature where it blocks you from navigating if you have not saved
@@ -951,7 +951,7 @@ changes to the crisis being edited.
 ![Crisis Detail View](img/guide/crisis-detail.png)
 
 
-### Crisis Feature
+## Crisis Feature
 
 This feature is very similar to the Heroes feature. It contains the following **Components**:
 
@@ -962,7 +962,7 @@ This feature is very similar to the Heroes feature. It contains the following **
 CrisisService and CrisisListComponent are basically the same as HeroService and HeroListComponent
 respectively.
 
-### Navigation Control Hooks
+## Navigation Control Hooks
 
 **How do I prevent navigation from occurring?**
 
@@ -979,7 +979,7 @@ can complete, all the **Components** must agree that they can be deactivated or
 The **Router** will call the `$routerCanDeactivate` and `$canActivate` hooks, if they are provided. If any
 of the hooks resolve to `false` then the navigation is cancelled.
 
-#### Dialog Box Service
+### Dialog Box Service
 
 We can implement a very simple dialog box that will prompt the user whether they are happy to lose changes they
 have made. The result of the prompt is a promise that can be used in a `$routerCanDeactivate` hook.

docs/content/guide/component.ngdoc

@@ -5,17 +5,17 @@
 
 # Understanding Components
 
-In AngularJS, a Component is a special kind of {@link guide/directive directive} that uses a simpler
+In Angular, a Component is a special kind of {@link guide/directive directive} that uses a simpler
 configuration which is suitable for a component-based application structure.
 
-This makes it easier to write an app in a way that's similar to using Web Components or using the new Angular's
-style of application architecture.
+This makes it easier to write an app in a way that's similar to using Web Components or using Angular
+2's style of application architecture.
 
 Advantages of Components:
 - simpler configuration than plain directives
 - promote sane defaults and best practices
 - optimized for component-based architecture
-- writing component directives will make it easier to upgrade to Angular
+- writing component directives will make it easier to upgrade to Angular 2
 
 When not to use Components:
 
@@ -25,7 +25,7 @@ When not to use Components:
 
 ## Creating and configuring a Component
 
-Components can be registered using the {@link ng.$compileProvider#component `.component()`} method of an AngularJS module (returned by {@link module `angular.module()`}). The method takes two arguments:
+Components can be registered using the `.component()` method of an Angular module (returned by {@link module `angular.module()`}). The method takes two arguments:
 
   * The name of the Component (as string).
   * The Component config object. (Note that, unlike the `.directive()` method, this method does **not** take a factory function.)
@@ -90,14 +90,14 @@ a component-based architecture. But what makes a component beyond the options th
 the component helper has?
 
 - **Components only control their own View and Data:**
-Components should never modify any data or DOM that is out of their own scope. Normally, in AngularJS
+Components should never modify any data or DOM that is out of their own scope. Normally, in Angular
 it is possible to modify data anywhere in the application through scope inheritance and watches. This
 is practical, but can also lead to problems when it is not clear which part of the application is
 responsible for modifying the data. That is why component directives use an isolate scope, so a whole
 class of scope manipulation is not possible.
 
 - **Components have a well-defined public API - Inputs and Outputs:**
-However, scope isolation only goes so far, because AngularJS uses two-way binding. So if you pass
+However, scope isolation only goes so far, because Angular uses two-way binding. So if you pass
 an object to a component like this - `bindings: {item: '='}`, and modify one of its properties, the
 change will be reflected in the parent component. For components however, only the component that owns
 the data should modify it, to make it easy to reason about what data is changed, and when. For that reason,
@@ -158,7 +158,7 @@ of the component. The following hook methods can be implemented:
     changes. Any actions that you wish to take in response to the changes that you detect must be
     invoked from this hook; implementing this has no effect on when `$onChanges` is called. For example, this hook
     could be useful if you wish to perform a deep equality check, or to check a Date object, changes to which would not
-    be detected by AngularJS's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
+    be detected by Angular's change detector and thus not trigger `$onChanges`. This hook is invoked with no arguments;
     if detecting changes, you must store the previous value(s) for comparison to the current values.
   * `$onDestroy()` - Called on a controller when its containing scope is destroyed. Use this hook for releasing
     external resources, watches and event handlers.
@@ -167,8 +167,8 @@ of the component. The following hook methods can be implemented:
     Note that child elements that contain `templateUrl` directives will not have been compiled and linked since
     they are waiting for their template to load asynchronously and their own compilation and linking has been
     suspended until that occurs.
-    This hook can be considered analogous to the `ngAfterViewInit` and `ngAfterContentInit` hooks in Angular.
-    Since the compilation process is rather different in AngularJS there is no direct mapping and care should
+    This hook can be considered analogous to the `ngAfterViewInit` and `ngAfterContentInit` hooks in Angular 2.
+    Since the compilation process is rather different in Angular 1 there is no direct mapping and care should
     be taken when upgrading.
 
 By implementing these methods, your component can hook into its lifecycle.
@@ -445,7 +445,7 @@ angular.module('docsTabsExample', [])
 </example>
 
 
-## Unit-testing Component Controllers
+# Unit-testing Component Controllers
 
 The easiest way to unit-test a component controller is by using the
 {@link ngMock.$componentController $componentController} that is included in {@link ngMock}. The

docs/content/guide/concepts.ngdoc

@@ -54,20 +54,20 @@ Try out the Live Preview above, and then let's walk through the example and desc
 
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding1.png">
 
-This looks like normal HTML, with some new markup. In AngularJS, a file like this is called a
-<a name="template">{@link templates template}</a>. When AngularJS starts your application, it parses and
+This looks like normal HTML, with some new markup. In Angular, a file like this is called a
+<a name="template">{@link templates template}</a>. When Angular starts your application, it parses and
 processes this new markup from the template using the <a name="compiler">{@link compiler compiler}</a>.
 The loaded, transformed and rendered DOM is then called the <a name="view"></a>*view*.
 
 The first kind of new markup are the <a name="directive">{@link directive directives}</a>.
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
-initializes our application. AngularJS also defines a directive for the {@link ng.directive:input `input`}
+initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
 element that adds extra behavior to the element. The {@link ng.directive:ngModel `ng-model`} directive
 stores/updates the value of the input field into/from a variable.
 
 <div class="alert alert-info">
-**Custom directives to access the DOM**: In AngularJS, the only place where an application should access the DOM is
+**Custom directives to access the DOM**: In Angular, the only place where an application should access the DOM is
  within directives. This is important because artifacts that access the DOM are hard to test.
  If you need to access the DOM directly you should write a custom directive for this. The
  {@link directive directives guide} explains how to do this.
@@ -76,12 +76,12 @@ stores/updates the value of the input field into/from a variable.
 The second kind of new markup are the double curly braces `{{ expression | filter }}`:
 When the compiler encounters this markup, it will replace it with the evaluated value of the markup.
 An <a name="expression">{@link expression expression}</a> in a template is a JavaScript-like code snippet that allows
-AngularJS to read and write variables. Note that those variables are not global variables.
+Angular to read and write variables. Note that those variables are not global variables.
 Just like variables in a JavaScript function live in a scope,
-AngularJS provides a <a name="scope">{@link scope scope}</a> for the variables accessible to expressions.
+Angular provides a <a name="scope">{@link scope scope}</a> for the variables accessible to expressions.
 The values that are stored in variables on the scope are referred to as the <a name="model"></a>*model*
 in the rest of the documentation.
-Applied to the example above, the markup directs AngularJS to "take the data we got from the input widgets
+Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
 and multiply them together".
 
 The example above also contains a <a name="filter">{@link guide/filter filter}</a>.
@@ -89,7 +89,7 @@ A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
 
-The important thing in the example is that AngularJS provides _live_ bindings:
+The important thing in the example is that Angular provides _live_ bindings:
 Whenever the input values change, the value of the expressions are automatically
 recalculated and the DOM is updated with their values.
 The concept behind this is <a name="databinding">{@link databinding two-way data binding}</a>.
@@ -157,9 +157,9 @@ expressions and directives.
 
 Besides the new file that contains the controller code, we also added an
 {@link ng.directive:ngController `ng-controller`} directive to the HTML.
-This directive tells AngularJS that the new `InvoiceController` is responsible for the element with the directive
+This directive tells Angular that the new `InvoiceController` is responsible for the element with the directive
 and all of the element's children.
-The syntax `InvoiceController as invoice` tells AngularJS to instantiate the controller
+The syntax `InvoiceController as invoice` tells Angular to instantiate the controller
 and save it in the variable `invoice` in the current scope.
 
 We also changed all expressions in the page to read and write variables within that
@@ -260,22 +260,22 @@ get a hold of the now separated function?
 This is where <a name="di">{@link di Dependency Injection}</a> comes into play.
 Dependency Injection (DI) is a software design pattern that
 deals with how objects and functions get created and how they get a hold of their dependencies.
-Everything within AngularJS (directives, filters, controllers,
-services, ...) is created and wired using dependency injection. Within AngularJS,
+Everything within Angular (directives, filters, controllers,
+services, ...) is created and wired using dependency injection. Within Angular,
 the DI container is called the <a name="injector">{@link di injector}</a>.
 
 To use DI, there needs to be a place where all the things that should work together are registered.
-In AngularJS, this is the purpose of the <a name="module">{@link module modules}</a>.
-When AngularJS starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
+In Angular, this is the purpose of the <a name="module">{@link module modules}</a>.
+When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
 including the configuration of all modules that this module depends on.
 
 In the example above:
-The template contains the directive `ng-app="invoice2"`. This tells AngularJS
+The template contains the directive `ng-app="invoice2"`. This tells Angular
 to use the `invoice2` module as the main module for the application.
 The code snippet `angular.module('invoice2', ['finance2'])`  specifies that the `invoice2` module depends on the
-`finance2` module. By this, AngularJS uses the `InvoiceController` as well as the `currencyConverter` service.
+`finance2` module. By this, Angular uses the `InvoiceController` as well as the `currencyConverter` service.
 
-Now that AngularJS knows of all the parts of the application, it needs to create them.
+Now that Angular knows of all the parts of the application, it needs to create them.
 In the previous section we saw that controllers are created using a constructor function.
 For services, there are multiple ways to specify how they are created
 (see the {@link services service guide}).
@@ -284,24 +284,24 @@ In the example above, we are using an anonymous function as the factory function
 This function should return the `currencyConverter` service instance.
 
 Back to the initial question: How does the `InvoiceController` get a reference to the `currencyConverter` function?
-In AngularJS, this is done by simply defining arguments on the constructor function. With this, the injector
+In Angular, this is done by simply defining arguments on the constructor function. With this, the injector
 is able to create the objects in the right order and pass the previously created objects into the
 factories of the objects that depend on them.
-In our example, the `InvoiceController` has an argument named `currencyConverter`. By this, AngularJS knows about the
+In our example, the `InvoiceController` has an argument named `currencyConverter`. By this, Angular knows about the
 dependency between the controller and the service and calls the controller with the service instance as argument.
 
 The last thing that changed in the example between the previous section and this section is that we
 now pass an array to the `module.controller` function, instead of a plain function. The array first
 contains the names of the service dependencies that the controller needs. The last entry
 in the array is the controller constructor function.
-AngularJS uses this array syntax to define the dependencies so that the DI also works after minifying
+Angular uses this array syntax to define the dependencies so that the DI also works after minifying
 the code, which will most probably rename the argument name of the controller constructor function
 to something shorter like `a`.
 
 ## Accessing the backend
 
 Let's finish our example by fetching the exchange rates from the [Fixer.io](http://fixer.io) exchange rate API.
-The following example shows how this is done with AngularJS:
+The following example shows how this is done with Angular:
 
 <example name="guide-concepts-3" ng-app-included="true">
   <file name="invoice3.js">
@@ -371,7 +371,7 @@ The following example shows how this is done with AngularJS:
 
 What changed?
 Our `currencyConverter` service of the `finance` module now uses the {@link ng.$http `$http`}, a
-built-in service provided by AngularJS for accessing a server backend. `$http` is a wrapper around
+built-in service provided by Angular for accessing a server backend. `$http` is a wrapper around
 [`XMLHttpRequest`](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest)
 and [JSONP](http://en.wikipedia.org/wiki/JSONP) transports.
 

docs/content/guide/controller.ngdoc

@@ -5,21 +5,16 @@
 
 # Understanding Controllers
 
-In AngularJS, a Controller is defined by a JavaScript **constructor function** that is used to augment the
-{@link scope AngularJS Scope}.
+In Angular, a Controller is defined by a JavaScript **constructor function** that is used to augment the
+{@link scope Angular Scope}.
 
-Controllers can be attached to the DOM in different ways. For each of them, AngularJS will
-instantiate a new Controller object, using the specified Controller's **constructor function**:
-
-- the {@link ng.directive:ngController ngController} directive. A new **child scope** will be
-created and made available as an injectable parameter to the Controller's constructor function
-as `$scope`.
-- a route controller in a {@link ngRoute.$routeProvider $route definition}.
-- the controller of a {@link guide/directive regular directive},  or a
-{@link guide/component component directive}.
+When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
+directive, Angular will instantiate a new Controller object, using the specified Controller's
+**constructor function**. A new **child scope** will be created and made available as an injectable
+parameter to the Controller's constructor function as `$scope`.
 
 If the controller has been attached using the `controller as` syntax then the controller instance will
-be assigned to a property on the scope.
+be assigned to a property on the new scope.
 
 Use controllers to:
 
@@ -29,27 +24,18 @@ Use controllers to:
 Do not use controllers to:
 
 - Manipulate DOM — Controllers should contain only business logic.
-  Putting any presentation logic into Controllers significantly affects its testability. AngularJS
+  Putting any presentation logic into Controllers significantly affects its testability. Angular
   has {@link databinding databinding} for most cases and {@link guide/directive directives} to
   encapsulate manual DOM manipulation.
-- Format input — Use {@link forms AngularJS form controls} instead.
-- Filter output — Use {@link guide/filter AngularJS filters} instead.
-- Share code or state across controllers — Use {@link services AngularJS
+- Format input — Use {@link forms angular form controls} instead.
+- Filter output — Use {@link guide/filter angular filters} instead.
+- Share code or state across controllers — Use {@link services angular
 services} instead.
 - Manage the life-cycle of other components (for example, to create service instances).
 
-In general, a Controller shouldn't try to do too much. It should contain only the business logic
-needed for a single view.
-
-The most common way to keep Controllers slim is by encapsulating work that doesn't belong to
-controllers into services and then using these services in Controllers via dependency injection.
-This is discussed in the {@link di Dependency Injection}  and  {@link services
-Services} sections of this guide.
-
-
 ## Setting up the initial state of a `$scope` object
 
-Typically, when you create an application you need to set up the initial state for the AngularJS
+Typically, when you create an application you need to set up the initial state for the Angular
 `$scope`. You set up the initial state of a scope by attaching properties to the `$scope` object.
 The properties contain the **view model** (the model that will be presented by the view).  All the
 `$scope` properties will be available to the {@link templates template} at the point in the DOM where the Controller
@@ -66,13 +52,13 @@ myApp.controller('GreetingController', ['$scope', function($scope) {
 }]);
 ```
 
-We create an {@link module AngularJS Module}, `myApp`, for our application. Then we add the controller's
+We create an {@link module Angular Module}, `myApp`, for our application. Then we add the controller's
 constructor function to the module using the `.controller()` method. This keeps the controller's
 constructor function out of the global scope.
 
 <div class="alert alert-info">
 We have used an **inline injection annotation** to explicitly specify the dependency
-of the Controller on the `$scope` service provided by AngularJS. See the guide on
+of the Controller on the `$scope` service provided by Angular. See the guide on
 {@link guide/di Dependency Injection} for more information.
 </div>
 
@@ -102,7 +88,7 @@ myApp.controller('DoubleController', ['$scope', function($scope) {
 }]);
 ```
 
-Once the Controller has been attached to the DOM, the `double` method can be invoked in an AngularJS
+Once the Controller has been attached to the DOM, the `double` method can be invoked in an Angular
 expression in the template:
 
 ```js
@@ -113,12 +99,29 @@ expression in the template:
 
 As discussed in the {@link concepts Concepts} section of this guide, any
 objects (or primitives) assigned to the scope become model properties. Any methods assigned to
-the scope are available in the template/view, and can be invoked via AngularJS expressions
+the scope are available in the template/view, and can be invoked via angular expressions
 and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).
 
+## Using Controllers Correctly
+
+In general, a Controller shouldn't try to do too much. It should contain only the business logic
+needed for a single view.
+
+The most common way to keep Controllers slim is by encapsulating work that doesn't belong to
+controllers into services and then using these services in Controllers via dependency injection.
+This is discussed in the {@link di Dependency Injection}  and  {@link services
+Services} sections of this guide.
+
+
+# Associating Controllers with Angular Scope Objects
+
+You can associate Controllers with scope objects implicitly via the {@link ng.directive:ngController ngController
+directive} or {@link ngRoute.$route $route service}.
+
+
 ## Simple Spicy Controller Example
 
-To illustrate further how Controller components work in AngularJS, let's create a little app with the
+To illustrate further how Controller components work in Angular, let's create a little app with the
 following components:
 
 - A {@link templates template} with two buttons and a simple message
@@ -259,7 +262,7 @@ Inheritance works with methods in the same way as it does with properties. So in
 examples, all of the properties could be replaced with methods that return string values.
 
 
-## Testing Controllers
+# Testing Controllers
 
 Although there are many ways to test a Controller, one of the best conventions, shown below,
 involves injecting the {@link ng.$rootScope $rootScope} and {@link ng.$controller $controller}:

docs/content/guide/css-styling.ngdoc

@@ -4,38 +4,38 @@
 @description
 
 
-AngularJS sets these CSS classes. It is up to your application to provide useful styling.
+Angular sets these CSS classes. It is up to your application to provide useful styling.
 
-# CSS classes used by AngularJS
+# CSS classes used by angular
 
 * `ng-scope`
-  - **Usage:** AngularJS applies this class to any element for which a new {@link $rootScope scope}
+  - **Usage:** angular applies this class to any element for which a new {@link $rootScope scope}
     is defined. (see {@link guide/scope scope} guide for more information about scopes)
 
 * `ng-isolate-scope`
-  - **Usage:** AngularJS applies this class to any element for which a new
+  - **Usage:** angular applies this class to any element for which a new
     {@link guide/directive#isolating-the-scope-of-a-directive isolate scope} is defined.
 
 * `ng-binding`
-  - **Usage:** AngularJS applies this class to any element that is attached to a data binding, via `ng-bind` or
+  - **Usage:** angular applies this class to any element that is attached to a data binding, via `ng-bind` or
     `{{}}` curly braces, for example. (see {@link guide/databinding databinding} guide)
 
 * `ng-invalid`, `ng-valid`
-  - **Usage:** AngularJS applies this class to a form control widget element if that element's input does
+  - **Usage:** angular applies this class to a form control widget element if that element's input does
     not pass validation. (see {@link ng.directive:input input} directive)
 
 * `ng-pristine`, `ng-dirty`
-  - **Usage:** AngularJS {@link ng.directive:ngModel ngModel} directive applies `ng-pristine` class
+  - **Usage:** angular {@link ng.directive:ngModel ngModel} directive applies `ng-pristine` class
     to a new form control widget which did not have user interaction. Once the user interacts with
     the form control, the class is changed to `ng-dirty`.
 
 * `ng-touched`, `ng-untouched`
-  - **Usage:** AngularJS {@link ng.directive:ngModel ngModel} directive applies `ng-untouched` class
+  - **Usage:** angular {@link ng.directive:ngModel ngModel} directive applies `ng-untouched` class
     to a new form control widget which has not been blurred. Once the user blurs the form control,
     the class is changed to `ng-touched`.
 
 
 ## Related Topics
 
-* {@link guide/templates AngularJS Templates}
-* {@link guide/forms AngularJS Forms}
+* {@link guide/templates Angular Templates}
+* {@link guide/forms Angular Forms}

docs/content/guide/databinding.ngdoc

@@ -5,8 +5,8 @@
 
 # Data Binding
 
-Data-binding in AngularJS apps is the automatic synchronization of data between the model and view
-components.  The way that AngularJS implements data-binding lets you treat the model as the
+Data-binding in Angular apps is the automatic synchronization of data between the model and view
+components.  The way that Angular implements data-binding lets you treat the model as the
 single-source-of-truth in your application.  The view is a projection of the model at all times.
 When the model changes, the view reflects the change, and vice versa.
 
@@ -19,10 +19,10 @@ or related sections of the view are NOT automatically reflected in the view. Wor
 that the user makes to the view are not reflected in the model. This means that the developer has
 to write code that constantly syncs the view with the model and the model with the view.
 
-## Data Binding in AngularJS Templates
+## Data Binding in Angular Templates
 
 <img class="right" src="img/Two_Way_Data_Binding.png"/><br />
-AngularJS templates work differently. First the template (which is the uncompiled HTML along with
+Angular templates work differently. First the template (which is the uncompiled HTML along with
 any additional markup or directives) is compiled on the browser. The compilation step produces a
 live view. Any changes to the view are immediately reflected in the model, and any changes in
 the model are propagated to the view. The model is the single-source-of-truth for the application
@@ -36,5 +36,5 @@ isolation without the view and the related DOM/browser dependency.
 
 ## Related Topics
 
-* {@link scope AngularJS Scopes}
-* {@link templates AngularJS Templates}
+* {@link scope Angular Scopes}
+* {@link templates Angular Templates}

docs/content/guide/decorators.ngdoc

@@ -13,7 +13,7 @@
 ## What are decorators?
 
 Decorators are a design pattern that is used to separate modification or *decoration* of a class without modifying the
-original source code. In AngularJS, decorators are functions that allow a service, directive or filter to be modified
+original source code. In Angular, decorators are functions that allow a service, directive or filter to be modified
 prior to its usage.
 
 ## How to use decorators

docs/content/guide/di.ngdoc

@@ -8,40 +8,32 @@
 Dependency Injection (DI) is a software design pattern that deals with how components get hold of
 their dependencies.
 
-The AngularJS injector subsystem is in charge of creating components, resolving their dependencies,
+The Angular injector subsystem is in charge of creating components, resolving their dependencies,
 and providing them to other components as requested.
 
 
 ## Using Dependency Injection
 
-Dependency Injection is pervasive throughout AngularJS. You can use it when defining components
-or when providing `run` and `config` blocks for a module.
+DI is pervasive throughout Angular. You can use it when defining components or when providing `run`
+and `config` blocks for a module.
 
-- {@link angular.Module#service Services}, {@link angular.Module#directive directives},
-{@link angular.Module#filter filters}, and {@link angular.Module#animation animations} are
-defined by an injectable factory method or constructor function, and can be injected with
-"services", "values", and "constants" as dependencies.
+- Components such as services, directives, filters, and animations are defined by an injectable
+factory method or constructor function. These components can be injected with "service" and "value"
+components as dependencies.
 
-- {@link ng.$controller Controllers} are defined by a constructor function, which can be injected
-with any of the "service" and "value" as dependencies, but they can also be provided with
-"special dependencies". See {@link di#controllers Controllers} below for a list of these
-special dependencies.
+- Controllers are defined by a constructor function, which can be injected with any of the "service"
+and "value" components as dependencies, but they can also be provided with special dependencies. See
+{@link di#controllers Controllers} below for a list of these special dependencies.
 
-- The {@link angular.Module#run `run`} method accepts a function, which can be injected with
-"services", "values" and, "constants" as dependencies. Note that you cannot inject "providers"
-into `run` blocks.
+- The `run` method accepts a function, which can be injected with "service", "value" and "constant"
+components as dependencies. Note that you cannot inject "providers" into `run` blocks.
 
-- The {@link angular.Module#config `config`} method accepts a function, which can be injected with
-"providers" and "constants" as dependencies. Note that you cannot inject "services" or
-"values" into configuration.
+- The `config` method accepts a function, which can be injected with "provider" and "constant"
+components as dependencies. Note that you cannot inject "service" or "value" components into
+configuration.
 
-- The {@link angular.Module#provider `provider`} method can only be injected with other "providers".
-However, only those that have been **registered beforehand** can be injected. This is different
-from services, where the order of registration does not matter.
-
-See {@link module#module-loading Modules} for more details about `run` and `config`
-blocks and {@link guide/providers Providers} for more information about the different provider
-types.
+See {@link module#module-loading-dependencies Modules} for more details about `run` and `config`
+blocks.
 
 
 ### Factory Methods
@@ -108,7 +100,7 @@ Moreover, additional dependencies are made available to Controllers:
 
 ## Dependency Annotation
 
-AngularJS invokes certain functions (like service factories and controllers) via the injector.
+Angular invokes certain functions (like service factories and controllers) via the injector.
 You need to annotate these functions so that the injector knows what services to inject into
 the function. There are three ways of annotating your code with service name information:
 
@@ -212,11 +204,11 @@ angular.module('myApp', [])
     // $rootScope is implicitly injected
   })
   .run(['willBreak', function(willBreak) {
-    // AngularJS will throw when this runs
+    // Angular will throw when this runs
   }]);
 ```
 
-When the `willBreak` service is instantiated, AngularJS will throw an error because of strict mode.
+When the `willBreak` service is instantiated, Angular will throw an error because of strict mode.
 This is useful when using a tool like [ng-annotate](https://github.com/olov/ng-annotate) to
 ensure that all of your application components have annotations.
 
@@ -233,7 +225,7 @@ angular.bootstrap(document, ['myApp'], {
 
 ## Why Dependency Injection?
 
-This section motivates and explains AngularJS's use of DI. For how to use DI, see above.
+This section motivates and explains Angular's use of DI. For how to use DI, see above.
 
 For in-depth discussion about DI, see
 [Dependency Injection](http://en.wikipedia.org/wiki/Dependency_injection) at Wikipedia,
@@ -272,7 +264,7 @@ code that constructs `SomeClass`.
 
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-module-injector.png">
 
-To manage the responsibility of dependency creation, each AngularJS application has an {@link
+To manage the responsibility of dependency creation, each Angular application has an {@link
 angular.injector injector}. The injector is a
 [service locator](http://en.wikipedia.org/wiki/Service_locator_pattern) that is responsible for
 construction and lookup of dependencies.
@@ -298,7 +290,7 @@ myModule.factory('greeter', function($window) {
 ```
 
 Create a new injector that can provide components defined in our `myModule` module and request our
-`greeter` service from the injector. (This is usually done automatically by AngularJS bootstrap).
+`greeter` service from the injector. (This is usually done automatically by angular bootstrap).
 
 ```js
 var injector = angular.injector(['ng', 'myModule']);
@@ -325,7 +317,7 @@ function MyController($scope, greeter) {
 }
 ```
 
-When AngularJS compiles the HTML, it processes the `ng-controller` directive, which in turn
+When Angular compiles the HTML, it processes the `ng-controller` directive, which in turn
 asks the injector to create an instance of the controller and its dependencies.
 
 ```js
@@ -340,6 +332,6 @@ This is the best outcome. The application code simply declares the dependencies
 having to deal with the injector. This setup does not break the Law of Demeter.
 
 <div class="alert alert-info">
-**Note:** AngularJS uses
+**Note:** Angular uses
 [**constructor injection**](http://misko.hevery.com/2009/02/19/constructor-injection-vs-setter-injection/).
 </div>

docs/content/guide/directive.ngdoc

@@ -24,9 +24,9 @@ name, comment or CSS class) that tell AngularJS's **HTML compiler** ({@link ng.$
 to attach a specified behavior to that DOM element (e.g. via event listeners), or even to transform
 the DOM element and its children.
 
-AngularJS comes with a set of these directives built-in, like `ngBind`, `ngModel`, and `ngClass`.
-Much like you create controllers and services, you can create your own directives for AngularJS to use.
-When AngularJS {@link guide/bootstrap bootstraps} your application, the
+Angular comes with a set of these directives built-in, like `ngBind`, `ngModel`, and `ngClass`.
+Much like you create controllers and services, you can create your own directives for Angular to use.
+When Angular {@link guide/bootstrap bootstraps} your application, the
 {@link guide/compiler HTML compiler} traverses the DOM matching directives against the DOM elements.
 
 <div class="alert alert-info">
@@ -41,7 +41,7 @@ mirrors the process of compiling source code in
 
 ## Matching Directives
 
-Before we can write a directive, we need to know how AngularJS's {@link guide/compiler HTML compiler}
+Before we can write a directive, we need to know how Angular's {@link guide/compiler HTML compiler}
 determines when to use a given directive.
 
 Similar to the terminology used when an [element **matches** a selector](https://developer.mozilla.org/en-US/docs/Web/API/Element.matches), we say an element **matches** a
@@ -67,7 +67,7 @@ And the following `<person>` element **matches** the `person` directive:
 
 ### Normalization
 
-AngularJS **normalizes** an element's tag and attribute name to determine which elements match which
+Angular **normalizes** an element's tag and attribute name to determine which elements match which
 directives. We typically refer to directives by their case-sensitive
 [camelCase](http://en.wikipedia.org/wiki/CamelCase) **normalized** name (e.g. `ngModel`).
 However, since HTML is case-insensitive, we refer to directives in the DOM by lower-case
@@ -125,8 +125,8 @@ and comments (M).
 
 The built-in AngularJS directives show in their documentation page which type of matching they support.
 
-The following demonstrates the various ways a directive (`myDir` in this case) that matches all
-4 types can be referenced from within a template.
+The following demonstrates the various ways a directive that matches all 4 types
+(`myDir` in this case) can be referenced from within a template.
 
 ```html
 <my-dir></my-dir>
@@ -178,7 +178,7 @@ and compilation process.
 directive names. For instance, if you created a `<carousel>` directive, it would be problematic if HTML7
 introduced the same element. A two or three letter prefix (e.g. `btfCarousel`) works well. Similarly, do
 not prefix your own directives with `ng` or they might conflict with directives included in a future
-version of AngularJS.
+version of Angular.
 </div>
 
 For the following examples, we'll use the prefix `my` (e.g. `myCustomer`).
@@ -257,7 +257,7 @@ using `templateUrl` instead:
 </example>
 
 `templateUrl` can also be a function which returns the URL of an HTML template to be loaded and
-used for the directive. AngularJS will call the `templateUrl` function with two parameters: the
+used for the directive. Angular will call the `templateUrl` function with two parameters: the
 element that the directive was called on, and an `attr` object associated with that element.
 
 <div class="alert alert-warning">
@@ -544,7 +544,7 @@ directive logic will be put.
  `link` takes a function with the following signature,
 `function link(scope, element, attrs, controller, transcludeFn) { ... }`, where:
 
-* `scope` is an AngularJS scope object.
+* `scope` is an Angular scope object.
 * `element` is the jqLite-wrapped element that this directive matches.
 * `attrs` is a hash object with key-value pairs of normalized attribute names and their
   corresponding attribute values.
@@ -614,7 +614,7 @@ function.
 We register an event `element.on('$destroy', ...)`. What fires this `$destroy` event?
 
 There are a few special events that AngularJS emits. When a DOM node that has been compiled
-with AngularJS's compiler is destroyed, it emits a `$destroy` event. Similarly, when an AngularJS
+with Angular's compiler is destroyed, it emits a `$destroy` event. Similarly, when an AngularJS
 scope is destroyed, it broadcasts a `$destroy` event to listening scopes.
 
 By listening to this event, you can remove event listeners that might cause memory leaks.

docs/content/guide/e2e-testing.ngdoc

@@ -5,6 +5,12 @@
 
 # E2E Testing
 
+<div class="alert alert-danger">
+**Note:** In the past, end-to-end testing could be done with a deprecated tool called
+[Angular Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
+is now in maintenance mode, and will be removed in version 1.7.0.
+</div>
+
 As applications grow in size and complexity, it becomes unrealistic to rely on manual testing to
 verify the correctness of new features, catch bugs and notice regressions. Unit tests
 are the first line of defense for catching bugs, but sometimes issues come up with integration
@@ -13,7 +19,7 @@ these problems.
 
 We have built [Protractor](https://github.com/angular/protractor), an end
 to end test runner which simulates user interactions that will help you verify the health of your
-AngularJS application.
+Angular application.
 
 ## Using Protractor
 
@@ -70,7 +76,7 @@ filter the list of items.
 
 ## Example
 See the [angular-seed](https://github.com/angular/angular-seed) project for more examples, or look
-at the embedded examples in the AngularJS documentation (For example, {@link $http $http}
+at the embedded examples in the Angular documentation (For example, {@link $http $http}
 has an end-to-end test in the example under the `protractor.js` tag).
 
 ## Caveats

docs/content/guide/expression.ngdoc

@@ -3,13 +3,13 @@
 @sortOrder 270
 @description
 
-# AngularJS Expressions
+# Angular Expressions
 
-AngularJS expressions are JavaScript-like code snippets that are mainly placed in
+Angular expressions are JavaScript-like code snippets that are mainly placed in
 interpolation bindings such as `<span title="{{ attrBinding }}">{{ textBinding }}</span>`,
 but also used directly in directive attributes such as `ng-click="functionExpression()"`.
 
-For example, these are valid expressions in AngularJS:
+For example, these are valid expressions in Angular:
 
   * `1+2`
   * `a+b`
@@ -17,38 +17,38 @@ For example, these are valid expressions in AngularJS:
   * `items[index]`
 
 
-## AngularJS Expressions vs. JavaScript Expressions
+## Angular Expressions vs. JavaScript Expressions
 
-AngularJS expressions are like JavaScript expressions with the following differences:
+Angular expressions are like JavaScript expressions with the following differences:
 
   * **Context:** JavaScript expressions are evaluated against the global `window`.
-    In AngularJS, expressions are evaluated against a {@link ng.$rootScope.Scope `scope`} object.
+    In Angular, expressions are evaluated against a {@link ng.$rootScope.Scope `scope`} object.
 
   * **Forgiving:** In JavaScript, trying to evaluate undefined properties generates `ReferenceError`
-    or `TypeError`. In AngularJS, expression evaluation is forgiving to `undefined` and `null`.
+    or `TypeError`. In Angular, expression evaluation is forgiving to `undefined` and `null`.
 
   * **Filters:** You can use {@link guide/filter filters} within expressions to format data before
     displaying it.
 
-  * **No Control Flow Statements:** You cannot use the following in an AngularJS expression:
+  * **No Control Flow Statements:** You cannot use the following in an Angular expression:
     conditionals, loops, or exceptions.
 
-  * **No Function Declarations:** You cannot declare functions in an AngularJS expression,
+  * **No Function Declarations:** You cannot declare functions in an Angular expression,
     even inside `ng-init` directive.
 
   * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
     in an AngularJS expression. An exception to this rule is {@link ngPattern `ng-pattern`} which accepts valid
     RegExp.
 
-  * **No Object Creation With New Operator:** You cannot use `new` operator in an AngularJS expression.
+  * **No Object Creation With New Operator:** You cannot use `new` operator in an Angular expression.
 
   * **No Bitwise, Comma, And Void Operators:** You cannot use
   [Bitwise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Bitwise_Operators),
-  `,` or `void` operators in an AngularJS expression.
+  `,` or `void` operators in an Angular expression.
 
 
 If you want to run more complex JavaScript code, you should make it a controller method and call
-the method from your view. If you want to `eval()` an AngularJS expression yourself, use the
+the method from your view. If you want to `eval()` an Angular expression yourself, use the
 {@link ng.$rootScope.Scope#$eval `$eval()`} method.
 
 ## Example
@@ -111,10 +111,10 @@ You can try evaluating different expressions here:
 
 ## Context
 
-AngularJS does not use JavaScript's `eval()` to evaluate expressions. Instead AngularJS's
+Angular does not use JavaScript's `eval()` to evaluate expressions. Instead Angular's
 {@link ng.$parse $parse} service processes these expressions.
 
-AngularJS expressions do not have direct access to global variables like `window`, `document` or `location`.
+Angular expressions do not have direct access to global variables like `window`, `document` or `location`.
 This restriction is intentional. It prevents accidental access to the global state – a common source of subtle bugs.
 
 Instead use services like `$window` and `$location` in functions on controllers, which are then called from expressions.
@@ -181,7 +181,7 @@ Similarly, invoking a function `a.b.c()` on `undefined` or `null` simply returns
 ## No Control Flow Statements
 
 Apart from the ternary operator (`a ? b : c`), you cannot write a control flow statement in an
-expression. The reason behind this is core to the AngularJS philosophy that application logic should
+expression. The reason behind this is core to the Angular philosophy that application logic should
 be in controllers, not the views. If you need a real conditional, loop, or to throw from a view
 expression, delegate to a JavaScript method instead.
 

docs/content/guide/external-resources.ngdoc

@@ -3,9 +3,9 @@
 @sortOrder 150
 @description
 
-# External AngularJS Resources
+# External Angular 1 Resources
 
-This is a collection of external, 3rd party resources for learning and developing AngularJS.
+This is a collection of external, 3rd party resources for learning and developing Angular.
 
 ## Articles, Videos, and Projects
 
@@ -21,7 +21,7 @@ This is a collection of external, 3rd party resources for learning and developin
 
 #### Application Structure & Style Guides
 
-* [AngularJS Styleguide](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md)
+* [Angular Styleguide](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md)
 * [Architecture, file structure, components, one-way dataflow and best practices](https://github.com/toddmotto/angular-styleguide)
 * [When to use directives, controllers or services](http://kirkbushell.me/when-to-use-directives-controllers-or-services-in-angular/)
 * [Service vs Factory](http://blog.thoughtram.io/angular/2015/07/07/service-vs-factory-once-and-for-all.html)
@@ -32,8 +32,8 @@ This is a collection of external, 3rd party resources for learning and developin
 
 #### Mobile
 
-* [AngularJS on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html)
-* [AngularJS and Cordova](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
+* [Angular on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html)
+* [Angular and Cordova](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
 * [Ionic Framework](http://ionicframework.com/)
 
 #### Deployment
@@ -48,7 +48,7 @@ This is a collection of external, 3rd party resources for learning and developin
 
 * **Django:** [Tutorial](http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework), [Integrating AngularJS with Django](http://django-angular.readthedocs.org/en/latest/integration.html), [Getting Started with Django Rest Framework and AngularJS](http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html)
 * **FireBase:** [AngularFire](http://angularfire.com/), [Realtime Apps with AngularJS and FireBase (video)](http://www.youtube.com/watch?v=C7ZI7z7qnHU)
-* **Google Cloud Platform:** [with Go](https://github.com/GoogleCloudPlatform/appengine-angular-gotodos)
+* **Google Cloud Platform: **[with Cloud Endpoints](https://cloud.google.com/developers/articles/angularjs-cloud-endpoints-recipe-for-building-modern-web-applications/), [with Go](https://github.com/GoogleCloudPlatform/appengine-angular-gotodos)
 * **Hood.ie:** [60 Minutes to Awesome](http://www.roberthorvick.com/2013/06/30/todomvc-angularjs-hood-ie-60-minutes-to-awesome/)
 * **MEAN Stack: **[Blog post](http://blog.mongodb.org/post/49262866911/the-mean-stack-mongodb-expressjs-angularjs-and), [Setup](http://thecodebarbarian.wordpress.com/2013/07/22/introduction-to-the-mean-stack-part-one-setting-up-your-tools/), [GDL Video](https://developers.google.com/live/shows/913996610)
 * **Rails: **[Tutorial](http://coderberry.me/blog/2013/04/22/angularjs-on-rails-4-part-1/), [AngularJS with Rails4](https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4), [angularjs-rails](https://github.com/hiravgandhi/angularjs-rails)
@@ -75,12 +75,12 @@ This is a collection of external, 3rd party resources for learning and developin
 * **Getting Started:** [Comparison of the options for starting a new project](http://www.dancancro.com/comparison-of-angularjs-application-starters/)
 * **Debugging:** [Batarang](https://chrome.google.com/webstore/detail/angularjs-batarang/ighdmehidhipcmcojjgiloacoafjmpfk?hl=en)
 * **Editor support:** [Webstorm](http://plugins.jetbrains.com/plugin/6971) (and [video](http://www.youtube.com/watch?v=LJOyrSh1kDU)), [Sublime Text](https://github.com/angular-ui/AngularJS-sublime-package), [Visual Studio](http://madskristensen.net/post/angularjs-intellisense-in-visual-studio-2012), [Atom](https://github.com/angular-ui/AngularJS-Atom), [Vim](https://github.com/burnettk/vim-angular)
-* **Workflow:** [Yeoman.io](https://github.com/yeoman/generator-angular) and [AngularJS Yeoman Tutorial](http://www.sitepoint.com/kickstart-your-angularjs-development-with-yeoman-grunt-and-bower/)
+* **Workflow:** [Yeoman.io](https://github.com/yeoman/generator-angular) and [Angular Yeoman Tutorial](http://www.sitepoint.com/kickstart-your-angularjs-development-with-yeoman-grunt-and-bower/)
 
 ## Complementary Libraries
 
-This is a list of libraries that enhance AngularJS, add common UI components or integrate with other libraries.
-You can find a larger list of AngularJS external libraries at [ngmodules.org](http://ngmodules.org/).
+This is a list of libraries that enhance Angular, add common UI components or integrate with other libraries.
+You can find a larger list of Angular external libraries at [ngmodules.org](http://ngmodules.org/).
 
 * **Advanced Routing:** [UI-Router](https://github.com/angular-ui/ui-router)
 * **Authentication:** [Http Auth Interceptor](https://github.com/witoldsz/angular-http-auth)
@@ -98,21 +98,21 @@ You can find a larger list of AngularJS external libraries at [ngmodules.org](ht
   - Data Modeling [JS-Data-Angular](https://github.com/js-data/js-data-angular)
 * **Fileupload:**
   - [ng-file-upload](https://github.com/danialfarid/ng-file-upload)
-  - [blueimp-fileupload for AngularJS](https://blueimp.github.io/jQuery-File-Upload/angularjs.html)
+  - [blueimp-fileupload for Angular](https://blueimp.github.io/jQuery-File-Upload/angularjs.html)
 * **General UI Libraries:**
-  - [AngularJS Material](https://material.angularjs.org/latest/)
-  - [AngularJS UI Bootstrap](http://angular-ui.github.io/)
+  - [Angular Material](https://material.angularjs.org/latest/)
+  - [Angular UI Bootstrap](http://angular-ui.github.io/)
   - [AngularStrap for Bootstrap 3](http://mgcrea.github.io/angular-strap/)
   - [KendoUI](http://kendo-labs.github.io/angular-kendo/#/)
   - [Wijmo](http://wijmo.com/tag/angularjs-2/)
 * **Specific UI Elements:**
   - [ngInfiniteScroll](https://sroze.github.io/ngInfiniteScroll/)
   - [ngTable](https://github.com/esvit/ng-table)
-  - [AngularJS UI Grid](http://angular-ui.github.io/grid)
+  - [Angular UI Grid](http://angular-ui.github.io/grid)
   - [Toaster Notifications](https://github.com/jirikavi/AngularJS-Toaster)
   - [textAngular Rich Text Editor / contenteditable](http://textangular.com/) (Rich Text Editor /
     binding to contenteditable)
-  - [AngularJS UI Map (Google Maps)](https://github.com/angular-ui/ui-map)
+  - [Angular UI Map (Google Maps)](https://github.com/angular-ui/ui-map)
 
 ## General Learning Resources
 

docs/content/guide/filter.ngdoc

@@ -6,7 +6,7 @@
 # Filters
 
 Filters format the value of an expression for display to the user. They can be used in view
-templates, controllers or services. AngularJS comes with a collection of
+templates, controllers or services. Angular comes with a collection of
 [built-in filters](api/ng/filter), but it is easy to define your own as well.
 
 The underlying API is the {@link ng.$filterProvider}.
@@ -44,7 +44,7 @@ as inputs. Filters that receive [Objects](https://developer.mozilla.org/en-US/do
 as input are executed on each `$digest`, as it would be too costly to track if the inputs have changed.
 
 2. Filters that are marked as `$stateful` are also executed on each $digest.
-See {@link guide/filter#stateful-filters Stateful filters} for more information. Note that no AngularJS
+See {@link guide/filter#stateful-filters Stateful filters} for more information. Note that no Angular
 core filters are $stateful.
 
 
@@ -110,12 +110,12 @@ function.
 
 The filter function should be a [pure function](http://en.wikipedia.org/wiki/Pure_function), which
 means that it should always return the same result given the same input arguments and should not affect
-external state, for example, other AngularJS services. AngularJS relies on this contract and will by default
+external state, for example, other Angular services. Angular relies on this contract and will by default
 execute a filter only when the inputs to the function change.
 {@link guide/filter#stateful-filters Stateful filters} are possible, but less performant.
 
 <div class="alert alert-warning">
-**Note:** Filter names must be valid AngularJS {@link expression} identifiers, such as `uppercase` or `orderBy`.
+**Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
 Names with special characters, such as hyphens and dots, are not allowed.  If you wish to namespace
 your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
 (`myapp_subsection_filterx`).
@@ -162,7 +162,7 @@ text upper-case.
 ### Stateful filters
 
 It is strongly discouraged to write filters that are stateful, because the execution of those can't
-be optimized by AngularJS, which often leads to performance issues. Many stateful filters can be
+be optimized by Angular, which often leads to performance issues. Many stateful filters can be
 converted into stateless filters just by exposing the hidden state as a model and turning it into an
 argument for the filter.
 

docs/content/guide/forms.ngdoc

@@ -303,7 +303,7 @@ after last change.
 
 ## Custom Validation
 
-AngularJS provides basic implementation for most common HTML5 {@link ng.directive:input input}
+Angular provides basic implementation for most common HTML5 {@link ng.directive:input input}
 types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url},
 {@link input[email] email}, {@link input[date] date}, {@link input[radio] radio}, {@link input[checkbox] checkbox}),
 as well as some directives for validation (`required`, `pattern`, `minlength`, `maxlength`,
@@ -314,7 +314,7 @@ the {@link ngModel.NgModelController `ngModelController`}. To get a hold of the
 you require it in the directive as shown in the example below.
 
 Each function in the `$validators` object receives the `modelValue` and the `viewValue`
-as parameters. AngularJS will then call `$setValidity` internally with the function's return value
+as parameters. Angular will then call `$setValidity` internally with the function's return value
 (`true`: valid, `false`: invalid). The validation functions are executed every time an input
 is changed (`$setViewValue` is called) or whenever the bound `model` changes.
 Validation happens after successfully running `$parsers` and `$formatters`, respectively.
@@ -422,7 +422,7 @@ In the following example we create two directives:
 
 ## Modifying built-in validators
 
-Since AngularJS itself uses `$validators`, you can easily replace or remove built-in validators,
+Since Angular itself uses `$validators`, you can easily replace or remove built-in validators,
 should you find it necessary. The following example shows you how to overwrite the email validator
 in `input[email]` from a custom directive so that it requires a specific top-level domain,
 `example.com` to be present.
@@ -451,10 +451,10 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
       return {
         require: '?ngModel',
         link: function(scope, elm, attrs, ctrl) {
-          // only apply the validator if ngModel is present and AngularJS has added the email validator
+          // only apply the validator if ngModel is present and Angular has added the email validator
           if (ctrl && ctrl.$validators.email) {
 
-            // this will overwrite the default AngularJS email validator
+            // this will overwrite the default Angular email validator
             ctrl.$validators.email = function(modelValue) {
               return ctrl.$isEmpty(modelValue) || EMAIL_REGEXP.test(modelValue);
             };
@@ -467,7 +467,7 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
 
 
 ## Implementing custom form controls (using `ngModel`)
-AngularJS implements all of the basic HTML form controls ({@link ng.directive:input input},
+Angular implements all of the basic HTML form controls ({@link ng.directive:input input},
 {@link ng.directive:select select}, {@link ng.directive:textarea textarea}),
 which should be sufficient for most cases. However, if you need more flexibility,
 you can write your own form control as a directive.

docs/content/guide/i18n.ngdoc

@@ -13,9 +13,9 @@ other locale-specific bits (such as date or currency formats) out of the applica
 application means providing translations and localized formats for the abstracted bits.
 
 
-## How does AngularJS support i18n/l10n?
+## How does Angular support i18n/l10n?
 
-AngularJS supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
+Angular supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
 {@link ng.filter:currency currency} filters.
 
 Localizable pluralization is supported via the {@link ng.directive:ngPluralize `ngPluralize`
@@ -23,11 +23,11 @@ directive}.  Additionally, you can use {@link guide/i18n#messageformat-extension
 `$interpolate` for localizable pluralization and gender support in all interpolations via the
 `ngMessageFormat` module.
 
-All localizable AngularJS components depend on locale-specific rule sets managed by the {@link
+All localizable Angular components depend on locale-specific rule sets managed by the {@link
 ng.$locale `$locale` service}.
 
-There are a few examples that showcase how to use AngularJS filters with various locale rule sets in the
-[`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the AngularJS
+There are a few examples that showcase how to use Angular filters with various locale rule sets in the
+[`i18n/e2e` directory](https://github.com/angular/angular.js/tree/master/i18n/e2e) of the Angular
 source code.
 
 
@@ -41,20 +41,20 @@ also valid. See the [ICU](http://userguide.icu-project.org/locale) website for m
 about using locale IDs.
 
 
-## Supported locales in AngularJS
+## Supported locales in Angular
 
-AngularJS separates number and datetime format rule sets into different files, each file for a
+Angular separates number and datetime format rule sets into different files, each file for a
 particular locale. You can find a list of currently supported locales
 [here](https://github.com/angular/angular.js/tree/master/src/ngLocale)
 
 
-## Providing locale rules to AngularJS
+## Providing locale rules to Angular
 
-There are two approaches to providing locale rules to AngularJS:
+There are two approaches to providing locale rules to Angular:
 
 ### 1. Pre-bundled rule sets
 
-You can pre-bundle the desired locale file with AngularJS by concatenating the content of the
+You can pre-bundle the desired locale file with Angular by concatenating the content of the
 locale-specific file to the end of `angular.js` or `angular.min.js` file.
 
 For example on *nix, to create an angular.js file that contains localization rules for german
@@ -63,7 +63,7 @@ locale, you can do the following:
 `cat angular.js i18n/angular-locale_de-de.js > angular_de-de.js`
 
 When the application containing `angular_de-de.js` script instead of the generic angular.js script
-starts, AngularJS is automatically pre-configured with localization rules for the german locale.
+starts, Angular is automatically pre-configured with localization rules for the german locale.
 
 ### 2. Including a locale script in `index.html`
 
@@ -93,12 +93,12 @@ an extra script needs to be loaded.
 
 ## Caveats
 
-Although AngularJS makes i18n convenient, there are several things you need to be conscious of as you
+Although Angular makes i18n convenient, there are several things you need to be conscious of as you
 develop your app.
 
 ### Currency symbol
 
-AngularJS's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
+Angular's {@link ng.filter:currency currency filter} allows you to use the default currency symbol
 from the {@link ng.$locale locale service}, or you can provide the filter with a custom currency
 symbol.
 
@@ -122,7 +122,7 @@ This is problematic because $1000 is not the same as ¥1000.
 In this case, you need to override the default currency symbol by providing the
 {@link ng.filter:currency} currency filter with a currency symbol as a parameter.
 
-If we change the above to `{{ 1000 | currency:"USD$"}}`, AngularJS will always show a balance of
+If we change the above to `{{ 1000 | currency:"USD$"}}`, Angular will always show a balance of
 `USD$1000` regardless of locale.
 
 ### Translation length
@@ -135,16 +135,16 @@ as expected even when their contents vary greatly in content size.
 
 ### Timezones
 
-The AngularJS datetime filter uses the time zone settings of the browser. The same
+The Angular datetime filter uses the time zone settings of the browser. The same
 application will show different time information depending on the time zone settings of the
-computer that the application is running on. Neither JavaScript nor AngularJS currently supports
+computer that the application is running on. Neither JavaScript nor Angular currently supports
 displaying the date with a timezone specified by the developer.
 
 
 <a name="MessageFormat"></a>
 ## MessageFormat extensions
 
-You can write localizable plural and gender based messages in AngularJS interpolation expressions and
+You can write localizable plural and gender based messages in Angular interpolation expressions and
 `$interpolate` calls.
 
 This syntax extension is provided by way of the `ngMessageFormat` module that your application can
@@ -271,7 +271,7 @@ actual message text that occurs in curly braces.  Whitespace is generally used t
 Here, `NUMERIC_EXPRESSION` is an expression that evaluates to a numeric value based on which the
 displayed message should change based on pluralization rules.
 
-Following the AngularJS expression, you would denote the plural extension syntax by the `, plural,`
+Following the Angular expression, you would denote the plural extension syntax by the `, plural,`
 syntax element.  The spaces there are optional.
 
 This is followed by a list of selection keyword and corresponding message pairs.  The "other"
@@ -303,7 +303,7 @@ later.)
 #### Messages
 
 Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain AngularJS interpolation syntax inside them.
+written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
 In addition, the `#` symbol is a placeholder for the actual numeric value of the expression.
 
 ### Simple plural example
@@ -316,7 +316,7 @@ In addition, the `#` symbol is a placeholder for the actual numeric value of the
 }}
 ```
 
-Because these messages can themselves contain AngularJS expressions, you could also write this as
+Because these messages can themselves contain Angular expressions, you could also write this as
 follows:
 
 ```text
@@ -342,7 +342,7 @@ explain this with an example.
 }}
 ```
 
-When an `offset` is specified, the matching works as follows.  First, the exact value of the AngularJS
+When an `offset` is specified, the matching works as follows.  First, the exact value of the Angular
 expression is matched against the exact matches (i.e. `=N` selectors) to find a match.  If there is
 one, that message is used.  If there was no match, then the offset value is subtracted from the
 value of the expression and locale specific pluralization rules are applied to this new value to
@@ -379,10 +379,10 @@ The syntax for gender based message selection looks like the following:
 Please note that whitespace (including newline) is generally insignificant except as part of the
 actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
 
-Here, `EXPRESSION` is an AngularJS expression that evaluates to the gender of the person that
+Here, `EXPRESSION` is an Angular expression that evaluates to the gender of the person that
 is used to select the message that should be displayed.
 
-The AngularJS expression is followed by `, select,` where the spaces are optional.
+The Angular expression is followed by `, select,` where the spaces are optional.
 
 This is followed by a list of selection keyword and corresponding message pairs.  The "other"
 keyword and corresponding message are **required** but you may have as few or as many of the other
@@ -392,13 +392,13 @@ matching is **case-sensitive**.
 #### Selection Keywords
 
 Selection keywords are simple words like "male" and "female".  The keyword, "other", and its
-corresponding message are required while others are optional.  It is used when the AngularJS
+corresponding message are required while others are optional.  It is used when the Angular
 expression does not match (case-insensitively) any of the other keywords specified.
 
 #### Messages
 
 Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain AngularJS interpolation syntax inside them.
+written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
 
 ### Simple gender example
 
@@ -412,8 +412,8 @@ written in single curly braces (`{}`).  They may contain AngularJS interpolation
 
 ### Nesting
 
-As mentioned in the syntax for plural and select, the embedded messages can contain AngularJS
-interpolation syntax.  Since you can use MessageFormat extensions in AngularJS interpolation, this
+As mentioned in the syntax for plural and select, the embedded messages can contain Angular
+interpolation syntax.  Since you can use MessageFormat extensions in Angular interpolation, this
 allows you to nest plural and gender expressions in any order.
 
 Please note that if these are intended to reach a translator and be translated, it is recommended
@@ -450,7 +450,7 @@ This syntax extension, while based on MessageFormat, has been designed to be bac
 with existing AngularJS interpolation expressions.  The key rule is simply this: **All
 interpolations are done inside double curlies.** The top level comma operator after an expression
 inside the double curlies causes MessageFormat extensions to be recognized.  Such a top level comma
-is otherwise illegal in an AngularJS expression and is used by MessageFormat to specify the function
+is otherwise illegal in an Angular expression and is used by MessageFormat to specify the function
 (such as plural/select) and it's related syntax.
 
 To understand the extension, take a look at the ICU MessageFormat syntax as specified by the ICU

docs/content/guide/ie.ngdoc

@@ -13,7 +13,7 @@ addressing issues specific to IE8 or earlier.
 </div>
 
 This document describes the Internet Explorer (IE) idiosyncrasies when dealing with custom HTML
-attributes and tags. Read this document if you are planning on deploying your AngularJS application
+attributes and tags. Read this document if you are planning on deploying your Angular application
 on IE.
 
 The project currently supports and will attempt to fix bugs for IE9 and above. The continuous
@@ -25,26 +25,17 @@ We do not run tests on IE8 and below. A subset of the AngularJS functionality ma
 browsers, but it is up to you to test and decide whether it works for your particular app.
 
 
-To ensure your AngularJS application works on IE please consider:
+To ensure your Angular application works on IE please consider:
 
 1. Use `ng-style` tags instead of `style="{{ someCss }}"`. The latter works in Chrome, Firefox,
    Safari and Edge but does not work in Internet Explorer (even 11).
 2. For the `type` attribute of buttons, use `ng-attr-type` tags instead of
    `type="{{ someExpression }}"`. If using the latter, Internet Explorer overwrites the expression
-   with `type="submit"` before AngularJS has a chance to interpolate it.
+   with `type="submit"` before Angular has a chance to interpolate it.
 3. For the `value` attribute of progress, use `ng-attr-value` tags instead of
    `value="{{ someExpression}}"`. If using the latter, Internet Explorer overwrites the expression
-   with `value="0"` before AngularJS has a chance to interpolate it.
+   with `value="0"` before Angular has a chance to interpolate it.
 4. For the `placeholder` attribute of textarea, use `ng-attr-placeholder` tags instead
    of `placeholder="{{ someExpression }}"`. If using the latter, Internet Explorer will error
    on accessing the `nodeValue` on a parentless `TextNode` in Internet Explorer 10 & 11
    (see [issue 5025](https://github.com/angular/angular.js/issues/5025)).
-5. Using the `disabled` attribute on an element that has
-   descendant form controls can result in unexpected behavior in Internet Explorer 11.
-   For example, the value of descendant input elements with `ng-model` will not reflect
-   the model (or changes to the model), and the value of the `placeholder` attribute will be
-   inserted as the input's value. Descendant select elements will also be inoperable, as if they
-   had the `disabled` attribute applied to them, which may not be the intended effect.
-   To work around this unexpected behavior, 1) avoid using the identifier `disabled` for custom attribute
-   directives that are on elements with descendant form controls, and 2) avoid using `disabled` as an identifier
-   for an attribute passed to a custom directive that has descendant form controls.