chore(package.json): update dist-tag for 1.7.x

chore(docs.angularjs.org): upgrade Firebase libraries
chore(code.angularjs.org): upgrade Firebase libraries
2020-06-01 13:04:39 +01:00 · 2020-04-14 16:13:06 +03:00 · 2020-04-14 16:13:05 +03:00 · 2020-04-13 15:51:46 +03:00 · 2020-03-11 13:32:56 +02:00 · 2020-02-07 16:24:47 +02:00
898 changed files with 50482 additions and 33747 deletions
@@ -1,4 +1,4 @@
-# http://editorconfig.org
+# https://editorconfig.org

 root = true

@@ -1,4 +1,3 @@
-bower_components/**
 build/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
@@ -8,3 +7,4 @@ src/angular.bind.js
 src/ngParseExt/ucd.js
 i18n/closure/**
 tmp/**
+vendor/**
@@ -1,8 +1,13 @@
 {
  "extends": "./.eslintrc-base.json",
-
  "env": {
    "browser": false,
    "node": true
-  }
+  },
+  "parserOptions": {
+    "ecmaVersion": 2017
+  },
+  "plugins": [
+    "promise"
+  ]
 }
@@ -1,3 +1,7 @@
+# AngularJS is in LTS mode
+We are no longer accepting changes that are not critical bug fixes into this project.
+See https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c for more detail.
+
 <!--
 IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATION
 -->
@@ -9,9 +13,10 @@ IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOU

 **I'm submitting a ...**
 <!-- (check one with "x") -->
- [ ] bug report
- [ ] feature request
- [ ] other (Please do not submit support requests here (see above))
+- [ ] regression from 1.7.0
+- [ ] security issue
+- [ ] issue caused by a new browser version
+- [ ] other <!--(Please do not submit support requests here - see above)-->

 **Current behavior:**
 <!-- Describe how the bug manifests / how the current features are insufficient. -->
@@ -26,11 +31,12 @@ please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the
 https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:yBpEi4).
 -->

-**Angular version:** 1.x.y
-<!-- Check whether this is still an issue in the most recent stable or in the snapshot AngularJS version (https://code.angularjs.org/snapshot/) -->
+**AngularJS version:** 1.7.x
+<!-- Check whether this is still an issue in the most recent stable or in the snapshot AngularJS
+version (https://code.angularjs.org/snapshot/) -->

-**Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
+**Browser:** [all | Chrome XX | Firefox XX | Edge XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView | Opera XX ]
 <!-- All browsers where this could be reproduced (and Operating System if relevant) -->

 **Anything else:**
-<!-- e.g. stacktraces, related issues, suggestions how to fix -->
+<!-- e.g. stacktraces, related issues, suggestions how to fix -->
@@ -1,5 +1,11 @@
-**What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**
+# AngularJS is in LTS mode
+We are no longer accepting changes that are not critical bug fixes into this project.
+See https://blog.angular.io/stable-angularjs-and-long-term-support-7e077635ee9c for more detail.

+<!-- General PR submission guidelines https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#submit-pr -->
+**Does this PR fix a regression since 1.7.0, a security flaw, or a problem caused by a new browser version?**
+
+<!-- If the answer is no, then we will not merge this PR -->


 **What is the current behavior? (You can also link to an open issue here)**
@@ -15,9 +21,9 @@


 **Please check if the PR fulfills these requirements**
- [ ] The commit message follows our guidelines: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit-message-format
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)
+- [ ] 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
+- [ ] Fix/Feature: Tests have been added; existing tests pass

 **Other information**:

@@ -1,4 +1,5 @@
 /build/
+/deploy/
 /benchpress-build/
 .DS_Store
 gen_docs.disable
@@ -9,9 +10,9 @@ performance/temp*.html
 *~
 *.swp
 angular.js.tmproj
-/node_modules/
-bower_components/
+node_modules/
 angular.xcodeproj
+.firebase/
 .idea
 *.iml
 .agignore
@@ -19,7 +20,6 @@ angular.xcodeproj
 libpeerconnection.log
 npm-debug.log
 /tmp/
-/scripts/bower/bower-*
 .vscode
 *.log
-*.stackdump
+*.stackdump
@@ -0,0 +1,29 @@
+Andres Ornelas <aornelas@google.com>
+Caitlin Potter <caitpotter88@gmail.com>
+Caitlin Potter <caitpotter88@gmail.com> <snowball@defpixel.com>
+Di Peng <pengdi@google.com>
+Di Peng <pengdi@google.com> <pengdi@go.wustl.edu>
+Georgios Kalpakas <kalpakas.g@gmail.com>
+Georgios Kalpakas <kalpakas.g@gmail.com> <g.kalpakas@hotmail.com>
+Julie Ralph <ju.ralph@gmail.com>
+Lucas Galfaso <lgalfaso@gmail.com>
+Martin Staffa <mjstaffa@gmail.com>
+Martin Staffa <mjstaffa@gmail.com> <mjstaffa@googlemail.com>
+Matias Niemelä <matias@yearofmoo.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
+Misko Hevery <misko@hevery.com>
+Misko Hevery <misko@hevery.com> <misko@google.com>
+Igor Minar <igor@angularjs.org>
+Igor Minar <igor@angularjs.org> <iiminar@gmail.com>
+Igor Minar <igor@angularjs.org> <iminar@google.com>
+Igor Minar <igor@angularjs.org> <iminar@dhcp-172-19-37-154.mtv.corp.google.com>
+Pawel Kozlowski <pkozlowski.opensource@gmail.com>
+Peter Bacon Darwin <pete@bacondarwin.com>
+Rodric Haddad <rody@rodyhaddad.com>
+Shahar Talmi <shahar.talmi@gmail.com>
+Shahar Talmi <shahar.talmi@gmail.com> <shahart@wix.com>
+Shyam Seshadri <shyamseshadri@google.com>
+Shyam Seshadri <shyamseshadri@google.com> <shyamseshadri@gmail.com>
+Vojta Jina <vojta.jina@gmail.com>
+Vojta Jina <vojta.jina@gmail.com> <vojta@gemin-i.org>
+Vojta Jina <vojta.jina@gmail.com> <vojta@google.com>
@@ -1 +1 @@
-6
+8
@@ -1,56 +1,104 @@
 language: node_js
 sudo: false
 node_js:
-  - '6'
+  - '8'

 cache:
  yarn: true
-  directories:
-    - bower_components

 branches:
  except:
-    - /^g3_.*$/
+    - "/^g3_.*$/"

 env:
  matrix:
    - JOB=ci-checks
-    - JOB=unit BROWSER_PROVIDER=saucelabs
-    - JOB=docs-e2e BROWSER_PROVIDER=saucelabs
+    - JOB=unit-core BROWSER_PROVIDER=saucelabs
+    - JOB=unit-jquery BROWSER_PROVIDER=saucelabs
+    - JOB=unit-modules BROWSER_PROVIDER=saucelabs
+    - JOB=docs-app BROWSER_PROVIDER=saucelabs
    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs
    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=saucelabs
  global:
-    - CXX=g++-4.8  # node 4 likes the G++ v4.8 compiler
    - SAUCE_USERNAME=angular-ci
    - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987
    - LOGS_DIR=/tmp/angular-build/logs
    - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready
+    - secure: oTBjhnOKhs0qDSKTf7fE4f6DYiNDPycvB7qfSF5QRIbJK/LK/J4UtFwetXuXj79HhUZG9qnoT+5e7lPaiaMlpsIKn9ann7ffqFWN1E8TMtpJF+AGigx3djYElwfgf5nEnFUFhwjFzvbfpZNnxVGgX5YbIZpe/WUbHkP4ffU0Wks=

-# node 4 likes the G++ v4.8 compiler
-# see https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
+before_install:
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.10.1
+  - export PATH="$HOME/.yarn/bin:$PATH"

 before_script:
-  - du -sh ./node_modules ./bower_components/ || true
-  - ./scripts/travis/before_build.sh
-
+  - du -sh ./node_modules || true
+  - "./scripts/travis/before_build.sh"
 script:
-  - ./scripts/travis/build.sh
+  - "./scripts/travis/build.sh"

 after_script:
-  - ./scripts/travis/tear_down_browser_provider.sh
-  - ./scripts/travis/print_logs.sh
+  - "./scripts/travis/tear_down_browser_provider.sh"
+  - "./scripts/travis/print_logs.sh"

 notifications:
  webhooks:
    urls:
      - https://webhooks.gitter.im/e/d2120f3f2bb39a4531b2
      - http://104.197.9.155:8484/hubot/travis/activity #hubot-server
-    on_success: always  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: always    # default: false
+    on_success: always # options: [always|never|change] default: always
+    on_failure: always # options: [always|never|change] default: always
+    on_start: always # default: false
+
+jobs:
+  include:
+    - stage: deploy
+      # Don't deploy from PRs. Only deploy from our default branches, or if commit is tagged.
+      # This is a Travis-specific boolean language: https://docs.travis-ci.com/user/conditional-builds-stages-jobs#Specifying-conditions
+      # The deployment logic for pushed branches is further defined in scripts\travis\build.sh
+      if: type != pull_request and (branch =~ ^(v1\.\d+\.x|master)$ or tag IS present)
+      env:
+        - JOB=deploy
+      before_script: skip
+      script:
+        # Export the variables into the current process
+        - . ./scripts/travis/build.sh
+        - "echo DEPLOY_DOCS: $DEPLOY_DOCS, DEPLOY_CODE: $DEPLOY_CODE"
+      after_script: skip
+      # Work around the 10min Travis timeout so the code.angularjs firebase+gcs code deploy can complete
+      # Only run the keep_alive once (before_deploy is run for each provider)
+      before_deploy: |
+        if ! [ "$BEFORE_DEPLOY_RUN" ]; then
+          export BEFORE_DEPLOY_RUN=1;
+
+          function keep_alive() {
+            while true; do
+              echo -en "\a"
+              sleep 10
+            done
+          }
+          keep_alive &
+        fi
+      deploy:
+        - 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:
+            repo: angular/angular.js
+            all_branches: true
+            condition: "$DEPLOY_DOCS == true"
+        - provider: gcs
+          skip_cleanup: true
+          access_key_id: GOOGLDB7W2J3LFHICF3R
+          secret_access_key:
+            secure: tHIFdSq55qkyZf9zT/3+VkhUrTvOTMuswxXU3KyWaBrSieZqG0UnUDyNm+n3lSfX95zEl/+rJAWbfvhVSxZi13ndOtvRF+MdI1cvow2JynP0aDSiPffEvVrZOmihD6mt2SlMfhskr5FTduQ69kZG6DfLcve1PPDaIwnbOv3phb8=
+          bucket: code-angularjs-org-338b8.appspot.com
+          local-dir: deploy/code
+          detect_encoding: true # detects gzip compression
+          on:
+            repo: angular/angular.js
+            all_branches: true
+            condition: "$DEPLOY_CODE == true"
+
@@ -0,0 +1,3 @@
+# 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.
@@ -3,81 +3,97 @@
 We'd love for you to contribute to our source code and to make AngularJS even better than it is
 today! Here are the guidelines we'd like you to follow:

- - [Code of Conduct](#coc)
- - [Question or Problem?](#question)
- - [Issues and Bugs](#issue)
- - [Feature Requests](#feature)
- - [Submission Guidelines](#submit)
- - [Coding Rules](#rules)
- - [Commit Message Guidelines](#commit)
- - [Signing the CLA](#cla)
- - [Further Info](#info)
+* [Code of Conduct](#coc)
+* [Questions and Problems](#question)
+* [Issues and Bugs](#issue)
+* [Feature Requests](#feature)
+* [Improving Documentation](#docs)
+* [Issue Submission Guidelines](#submit)
+* [Pull Request Submission Guidelines](#submit-pr)
+* [Signing the CLA](#cla)

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

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

-## <a name="question"></a> Got a Question or Problem?
+## <a name="requests"></a> Questions, Bugs, Features

-If you have questions about how to use AngularJS, please direct these to the [Google Group][groups]
-discussion list or [StackOverflow][stackoverflow]. We are also available on [IRC][irc] and
-[Gitter][gitter].
+### <a name="question"></a> Got a Question or Problem?

-## <a name="issue"></a> Found an Issue?
+Do not open issues for general support questions as we want to keep GitHub issues for bug reports
+and feature requests. You've got much better chances of getting your question answered on dedicated
+support platforms, the best being [Stack Overflow][stackoverflow].

-If you find a bug in the source code or a mistake in the documentation, you can help us by
-submitting an issue to our [GitHub Repository][github]. Even better you can submit a Pull Request
-with a fix.
+Stack Overflow is a much better place to ask questions since:

-**Localization Issues:** AngularJS uses the [Google Closure I18N library] to generate
-its own I18N files (the ngLocale module). This means that any changes to these files would be lost
-the next time that we import the library.
+- there are thousands of people willing to help on Stack Overflow
+- questions and answers stay available for public viewing so your question / answer might help
+  someone else
+- Stack Overflow's voting system assures that the best answers are prominently visible.
+
+To save your and our time, we will systematically close all issues that are requests for general
+support and redirect people to the section you are reading right now.
+
+Other channels for support are:
+- the [Google Group][groups] discussion list
+- the [AngularJS IRC][irc]
+- the [AngularJS Gitter][gitter]
+
+### <a name="issue"></a> Found an Issue or Bug?
+
+If you find a bug in the source code, you can help us by submitting an issue to our
+[GitHub Repository][github]. Even better, you can submit a Pull Request with a fix.
+
+**Please see the [Submission Guidelines](#submit) below.**
+
+**Special Note for Localization Issues:** AngularJS uses the [Google Closure I18N library] to
+generate its own I18N files (the ngLocale module). This means that any changes to these files
+would be lost the next time that we import the library.
 Since the Closure library i18n data is itself auto-generated from the data of the
 [Common Locale Data Repository (CLDR)] project, errors in the data should
 be reported there. See also the [Closure guide to i18n changes].

-**Please see the [Submission Guidelines](#submit) below.**
+### <a name="feature"></a> Missing a Feature?

-## <a name="feature"></a> Want a Feature?
+You can request a new feature by submitting an issue to our [GitHub Repository][github-issues].

-You can request a new feature by submitting an issue to our [GitHub Repository][github].  If you
-would like to implement a new feature then consider what kind of change it is:
+If you would like to implement a new feature then consider what kind of change it is:

-* **Major Changes** that you wish to contribute to the project should be discussed first on our
-  [dev mailing list][angular-dev] or [IRC][irc] so that we can better coordinate our efforts,
-  prevent duplication of work, and help you to craft the change so that it is successfully accepted
-  into the project.
-* **Small Changes** can be crafted and submitted to the [GitHub Repository][github] as a Pull
-  Request.
+* **Major Changes** that you wish to contribute to the project should be discussed first in an
+  [GitHub issue][github-issues] that clearly outlines the changes and benefits of the feature.
+* **Small Changes** can directly be crafted and submitted to the [GitHub Repository][github]
+  as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr), and
+  for detailed information the [core development documentation][developers].

+### <a name="docs"></a> Want a Doc Fix?

-## <a name="docs"></a> Want a Doc Fix?
+Should you have a suggestion for the documentation, you can open an issue and outline the problem
+or improvement you have - however, creating the doc fix yourself is much better!

 If you want to help improve the docs, it's a good idea to let others know what you're working on to
 minimize duplication of effort. Create a new issue (or comment on a related existing one) to let
 others know what you're working on.

+If you're making a small change (typo, phrasing) don't worry about filing an issue first. Use the
+friendly blue "Improve this doc" button at the top right of the doc page to fork the repository
+in-place and make a quick change on the fly. The commit message is preformatted to the right type
+and scope, so you only have to add the description.
+
 For large fixes, please build and test the documentation before submitting the PR to be sure you
 haven't accidentally introduced any layout or formatting issues. You should also make sure that your
-commit message starts with "docs" and follows the **[Commit Message Guidelines](#commit)** outlined
-below.
+commit message follows the **[Commit Message Guidelines][developers.commits]**.

-If you're just making a small change, don't worry about filing an issue first. Use the friendly blue
-"Improve this doc" button at the top right of the doc page to fork the repository in-place and make
-a quick change on the fly. When naming the commit, it is advised to follow the commit message
-guidelines below, by starting the commit message with **docs** and referencing the filename. Since
-this is not obvious and some changes are made on the fly, this is not strictly necessary and we will
-understand if this isn't done the first few times.
-
-## <a name="submit"></a> Submission Guidelines
-
-### Submitting an Issue
+## <a name="submit"></a> Issue Submission Guidelines
 Before you submit your issue search the archive, maybe your question was already answered.

 If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
 the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
-Providing the following information will increase the chances of your issue being dealt with
-quickly:
+
+The "[new issue][github-new-issue]" form contains a number of prompts that you should fill out to
+make it easier to understand and categorize the issue.
+
+In general, providing the following information will increase the chances of your issue being dealt
+with quickly:

 * **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
 * **Motivation for or Use Case** - explain why this is a bug for you
@@ -89,41 +105,43 @@ quickly:
 * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
  causing the problem (line of code or commit)

-Here is a great example of a well defined issue: https://github.com/angular/angular.js/issues/5069
+Here is a great example of a well defined issue: https://github.com/angular/angular.js/issues/5069.

 **If you get help, help others. Good karma rulez!**

-### Submitting a Pull Request
+## <a name="submit-pr"></a> Pull Request Submission Guidelines
 Before you submit your pull request consider the following guidelines:

 * Search [GitHub](https://github.com/angular/angular.js/pulls) for an open or closed Pull Request
  that relates to your submission. You don't want to duplicate effort.
-* Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
-  requests. We cannot accept code without this.
+* Create the [development environment][developers.setup]
 * Make your changes in a new git branch:

    ```shell
    git checkout -b my-fix-branch master
    ```

-* Create your patch, **including appropriate test cases**.
-* Follow our [Coding Rules](#rules).
-* Run the full AngularJS test suite, as described in the [developer documentation][dev-doc],
-  and ensure that all tests pass.
+* Create your patch commit, **including appropriate test cases**.
+* Follow our [Coding Rules][developers.rules].
+* If the changes affect public APIs, change or add relevant [documentation][developers.documentation].
+* Run the AngularJS [unit][developers.tests-unit] and [E2E test][developers.tests-e2e] suites, and ensure that all tests
+  pass. It is generally sufficient to run the tests only on Chrome, as our Travis integration will
+  run the tests on all supported browsers.
+* Run `yarn grunt eslint` to check that you have followed the automatically enforced coding rules
 * Commit your changes using a descriptive commit message that follows our
-  [commit message conventions](#commit) and passes our commit message presubmit hook
-  (`validate-commit-msg.js`). Adherence to the [commit message conventions](#commit) is required,
-  because release notes are automatically generated from these messages.
+  [commit message conventions][developers.commits]. Adherence to the
+  [commit message conventions][developers.commits] is required, because release notes are
+  automatically generated from these messages.

    ```shell
    git commit -a
    ```
  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.

-* Build your changes locally to ensure all the tests pass:
+* Before creating the Pull Request, package and run all tests a last time:

    ```shell
-    grunt test
+    yarn grunt test
    ```

 * Push your branch to GitHub:
@@ -132,24 +150,30 @@ Before you submit your pull request consider the following guidelines:
    git push origin my-fix-branch
    ```

-In GitHub, send a pull request to `angular.js:master`.
-If we suggest changes, then:
+* In GitHub, send a pull request to `angular.js:master`. This will trigger the check of the
+[Contributor License Agreement](#cla) and the Travis integration.

-* Make the required updates.
-* Re-run the AngularJS test suite to ensure tests are still passing.
-* Commit your changes to your branch (e.g. `my-fix-branch`).
-* Push the changes to your GitHub repository (this will update your Pull Request).
+* If you find that the Travis integration has failed, look into the logs on Travis to find out
+if your changes caused test failures, the commit message was malformed etc. If you find that the
+tests failed or times out for unrelated reasons, you can ping a team member so that the build can be
+restarted.

-If the PR gets too outdated we may ask you to rebase and force push to update the PR:
+* If we suggest changes, then:

-```shell
-git rebase master -i
-git push origin my-fix-branch -f
-```
+  * Make the required updates.
+  * Re-run the AngularJS test suite to ensure tests are still passing.
+  * Commit your changes to your branch (e.g. `my-fix-branch`).
+  * Push the changes to your GitHub repository (this will update your Pull Request).

-_WARNING: Squashing or reverting commits and force-pushing thereafter may remove GitHub comments
-on code that were previously made by you or others in your commits. Avoid any form of rebasing
-unless necessary._
+    You can also amend the initial commits and force push them to the branch.
+
+    ```shell
+    git rebase master -i
+    git push origin my-fix-branch -f
+    ```
+
+    This is generally easier to follow, but separate commits are useful if the Pull Request contains
+    iterations that might be interesting to see side-by-side.

 That's it! Thank you for your contribution!

@@ -182,135 +206,41 @@ from the main (upstream) repository:
    git pull --ff upstream master
    ```

-## <a name="rules"></a> Coding Rules
+## <a name="cla"></a> Signing the Contributor License Agreement (CLA)

-To ensure consistency throughout the source code, keep these rules in mind as you are working:
-
-* All features or bug fixes **must be tested** by one or more [specs][unit-testing].
-* All public API methods **must be documented** with ngdoc, an extended version of jsdoc (we added
-  support for markdown and templating via @ngdoc tag). To see how we document our APIs, please check
-  out the existing source code and see [this wiki page][ngDocs].
-* With the exceptions listed below, we follow the rules contained in
-  [Google's JavaScript Style Guide][js-style-guide]:
-    * **Do not use namespaces**: Instead,  wrap the entire AngularJS code base in an anonymous closure and
-      export our API explicitly rather than implicitly.
-    * Wrap all code at **100 characters**.
-    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
-      inheritance only when absolutely necessary.
-    * We **love functions and closures** and, whenever possible, prefer them over objects.
-    * To write concise code that can be better minified, we **use aliases internally** that map to the
-      external API. See our existing code to see what we mean.
-    * We **don't go crazy with type annotations** for private internal APIs unless it's an internal API
-      that is used throughout AngularJS. The best guidance is to do what makes the most sense.
-
-## <a name="commit"></a> Git Commit Guidelines
-
-We have very precise rules over how our git commit messages can be formatted.  This leads to **more
-readable messages** that are easy to follow when looking through the **project history**.  But also,
-we use the git commit messages to **generate the AngularJS change log**.
-
-The commit message formatting can be added using a typical git workflow or through the use of a CLI
-wizard ([Commitizen](https://github.com/commitizen/cz-cli)). To use the wizard, run `yarn run commit`
-in your terminal after staging your changes in git.
-
-### Commit Message Format
-Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
-format that includes a **type**, a **scope** and a **subject**:
-
-```
-<type>(<scope>): <subject>
-<BLANK LINE>
-<body>
-<BLANK LINE>
-<footer>
-```
-
-The **header** is mandatory and the **scope** of the header is optional.
-
-Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
-to read on GitHub as well as in various git tools.
-
-### Revert
-If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit.
-In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
-
-### Type
-Must be one of the following:
-
-* **feat**: A new feature
-* **fix**: A bug fix
-* **docs**: Documentation only changes
-* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
-  semi-colons, etc)
-* **refactor**: A code change that neither fixes a bug nor adds a feature
-* **perf**: A code change that improves performance
-* **test**: Adding missing or correcting existing tests
-* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
-  generation
-
-### Scope
-The scope could be anything specifying place of the commit change. For example `$location`,
-`$browser`, `$compile`, `$rootScope`, `ngHref`, `ngClick`, `ngView`, etc...
-
-You can use `*` when the change affects more than a single scope.
-
-### Subject
-The subject contains succinct description of the change:
-
-* use the imperative, present tense: "change" not "changed" nor "changes"
-* don't capitalize first letter
-* no dot (.) at the end
-
-### Body
-Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
-The body should include the motivation for the change and contrast this with previous behavior.
-
-### Footer
-The footer should contain any information about **Breaking Changes** and is also the place to
-[reference GitHub issues that this commit closes][closing-issues].
-
-**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
-The rest of the commit message is then used for this.
-
-A detailed explanation can be found in this [document][commit-message-format].
-
-## <a name="cla"></a> Signing the CLA
-
-Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
-changes to be accepted, the CLA must be signed. It's a quick process, we promise!
+Upon submmitting a Pull Request, a friendly bot will ask you to sign our CLA if you haven't done
+so before. Unfortunately, this is necessary for documentation changes, too.
+It's a quick process, we promise!

 * For individuals we have a [simple click-through form][individual-cla].
 * For corporations we'll need you to
  [print, sign and one of scan+email, fax or mail the form][corporate-cla].

-## <a name="info"></a> Further Information
-You can find out more detailed information about contributing in the
-[AngularJS documentation][contributing].


-
-[Google Closure I18N library]: https://github.com/google/closure-library/tree/master/closure/goog/i18n
-[angular-dev]: https://groups.google.com/forum/?fromgroups#!forum/angular-dev
-[closing-issues]: https://help.github.com/articles/closing-issues-via-commit-messages/
+[Closure guide to i18n changes]: https://github.com/google/closure-library/wiki/Internationalization-%28i18n%29-changes-in-Closure-Library
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
-[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
-[contribute]: http://docs.angularjs.org/misc/contribute
-[contributing]: http://docs.angularjs.org/misc/contribute
+[Common Locale Data Repository (CLDR)]: http://cldr.unicode.org
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[dev-doc]: https://docs.angularjs.org/guide
+[developers]: DEVELOPERS.md
+[developers.commits]: DEVELOPERS.md#commits
+[developers.documentation]: DEVELOPERS.md#documentation
+[developers.rules]: DEVELOPERS.md#rules
+[developers.setup]: DEVELOPERS.md#setup
+[developers.tests-e2e]: DEVELOPERS.md#e2e-tests
+[developers.tests-unit]: DEVELOPERS.md#unit-tests
+[github-issues]: https://github.com/angular/angular.js/issues
+[github-new-issue]: https://github.com/angular/angular.js/issues/new
 [github]: https://github.com/angular/angular.js
 [gitter]: https://gitter.im/angular/angular.js
+[Google Closure I18N library]: https://github.com/google/closure-library/tree/master/closure/goog/i18n
 [groups]: https://groups.google.com/forum/?fromgroups#!forum/angular
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [irc]: http://webchat.freenode.net/?channels=angularjs&uio=d4
-[js-style-guide]: https://google.github.io/styleguide/javascriptguide.xml
 [jsfiddle]: http://jsfiddle.net/
-[list]: https://groups.google.com/forum/?fromgroups#!forum/angular
-[ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation
+[karma-browserstack]: https://github.com/karma-runner/karma-browserstack-launcher
+[karma-saucelabs]: https://github.com/karma-runner/karma-sauce-launcher
 [plunker]: http://plnkr.co/edit
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angularjs
-[unit-testing]: https://docs.angularjs.org/guide/unit-testing
-[Common Locale Data Repository (CLDR)]: http://cldr.unicode.org
-[Closure guide to i18n changes]: https://github.com/google/closure-library/wiki/Internationalization-%28i18n%29-changes-in-Closure-Library

 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/CONTRIBUTING.md?pixel)](https://github.com/igrigorik/ga-beacon)
@@ -0,0 +1,488 @@
+# Developing AngularJS
+
+* [Development Setup](#setup)
+* [Running Tests](#tests)
+* [Coding Rules](#rules)
+* [Commit Message Guidelines](#commits)
+* [Writing Documentation](#documentation)
+
+## <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`.
+
+### Installing Dependencies
+
+Before you can build AngularJS, you must install and configure the following dependencies on your
+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
+  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.
+
+  We recommend using [nvm](https://github.com/creationix/nvm) (or
+  [nvm-windows](https://github.com/coreybutler/nvm-windows))
+  to manage and install Node.js, which makes it easy to change the version of Node.js per project.
+
+* [Yarn](https://yarnpkg.com): We use Yarn to install our Node.js module dependencies
+  (rather than using npm). See the detailed [installation instructions][yarn-install].
+
+* [Java](http://www.java.com): We minify JavaScript using
+  [Closure Tools](https://developers.google.com/closure/), which require Java (version 7 or higher)
+  to be installed and included in your
+  [PATH](http://docs.oracle.com/javase/tutorial/essential/environment/paths.html) variable.
+
+* [Grunt](http://gruntjs.com): We use Grunt as our build system. We're using it as a local dependency,
+  but you can also add the grunt command-line tool globally (with `yarn global add grunt-cli`), which allows
+  you to leave out the `yarn` prefix for all our grunt commands.
+
+### Forking AngularJS on Github
+
+To contribute code to AngularJS, you must have a GitHub account so you can push code to your own
+fork of AngularJS and open Pull Requests in the [GitHub Repository][github].
+
+To create a Github account, follow the instructions [here](https://github.com/signup/free).
+Afterwards, go ahead and [fork](http://help.github.com/forking) the
+[main AngularJS repository][github].
+
+
+### Building AngularJS
+
+To build AngularJS, you clone the source code repository and use Grunt to generate the non-minified
+and minified AngularJS files:
+
+```shell
+# Clone your Github repository:
+git clone https://github.com/<github username>/angular.js.git
+
+# Go to the AngularJS directory:
+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:
+yarn install
+
+# Build AngularJS:
+yarn grunt package
+```
+
+**Note:** If you're using Windows, you must use an elevated command prompt (right click, run as
+Administrator). This is because `yarn grunt package` creates some symbolic links.
+
+The build output is in the `build` directory. It consists of the following files and
+directories:
+
+* `angular-<version>.zip` — The complete zip file, containing all of the release build
+artifacts.
+
+* `angular.js` / `angular.min.js` — The regular and minified core AngularJS script file.
+
+* `angular-*.js` / `angular-*.min.js` — All other AngularJS module script files.
+
+* `docs/` — A directory that contains a standalone version of the docs
+  (same as served in `docs.angularjs.org`).
+
+### <a name="local-server"></a> Running a Local Development Web Server
+
+To debug code, run end-to-end tests, and serve the docs, it is often useful to have a local
+HTTP server. For this purpose, we have made available a local web server based on Node.js.
+
+1. To start the web server, run:
+   ```shell
+   yarn grunt webserver
+   ```
+
+2. To access the local server, enter the following URL into your web browser:
+   ```text
+   http://localhost:8000/
+   ```
+   By default, it serves the contents of the AngularJS project directory.
+
+3. To access the locally served docs, visit this URL:
+   ```text
+   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
+tests once on Chrome run:
+
+```shell
+yarn grunt test:unit
+```
+
+To run the tests on other browsers use the command line flag:
+
+```shell
+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.
+
+For example, to run the whole unit test suite on selected browsers:
+
+```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
+# 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
+```
+
+Running these commands requires you to set up [Karma Browserstack][karma-browserstack] or
+[Karma-Saucelabs][karma-saucelabs], respectively.
+
+During development, however, it's more productive to continuously run unit tests every time the
+source or test files change. To execute tests in this mode run:
+
+1. To start the Karma server, capture Chrome browser and run unit tests, run:
+
+   ```shell
+   yarn grunt autotest
+   ```
+
+2. To capture more browsers, open this URL in the desired browser (URL might be different if you
+   have multiple instance of Karma running, read Karma's console output for the correct URL):
+
+   ```text
+   http://localhost:9876/
+   ```
+
+3. To re-run tests just change any source or test file.
+
+
+To learn more about all of the preconfigured Grunt tasks run:
+
+```shell
+yarn grunt --help
+```
+
+
+### <a name="e2e-tests"></a> Running the End-to-end Test Suite
+
+AngularJS's end to end tests are run with Protractor. Simply run:
+
+```shell
+yarn grunt test:e2e
+```
+
+This will start the webserver and run the tests on Chrome.
+
+## <a name="rules"></a> Coding Rules
+
+To ensure consistency throughout the source code, keep these rules in mind as you are working:
+
+* All features or bug fixes **must be tested** by one or more [specs][unit-testing].
+* All public API methods **must be documented** with ngdoc, an extended version of jsdoc (we added
+  support for markdown and templating via @ngdoc tag). To see how we document our APIs, please check
+  out the existing source code and see the section about [writing documentation](#documentation)
+* With the exceptions listed below, we follow the rules contained in
+  [Google's JavaScript Style Guide][js-style-guide]:
+    * **Do not use namespaces**: Instead,  wrap the entire AngularJS code base in an anonymous
+      closure and export our API explicitly rather than implicitly.
+    * Wrap all code at **100 characters**.
+    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
+      inheritance only when absolutely necessary.
+    * We **love functions and closures** and, whenever possible, prefer them over objects.
+    * To write concise code that can be better minified, we **use aliases internally** that map to
+      the external API. See our existing code to see what we mean.
+    * We **don't go crazy with type annotations** for private internal APIs unless it's an internal
+      API that is used throughout AngularJS. The best guidance is to do what makes the most sense.
+
+### Specific topics
+
+#### Provider configuration
+
+When adding configuration (options) to [providers][docs.provider], we follow a special pattern.
+
+- for each option, add a `method` that ...
+  - works as a getter and returns the current value when called without argument
+  - works as a setter and returns itself for chaining when called with argument
+  - for boolean options, uses the naming scheme `<option>Enabled([enabled])`
+- non-primitive options (e.g. objects) should be copied or the properties assigned explicitly to a
+  new object so that the configuration cannot be changed during runtime.
+
+For a boolean config example, see [`$compileProvider#debugInfoEnabled`][code.debugInfoEnabled]
+
+For an object config example, see [`$location.html5Mode`][code.html5Mode]
+
+#### Throwing errors
+
+User-facing errors should be thrown with [`minErr`][code.minErr], a special error function that provides
+errors ids, templated error messages, and adds a link to a detailed error description.
+
+The `$compile:badrestrict` error is a good example for a well-defined `minErr`:
+[code][code.badrestrict] and [description][docs.badrestrict].
+
+
+## <a name="commits"></a> Git Commit Guidelines
+
+We have very precise rules over how our git commit messages can be formatted.  This leads to **more
+readable messages** that are easy to follow when looking through the **project history**.  But also,
+we use the git commit messages to **generate the AngularJS change log**.
+
+The commit message formatting can be added using a typical git workflow or through the use of a CLI
+wizard ([Commitizen](https://github.com/commitizen/cz-cli)). To use the wizard, run `yarn run commit`
+in your terminal after staging your changes in git.
+
+### Commit Message Format
+Each commit message consists of a **header**, a **body** and a **footer**.  The header has a special
+format that includes a **type**, a **scope** and a **subject**:
+
+```
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+Any line of the commit message cannot be longer than 100 characters! This allows the message to be easier
+to read on GitHub as well as in various git tools.
+
+### Revert
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header
+of the reverted commit.
+In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit
+being reverted.
+
+### Type
+Must be one of the following:
+
+* **feat**: A new feature
+* **fix**: A bug fix
+* **docs**: Documentation only changes
+* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing
+  semi-colons, etc)
+* **refactor**: A code change that neither fixes a bug nor adds a feature
+* **perf**: A code change that improves performance
+* **test**: Adding missing or correcting existing tests
+* **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
+  generation
+
+### Scope
+The scope could be anything specifying place of the commit change. For example `$location`,
+`$browser`, `$compile`, `$rootScope`, `ngHref`, `ngClick`, `ngView`, etc...
+
+You can use `*` when the change affects more than a single scope.
+
+### Subject
+The subject contains succinct description of the change:
+
+* use the imperative, present tense: "change" not "changed" nor "changes"
+* don't capitalize first letter
+* no dot (.) at the end
+
+### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to
+[reference GitHub issues that this commit closes][closing-issues].
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines.
+The rest of the commit message is then used for this.
+
+A detailed explanation can be found in this [document][commit-message-format].
+
+## <a name="documentation"></a> Writing Documentation
+
+The AngularJS project uses a form of [jsdoc](http://usejsdoc.org/) called ngdoc for all of its code
+documentation.
+
+This means that all the docs are stored inline in the source code and so are kept in sync as it
+changes.
+
+There is also extra content (the developer guide, error pages, the tutorial,
+and misceallenous pages) that live inside the AngularJS repository as markdown files.
+
+This means that since we generate the documentation from the source code, we can easily provide
+version-specific documentation by simply checking out a version of AngularJS and running the build.
+
+Extracting the source code documentation, processing and building the docs is handled by the
+documentation generation tool [Dgeni][dgeni].
+
+### Building and viewing the docs locally
+The docs can be built from scratch using grunt:
+
+```shell
+yarn grunt docs
+```
+
+This defers the doc-building task to `gulp`.
+
+Note that the docs app is using the local build files to run. This means you might first have to run
+the build:
+
+```shell
+yarn grunt build
+```
+
+(This is also necessary if you are making changes to minErrors).
+
+To view the docs, see [Running a Local Development Web Server](#local-server).
+
+### Writing jsdoc
+The ngdoc utility has basic support for many of the standard jsdoc directives.  But in particular it
+is interested in the following block tags:
+
+* `@name name` - the name of the ngdoc document
+* `@param {type} name description` - describes a parameter of a function
+* `@returns {type} description` - describes what a function returns
+* `@requires` - normally indicates that a JavaScript module is required; in an Angular service it is
+  used to describe what other services this service relies on
+* `@property` - describes a property of an object
+* `@description` - used to provide a description of a component in markdown
+* `@link` - specifies a link to a URL or a type in the API reference.
+  Links to the API have the following structure:
+
+  * the module namespace, followed by `.` (optional, default `ng`)
+  * the `@ngdoc` type (see below), followed by `:` (optional, automatically inferred)
+  * the name
+  * the method, property, or anchor (optional)
+  * the display name
+
+  For example: `{@link ng.type:$rootScope.Scope#$new Scope.$new()}`.
+
+* `@example` - specifies an example. This can be a simple code block, or a
+  [runnable example](#the-example-tag).
+* `@deprecated` - specifies that the following code is deprecated and should not be used.
+  In The AngularJS docs, there are two specific patterns which can be used to further describe
+  the deprecation: `sinceVersion="<version>"` and `removeVersion="<version>"`
+
+The `type` in `@param` and `@returns` must be wrapped in `{}` curly braces, e.g. `{Object|Array}`.
+Parameters can be made optional by *either* appending a `=` to the type, e.g. `{Object=}`, *or* by
+putting the `[name]` in square brackets.
+Default values are only possible with the second syntax by appending `=<value>` to the parameter
+name, e.g. `@param {boolean} [ownPropsOnly=false]`.
+
+Descriptions can contain markdown formatting.
+
+#### AngularJS-specific jsdoc directives
+
+In addition to the standard jsdoc tags, there are a number that are specific to the Angular
+code-base:
+
+* `@ngdoc` - specifies the type of thing being documented. See below for more detail.
+* `@eventType emit|broadcast` - specifies whether the event is emitted or broadcast
+* `@usage` - shows how to use a `function` or `directive`. Is usually automatically generated.
+* `@knownIssue` - adds info about known quirks, problems, or limitations with the API, and possibly,
+  workarounds. This section is not for bugs.
+
+The following are specific to directives:
+
+* `@animations` - specifies the animations a directive supports
+* `@multiElement` - specifies if a directive can span over multiple elements
+* `@priority` - specifies a directive's priority
+* `@restrict` - is extracted to show the usage of a directive. For example, for [E]lement,
+  [A]ttribute, and [C]lass, use `@restrict ECA`
+* `@scope` - specifies that a directive will create a new scope
+
+### The `@ngdoc` Directive
+This directive helps to specify the template used to render the item being documented.  For instance,
+a directive would have different properties to a filter and so would be documented differently.  The
+commonly used types are:
+
+* `overview` - a general page (guide, api index)
+* `provider` - AngularJS provider, such as `$compileProvider` or `$httpProvider`.
+* `service` - injectable AngularJS service, such as `$compile` or `$http`.
+* `object` - well defined object (often exposed as a service)
+* `function` - function that will be available to other methods (such as a helper function within
+  the ng module)
+* `method` - method on an object/service/controller
+* `property` - property on an object/service/controller
+* `event` -  AngularJS event that will propagate through the `$scope` tree.
+* `directive` - AngularJS  directive
+* `filter` - AngularJS filter
+* `error` - minErr error description
+
+### General documentation with Markdown
+
+Any text in tags can contain markdown syntax for formatting. Generally, you can use any markdown
+feature.
+
+#### Headings
+
+Only use *h2* headings and lower, as the page title is set in *h1*. Also make sure you follow the
+heading hierarchy. This ensures correct table of contents are created.
+
+#### Code blocks
+In line code can be specified by enclosing the code in back-ticks (\`).
+A block of multi-line code can be enclosed in triple back-ticks (\`\`\`) but it is formatted better
+if it is enclosed in &lt;pre&gt;...&lt;/pre&gt; tags and the code lines themselves are indented.
+
+### Writing runnable (live) examples and e2e tests
+It is possible to embed examples in the documentation along with appropriate e2e tests. These
+examples and scenarios will be converted to runnable code within the documentation.  So it is
+important that they work correctly.  To ensure this, all these e2e scenarios are run as part of the
+automated Travis tests.
+
+If you are adding an example with an e2e test, you should [run the test locally](#e2e-tests) first
+to ensure it passes. You can change `it(...)` to `fit(...)` to run only your test,
+but make sure you change it back to `it(...)` before committing.
+
+#### The `<example>` tag
+This tag identifies a block of HTML that will define a runnable example. It can take the following
+attributes:
+
+* `animations` - if set to `true` then this example uses ngAnimate.
+* `deps` - Semicolon-separated list of additional angular module files to be loaded,
+  e.g. `angular-animate.js`
+* `name` - every example should have a name. It should start with the component, e.g directive name,
+  and not contain whitespace
+* `module` - the name of the app module as defined in the example's JavaScript
+
+Within this tag we provide `<file>` tags that specify what files contain the example code.
+
+```
+<example
+  module="angularAppModule"
+  name="exampleName"
+  deps="angular-animate.js;angular-route.js"
+  animations="true">
+  ...
+  <file name="index.html">...</file>
+  <file name="script.js">...</file>
+  <file name="animations.css">...</file>
+  <file name="protractor.js">...</file>
+  ...
+</example>
+```
+
+You can see an example of a well-defined example [in the `ngRepeat` documentation][code.ngRepeat-example].
+
+[closing-issues]: https://help.github.com/articles/closing-issues-via-commit-messages/
+[Closure guide to i18n changes]: https://github.com/google/closure-library/wiki/Internationalization-%28i18n%29-changes-in-Closure-Library
+[code.badrestrict]: https://github.com/angular/angular.js/blob/202f1809ad14827a6ac6a125157c605d65e0b551/src/ng/compile.js#L1107-L1110
+[code.debugInfoEnabled]: https://github.com/angular/angular.js/blob/32fbb2e78f53d765fbb170f7cf99e42e072d363b/src/ng/compile.js#L1378-L1413
+[code.html5Mode]: https://github.com/angular/angular.js/blob/202f1809ad14827a6ac6a125157c605d65e0b551/src/ng/location.js#L752-L797
+[code.minErr]: https://github.com/angular/angular.js/blob/202f1809ad14827a6ac6a125157c605d65e0b551/src/minErr.js#L53-L113
+[code.ngRepeat-example]: https://github.com/angular/angular.js/blob/0822d34b10ea0371c260c80a1486a4d508ea5a91/src/ng/directive/ngRepeat.js#L249-L340
+[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
+[Common Locale Data Repository (CLDR)]: http://cldr.unicode.org
+[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
+[dgeni]: https://github.com/angular/dgeni
+[docs.badrestrict]: docs/content/error/$compile/badrestrict.ngdoc
+[docs.provider]: https://code.angularjs.org/snapshot/docs/api/auto/service/$provide#provider
+[git-revert]: https://git-scm.com/docs/git-revert
+[git-setup]: https://help.github.com/articles/set-up-git
+[github-issues]: https://github.com/angular/angular.js/issues
+[github]: https://github.com/angular/angular.js
+[js-style-guide]: https://google.github.io/styleguide/javascriptguide.xml
+[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
@@ -4,6 +4,7 @@ var serveFavicon = require('serve-favicon');
 var serveStatic = require('serve-static');
 var serveIndex = require('serve-index');
 var files = require('./angularFiles').files;
+var mergeFilesFor = require('./angularFiles').mergeFilesFor;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
 var path = require('path');
@@ -13,6 +14,8 @@ 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 + '). ' +
@@ -28,7 +31,7 @@ if (!semver.satisfies(currentYarnVersion, expectedYarnVersion)) {
 }

 // Grunt CLI version checks
-var expectedGruntVersion = pkg.engines.grunt;
+var expectedGruntVersion = pkg.engines['grunt-cli'];
 var currentGruntVersions = exec('grunt --version', {silent: true}).stdout;
 var match = /^grunt-cli v(.+)$/m.exec(currentGruntVersions);
 if (!match) {
@@ -49,7 +52,6 @@ if (!process.env.TRAVIS && !process.env.JENKINS_HOME) {
  }
 }

-
 module.exports = function(grunt) {

  // this loads all the node_modules that start with `grunt-` as plugins
@@ -64,6 +66,12 @@ module.exports = function(grunt) {
  NG_VERSION.cdn = versionInfo.cdnVersion;
  var dist = 'angular-' + NG_VERSION.full;

+  var deployVersion = NG_VERSION.full;
+
+  if (NG_VERSION.isSnapshot) {
+    deployVersion = NG_VERSION.distTag === 'latest' ? 'snapshot-stable' : 'snapshot';
+  }
+
  if (versionInfo.cdnVersion == null) {
    throw new Error('Unable to read CDN version, are you offline or has the CDN not been properly pushed?\n' +
                    'Perhaps you want to set the NG1_BUILD_NO_REMOTE_VERSION_REQUESTS environment variable?');
@@ -134,7 +142,9 @@ module.exports = function(grunt) {
      'jquery-2.2': 'karma-jquery-2.2.conf.js',
      'jquery-2.1': 'karma-jquery-2.1.conf.js',
      docs: 'karma-docs.conf.js',
-      modules: 'karma-modules.conf.js'
+      modules: 'karma-modules.conf.js',
+      'modules-ngAnimate': 'karma-modules-ngAnimate.conf.js',
+      'modules-ngMock': 'karma-modules-ngMock.conf.js'
    },


@@ -157,7 +167,12 @@ module.exports = function(grunt) {

    clean: {
      build: ['build'],
-      tmp: ['tmp']
+      tmp: ['tmp'],
+      deploy: [
+        'deploy/docs',
+        'deploy/code',
+        docsScriptFolder + '/functions/html'
+      ]
    },

    eslint: {
@@ -168,6 +183,7 @@ module.exports = function(grunt) {
          'docs/**/*.js',
          'lib/**/*.js',
          'scripts/**/*.js',
+          '!scripts/*/*/node_modules/**',
          'src/**/*.js',
          'test/**/*.js',
          'i18n/**/*.js',
@@ -181,16 +197,6 @@ 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'),
@@ -208,6 +214,12 @@ module.exports = function(grunt) {
        dest: 'build/angular-touch.js',
        src: util.wrap(files['angularModules']['ngTouch'], 'module')
      },
+      touchModuleTestBundle: {
+        dest: 'build/test-bundles/angular-touch.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngTouch'),
+        suffix: 'src/module.suffix'
+      },
      mocks: {
        dest: 'build/angular-mocks.js',
        src: util.wrap(files['angularModules']['ngMock'], 'module'),
@@ -217,18 +229,42 @@ module.exports = function(grunt) {
        dest: 'build/angular-sanitize.js',
        src: util.wrap(files['angularModules']['ngSanitize'], 'module')
      },
+      sanitizeModuleTestBundle: {
+        dest: 'build/test-bundles/angular-sanitize.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngSanitize'),
+        suffix: 'src/module.suffix'
+      },
      resource: {
        dest: 'build/angular-resource.js',
        src: util.wrap(files['angularModules']['ngResource'], 'module')
      },
+      resourceModuleTestBundle: {
+        dest: 'build/test-bundles/angular-resource.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngResource'),
+        suffix: 'src/module.suffix'
+      },
      messageformat: {
        dest: 'build/angular-message-format.js',
        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
      },
+      messageformatModuleTestBundle: {
+        dest: 'build/test-bundles/angular-message-format.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngMessageFormat'),
+        suffix: 'src/module.suffix'
+      },
      messages: {
        dest: 'build/angular-messages.js',
        src: util.wrap(files['angularModules']['ngMessages'], 'module')
      },
+      messagesModuleTestBundle: {
+        dest: 'build/test-bundles/angular-messages.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngMessages'),
+        suffix: 'src/module.suffix'
+      },
      animate: {
        dest: 'build/angular-animate.js',
        src: util.wrap(files['angularModules']['ngAnimate'], 'module')
@@ -237,14 +273,32 @@ module.exports = function(grunt) {
        dest: 'build/angular-route.js',
        src: util.wrap(files['angularModules']['ngRoute'], 'module')
      },
+      routeModuleTestBundle: {
+        dest: 'build/test-bundles/angular-route.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngRoute'),
+        suffix: 'src/module.suffix'
+      },
      cookies: {
        dest: 'build/angular-cookies.js',
        src: util.wrap(files['angularModules']['ngCookies'], 'module')
      },
+      cookiesModuleTestBundle: {
+        dest: 'build/test-bundles/angular-cookies.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngCookies'),
+        suffix: 'src/module.suffix'
+      },
      aria: {
        dest: 'build/angular-aria.js',
        src: util.wrap(files['angularModules']['ngAria'], 'module')
      },
+      ariaModuleTestBundle: {
+        dest: 'build/test-bundles/angular-aria.js',
+        prefix: 'src/module.prefix',
+        src: mergeFilesFor('karmaModules-ngAria'),
+        suffix: 'src/module.suffix'
+      },
      parseext: {
        dest: 'build/angular-parse-ext.js',
        src: util.wrap(files['angularModules']['ngParseExt'], 'module')
@@ -276,9 +330,7 @@ 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: {
@@ -310,7 +362,54 @@ module.exports = function(grunt) {
    copy: {
      i18n: {
        files: [
-          { src: 'src/ngLocale/**', dest: 'build/i18n/', expand: true, flatten: true }
+          {
+            src: 'src/ngLocale/**',
+            dest: 'build/i18n/',
+            expand: true,
+            flatten: true
+          }
+        ]
+      },
+      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/',
+            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',
+            expand: true
+          }
        ]
      }
    },
@@ -324,6 +423,16 @@ module.exports = function(grunt) {
        expand: true,
        dot: true,
        dest: dist + '/'
+      },
+      deployFirebaseCode: {
+        options: {
+          mode: 'gzip'
+        },
+        // Already compressed files should not be compressed again
+        src: ['**', '!**/*.{zip,png,jpeg,jpg}'],
+        cwd: 'build',
+        expand: true,
+        dest: 'deploy/code/' + deployVersion + '/'
      }
    },

@@ -358,24 +467,80 @@ module.exports = function(grunt) {
  });

  //alias tasks
-  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['eslint', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
+  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', [
+    'eslint',
+    'package',
+    'test:unit',
+    'test:promises-aplus',
+    'tests:docs',
+    'test:protractor'
+  ]);
  grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
  grunt.registerTask('test:jquery', 'Run the jQuery (latest) unit tests with Karma', ['tests:jquery']);
  grunt.registerTask('test:jquery-2.2', 'Run the jQuery 2.2 unit tests with Karma', ['tests:jquery-2.2']);
  grunt.registerTask('test:jquery-2.1', 'Run the jQuery 2.1 unit tests with Karma', ['tests:jquery-2.1']);
-  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['build', 'tests:modules']);
+  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', [
+    'build',
+    'tests:modules',
+    'tests:modules-ngAnimate',
+    'tests:modules-ngMock'
+  ]);
  grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
-  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['test:jqlite', 'test:jquery', 'test:jquery-2.2', 'test:jquery-2.1', 'test:modules']);
-  grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
-  grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
-  grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', [
+    'test:jqlite',
+    'test:jquery',
+    'test:jquery-2.2',
+    'test:jquery-2.1',
+    'test:modules'
+  ]);
+  grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', [
+    'webdriver',
+    'connect:testserver',
+    'protractor:normal'
+  ]);
+  grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', [
+    'connect:testserver',
+    'protractor:travis'
+  ]);
+  grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', [
+    'webdriver',
+    'connect:testserver',
+    'protractor:jenkins'
+  ]);
  grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']);
-  grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter', 'shell:promises-aplus-tests']);
-
-  grunt.registerTask('minify', ['bower', 'clean', 'build', 'minall']);
+  grunt.registerTask('test:promises-aplus',[
+    'build:promises-aplus-adapter',
+    'shell:promises-aplus-tests'
+  ]);
+  grunt.registerTask('minify', [
+    'clean',
+    'build',
+    'minall'
+  ]);
  grunt.registerTask('webserver', ['connect:devserver']);
-  grunt.registerTask('package', ['bower', 'validate-angular-files', 'clean', 'buildall', 'minall', 'collect-errors', 'write', 'docs', 'copy', 'compress']);
-  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'eslint']);
+  grunt.registerTask('package', [
+    'validate-angular-files',
+    'clean',
+    'buildall',
+    'minall',
+    'collect-errors',
+    'write',
+    'docs',
+    'copy:i18n',
+    'compress:build'
+  ]);
+  grunt.registerTask('ci-checks', [
+    'ddescribe-iit',
+    'merge-conflict',
+    'eslint'
+  ]);
+  grunt.registerTask('prepareDeploy', [
+    'package',
+    'compress:deployFirebaseCode',
+    'copy:deployFirebaseCode',
+    'firebaseDocsJsonForTravis',
+    'copy:deployFirebaseDocs'
+  ]);
  grunt.registerTask('default', ['package']);
 };

@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2010-2017 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2020 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
@@ -8,43 +8,42 @@ synchronizes data from your UI (view) with your JavaScript objects (model) throu
 binding. To help you structure your application better and make it easy to test, AngularJS teaches
 the browser how to do dependency injection and inversion of control.

-It also helps with server-side communication, taming async callbacks with promises and deferreds,
-and it makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
+It also helps with server-side communication, taming async callbacks with promises and deferred objects,
+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!

+--------------------
+
+**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [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
 * Developer Guide: https://docs.angularjs.org/guide
-* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
+* Contribution guidelines: [CONTRIBUTING.md](CONTRIBUTING.md)
+* Core Development: [DEVELOPERS.md](DEVELOPERS.md)
 * Dashboard: https://dashboard.angularjs.org

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

-Building AngularJS
---------
-[Once you have set up your environment](https://docs.angularjs.org/misc/contribute), just run:
+Documentation
+--------------------
+Go to https://docs.angularjs.org

-    grunt package
-
-
-Running tests
-------------
-To execute all unit tests, use:
-
-    grunt test:unit
-
-To execute end-to-end (e2e) tests, use:
-
-    grunt package
-    grunt test:e2e
-
-To learn more about the grunt tasks, run `grunt --help`
-
-Contribute & Develop
+Contribute
 --------------------

-We've set up a separate document for our [contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
+We've set up a separate document for our
+[contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
+
+Develop
+--------------------
+
+We've set up a separate document for
+[developers](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md).


 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)
@@ -0,0 +1,98 @@
+# AngularJS Release instructions
+
+
+## Compare the list of commits between stable and unstable
+
+There is a script - compare-master-to-stable.js - that helps with this.
+We just want to make sure that good commits (low risk fixes + docs fixes) got cherry-picked into stable branch and nothing interesting got merged only into stable branch.
+
+
+## Pick a release name (for this version)
+
+A super-heroic power (adverb-verb phrase).
+
+
+## Generate release notes
+
+Example Commit: https://github.com/angular/angular.js/commit/7ab5098c14ee4f195dbfe2681e402fe2dfeacd78
+
+1) Run
+
+```bash
+node_modules/.bin/changez -o changes.md -v <new version> <base branch>
+```
+
+2) Review the generated file and manually fix typos, group and reorder stuff if needed.
+3) Move the content into CHANGELOG.md add release code-names to headers.
+4) Push the changes to your private github repo and review.
+5) cherry-pick the release notes commit to the appropriate branches.
+
+
+## Pick a commit to release (for this version)
+
+Usually this will be the commit containing the release notes, but it may also be in the past.
+
+
+## Run "release" script
+
+  ```bash
+  scripts/jenkins/release.sh --git-push-dryrun=false --commit-sha=8822a4f --version-number=1.7.6 --version-name=gravity-manipulation
+  ```
+
+  1) The SHA is of the commit to release (could be in the past).
+
+  2) The version number and code-name that should be released, not the next version number (e.g. to release 1.2.12 you enter 1.2.12 as release version and the code-name that was picked for 1.2.12, cauliflower-eradication).
+
+  3) You will need to have write access to all the AngularJS github dist repositories and publish rights for the AngularJS packages on npm.
+
+
+## Update GitHub milestones
+
+1) Create the next milestone if it doesn't exist yet-giving ita due date.
+2) Move all open issues and PRs for the current milestone to the next milestone<br>
+  You can do this by filtering the current milestone, selecting via checklist, and moving to the next milestone within the GH issues page.
+
+3) Close the current milestone click the milestones tab and close from there.
+4) Create a new holding milestone for the release after next-but don't give it a due date otherwise that will mess up the dashboard.
+
+
+## Push build artifacts to CDN
+
+Google CDNs are fed with data from google3 every day at 11:15am PT it takes only few minutes for the import to propagate).
+If we want to make our files available, we need submit our CLs before this time on the day of the release.
+
+
+## Don't update the package.json (branchVersion) until the CDN has updated
+
+This is the version used to compute what version to link to in the CDN. If you update this too early then the CDN lookup fails and you end up with 'null, for the version, which breaks the docs.
+
+
+## Verify angularjs.org download modal has latest version (updates via Travis job)
+
+The versions in the modal are updated (based on the versions available on CDN) as part of the Travis deploy stage: https://github.com/angular/angularjs.org/blob/a4d25c5abcd39e8ce19d31cb1c78073d13c4c974/.travis.yml#L26
+(You may need to explicitly trigger the Travis job. e.g. re-running the last job.)
+
+
+## Announce the release (via official Google accounts)
+
+Double check that angularjs.org is up to date with the new release version before sharing.
+
+1) Collect a list of contributors
+
+use: `git log --format='%aN' v1.2.12..v1.2.13 | sort -u`
+
+2) Write a blog post (for minor releases, not patch releases) and publish it with the "release" tag
+3) Post on twitter as yourself (tweet from your heart; there is no template for this), retweet as @AngularJS
+
+
+## Party!
+
+
+## Major Release Tasks
+
+1) Update angularjs.org to use the latest branch.
+2) Write up a migration document.
+3) Create a new git branch for the version that has been released (e.g. 1.8.x).
+4) Check that the build and release scripts still work.
+5) Update the dist-tag of the old branch, see https://github.com/angular/angular.js/pull/12722.
+6) Write a blog post.
@@ -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 on Bower and/or to the npm repository.
+> The good news is that you could easily implement this as a third-party module and publish it to the npm registry.


 ## Assigning Work
@@ -28,6 +28,7 @@ var angularFiles = {
    'src/ng/httpBackend.js',
    'src/ng/interpolate.js',
    'src/ng/interval.js',
+    'src/ng/intervalFactory.js',
    'src/ng/jsonpCallbacks.js',
    'src/ng/locale.js',
    'src/ng/location.js',
@@ -40,6 +41,7 @@ var angularFiles = {
    'src/ng/sanitizeUri.js',
    'src/ng/sce.js',
    'src/ng/sniffer.js',
+    'src/ng/taskTrackerFactory.js',
    'src/ng/templateRequest.js',
    'src/ng/testability.js',
    'src/ng/timeout.js',
@@ -74,6 +76,7 @@ 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',
@@ -103,13 +106,13 @@ var angularFiles = {
      'src/ngAnimate/animateJs.js',
      'src/ngAnimate/animateJsDriver.js',
      'src/ngAnimate/animateQueue.js',
+      'src/ngAnimate/animateCache.js',
      'src/ngAnimate/animation.js',
      'src/ngAnimate/ngAnimateSwap.js',
      'src/ngAnimate/module.js'
    ],
    'ngCookies': [
      'src/ngCookies/cookies.js',
-      'src/ngCookies/cookieStore.js',
      'src/ngCookies/cookieWriter.js'
    ],
    'ngMessageFormat': [
@@ -131,6 +134,7 @@ var angularFiles = {
    ],
    'ngRoute': [
      'src/shallowCopy.js',
+      'src/routeToRegExp.js',
      'src/ngRoute/route.js',
      'src/ngRoute/routeParams.js',
      'src/ngRoute/directive/ngView.js'
@@ -140,6 +144,7 @@ var angularFiles = {
      'src/ngSanitize/filter/linky.js'
    ],
    'ngMock': [
+      'src/routeToRegExp.js',
      'src/ngMock/angular-mocks.js',
      'src/ngMock/browserTrigger.js'
    ],
@@ -153,26 +158,8 @@ 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',
@@ -189,55 +176,97 @@ var angularFiles = {
  ],

  'karma': [
-    'bower_components/jquery/dist/jquery.js',
+    'node_modules/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-ngAnimate': [
+    'build/angular.js',
+    'build/angular-mocks.js',
+    'test/modules/no_bootstrap.js',
+    'test/helpers/matchers.js',
+    'test/helpers/privateMocks.js',
+    'test/helpers/support.js',
+    'test/helpers/testabilityPatch.js',
+    '@angularSrcModuleNgAnimate',
+    'test/ngAnimate/**/*.js'
  ],

-  'karmaModules': [
+  'karmaModules-ngAria': [
+    '@angularSrcModuleNgAria',
+    'test/ngAria/**/*.js'
+  ],
+
+  'karmaModules-ngCookies': [
+    '@angularSrcModuleNgCookies',
+    'test/ngCookies/**/*.js'
+  ],
+
+  'karmaModules-ngMessageFormat': [
+    '@angularSrcModuleNgMessageFormat',
+    'test/ngMessageFormat/**/*.js'
+  ],
+
+  'karmaModules-ngMessages': [
+    'build/angular-animate.js',
+    '@angularSrcModuleNgMessages',
+    'test/ngMessages/**/*.js'
+  ],
+
+  // ngMock doesn't include the base because it must use the ngMock src files
+  'karmaModules-ngMock': [
    'build/angular.js',
-    '@angularSrcModules',
+    'src/ngMock/*.js',
    'test/modules/no_bootstrap.js',
-    'test/helpers/*.js',
-    'test/ngAnimate/*.js',
-    'test/ngMessageFormat/*.js',
-    'test/ngMessages/*.js',
-    'test/ngMock/*.js',
-    'test/ngCookies/*.js',
-    'test/ngRoute/**/*.js',
-    'test/ngResource/*.js',
-    'test/ngSanitize/**/*.js',
-    'test/ngTouch/**/*.js',
-    'test/ngAria/*.js'
+    'test/helpers/matchers.js',
+    'test/helpers/privateMocks.js',
+    'test/helpers/support.js',
+    'test/helpers/testabilityPatch.js',
+    'src/routeToRegExp.js',
+    'build/angular-animate.js',
+    'test/ngMock/**/*.js'
+  ],
+
+  'karmaModules-ngResource': [
+    '@angularSrcModuleNgResource',
+    'test/ngResource/**/*.js'
+  ],
+
+  'karmaModules-ngRoute': [
+    'build/angular-animate.js',
+    '@angularSrcModuleNgRoute',
+    'test/ngRoute/**/*.js'
+  ],
+
+  'karmaModules-ngSanitize': [
+    '@angularSrcModuleNgSanitize',
+    'test/ngSanitize/**/*.js'
+  ],
+
+  'karmaModules-ngTouch': [
+    '@angularSrcModuleNgTouch',
+    'test/ngTouch/**/*.js'
  ],

  'karmaJquery': [
-    'bower_components/jquery/dist/jquery.js',
+    'node_modules/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'
  ]
@@ -247,13 +276,23 @@ var angularFiles = {
  angularFiles['karmaJquery' + jQueryVersion] = []
    .concat(angularFiles.karmaJquery)
    .map(function(path) {
-      if (path.startsWith('bower_components/jquery')) {
-        return path.replace(/^bower_components\/jquery/, 'bower_components/jquery-' + jQueryVersion);
+      if (path.startsWith('node_modules/jquery')) {
+        return path.replace(/^node_modules\/jquery/, 'node_modules/jquery-' + jQueryVersion);
      }
      return path;
    });
 });

+angularFiles['angularSrcModuleNgAnimate'] = angularFiles['angularModules']['ngAnimate'];
+angularFiles['angularSrcModuleNgAria'] = angularFiles['angularModules']['ngAria'];
+angularFiles['angularSrcModuleNgCookies'] = angularFiles['angularModules']['ngCookies'];
+angularFiles['angularSrcModuleNgMessageFormat'] = angularFiles['angularModules']['ngMessageFormat'];
+angularFiles['angularSrcModuleNgMessages'] = angularFiles['angularModules']['ngMessages'];
+angularFiles['angularSrcModuleNgResource'] = angularFiles['angularModules']['ngResource'];
+angularFiles['angularSrcModuleNgRoute'] = angularFiles['angularModules']['ngRoute'];
+angularFiles['angularSrcModuleNgSanitize'] = angularFiles['angularModules']['ngSanitize'];
+angularFiles['angularSrcModuleNgTouch'] = angularFiles['angularModules']['ngTouch'];
+
 angularFiles['angularSrcModules'] = [].concat(
  angularFiles['angularModules']['ngAnimate'],
  angularFiles['angularModules']['ngMessageFormat'],
@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
@@ -1 +1 @@
-// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
+// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
@@ -29,19 +29,16 @@ app.directive('bmPeWatch', 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;
-  }
-
+//Executes the specified expression as a collection watcher
+app.directive('bmPeWatchCollection', function() {
  return {
    restrict: 'A',
    compile: function($element, $attrs) {
-      $element.text($attrs.bmPeWatchLiteral);
+      $element.text($attrs.bmPeWatchCollection);
      return function($scope, $element, $attrs) {
-        $scope.$watch($parse($attrs.bmPeWatchLiteral, retZero));
+        $scope.$watchCollection($attrs.bmPeWatchCollection, function(val) {
+          $element.text(val);
+        });
      };
    }
  };
@@ -72,8 +69,7 @@ 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])),
-      constructor: data[i - 1]
+      keys: data[i - 1] && (data[i - 1].keys || Object.keys(data[i - 1]))
    });
  }

@@ -16,12 +16,6 @@
          <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>
@@ -66,6 +60,16 @@
          <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>

      <!--
@@ -88,17 +92,6 @@
          <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>
@@ -215,27 +208,44 @@
        </li>

        <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <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>
+          <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>
        </li>

        <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <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>
+          <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>
        </li>
      </ul>
    </div>
@@ -0,0 +1,9 @@
+'use strict';
+
+angular.module('repeatAnimateBenchmark', ['ngAnimate'])
+  .config(function($animateProvider) {
+    $animateProvider.classNameFilter(/animate-/);
+  })
+  .run(function($rootScope) {
+    $rootScope.fileType = 'classfilter';
+  });
@@ -0,0 +1,6 @@
+'use strict';
+
+angular.module('repeatAnimateBenchmark', [])
+  .run(function($rootScope) {
+    $rootScope.fileType = 'noanimate';
+  });
@@ -0,0 +1,7 @@
+'use strict';
+
+angular.module('repeatAnimateBenchmark', ['ngAnimate'])
+  .run(function($rootScope) {
+    $rootScope.fileType = 'default';
+  });
+
@@ -0,0 +1,24 @@
+/* eslint-env node */
+
+'use strict';
+
+module.exports = function(config) {
+  config.set({
+    scripts: [
+    {
+      id: 'angular',
+      src: '/build/angular.js'
+    },
+    {
+      id: 'angular-animate',
+      src: '/build/angular-animate.js'
+    },
+    {
+      id: 'app',
+      src: 'app.js'
+    },
+    {
+      src: 'common.js'
+    }]
+  });
+};
@@ -0,0 +1,120 @@
+'use strict';
+
+(function() {
+  var app = angular.module('repeatAnimateBenchmark');
+
+  app.config(function($compileProvider, $animateProvider) {
+    if ($compileProvider.debugInfoEnabled) {
+      $compileProvider.debugInfoEnabled(false);
+    }
+
+  });
+
+  app.run(function($animate) {
+    if ($animate.enabled) {
+      $animate.enabled(true);
+    }
+  });
+
+  app.controller('DataController', function($scope, $rootScope, $animate) {
+    var totalRows = 500;
+    var totalColumns = 20;
+
+    var data = $scope.data = [];
+
+    function fillData() {
+      if ($animate.enabled) {
+        $animate.enabled($scope.benchmarkType !== 'globallyDisabled');
+      }
+
+      for (var i = 0; i < totalRows; i++) {
+        data[i] = [];
+        for (var j = 0; j < totalColumns; j++) {
+          data[i][j] = {
+            i: i
+          };
+        }
+      }
+    }
+
+    benchmarkSteps.push({
+      name: 'enter',
+      fn: function() {
+        $scope.$apply(function() {
+          fillData();
+        });
+      }
+    });
+
+    benchmarkSteps.push({
+      name: 'leave',
+      fn: function() {
+        $scope.$apply(function() {
+          data = $scope.data = [];
+        });
+      }
+    });
+  });
+
+  app.directive('disableAnimations', function($animate) {
+    return {
+      link: {
+        pre: function(s, e) {
+          $animate.enabled(e, false);
+        }
+      }
+    };
+  });
+
+  app.directive('noop', function($animate) {
+    return {
+      link: {
+        pre: angular.noop
+      }
+    };
+  });
+
+  app.directive('baseline', function($document) {
+    return {
+      restrict: 'E',
+      link: function($scope, $element) {
+        var document = $document[0];
+
+        var i, j, row, cell, comment;
+        var template = document.createElement('span');
+        template.setAttribute('ng-repeat', 'foo in foos');
+        template.classList.add('ng-scope');
+        template.appendChild(document.createElement('span'));
+        template.appendChild(document.createTextNode(':'));
+
+        function createList() {
+          for (i = 0; i < $scope.data.length; i++) {
+            row = document.createElement('div');
+            $element[0].appendChild(row);
+            for (j = 0; j < $scope.data[i].length; j++) {
+              cell = template.cloneNode(true);
+              row.appendChild(cell);
+              cell.childNodes[0].textContent = i;
+              cell.ng339 = 'xxx';
+              comment = document.createComment('ngRepeat end: bar in foo');
+              row.appendChild(comment);
+            }
+
+            comment = document.createComment('ngRepeat end: foo in foos');
+            $element[0].appendChild(comment);
+          }
+        }
+
+        $scope.$watch('data.length', function(newVal) {
+          if (newVal === 0) {
+            while ($element[0].firstChild) {
+                $element[0].removeChild($element[0].firstChild);
+            }
+          } else {
+            createList();
+          }
+        });
+      }
+    };
+  });
+})();
@@ -0,0 +1,70 @@
+<div ng-app="repeatAnimateBenchmark" ng-cloak>
+  <div ng-controller="DataController">
+    <div class="container-fluid">
+      <p>
+        Tests rendering of an ngRepeat with 500 elements.<br>
+        Animations can be enabled / disabled in different ways.<br>
+        Two tests require reloading the app with different module / app configurations.
+      </p>
+
+      <div><label><input type="radio" ng-model="benchmarkType" value="none">none: </label></div>
+      <div><label><input type="radio" ng-model="benchmarkType" value="baseline">baseline (vanilla Javascript): </label></div>
+      <div><label><input type="radio" ng-model="benchmarkType" ng-disabled="fileType !== 'default'" value="enabled">enabled : </label> (requires <a href="./">app.js</a>)</div>
+      <div><label><input type="radio" ng-model="benchmarkType" ng-disabled="fileType !== 'default' && fileType !== 'classfilter'" value="globallyDisabled">globally disabled:</label> (requires <a href="./">app.js</a> or <a href="?app=app-classfilter.js">app-classfilter.js</a>)</div>
+      <div><label><input type="radio" ng-model="benchmarkType" ng-disabled="fileType !== 'default'" value="disabledParentElement">disabled by $animate.enabled() on parent element: </label> (requires <a href="./">app.js</a>)</div>
+      <div><label><input type="radio" ng-model="benchmarkType" ng-disabled="fileType !== 'noanimate'" value="noanimate">Without ngAnimate:</label> (requires <a href="?app=app-noanimate.js">app-noanimate.js</a>)</div>
+      <div><label><input type="radio" ng-model="benchmarkType" ng-disabled="fileType !== 'classfilter'" value="disabledClassFilter">disabled by classNameFilter on element:</label> (requires <a href="?app=app-classfilter.js">app-classfilter.js</a>)</div>
+
+      <ng-switch on="benchmarkType">
+        <baseline ng-switch-when="baseline">
+        </baseline>
+        <div ng-switch-when="noanimate">
+          <div noop>
+            <div ng-repeat="row in data">
+              <span ng-repeat="column in row">
+                <span>{{column.i}}</span>
+              </span>
+            </div>
+          </div>
+        </div>
+        <div ng-switch-when="enabled">
+          <div noop>
+            <div ng-repeat="row in data">
+              <span ng-repeat="column in row">
+                <span>{{column.i}}</span>
+              </span>
+            </div>
+          </div>
+        </div>
+        <div ng-switch-when="globallyDisabled">
+          <div noop>
+            <div ng-repeat="row in data">
+              <span ng-repeat="column in row">
+                <span>{{column.i}}</span>
+              </span>
+            </div>
+          </div>
+        </div>
+        <div ng-switch-when="disabledClassFilter">
+          <div noop>
+            <div ng-repeat="row in data">
+              <span class="disable-animations" ng-repeat="column in row">
+                <span>{{column.i}}</span>
+              </span>
+            </div>
+          </div>
+        </div>
+        <div ng-switch-when="disabledParentElement">
+          <div disable-animations>
+            <div ng-repeat="row in data">
+              <span ng-repeat="column in row">
+                <span>{{column.i}}</span>
+              </span>
+            </div>
+          </div>
+        </div>
+      </ng-switch>
+
+    </div>
+  </div>
+</div>
@@ -1,11 +0,0 @@
-{
-  "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"
-  }
-}
@@ -13,7 +13,8 @@ body {
  text-align: center;
 }

-#json, #xml {
+#json,
+#xml {
  display: none;
 }

@@ -1,7 +1,11 @@
@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;
 }
@@ -1,3 +1,37 @@
+@font-face {
+  font-family: 'Open Sans';
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Regular/OpenSans-Regular.eot?v=1.1.0");
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Regular/OpenSans-Regular.eot?#iefix&v=1.1.0") format("embedded-opentype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Regular/OpenSans-Regular.woff?v=1.1.0") format("woff"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Regular/OpenSans-Regular.ttf?v=1.1.0") format("truetype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Regular/OpenSans-Regular.svg?v=1.1.0#OpenSansBold") format("svg");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Semibold/OpenSans-Semibold.eot?v=1.1.0");
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Semibold/OpenSans-Semibold.eot?#iefix&v=1.1.0") format("embedded-opentype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Semibold/OpenSans-Semibold.woff?v=1.1.0") format("woff"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Semibold/OpenSans-Semibold.ttf?v=1.1.0") format("truetype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Semibold/OpenSans-Semibold.svg?v=1.1.0#OpenSansBold") format("svg");
+  font-weight: 600;
+  font-style: normal;
+}
+
+
+@font-face {
+  font-family: 'Open Sans';
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Bold/OpenSans-Bold.eot?v=1.1.0");
+  src: url("../components/open-sans-fontface-1.4.0/fonts/Bold/OpenSans-Bold.eot?#iefix&v=1.1.0") format("embedded-opentype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Bold/OpenSans-Bold.woff?v=1.1.0") format("woff"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Bold/OpenSans-Bold.ttf?v=1.1.0") format("truetype"),
+    url("../components/open-sans-fontface-1.4.0/fonts/Bold/OpenSans-Bold.svg?v=1.1.0#OpenSansBold") format("svg");
+  font-weight: bold;
+  font-style: normal;
+}
+
 html, body {
  position: relative;
  height: 100%;
@@ -679,14 +713,14 @@ ul.events > li {
  margin-right: 5px;
 }

-@media only screen and (min-width: 769px) {
+@media only screen and (min-width: 768px) {
  [ng-include="partialPath"].ng-hide {
    display: block !important;
    visibility: hidden;
  }
 }

-@media only screen and (min-width: 769px) and (max-width: 991px) {
+@media only screen and (min-width: 768px) and (max-width: 991px) {
  .main-body-grid {
    margin-top: 160px;
  }
@@ -695,7 +729,7 @@ ul.events > li {
  }
 }

-@media only screen and (max-width : 768px) {
+@media only screen and (max-width: 767px) {
  .picker, .picker select {
    width: auto;
    display: block;
@@ -871,6 +905,43 @@ iframe[name="example-anchoringExample"] {
  background-color: inherit;
 }

+toc-container {
+  display: block;
+  margin: 15px 10px;
+}
+
+toc-container b {
+  text-transform: uppercase;
+}
+
+toc-container .btn {
+  padding: 3px 6px;
+  font-size: 13px;
+  margin-left: 5px;
+}
+
+toc-container > div > toc-tree ul {
+  list-style: none;
+  padding-left: 15px;
+  padding-bottom: 2px;
+}
+
+toc-container > div > toc-tree > ul {
+  padding-left: 0;
+}
+
+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;
@@ -0,0 +1,4 @@
+User-agent: *
+
+# The map files are not required by the app
+Disallow: /*.map$
@@ -9,6 +9,7 @@
  },

  "globals": {
+    "angular": false,
    /* testabilityPatch / matchers */
    "inject": false,
    "module": false,
@@ -1,51 +1,48 @@
 'use strict';

-describe('doc.angularjs.org', function() {
+describe('API pages', function() {

-  describe('API pages', function() {
+  it('should display links to code on GitHub', function() {
+    browser.get('build/docs/index.html#!/api/ng/service/$http');
+    expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);

-    it('should display links to code on GitHub', function() {
-      browser.get('build/docs/index.html#!/api/ng/service/$http');
-      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
+    browser.get('build/docs/index.html#!/api/ng/service/$http');
+    expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
+  });

-      browser.get('build/docs/index.html#!/api/ng/service/$http');
-      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
-    });
+  it('should change the page content when clicking a link to a service', function() {
+    browser.get('build/docs/index.html');

-    it('should change the page content when clicking a link to a service', function() {
-      browser.get('build/docs/index.html');
+    var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+    ngBindLink.click();

-      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
-      ngBindLink.click();
-
-      var mainHeader = element(by.css('.main-body h1 '));
-      expect(mainHeader.getText()).toEqual('ngClick');
-    });
+    var mainHeader = element(by.css('.main-body h1 '));
+    expect(mainHeader.getText()).toEqual('ngClick');
+  });


-    it('should show the functioning input directive example', function() {
-      browser.get('build/docs/index.html#!/api/ng/directive/input');
+  it('should show the functioning input directive example', function() {
+    browser.get('build/docs/index.html#!/api/ng/directive/input');

-      // Ensure that the page is loaded before trying to switch frames.
-      browser.waitForAngular();
+    // Ensure that the page is loaded before trying to switch frames.
+    browser.waitForAngular();

-      browser.switchTo().frame('example-input-directive');
+    browser.switchTo().frame('example-input-directive');

-      var nameInput = element(by.model('user.name'));
-      nameInput.sendKeys('!!!');
+    var nameInput = element(by.model('user.name'));
+    nameInput.sendKeys('!!!');

-      var code = element.all(by.css('tt')).first();
-      expect(code.getText()).toContain('guest!!!');
-    });
+    var code = element.all(by.css('tt')).first();
+    expect(code.getText()).toContain('guest!!!');
+  });

-    it('should trim indentation from code blocks', function() {
-      browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');
+  it('should trim indentation from code blocks', function() {
+    browser.get('build/docs/index.html#!/api/ng/type/$rootScope.Scope');

-      var codeBlocks = element.all(by.css('pre > code.lang-js'));
-      codeBlocks.each(function(codeBlock) {
-        var firstSpan = codeBlock.all(by.css('span')).first();
-        expect(firstSpan.getText()).not.toMatch(/^\W+$/);
-      });
+    var codeBlocks = element.all(by.css('pre > code.lang-js'));
+    codeBlocks.each(function(codeBlock) {
+      var firstSpan = codeBlock.all(by.css('span')).first();
+      expect(firstSpan.getText()).not.toMatch(/^\W+$/);
    });
  });
 });
@@ -0,0 +1,58 @@
+'use strict';
+
+describe('directives', function() {
+
+  describe('parameter section', function() {
+
+    it('should show the directive name only if it is a param (attribute) with a value', function() {
+      browser.get('build/docs/index.html#!/api/ng/directive/ngInclude');
+      expect(getParamNames().getText()).toContain('ngInclude | src');
+
+      browser.get('build/docs/index.html#!/api/ngRoute/directive/ngView');
+      expect(getParamNames().getText()).not.toContain('ngView');
+    });
+  });
+
+  describe('usage section', function() {
+
+    it('should show the directive name if it is a param (attribute) with a value', function() {
+      browser.get('build/docs/index.html#!/api/ng/directive/ngInclude');
+
+      expect(getUsageAs('element', 'ng-include').isPresent()).toBe(true);
+      expect(getUsageAs('attribute', 'ng-include').isPresent()).toBe(true);
+      expect(getUsageAs('CSS class', 'ng-include').isPresent()).toBe(true);
+    });
+
+    it('should show the directive name if it is a void param (attribute)', function() {
+      browser.get('build/docs/index.html#!/api/ngRoute/directive/ngView');
+
+      expect(getUsageAs('element', 'ng-view').isPresent()).toBe(true);
+      expect(getUsageAs('attribute', 'ng-view').isPresent()).toBe(true);
+      expect(getUsageAs('CSS class', 'ng-view').isPresent()).toBe(true);
+    });
+  });
+});
+
+function getParamNames() {
+  var argsSection = element(by.className('input-arguments'));
+
+  var paramNames = argsSection.all(by.css('tr td:nth-child(1)'));
+
+  return paramNames;
+}
+
+// Based on the type of directive usage, the directive name will show up in the code block
+// with a specific class
+var typeClassMap = {
+  element: 'tag',
+  attribute: 'atn',
+  'CSS class': 'atv'
+};
+
+function getUsageAs(type, directiveName) {
+  var usage = element(by.className('usage'));
+
+  var as = usage.element(by.cssContainingText('li', 'as ' + type));
+
+  return as.element(by.cssContainingText('span.' + typeClassMap[type], directiveName));
+}
@@ -21,6 +21,9 @@ describe('docs.angularjs.org', function() {
        console.log('browser console errors: ' + require('util').inspect(filteredLog));
      }
    });
+
+    browser.ignoreSynchronization = false;
+    browser.clearMockModules();
  });


@@ -49,6 +52,25 @@ describe('docs.angularjs.org', function() {
    });


+    it('should include the files for the embedded examples from the same domain', function() {
+      browser.get('build/docs/index-production.html#!api/ng/directive/ngClick');
+
+      var origin = browser.executeScript('return document.location.origin;');
+
+      var exampleIFrame = element(by.name('example-ng-click'));
+
+      // This is technically an implementation detail, but if this changes, then there's a good
+      // chance the deployment process changed
+      expect(exampleIFrame.getAttribute('src')).toContain('examples/example-ng-click/index.html');
+
+      browser.switchTo().frame('example-ng-click');
+
+      var scriptEl = element(by.tagName('script'));
+
+      // Ensure the included file is from the same domain
+      expect(scriptEl.getAttribute('src')).toContain(origin);
+    });
+

    it('should be resilient to trailing slashes', function() {
      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/');
@@ -83,6 +105,66 @@ 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);
+        });
+      });
+
+
+    });
+
  });

 });
@@ -0,0 +1,130 @@
+'use strict';
+
+/**
+ * This scenario checks the presence of the table of contents for a sample of pages - API and guide.
+ * The expectations are kept vague so that they can be easily adjusted when the docs change.
+ */
+
+describe('table of contents', function() {
+
+  it('on provider pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/provider/$controllerProvider');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Methods');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(2);
+
+      expect(match[1].all(by.css('li')).count()).toBe(2);
+    });
+
+  });
+
+  it('on service pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/service/$controller');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Usage');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(3);
+
+      expect(match[2].all(by.css('li')).count()).toBe(2);
+    });
+  });
+
+  it('on directive pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/directive/input');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Usage');
+      expect(text.join('')).toContain('Directive Info');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(4);
+
+      expect(match[2].all(by.css('li')).count()).toBe(1);
+    });
+  });
+
+  it('on function pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/function/angular.bind');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Usage');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(2);
+
+      expect(match[1].all(by.css('li')).count()).toBe(2);
+    });
+  });
+
+  it('on type pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/type/ModelOptions');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Methods');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(2);
+
+      expect(match[1].all(by.css('li')).count()).toBe(2);
+    });
+  });
+
+  it('on filter pages', function() {
+    browser.get('build/docs/index.html#!/api/ng/filter/date');
+
+    var toc = element.all(by.css('toc-container > div > toc-tree'));
+    toc.getText().then(function(text) {
+      expect(text.join('')).toContain('Overview');
+      expect(text.join('')).toContain('Usage');
+    });
+
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(3);
+
+      expect(match[1].all(by.css('li')).count()).toBe(2);
+    });
+  });
+
+  it('on guide pages', function() {
+    browser.get('build/docs/index.html#!/guide/services');
+    var tocFirstLevel = element.all(by.css('toc-container > div > toc-tree > ul > li'));
+
+    tocFirstLevel.then(function(match) {
+      expect(match.length).toBe(5);
+
+      expect(match[1].all(by.css('li')).count()).toBe(3);
+    });
+  });
+});
@@ -1,7 +1,8 @@
 'use strict';

-angular.module('directives', [])
+var directivesModule = angular.module('directives', []);

+directivesModule
 /**
 * backToTop Directive
 * @param  {Function} $anchorScroll
@@ -47,4 +48,136 @@ angular.module('directives', [])
      }
    }
  };
-});
+})
+
+.directive('tocCollector', ['$rootScope', function($rootScope) {
+  return {
+    controller: ['$element', function($element) {
+      /* eslint-disable no-invalid-this */
+      var ctrl = this;
+
+      $rootScope.$on('$includeContentRequested', function() {
+        ctrl.hs = [];
+        ctrl.root = [];
+      });
+
+      this.hs = [];
+      this.root = [];
+      this.element = $element;
+
+      this.register = function(h) {
+        var previousLevel;
+
+        for (var i = ctrl.hs.length - 1; i >= 0; i--) {
+          if (ctrl.hs[i].level === (h.level - 1)) {
+            previousLevel = ctrl.hs[i];
+            break;
+          }
+        }
+
+        if (previousLevel) {
+          previousLevel.children.push(h);
+        } else {
+          this.root.push(h);
+        }
+
+        ctrl.hs.push(h);
+        /* eslint-enable no-invalid-this */
+      };
+    }]
+  };
+}])
+
+.component('tocTree', {
+  template: '<ul>' +
+      '<li ng-repeat="item in $ctrl.items">' +
+        '<a ng-href="{{ $ctrl.path }}#{{item.fragment}}">{{item.title}}</a>' +
+        '<toc-tree ng-if="::item.children.length > 0" items="item.children"></toc-tree>' +
+      '</li>' +
+    '</ul>',
+  bindings: {
+    items: '<'
+  },
+  controller: ['$location', /** @this */ function($location) {
+    this.path = $location.path().replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
+  }]
+})
+.directive('tocContainer', function() {
+  return {
+    scope: true,
+    restrict: 'E',
+    require: {
+      tocContainer: '',
+      tocCollector: '^^'
+    },
+    controller: function() {
+      this.showToc = true;
+      this.items = [];
+    },
+    controllerAs: '$ctrl',
+    link: function(scope, element, attrs, ctrls) {
+      ctrls.tocContainer.items = ctrls.tocCollector.root;
+    },
+    template: '<div ng-if="::$ctrl.items.length > 1">' +
+      '<b>Contents</b>' +
+      '<button class="btn" ng-click="$ctrl.showToc = !$ctrl.showToc">{{$ctrl.showToc ? \'Hide\' : \'Show\'}}</button><br>' +
+      '<toc-tree items="$ctrl.items" ng-show="$ctrl.showToc"></toc-tree>' +
+      '</div>'
+  };
+})
+.directive('header', function() {
+  return {
+    restrict: 'E',
+    controller: ['$element', function($element) {
+      // eslint-disable-next-line no-invalid-this
+      this.element = $element;
+    }]
+  };
+})
+.directive('h1', ['$compile', function($compile) {
+  return {
+    restrict: 'E',
+    require: {
+      tocCollector: '^^?',
+      header: '^^?'
+    },
+    link: function(scope, element, attrs, ctrls) {
+      if (!ctrls.tocCollector) return;
+
+      var tocContainer = angular.element('<toc-container></toc-container>');
+      var containerElement = ctrls.header ? ctrls.header.element : element;
+
+      containerElement.after(tocContainer);
+      $compile(tocContainer)(scope);
+    }
+  };
+}]);
+
+for (var i = 2; i <= 5; i++) {
+  registerHDirective(i);
+}
+
+function registerHDirective(i) {
+  directivesModule.directive('h' + i, function() {
+    return {
+      restrict: 'E',
+      require: {
+        'tocCollector': '^^?'
+      },
+      link: function(scope, element, attrs, ctrls) {
+        var toc = ctrls.tocCollector;
+
+        if (!toc || !attrs.id) return;
+
+        toc.register({
+          level: i,
+          fragment: attrs.id,
+          title: element.text(),
+          children: []
+        });
+
+      }
+    };
+  });
+}
+
@@ -8,6 +8,8 @@ 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,
@@ -16,8 +18,6 @@ angular.module('DocsController', ['currentVersionData'])
    };
  };

-
-
  $scope.$on('$includeContentLoaded', function() {
    var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
    $window._gaq.push(['_trackPageview', pagePath]);
@@ -26,6 +26,7 @@ angular.module('DocsController', ['currentVersionData'])

  $scope.$on('$includeContentError', function() {
    $scope.loading = false;
+    $scope.loadingError = true;
  });

  $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
@@ -35,6 +36,7 @@ angular.module('DocsController', ['currentVersionData'])
    var currentPage = $scope.currentPage = NG_PAGES[path];

    $scope.loading = true;
+    $scope.loadingError = false;

    if (currentPage) {
      $scope.partialPath = 'partials/' + path + '.html';
@@ -50,18 +52,22 @@ angular.module('DocsController', ['currentVersionData'])
    } else {
      $scope.currentArea = NG_NAVIGATION['api'];
      $scope.breadcrumb = [];
-      $scope.partialPath = 'Error404.html';
+      $scope.partialPath = errorPartialPath;
    }
  });

+  $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 = 0;
-
+  $scope.loading = false;
+  $scope.loadingError = false;

  var INDEX_PATH = /^(\/|\/index[^.]*.html)$/;
  if (!$location.path() || INDEX_PATH.test($location.path())) {
@@ -67,6 +67,12 @@ angular.module('search', [])
    clearResults();
    $scope.q = '';
  };
+
+  $scope.handleResultClicked = function($event) {
+    if ($event.which === 1 && !$event.ctrlKey && !$event.metaKey) {
+      $scope.hideResults();
+    }
+  };
 }])


@@ -12,10 +12,16 @@ angular.module('versions', ['currentVersionData', 'allVersionsData'])
            /** @this VersionPickerController */
            function VersionPickerController($location, $window, CURRENT_NG_VERSION, ALL_NG_VERSIONS) {

-      var versionStr = CURRENT_NG_VERSION.isSnapshot ? 'snapshot' : CURRENT_NG_VERSION.version;
+      var versionStr = CURRENT_NG_VERSION.version;
+
+      if (CURRENT_NG_VERSION.isSnapshot) {
+        versionStr = CURRENT_NG_VERSION.distTag === 'latest' ? 'snapshot-stable' : 'snapshot';
+      }

      this.versions  = ALL_NG_VERSIONS;
-      this.selectedVersion = find(ALL_NG_VERSIONS, function(value) { return value.version.version === versionStr; });
+      this.selectedVersion = find(ALL_NG_VERSIONS, function(value) {
+        return value.version.version === versionStr;
+      });

      this.jumpToDocsVersion = function(value) {
        var currentPagePath = $location.path().replace(/\/$/, '');
@@ -1,40 +1,50 @@
 'use strict';

-describe('code', function() {
-  var prettyPrintOne, oldPP;
+describe('directives', function() {
  var compile, scope;

-  var any = jasmine.any;

  beforeEach(module('directives'));

-  beforeEach(inject(function($rootScope, $compile) {
-    // Provide stub for pretty print function
-    oldPP = window.prettyPrintOne;
-    prettyPrintOne = window.prettyPrintOne = jasmine.createSpy();
+  beforeEach(module(function($compileProvider) {
+    $compileProvider.debugInfoEnabled(false);
+  }));

+  beforeEach(inject(function($rootScope, $compile) {
    scope = $rootScope.$new();
    compile = $compile;
  }));

-  afterEach(function() {
-    window.prettyPrintOne = oldPP;
-  });
+  describe('code', function() {
+    var prettyPrintOne, oldPP;
+    var any = jasmine.any;
+
+    beforeEach(function() {
+      // Provide stub for pretty print function
+      oldPP = window.prettyPrintOne;
+      prettyPrintOne = window.prettyPrintOne = jasmine.createSpy();
+    });
+
+    afterEach(function() {
+      window.prettyPrintOne = oldPP;
+    });


-  it('should pretty print innerHTML', function() {
-    compile('<code>var x;</code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith('var x;', null, false);
+    it('should pretty print innerHTML', function() {
+      compile('<code>var x;</code>')(scope);
+      expect(prettyPrintOne).toHaveBeenCalledWith('var x;', null, false);
+    });
+
+    it('should allow language declaration', function() {
+      compile('<code class="lang-javascript"></code>')(scope);
+      expect(prettyPrintOne).toHaveBeenCalledWith(any(String), 'javascript', false);
+    });
+
+    it('supports allow line numbers', function() {
+      compile('<code class="linenum"></code>')(scope);
+      expect(prettyPrintOne).toHaveBeenCalledWith(any(String), null, true);
+    });
  });

-  it('should allow language declaration', function() {
-    compile('<code class="lang-javascript"></code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith(any(String), 'javascript', false);
-  });
-
-  it('supports allow line numbers', function() {
-    compile('<code class="linenum"></code>')(scope);
-    expect(prettyPrintOne).toHaveBeenCalledWith(any(String), null, true);
-  });
 });

@@ -22,6 +22,7 @@ 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'))
@@ -31,6 +32,7 @@ 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) {
@@ -146,6 +148,7 @@ 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; };
 })
@@ -156,12 +159,14 @@ module.exports = new Package('angularjs', [
  generateProtractorTestsProcessor,
  generateExamplesProcessor,
  debugDeployment, defaultDeployment,
-  jqueryDeployment, productionDeployment) {
+  jqueryDeployment, testDeployment,
+  productionDeployment) {

  generateIndexPagesProcessor.deployments = [
    debugDeployment,
    defaultDeployment,
    jqueryDeployment,
+    testDeployment,
    productionDeployment
  ];

@@ -0,0 +1,25 @@
+'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;
+        })
+      });
+    }
+  };
+};
@@ -47,6 +47,14 @@ module.exports = function generateVersionDocProcessor(gitData) {

        var latestMap = {};

+        // When the docs are built on a tagged commit, yarn info won't include the latest release,
+        // so we add it manually based on the local version.json file.
+        var missesCurrentVersion = !currentVersion.isSnapshot && !versions.find(function(version) {
+          return version === currentVersion.version;
+        });
+
+        if (missesCurrentVersion) versions.push(currentVersion.version);
+
        versions = versions
            .filter(function(versionStr) {
              return blacklist.indexOf(versionStr) === -1;
@@ -70,10 +78,28 @@ module.exports = function generateVersionDocProcessor(gitData) {
            })
            .reverse();

+        // List the latest version for each branch
        var latest = sortObject(latestMap, reverse(semver.compare))
            .map(function(version) { return makeOption(version, 'Latest'); });

-        return [makeOption({version: 'snapshot'}, 'Latest', 'master')]
+        // Get the stable release with the highest version
+        var highestStableRelease = versions.find(semverIsStable);
+
+        // Generate master and stable snapshots
+        var snapshots = [
+          makeOption(
+            {version: 'snapshot'},
+            'Latest',
+            'master-snapshot'
+          ),
+          makeOption(
+            {version: 'snapshot-stable'},
+            'Latest',
+            createSnapshotStableLabel(highestStableRelease)
+          )
+        ];
+
+        return snapshots
            .concat(latest)
            .concat(versions);
      }
@@ -103,6 +129,19 @@ module.exports = function generateVersionDocProcessor(gitData) {
      function sortObject(obj, cmp) {
        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;
+        return semverObj === null ? false : !semverObj.prerelease.length;
+      }
+
+      function createSnapshotStableLabel(version) {
+        var label = version.label.replace(/.$/, 'x') + '-snapshot';
+
+        return label;
+      }
    }
  };
 };
@@ -30,7 +30,6 @@ module.exports = function debugDeployment(getVersion) {
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
-      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
      'css/prettify-theme.css',
      'css/angular-topnav.css',
      'css/docs.css',
@@ -17,7 +17,7 @@ module.exports = function defaultDeployment(getVersion) {
      '../angular-sanitize.min.js',
      '../angular-touch.min.js',
      '../angular-animate.min.js',
-      'components/marked-' + getVersion('marked') + '/lib/marked.js',
+      'components/marked-' + getVersion('marked') + '/marked.min.js',
      'js/angular-bootstrap/dropdown-toggle.min.js',
      'components/lunr-' + getVersion('lunr') + '/lunr.min.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
@@ -30,7 +30,6 @@ module.exports = function defaultDeployment(getVersion) {
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
      'css/prettify-theme.css',
      'css/angular-topnav.css',
      'css/docs.css',
@@ -34,7 +34,6 @@ module.exports = function jqueryDeployment(getVersion) {
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
      'css/prettify-theme.css',
      'css/angular-topnav.css',
      'css/docs.css',
@@ -7,24 +7,25 @@ var angularCodeUrl = '//code.angularjs.org/';

 var cdnUrl = googleCdnUrl + versionInfo.cdnVersion;

-// The plnkr examples must use the code.angularjs.org repo for the snapshot,
-// and the cdn for the tagged version and, if the build is not tagged, the currentVersion.
-//
-// The currentVersion may not be available on the cdn (e.g. if built locally, or hasn't been pushed
-// yet). This will lead to a 404, but this is preferable to loading a version with which the example
-// might not work (possibly in subtle ways).
-var examplesCdnUrl = versionInfo.currentVersion.isSnapshot ?
-  (angularCodeUrl + 'snapshot') :
-  (googleCdnUrl + (versionInfo.currentVersion.version || versionInfo.currentVersion));
+// The "examplesDependencyPath" here applies to the examples when they are opened in plnkr.co.
+// The embedded examples instead always include the files from the *default* deployment,
+// to ensure that the source files are always available.
+// The plnkr examples must always use the code.angularjs.org source files.
+// We cannot rely on the CDN files here, because they are not deployed by the time
+// docs.angularjs.org and code.angularjs.org need them.
+var versionPath = versionInfo.currentVersion.isSnapshot ?
+  'snapshot' :
+  versionInfo.currentVersion.version;
+var examplesDependencyPath = angularCodeUrl + versionPath + '/';

 module.exports = function productionDeployment(getVersion) {
  return {
    name: 'production',
    examples: {
      commonFiles: {
-        scripts: [examplesCdnUrl + '/angular.min.js']
+        scripts: [examplesDependencyPath + 'angular.min.js']
      },
-      dependencyPath: examplesCdnUrl + '/'
+      dependencyPath: examplesDependencyPath
    },
    scripts: [
      cdnUrl + '/angular.min.js',
@@ -34,7 +35,7 @@ module.exports = function productionDeployment(getVersion) {
      cdnUrl + '/angular-sanitize.min.js',
      cdnUrl + '/angular-touch.min.js',
      cdnUrl + '/angular-animate.min.js',
-      'components/marked-' + getVersion('marked') + '/lib/marked.js',
+      'components/marked-' + getVersion('marked') + '/marked.min.js',
      'js/angular-bootstrap/dropdown-toggle.min.js',
      'components/lunr-' + getVersion('lunr') + '/lunr.min.js',
      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
@@ -47,7 +48,6 @@ module.exports = function productionDeployment(getVersion) {
    ],
    stylesheets: [
      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
-      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
      'css/prettify-theme.css',
      'css/angular-topnav.css',
      'css/docs.css',
@@ -0,0 +1,40 @@
+'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'
+    ]
+  };
+};
@@ -4,14 +4,13 @@ var path = require('canonical-path');
 /**
 * dgService getVersion
 * @description
- * Find the current version of the bower component (or node module)
+ * Find the current version of the node module
 */
 module.exports = function getVersion(readFilesProcessor) {
-  var basePath = readFilesProcessor.basePath;
+  var sourceFolder = path.resolve(readFilesProcessor.basePath, 'node_modules');
+  var packageFile = 'package.json';

-  return function(component, sourceFolder, packageFile) {
-    sourceFolder = path.resolve(basePath, sourceFolder || 'node_modules');
-    packageFile = packageFile || 'package.json';
-    return require(path.join(sourceFolder,component,packageFile)).version;
+  return function(component) {
+    return require(path.join(sourceFolder, component, packageFile)).version;
  };
 };
@@ -9,7 +9,7 @@
    <pre class="minerr-errmsg" error-display="{$ doc.formattedErrorMessage $}">{$ doc.formattedErrorMessage $}</pre>
 </div>

-<h2>Description</h2>
+<h2 id="description">Description</h2>
 <div class="description">
  {$ doc.description | marked $}
 </div>
@@ -11,6 +11,18 @@
  <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
@@ -70,7 +82,7 @@
 </head>
 <body class="homepage">
  <div id="wrapper">
-    <header class="header" scroll-y-offset-element>
+    <header class="header">
      <nav id="navbar-main" class="navbar navbar-fixed-top">
        <div class="navbar-inner" ng-controller="DocsSearchCtrl">
          <div class="container">
@@ -108,6 +120,7 @@
                  <li><a href="misc/contribute">Contribute</a></li>
                  <li><a href="https://github.com/angular/angular-seed">Seed App project template</a></li>
                  <li><a href="https://github.com/angular/angular.js">GitHub</a></li>
+                  <li><a href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md">Changelog</a></li>
                  <li><a href="http://code.angularjs.org/">Download</a></li>
                </ul>
              </li>
@@ -126,13 +139,13 @@
            </ul>

          </div>
-          <div class="search-results-container" ng-show="hasResults">
+          <div class="search-results-container" ng-show="hasResults" ng-cloak>
            <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">
                  <h4 class="search-results-group-heading">{{ key }}</h4>
                  <ul class="search-results">
-                    <li ng-repeat="item in value" class="search-result"><a ng-click="hideResults()" ng-href="{{ item.path }}">{{ item.name }}</a></li>
+                    <li ng-repeat="item in value" class="search-result"><a ng-click="handleResultClicked($event)" ng-href="{{ item.path }}">{{ item.name }}</a></li>
                  </ul>
                </div>
              </div>
@@ -156,7 +169,7 @@
          </div>
        </div>
      </nav>
-      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top">
+      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element ng-cloak>
        <div class="container main-grid main-header-grid">
          <div class="grid-left">
            <version-picker></version-picker>
@@ -173,7 +186,7 @@
      </nav>
    </header>

-    <section role="main" class="container main-body">
+    <section role="main" class="container main-body" ng-cloak>
      <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>
@@ -197,8 +210,9 @@
          </div>
        </div>
        <div class="grid-right">
-          <div id="loading" ng-show="loading">Loading...</div>
-          <div ng-hide="loading" ng-include="partialPath" autoscroll></div>
+          <div ng-show="loading">Loading &hellip;</div>
+          <div ng-show="loadingError">There was an error loading this resource. Please try again later.</div>
+          <div ng-hide="loading" ng-include="partialPath" toc-collector autoscroll></div>
        </div>
      </div>
    </section>
@@ -208,7 +222,7 @@
        <p class="pull-right"><a back-to-top>Back to top</a></p>

        <p>
-          Super-powered by Google ©2010-2017
+          Super-powered by Google ©2010-2020
          (<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">
@@ -0,0 +1,7 @@
+<?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>
@@ -23,6 +23,7 @@

 {% block description %}
 <div class="api-profile-description">
+  <h2 id="overview">Overview</h2>
  {$ doc.description | marked $}
 </div>
 {% endblock %}
@@ -51,7 +52,7 @@

  {% block examples %}
  {%- if doc.examples %}
-  <h2 id="example">Examples</h2>
+  <h2 id="examples">{$ "Examples" if doc.examples | length > 1 else "Example" $}</h2>
  {%- for example in doc.examples -%}
    {$ example | marked $}
  {%- endfor -%}
@@ -2,7 +2,7 @@
 {% extends "api/api.template.html" %}

 {% block additional %}
-  <h2>Directive Info</h2>
+  <h2 id="{$ doc.name $}-info">Directive Info</h2>
  <ul>
    {% if doc.scope %}<li>This directive creates new scope.</li>{% endif %}
    <li>This directive executes at priority level {$ doc.priority $}.</li>
@@ -18,9 +18,6 @@
    <ul>
    {% if doc.restrict.element %}
      <li>as element:
-      {% if doc.name.indexOf('ng') == 0 -%}
-      (This directive can be used as custom element, but be aware of <a href="guide/ie">IE restrictions</a>).
-      {%- endif %}
      {% code %}
      <{$ doc.name | dashCase $}
        {%- for param in doc.params %}
@@ -32,10 +29,23 @@
      </li>
    {% endif -%}

+
+    {% set hasNameAsParam = false %}
+
+    {# when a directive's name is not a parameter (i.e. doesn't take a value),
+      add the directive name to the list of attributes and/or css classes #}
+
+    {%- for param in doc.params %}
+    {% set hasNameAsParam = true if param.name === doc.name else hasNameAsParam %}
+    {%- endfor %}
+
    {%- if doc.restrict.attribute -%}
      <li>as attribute:
        {% code %}
        <{$ doc.element $}
+          {%- if not hasNameAsParam %}
+          {$ lib.directiveParam(doc.name, {}, '', '') $}
+          {%- endif -%}
          {%- for param in doc.params %}
          {$ lib.directiveParam(param.name, param.type, '="', '"') $}
          {%- endfor %}>
@@ -46,10 +56,14 @@
    {% endif -%}

    {%- if doc.restrict.cssClass -%}
+
      <li>as CSS class:
        {% code %}
        {% set sep = joiner(' ') %}
        <{$ doc.element $} class="
+        {%- if not hasNameAsParam -%}
+          {$ sep() $}{$ lib.directiveParam(doc.name, {}, '', '') $}
+        {%- endif -%}
        {%- for param in doc.params -%}
          {$ sep() $}{$ lib.directiveParam(param.name, param.type, ': ', ';') $}
        {%- endfor %}"> ... </{$ doc.element $}>
@@ -2,7 +2,7 @@
 {% extends "api/api.template.html" %}

 {% block additional %}
-  <h2>Usage</h2>
+  <h2 id="usage">Usage</h2>
  <h3>In HTML Template Binding</h3>
  {% if doc.usage %}
    {$ doc.usage | code $}
@@ -8,7 +8,7 @@

 {$ x.deprecatedBlock(doc) $}

-<h2>Installation</h2>
+<h2 id="module-installation">Installation</h2>
 {% if doc.installation or doc.installation == '' %}
  {$ doc.installation | marked $}
 {% else %}
@@ -76,7 +76,7 @@

 {% if doc.componentGroups.length %}
 <div class="component-breakdown">
-  <h2>Module Components</h2>
+  <h2 id="module-components">Module Components</h2>
  {% for componentGroup in doc.componentGroups %}
  <div>
    <h3 class="component-heading" id="{$ componentGroup.groupType | dashCase $}">{$ componentGroup.groupType | title $}</h3>
@@ -98,7 +98,7 @@
 {% endif %}

 {% if doc.usage %}
-  <h2>Usage</h2>
+  <h2 id="module-usage">Usage</h2>
  {$ doc.usage | marked $}
 {% endif %}

@@ -2,11 +2,11 @@
 {% import "lib/deprecated.html" as x -%}

 {%- if doc.events %}
-<h2>Events</h2>
+<h2 id="events">Events</h2>
 <ul class="events">
  {%- for event in doc.events %}
  <li id="{$ event.name $}">
-    <h3>{$ event.name $}</h3>
+    <h3 id="event-{$ event.name $}">{$ event.name $}</h3>
    <div>{$ event.description | marked $}</div>

    {$ x.deprecatedBlock(event) $}
@@ -27,7 +27,7 @@
    {% endif -%}
    {%- if event.params %}
    <section class="api-section">
-      <h3>Parameters</h3>
+      <h4>Parameters</h4>
      {$ lib.paramTable(event.params) $}
    </section>
    {%- endif -%}
@@ -2,11 +2,11 @@
 {% import "lib/deprecated.html" as x -%}

 {%- if doc.methods %}
-<h2>Methods</h2>
+<h2 id="{$ doc.name $}-methods">Methods</h2>
 <ul class="methods">
  {%- for method in doc.methods %}
-  <li id="{$ method.name $}">
-    <h3>{$ lib.functionSyntax(method) $}</h3>
+  <li>
+    <h3 id="{$ method.name $}">{$ lib.functionSyntax(method) $}</h3>
    <div>{$ method.description | marked $}</div>

    {$ x.deprecatedBlock(method) $}
@@ -17,7 +17,7 @@
    {% endif %}

    {% if method.this %}
-    <h4>Method's {% code %}this{% endcode %}</h4>
+    <h4>Method's `this`</h4>
    {$ method.this | marked $}
    {% endif %}

@@ -27,7 +27,7 @@
    {% endif %}

    {%- if method.examples %}
-    <h4 id="{$ doc.name $}.{$ method.name $}-examples">Examples</h4>
+    <h4 id="{$ doc.name $}.{$ method.name $}-examples">{$ "Examples" if method.examples | length > 1 else "Example" $}</h4>
    {%- for example in method.examples -%}
      {$ example | marked $}
    {%- endfor -%}
@@ -1,7 +1,7 @@
 {% import "lib/macros.html" as lib -%}
 {%- if doc.params %}
 <section class="api-section">
-  <h3>Arguments</h3>
+  <h3 id="{$ doc.name $}-arguments">Arguments</h3>
 {$ lib.paramTable(doc.params) $}
 </section>
 {%- endif -%}
@@ -2,11 +2,11 @@
 {% import "lib/deprecated.html" as x -%}

 {%- if doc.properties %}
-<h2>Properties</h2>
+<h2 id="{$ doc.name $}-properties">Properties</h2>
 <ul class="properties">
  {%- for property in doc.properties %}
-  <li id="{$ property.name $}">
-    <h3>{$ property.name | code $}</h3>
+  <li>
+    <h3 id="{$ property.name $}">{$ property.name | code $}</h3>
    {$ lib.typeInfo(property) $}
    {$ x.deprecatedBlock(property) $}
  </li>
@@ -1,5 +1,5 @@
 {% import "lib/macros.html" as lib -%}
 {% if doc.returns -%}
-<h3>Returns</h3>
+<h3 id="{$ doc.name $}-returns">Returns</h3>
 {$ lib.typeInfo(doc.returns) $}
 {%- endif %}
@@ -1,4 +1,4 @@
 {% if doc.this %}
-<h3>Method's {% code %}this{% endcode %}</h3>
+<h3>Method's `this`</h3>
 {$ doc.this | marked $}
-{% endif %}
+{% endif %}
@@ -3,7 +3,15 @@
@description

 # AngularJS API Docs
-Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
+
+<div class="alert alert-warning">
+**On July 1, 2018 AngularJS entered a 3 year Long Term Support period:** [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>.
+

 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.
@@ -214,11 +222,7 @@ Use the ngCookies module to handle cookie management within your application.
      {@link ngCookies#service Services / Factories}
    </td>
    <td>
-      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>
+      The {@link ngCookies.$cookies $cookies} service is a convenient wrapper to store simple data within browser cookies.
    </td>
  </tr>
 </table>
@@ -5,7 +5,7 @@

 This error occurs when the restrict property of a directive is not valid.

-The directive restrict property must be a string including one of more of the following characters:
+The directive restrict property must be a string including one or more of the following characters:
 * E (element)
 * A (attribute)
 * C (class)
@@ -15,4 +15,4 @@ For example:
 ```javascript
 restrict: 'E'
 restrict: 'EAC'
-```
+```
@@ -0,0 +1,13 @@
+@ngdoc error
+@name $compile:ctxoverride
+@fullName DOM Property Security Context Override
+@description
+
+This error occurs when the security context for a property is defined via {@link ng.$compileProvider#addPropertySecurityContext addPropertySecurityContext()} multiple times under different security contexts.
+
+For example:
+
+```js
+$compileProvider.addPropertySecurityContext("my-element", "src", $sce.MEDIA_URL);
+$compileProvider.addPropertySecurityContext("my-element", "src", $sce.RESOURCE_URL);    //throws
+```
@@ -10,13 +10,15 @@ myModule.directive('directiveName', function factory() {
  return {
    ...
    scope: {
-      '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
+      '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 =
    }
    ...
  }
@@ -0,0 +1,36 @@
+@ngdoc error
+@name $compile:missingattr
+@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>
+```
+
@@ -1,12 +1,12 @@
@ngdoc error
@name $compile:nodomevents
-@fullName Interpolated Event Attributes
+@fullName Event Attribute/Property Binding
@description

-This error occurs when one tries to create a binding for event handler attributes like `onclick`, `onload`, `onsubmit`, etc.
+This error occurs when one tries to create a binding for event handler attributes or properties like `onclick`, `onload`, `onsubmit`, etc.

-There is no practical value in binding to these attributes and doing so only exposes your application to security vulnerabilities like XSS.
-For these reasons binding to event handler attributes (all attributes that start with `on` and `formaction` attribute) is not supported.
+There is no practical value in binding to these attributes/properties and doing so only exposes your application to security vulnerabilities like XSS.
+For these reasons binding to event handler attributes and properties (`formaction` and all starting with `on`) is not supported.


 An example code that would allow XSS vulnerability by evaluating user input in the window context could look like this:
@@ -17,4 +17,4 @@ An example code that would allow XSS vulnerability by evaluating user input in t

 Since the `onclick` evaluates the value as JavaScript code in the window context, setting the `username` model to a value like `javascript:alert('PWND')` would result in script injection when the `div` is clicked.

-
+Please use the `ng-*` or `ng-on-*` versions instead (such as `ng-click` or `ng-on-click` rather than `onclick`).
@@ -0,0 +1,12 @@
+@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.
@@ -1,11 +0,0 @@
-@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.
@@ -3,12 +3,12 @@
@fullName Bad JSON Data
@description

-The default @{link ng.$http#default-transformations `transformResponse`} will try to parse the
-response as JSON if the `Content-Type` header is `application/json` or the response looks like a
+The default {@link ng.$http#default-transformations `transformResponse`} will try to parse the
+response as JSON if the `Content-Type` header is `application/json`, or the response looks like a
 valid JSON-stringified object or array.
 This error occurs when that data is not a valid JSON object.

-The error message should provide additional context such as the actual response.
-
-To resolve this error, make sure you pass valid JSON data to `transformResponse` or use an
-appropriate `Content-Type` header for non-JSON data.
+To resolve this error, make sure you pass valid JSON data to `transformResponse`. If the response
+data looks like JSON, but has a different `Content-Type` header, you must
+{@link ng.$http#overriding-the-default-transformations-per-request implement your own response
+transformer on a per request basis}, or {@link ng.$http#default-transformations modify the default `$http` responseTransform}.
@@ -9,7 +9,7 @@ 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 configuratio of the request.
+property. You must not provide your own parameter with this name in the configuration of the request.

 In previous versions of AngularJS, you specified where to add the callback parameter value via the
 `JSON_CALLBACK` placeholder. This is no longer allowed.
@@ -0,0 +1,25 @@
+@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);
+```
@@ -0,0 +1,10 @@
+@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.
@@ -0,0 +1,13 @@
+@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';
+```
@@ -0,0 +1,8 @@
+@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.
@@ -0,0 +1,18 @@
+@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.
@@ -0,0 +1,25 @@
+@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);
+```
@@ -0,0 +1,17 @@
+@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">`.
@@ -0,0 +1,27 @@
+@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>
+
+```
@@ -3,7 +3,7 @@
@sortOrder 500
@description

-# What does it do?
+# Using the `$location` service

 The `$location` service parses the URL in the browser address bar (based on [`window.location`](https://developer.mozilla.org/en/window.location)) and makes the URL available to
 your application. Changes to the URL in the address bar are reflected into the `$location` service and
@@ -76,7 +76,7 @@ the current URL in the browser.
 It does not cause a full page reload when the browser URL is changed. To reload the page after
 changing the URL, use the lower-level API, `$window.location.href`.

-# General overview of the API
+## General overview of the API

 The `$location` service can behave differently, depending on the configuration that was provided to
 it when it was instantiated. The default configuration is suitable for many applications, for
@@ -85,7 +85,7 @@ others customizing the configuration can enable new features.
 Once the `$location` service is instantiated, you can interact with it via jQuery-style getter and
 setter methods that allow you to get or change the current URL in the browser.

-## `$location` service configuration
+### `$location` service configuration

 To configure the `$location` service, retrieve the
 {@link ng.$locationProvider $locationProvider} and set the parameters as follows:
@@ -113,12 +113,12 @@ To configure the `$location` service, retrieve the
  Prefix used for Hashbang URLs (used in Hashbang mode or in legacy browsers in HTML5 mode).<br />
  Default: `'!'`

-### Example configuration
+#### Example configuration
 ```js
 $locationProvider.html5Mode(true).hashPrefix('*');
 ```

-## Getter and setter methods
+### Getter and setter methods

 `$location` service provides getter methods for read-only parts of the URL (absUrl, protocol, host,
 port) and getter / setter methods for url, path, search, hash:
@@ -137,7 +137,7 @@ change multiple segments in one go, chain setters like this:
 $location.path('/newValue').search({key: value});
 ```

-## Replace method
+### Replace method

 There is a special `replace` method which can be used to tell the $location service that the next
 time the $location service is synced with the browser, the last history record should be replaced
@@ -173,7 +173,7 @@ encoded.
 `/path?search=a&b=c#hash`. The segments are encoded as well.


-# Hashbang and HTML5 Modes
+## Hashbang and HTML5 Modes

 `$location` service has two configuration modes which control the format of the URL in the browser
 address bar: **Hashbang mode** (the default) and the **HTML5 mode** which is based on using the
@@ -221,7 +221,7 @@ facilitate the browser URL change and history management.
 </tbody>
 </table>

-## Hashbang mode (default mode)
+### 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
@@ -229,7 +229,7 @@ as expected and also perform full page reloads when other parts of the url
 than the hash fragment was changed.


-### Example
+#### Example

 ```js
 it('should show example', function() {
@@ -255,7 +255,7 @@ it('should show example', function() {
 });
 ```

-## HTML5 mode
+### HTML5 mode

 In HTML5 mode, the `$location` service getters and setters interact with the browser URL address
 through the HTML5 history API. This allows for use of regular URL path and search segments,
@@ -271,7 +271,7 @@ Note that in this mode, AngularJS intercepts all links (subject to the "Html lin
 and updates the url in a way that never performs a full page reload.


-### Example
+#### Example

 ```js
 it('should show example', function() {
@@ -320,14 +320,14 @@ it('should show example (when browser doesn\'t support HTML5 mode', function() {
 });
 ```

-### Fallback for legacy browsers
+#### Fallback for legacy browsers

 For browsers that support the HTML5 history API, `$location` uses the HTML5 history API to write
 path and search. If the history API is not supported by a browser, `$location` supplies a Hashbang
 URL. This frees you from having to worry about whether the browser viewing your app supports the
 history API  or not; the `$location` service makes this transparent to you.

-### HTML link rewriting
+#### HTML link rewriting

 When you use HTML5 history API mode, you will not need special hashbang links. All you have to do
 is specify regular URL links, such as: `<a href="/some?foo=bar">link</a>`
@@ -361,7 +361,7 @@ Note that [attribute name normalization](guide/directive#normalization) does not
 `'internalLink'` will **not** match `'internal-link'`.


-### Relative links
+#### Relative links

 Be sure to check all relative links, images, scripts etc. AngularJS requires you to specify the url
 base in the head of your main html file (`<base href="/my-base/index.html">`) unless `html5Mode.requireBase`
@@ -374,14 +374,14 @@ will only change `$location.hash()` and not modify the url otherwise. This is us
 to anchors on the same page without needing to know on which page the user currently is.


-### Server side
+#### Server side

 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
 base and the path that should be handled by the application.

-### Base href constraints
+#### Base href constraints

 The `$location` service is not able to function properly if the current URL is outside the URL given
 as the base href. This can have subtle confusing consequences...
@@ -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
-you server is setup to redirect such requests to `/base/`.
+your server is setup to redirect such requests to `/base/`.

 See https://github.com/angular/angular.js/issues/14018 for more information.

@@ -403,7 +403,7 @@ legacy browsers and hashbang links in modern browser:
 - Modern browser will rewrite hashbang URLs to regular URLs.
 - Older browsers will redirect regular URLs to hashbang URLs.

-### Example
+#### Example

 Here you can see two `$location` instances that show the difference between **Html5 mode** and **Html5 Fallback mode**.
 Note that to simulate different levels of browser support, the `$location` instances are connected to
@@ -415,7 +415,7 @@ redirect to regular / hashbang url, as this conversion happens only during parsi

 In these examples we use `<base href="/base/index.html" />`. The inputs represent the address bar of the browser.

-#### Browser in HTML5 mode
+##### Browser in HTML5 mode
 <example module="html5-mode" name="location-html5-mode">
  <file name="index.html">
    <div ng-controller="LocationController">
@@ -565,7 +565,7 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen

 </example>

-#### Browser in HTML5 Fallback mode (Hashbang mode)
+##### Browser in HTML5 Fallback mode (Hashbang mode)
 <example module="hashbang-mode" name="location-hashbang-mode">
  <file name="index.html">
    <div ng-controller="LocationController">
@@ -718,15 +718,15 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen

 </example>

-# Caveats
+## Caveats

-## Page reload navigation
+### Page reload navigation

 The `$location` service allows you to change only the URL; it does not allow you to reload the
 page. When you need to change the URL and reload the page or navigate to a different page, please
 use a lower level API, {@link ng.$window $window.location.href}.

-## Using $location outside of the scope life-cycle
+### 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
 the browser it updates the `$location` and calls `$apply` so that all
@@ -738,7 +738,7 @@ propagate this change into browser and will notify all the {@link ng.$rootScope.
 When you want to change the `$location` from outside AngularJS (for example, through a DOM Event or
 during testing) - you must call `$apply` to propagate the changes.

-## $location.path() and ! or / prefixes
+### $location.path() and ! or / prefixes

 A path should always begin with forward slash (`/`); the `$location.path()` setter will add the
 forward slash if it is missing.
@@ -746,22 +746,17 @@ forward slash if it is missing.
 Note that the `!` prefix in the hashbang mode is not part of `$location.path()`; it is actually
 `hashPrefix`.

-## Crawling your app
+### Crawling your app

-To allow indexing of your AJAX application, you have to add special meta tag in the head section of
-your document:
+Most modern search engines are able to crawl AJAX applications with dynamic content, provided all
+included resources are available to the crawler bots.

-```html
-<meta name="fragment" content="!" />
-```
+There also exists a special
+[AJAX crawling scheme](http://code.google.com/web/ajaxcrawling/docs/specification.html) developed by
+Google that allows bots to crawl the static equivalent of a dynamically generated page,
+but this schema has been deprecated, and support for it may vary by search engine.

-This will cause crawler bot to request links with `_escaped_fragment_` param so that your server
-can recognize the crawler and serve a HTML snapshots. For more information about this technique,
-see [Making AJAX Applications
-Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
-
-
-# Testing with the $location service
+## Testing with the $location service

 When using `$location` service during testing, you are outside of the angular's {@link
 ng.$rootScope.Scope scope} life-cycle. This means it's your responsibility to call `scope.$apply()`.
@@ -784,85 +779,6 @@ describe('serviceUnderTest', function() {
 });
 ```

-
-# Migrating from earlier AngularJS releases
-
-In earlier releases of AngularJS, `$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.
-
-## Changes to your code
-
-<table class="table">
-  <thead>
-    <tr class="head">
-      <th>Navigation inside the app</th>
-      <th>Change to</th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr>
-      <td>$location.href = value<br />$location.hash = value<br />$location.update(value)<br
-/>$location.updateHash(value)</td>
-      <td>$location.path(path).search(search)</td>
-    </tr>
-
-    <tr>
-      <td>$location.hashPath = path</td>
-      <td>$location.path(path)</td>
-    </tr>
-
-    <tr>
-      <td>$location.hashSearch = search</td>
-      <td>$location.search(search)</td>
-    </tr>
-
-    <tr class="head">
-      <th>Navigation outside the app</td>
-      <th>Use lower level API</td>
-    </tr>
-
-    <tr>
-      <td>$location.href = value<br />$location.update(value)</td>
-      <td>$window.location.href = value</td>
-    </tr>
-
-    <tr>
-      <td>$location[protocol | host | port | path | search]</td>
-      <td>$window.location[protocol | host | port | path | search]</td>
-    </tr>
-
-    <tr class="head">
-      <th>Read access</td>
-      <th>Change to</td>
-    </tr>
-
-    <tr>
-      <td>$location.hashPath</td>
-      <td>$location.path()</td>
-    </tr>
-
-    <tr>
-      <td>$location.hashSearch</td>
-      <td>$location.search()</td>
-    </tr>
-
-    <tr>
-      <td>$location.href<br />$location.protocol<br />$location.host<br />$location.port<br
-/>$location.hash</td>
-      <td>$location.absUrl()<br />$location.protocol()<br />$location.host()<br />$location.port()<br
-/>$location.path() + $location.search()</td>
-    </tr>
-
-    <tr>
-      <td>$location.path<br />$location.search</td>
-      <td>$window.location.path<br />$window.location.search</td>
-    </tr>
-  </tbody>
-</table>
-
 ## Two-way binding to $location

 Because `$location` uses getters/setters, you can use `ng-model-options="{ getterSetter: true }"`
@@ -884,6 +800,6 @@ angular.module('locationExample', [])
 </file>
 </example>

-# Related API
+## Related API

 * {@link ng.$location `$location` API}
@@ -6,20 +6,26 @@

 # Animations

-AngularJS provides animation hooks for common directives such as `ngRepeat`, `ngSwitch`, and `ngView`, as well as custom directives
-via the `$animate` service. These animation hooks are set in place to trigger animations during the life cycle of various directives and when
-triggered, will attempt to perform a CSS Transition, CSS Keyframe Animation or a JavaScript callback Animation (depending on if an animation is
-placed on the given directive). Animations can be placed using vanilla CSS by following the naming conventions set in place by AngularJS
-or with JavaScript code when it's defined as a factory.
+AngularJS provides animation hooks for common directives such as
+{@link ng.directive:ngRepeat ngRepeat}, {@link ng.directive:ngSwitch ngSwitch}, and
+{@link ngRoute.directive:ngView ngView}, as well as custom directives via the `$animate` service.
+These animation hooks are set in place to trigger animations during the life cycle of various
+directives and when triggered, will attempt to perform a CSS Transition, CSS Keyframe Animation or a
+JavaScript callback Animation (depending on whether an animation is placed on the given directive).
+Animations can be placed using vanilla CSS by following the naming conventions set in place by
+AngularJS or with JavaScript code, defined as a factory.

 <div class="alert alert-info">
-  Note that we have used non-prefixed CSS transition properties in our examples as the major browsers now support non-prefixed
-  properties. If you intend to support older browsers or certain mobile browsers then you will need to include prefixed
-  versions of the transition properties.  Take a look at http://caniuse.com/#feat=css-transitions for what browsers require prefixes,
-  and https://github.com/postcss/autoprefixer for a tool that can automatically generate the prefixes for you.
+  Note that we have used non-prefixed CSS transition properties in our examples as the major
+  browsers now support non-prefixed properties. If you intend to support older browsers or certain
+  mobile browsers then you will need to include prefixed versions of the transition properties. Take
+  a look at http://caniuse.com/#feat=css-transitions for what browsers require prefixes, and
+  https://github.com/postcss/autoprefixer for a tool that can automatically generate the prefixes
+  for you.
 </div>

-Animations are not available unless you include the {@link ngAnimate `ngAnimate` module} as a dependency within your application.
+Animations are not available unless you include the {@link ngAnimate `ngAnimate` module} as a
+dependency of your application.

 Below is a quick example of animations being enabled for `ngShow` and `ngHide`:

@@ -59,8 +65,9 @@ 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 a HTML element within
-your website, you can apply animations to it. Lets say for example that we have an HTML template with a repeater in it like so:
+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
+example that we have an HTML template with a repeater like so:

 ```html
 <div ng-repeat="item in items" class="repeated-item">
@@ -68,22 +75,21 @@ your website, you can apply animations to it. Lets say for example that we have
 </div>
 ```

-As you can see, the `.repeated-item` class is present on the element that will be repeated and this class will be
-used as a reference within our application's CSS and/or JavaScript animation code to tell AngularJS to perform an animation.
+As you can see, the `repeated-item` class is present on the element that will be repeated and this
+class will be used as a reference within our application's CSS and/or JavaScript animation code to
+tell AngularJS to perform an animation.

-As ngRepeat does its thing, each time a new item is added into the list, ngRepeat will add
-a `ng-enter` class name to the element that is being added. When removed it will apply a `ng-leave` class name and when moved around
-it will apply a `ng-move` class name.
+As `ngRepeat` does its thing, each time a new item is added into the list, `ngRepeat` will add an
+`ng-enter` class to the element that is being added. When removed it will apply an `ng-leave` class
+and when moved around it will apply an `ng-move` class.

-Taking a look at the following CSS code, we can see some transition and keyframe animation code set for each of those events that
-occur when ngRepeat triggers them:
+Taking a look at the following CSS code, we can see some transition and keyframe animation code set
+up for each of those events that occur when `ngRepeat` triggers them:

 ```css
 /*
-  We're using CSS transitions for when
-  the enter and move events are triggered
-  for the element that has the .repeated-item
-  class
+  We are using CSS transitions for when the enter and move events
+  are triggered for the element that has the `repeated-item` class
 */
 .repeated-item.ng-enter, .repeated-item.ng-move {
  transition: all 0.5s linear;
@@ -91,10 +97,8 @@ occur when ngRepeat triggers them:
 }

 /*
- The ng-enter-active and ng-move-active
- are where the transition destination properties
- are set so that the animation knows what to
- animate.
+  `.ng-enter-active` and `.ng-move-active` are where the transition destination
+  properties are set so that the animation knows what to animate
 */
 .repeated-item.ng-enter.ng-enter-active,
 .repeated-item.ng-move.ng-move-active {
@@ -102,73 +106,64 @@ occur when ngRepeat triggers them:
 }

 /*
-  We're using CSS keyframe animations for when
-  the leave event is triggered for the element
-  that has the .repeated-item class
+  We are using CSS keyframe animations for when the `leave` event
+  is triggered for the element that has the `repeated-item` class
 */
 .repeated-item.ng-leave {
  animation: 0.5s my_animation;
 }

@keyframes my_animation {
-  from { opacity:1; }
-  to { opacity:0; }
+  from { opacity: 1; }
+  to   { opacity: 0; }
 }
-
 ```

-The same approach to animation can be used using JavaScript code (**jQuery is used within to perform animations**):
+The same approach to animation can be used using JavaScript code
+(**for simplicity, we rely on jQuery to perform animations here**):

 ```js
 myModule.animation('.repeated-item', function() {
  return {
    enter: function(element, done) {
-      element.css('opacity',0);
-      jQuery(element).animate({
-        opacity: 1
-      }, done);
+      // Initialize the element's opacity
+      element.css('opacity', 0);

-      // optional onDone or onCancel callback
-      // function to handle any post-animation
-      // cleanup operations
+      // Animate the element's opacity
+      // (`element.animate()` is provided by jQuery)
+      element.animate({opacity: 1}, done);
+
+      // Optional `onDone`/`onCancel` callback function
+      // to handle any post-animation cleanup operations
      return function(isCancelled) {
-        if(isCancelled) {
-          jQuery(element).stop();
+        if (isCancelled) {
+          // Abort the animation if cancelled
+          // (`element.stop()` is provided by jQuery)
+          element.stop();
        }
-      }
+      };
    },
    leave: function(element, done) {
+      // Initialize the element's opacity
      element.css('opacity', 1);
-      jQuery(element).animate({
-        opacity: 0
-      }, done);

-      // optional onDone or onCancel callback
-      // function to handle any post-animation
-      // cleanup operations
-      return function(isCancelled) {
-        if(isCancelled) {
-          jQuery(element).stop();
-        }
-      }
-    },
-    move: function(element, done) {
-      element.css('opacity', 0);
-      jQuery(element).animate({
-        opacity: 1
-      }, done);
+      // Animate the element's opacity
+      // (`element.animate()` is provided by jQuery)
+      element.animate({opacity: 0}, done);

-      // optional onDone or onCancel callback
-      // function to handle any post-animation
-      // cleanup operations
+      // Optional `onDone`/`onCancel` callback function
+      // to handle any post-animation cleanup operations
      return function(isCancelled) {
-        if(isCancelled) {
-          jQuery(element).stop();
+        if (isCancelled) {
+          // Abort the animation if cancelled
+          // (`element.stop()` is provided by jQuery)
+          element.stop();
        }
-      }
+      };
    },

-    // you can also capture these animation events
+    // We can also capture the following animation events:
+    move: function(element, done) {},
    addClass: function(element, className, done) {},
    removeClass: function(element, className, done) {}
  }
@@ -176,74 +171,88 @@ myModule.animation('.repeated-item', function() {
 ```

 With these generated CSS class names present on the element at the time, AngularJS automatically
-figures out whether to perform a CSS and/or JavaScript animation. If both CSS and JavaScript animation
-code is present, and match the CSS class name on the element, then AngularJS will run both animations at the same time.
+figures out whether to perform a CSS and/or JavaScript animation. Note that you can't have both CSS
+and JavaScript animations based on the same CSS class. See
+{@link ngAnimate#css-js-animations-together here} for more details.

-## Class and ngClass animation hooks
+## Class and `ngClass` animation hooks

-AngularJS also pays attention to CSS class changes on elements by triggering the **add** and **remove** hooks.
-This means that if a CSS class is added to or removed from an element then an animation can be executed in between,
-before the CSS class addition or removal is finalized. (Keep in mind that AngularJS will only be
-able to capture class changes if an **expression** or the **ng-class** directive is used on the element.)
+AngularJS also pays attention to CSS class changes on elements by triggering the **add** and
+**remove** hooks. This means that if a CSS class is added to or removed from an element then an
+animation can be executed in between, before the CSS class addition or removal is finalized.
+(Keep in mind that AngularJS will only be able to capture class changes if an
+**interpolated expression** or the **ng-class** directive is used on the element.)

 The example below shows how to perform animations during class changes:

 <example module="ngAnimate" deps="angular-animate.js" animations="true" name="animate-css-class">
- <file name="index.html">
-  <p>
-    <input type="button" value="set" ng-click="myCssVar='css-class'">
-    <input type="button" value="clear" ng-click="myCssVar=''">
-    <br>
-    <span ng-class="myCssVar">CSS-Animated Text</span>
-  </p>
- </file>
- <file name="style.css">
-   .css-class-add, .css-class-remove {
-     transition: all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-   }
+  <file name="index.html">
+    <p>
+      <button ng-click="myCssVar='css-class'">Set</button>
+      <button ng-click="myCssVar=''">Clear</button>
+      <br>
+      <span ng-class="myCssVar">CSS-Animated Text</span>
+    </p>
+  </file>
+  <file name="style.css">
+    .css-class-add, .css-class-remove {
+      transition: all 0.5s cubic-bezier(0.250, 0.460, 0.450, 0.940);
+    }

-   .css-class,
-   .css-class-add.css-class-add-active {
-     color: red;
-     font-size:3em;
-   }
+    .css-class,
+    .css-class-add.css-class-add-active {
+      color: red;
+      font-size: 3em;
+    }

-   .css-class-remove.css-class-remove-active {
-     font-size:1.0em;
-     color: black;
-   }
- </file>
+    .css-class-remove.css-class-remove-active {
+      font-size: 1em;
+      color: black;
+    }
+  </file>
 </example>

 Although the CSS is a little different than what we saw before, the idea is the same.

 ## Which directives support animations?

-A handful of common AngularJS directives support and trigger animation hooks whenever any major event occurs during its life cycle.
-The table below explains in detail which animation events are triggered
+A handful of common AngularJS directives support and trigger animation hooks whenever any major
+event occurs during their life cycle. The table below explains in detail which animation events are
+triggered:

-| Directive                                                                           | Supported Animations                     |
-|-------------------------------------------------------------------------------------|------------------------------------------|
-| {@link ng.directive:ngRepeat#animations ngRepeat}                                   | enter, leave, and move                   |
-| {@link ngRoute.directive:ngView#animations ngView}                                  | enter and leave                          |
-| {@link ng.directive:ngInclude#animations ngInclude}                                 | enter and leave                          |
-| {@link ng.directive:ngSwitch#animations ngSwitch}                                   | enter and leave                          |
-| {@link ng.directive:ngIf#animations ngIf}                                           | enter and leave                          |
-| {@link ng.directive:ngClass#animations ngClass or &#123;&#123;class&#125;&#125;}    | add and remove                           |
-| {@link ng.directive:ngShow#animations ngShow & ngHide}                              | add and remove (the ng-hide class value) |
+| 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&#125;&#8203;&#125;}  | 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:ngSwitch#animations ngSwitch}                             | enter and leave                                                           |
+| {@link ngRoute.directive:ngView#animations ngView}                            | enter and leave                                                           |

-For a full breakdown of the steps involved during each animation event, refer to the {@link ng.$animate API docs}.
+(More information can be found by visiting the documentation associated with each directive.)
+
+For a full breakdown of the steps involved during each animation event, refer to the
+{@link ng.$animate `$animate` API docs}.

 ## How do I use animations in my own directives?

-Animations within custom directives can also be established by injecting `$animate` directly into your directive and
-making calls to it when needed.
+Animations within custom directives can also be established by injecting `$animate` directly into
+your directive and making calls to it when needed.

 ```js
 myModule.directive('my-directive', ['$animate', function($animate) {
-  return function(scope, element, attrs) {
+  return function(scope, element) {
    element.on('click', function() {
-      if(element.hasClass('clicked')) {
+      if (element.hasClass('clicked')) {
        $animate.removeClass(element, 'clicked');
      } else {
        $animate.addClass(element, 'clicked');
@@ -255,17 +264,19 @@ myModule.directive('my-directive', ['$animate', function($animate) {

 ## Animations on app bootstrap / page load

-By default, animations are disabled when the AngularJS app {@link guide/bootstrap bootstraps}. If you are using the {@link ngApp} directive,
-this happens in the `DOMContentLoaded` event, so immediately after the page has been loaded.
-Animations are disabled, so that UI and content are instantly visible. Otherwise, with many animations on
-the page, the loading process may become too visually overwhelming, and the performance may suffer.
+By default, animations are disabled when the AngularJS app {@link guide/bootstrap bootstraps}. If you
+are using the {@link ngApp} directive, this happens in the `DOMContentLoaded` event, so immediately
+after the page has been loaded. Animations are disabled, so that UI and content are instantly
+visible. Otherwise, with many animations on the page, the loading process may become too visually
+overwhelming, and the performance may suffer.

-Internally, `ngAnimate` waits until all template downloads that are started right after bootstrap have finished.
-Then, it waits for the currently running {@link ng.$rootScope.Scope#$digest} and the one after that to finish.
-This ensures that the whole app has been compiled fully before animations are attempted.
+Internally, `ngAnimate` waits until all template downloads that are started right after bootstrap
+have finished. Then, it waits for the currently running {@link ng.$rootScope.Scope#$digest $digest}
+and one more after that, to finish. This ensures that the whole app has been compiled fully before
+animations are attempted.

-If you do want your animations to play when the app bootstraps, you can enable animations globally in
-your main module's {@link angular.Module#run run} function:
+If you do want your animations to play when the app bootstraps, you can enable animations globally
+in your main module's {@link angular.Module#run run} function:

 ```js
 myModule.run(function($animate) {
@@ -275,17 +286,50 @@ myModule.run(function($animate) {

 ## How to (selectively) enable, disable and skip animations

-There are three different ways to disable animations, both globally and for specific animations.
-Disabling specific animations can help to speed up the render performance, for example for large `ngRepeat`
-lists that don't actually have animations. Because ngAnimate checks at runtime if animations are present,
-performance will take a hit even if an element has no animation.
+There are several different ways to disable animations, both globally and for specific animations.
+Disabling specific animations can help to speed up the render performance, for example for large
+`ngRepeat` lists that don't actually have animations. Because `ngAnimate` checks at runtime if
+animations are present, performance will take a hit even if an element has no animation.

-### In the config: {@link $animateProvider#classNameFilter $animateProvider.classNameFilter()}
+### During the config: {@link $animateProvider#customFilter $animateProvider.customFilter()}

-This function can be called in the {@link angular.Module#config config} phase of an app. It takes a regex as the only argument,
-which will then be matched against the classes of any element that is about to be animated. The regex
-allows a lot of flexibility - you can either allow animations only for specific classes (useful when
-you are working with 3rd party animations), or exclude specific classes from getting animated.
+This function can be called during the {@link angular.Module#config config} phase of an app. It
+takes a filter function as the only argument, which will then be used to "filter" animations (based
+on the animated element, the event type, and the animation options). Only when the filter function
+returns `true`, will the animation be performed. This allows great flexibility - you can easily
+create complex rules, such as allowing specific events only or enabling animations on specific
+subtrees of the DOM, and dynamically modify them, for example disabling animations at certain points
+in time or under certain circumstances.
+
+```js
+app.config(function($animateProvider) {
+  $animateProvider.customFilter(function(node, event, options) {
+    // Example: Only animate `enter` and `leave` operations.
+    return event === 'enter' || event === 'leave';
+  });
+});
+```
+
+The `customFilter` approach generally gives a big speed boost compared to other strategies, because
+the matching is done before other animation disabling strategies are checked.
+
+<div class="alert alert-success">
+  **Best Practice:**
+  Keep the filtering function as lean as possible, because it will be called for each DOM
+  action (e.g. insertion, removal, class change) performed by "animation-aware" directives.
+  See {@link guide/animations#which-directives-support-animations- here} for a list of built-in
+  directives that support animations.
+  Performing computationally expensive or time-consuming operations on each call of the
+  filtering function can make your animations sluggish.
+</div>
+
+### During the config: {@link $animateProvider#classNameFilter $animateProvider.classNameFilter()}
+
+This function too can be called during the {@link angular.Module#config config} phase of an app. It
+takes a regex as the only argument, which will then be matched against the classes of any element
+that is about to be animated. The regex allows a lot of flexibility - you can either allow
+animations for specific classes only (useful when you are working with 3rd party animations), or
+exclude specific classes from getting animated.

 ```js
 app.config(function($animateProvider) {
@@ -294,42 +338,43 @@ app.config(function($animateProvider) {
 ```

 ```css
-/&#42; prefixed with animate- &#42;/
+/&#42; prefixed with `animate-` &#42;/
 .animate-fade-add.animate-fade-add-active {
  transition: all 1s linear;
  opacity: 0;
 }
 ```

-The classNameFilter approach generally applies the biggest speed boost, because the matching is
-done before any other animation disabling strategies are checked. However, that also means it is not
-possible to override class name matching with the two following strategies. It's of course still possible
-to enable / disable animations by changing an element's class name at runtime.
+The `classNameFilter` approach generally gives a big speed boost compared to other strategies,
+because the matching is done before other animation disabling strategies are checked. However, that
+also means it is not possible to override class name matching with the two following strategies.
+It's of course still possible to enable / disable animations by changing an element's class name at
+runtime.

 ### At runtime: {@link ng.$animate#enabled $animate.enabled()}

 This function can be used to enable / disable animations in two different ways:

-With a single `boolean` argument, it enables / disables animations globally: `$animate.enabled(false)`
-disables all animations in your app.
+With a single `boolean` argument, it enables / disables animations globally:
+`$animate.enabled(false)` disables all animations in your app.

 When the first argument is a native DOM or jqLite/jQuery element, the function enables / disables
-animations on this element *and all its children*: `$animate.enabled(myElement, false)`. This is the
-most flexible way to change the animation state. For example, even if you have used it to disable
-animations on a parent element, you can still re-enable it for a child element. And compared to the
-`classNameFilter`, you can change the animation status at runtime instead of during the config phase.
+animations on this element *and all its children*: `$animate.enabled(myElement, false)`. You can
+still use it to re-enable animations for a child element, even if you have disabled them on a parent
+element. And compared to the `classNameFilter`, you can change the animation status at runtime
+instead of during the config phase.

-Note however that the `$animate.enabled()` state for individual elements does not overwrite disabling
-rules that have been set in the {@link $animateProvider#classNameFilter classNameFilter}.
+Note however that the `$animate.enabled()` state for individual elements does not overwrite
+disabling rules that have been set in the {@link $animateProvider#classNameFilter classNameFilter}.

 ### Via CSS styles: overwriting styles in the `ng-animate` CSS class
-Whenever an animation is started, ngAnimate applies the `ng-animate` class to the element for the
-whole duration of the animation. By applying CSS transition / animation styling to the class,
-you can skip an animation:
+
+Whenever an animation is started, `ngAnimate` applies the `ng-animate` class to the element for the
+whole duration of the animation. By applying CSS transition / animation styling to that class, you
+can skip an animation:

 ```css
-
-.my-class{
+.my-class {
  transition: transform 2s;
 }

@@ -340,23 +385,23 @@ you can skip an animation:
 my-class.ng-animate {
  transition: 0s;
 }
-
 ```

-By setting `transition: 0s`, ngAnimate will ignore the existing transition styles, and not try to animate them (Javascript
-animations will still execute, though). This can be used to prevent {@link guide/animations#preventing-collisions-with-existing-animations-and-third-party-libraries
-issues with existing animations interfering with ngAnimate}.
+By setting `transition: 0s`, `ngAnimate` will ignore the existing transition styles, and not try to
+animate them (Javascript animations will still execute, though). This can be used to prevent
+{@link guide/animations#preventing-collisions-with-existing-animations-and-third-party-libraries
+issues with existing animations interfering with `ngAnimate`}.


 ## Preventing flicker before an animation starts

-When nesting elements with structural animations such as `ngIf` into elements that have class-based
-animations such as `ngClass`, it sometimes happens that before the actual animation starts, there is a brief flicker or flash of content
-where the animated element is briefly visible.
+When nesting elements with structural animations, such as `ngIf`, into elements that have
+class-based animations such as `ngClass`, it sometimes happens that before the actual animation
+starts, there is a brief flicker or flash of content where the animated element is briefly visible.

-To prevent this, you can apply styles to the `ng-[event]-prepare` class, which is added as soon as an animation is initialized,
-but removed before the actual animation starts (after waiting for a $digest). This class is only added for *structural*
-animations (`enter`, `move`, and `leave`).
+To prevent this, you can apply styles to the `ng-[event]-prepare` class, which is added as soon as
+an animation is initialized, but removed before the actual animation starts (after waiting for a
+`$digest`). This class is only added for *structural* animations (`enter`, `move`, and `leave`).

 Here's an example where you might see flickering:

@@ -368,8 +413,9 @@ Here's an example where you might see flickering:
 </div>
 ```

-It is possible that during the `enter` event, the `.message` div will be briefly visible before it starts animating.
-In that case, you can add styles to the CSS that make sure the element stays hidden before the animation starts:
+It is possible that during the `enter` event, the `.message` div will be briefly visible before it
+starts animating. In that case, you can add styles to the CSS that make sure the element stays
+hidden before the animation starts:

 ```css
 .message.ng-enter-prepare {
@@ -379,66 +425,71 @@ In that case, you can add styles to the CSS that make sure the element stays hid
 /* Other animation styles ... */
 ```

-## Preventing Collisions with Existing Animations and Third Party Libraries
-By default, any `ngAnimate` enabled directives will assume any transition / animation styles on the
-element are part of an `ngAnimate` animation. This can lead to problems when the styles are actually
-for animations that are independent of `ngAnimate`.
+## Preventing collisions with existing animations and third-party libraries

-For example, an element acts as a loading spinner. It has an infinite css animation on it, and also an
-{@link ngIf `ngIf`} directive, for which no animations are defined:
+By default, any `ngAnimate`-enabled directives will assume that `transition` / `animation` styles on
+the element are part of an `ngAnimate` animation. This can lead to problems when the styles are
+actually for animations that are independent of `ngAnimate`.
+
+For example, an element acts as a loading spinner. It has an infinite css animation on it, and also
+an {@link ngIf `ngIf`} directive, for which no animations are defined:

 ```css
-@keyframes rotating {
-    from { transform: rotate(0deg); }
-    to { transform: rotate(360deg); }
+.spinner {
+  animation: rotating 2s linear infinite;
 }

-.spinner {
-    animation: rotating 2s linear infinite;
+@keyframes rotating {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
 }
 ```

-Now, when the `ngIf` changes, `ngAnimate` will see the spinner animation and use
-it to animate the `enter`/`leave` event, which doesn't work because
-the animation is infinite. The element will still be added / removed after a timeout, but there will be a
-noticable delay.
+Now, when the `ngIf` expression changes, `ngAnimate` will see the spinner animation and use it to
+animate the `enter`/`leave` event, which doesn't work because the animation is infinite. The element
+will still be added / removed after a timeout, but there will be a noticeable delay.

-This might also happen because some third-party frameworks place animation duration defaults
-across many element or className selectors in order to make their code small and reuseable.
+This might also happen because some third-party frameworks place animation duration defaults across
+many element or className selectors in order to make their code small and reusable.

-You can prevent this unwanted behavior by adding CSS to the `.ng-animate` class that is added
-for the whole duration of an animation. Simply overwrite the transition / animation duration. In the
+You can prevent this unwanted behavior by adding CSS to the `.ng-animate` class, that is added for
+the whole duration of each animation. Simply overwrite the transition / animation duration. In the
 case of the spinner, this would be:

+```css
 .spinner.ng-animate {
-    transition: 0s none;
-    animation: 0s none;
+  animation: 0s none;
+  transition: 0s none;
 }
+```

-If you do have CSS transitions / animations defined for the animation events, make sure they have higher priority
-than any styles that are independent from ngAnimate.
+If you do have CSS transitions / animations defined for the animation events, make sure they have a
+higher priority than any styles that are not related to `ngAnimate`.

-You can also use one of the two other {@link guide/animations#how-to-selectively-enable-disable-and-skip-animations strategies to disable animations}.
+You can also use one of the other
+{@link guide/animations#how-to-selectively-enable-disable-and-skip-animations
+strategies to disable animations}.


-### Enable animations for elements outside of the AngularJS application DOM tree: {@link ng.$animate#pin $animate.pin()}
+## Enable animations outside of the application DOM tree: {@link ng.$animate#pin $animate.pin()}

-Before animating, `ngAnimate` checks to see if the element being animated is inside the application DOM tree,
-and if it is not, no animation is run. Usually, this is not a problem as most apps use the `ngApp`
-attribute / bootstrap the app on the `html` or `body` element.
+Before animating, `ngAnimate` checks if the animated element is inside the application DOM tree. If
+not, no animation is run. Usually, this is not a problem since most apps use the `html` or `body`
+elements as their root.

 Problems arise when the application is bootstrapped on a different element, and animations are
-attempted on elements that are outside the application tree, e.g. when libraries append popup and modal
-elements as the last child in the body tag.
+attempted on elements that are outside the application tree, e.g. when libraries append popup or
+modal elements to the body tag.

-You can use {@link ng.$animate#pin `$animate.pin(elementToAnimate, parentHost)`} to specify that an
-element belongs to your application. Simply call it before the element is added to the DOM / before
-the animation starts, with the element you want to animate, and the element which should be its
-assumed parent.
+You can use {@link ng.$animate#pin `$animate.pin(element, parentHost)`} to associate an element with
+another element that belongs to your application. Simply call it before the element is added to the
+DOM / before the animation starts, with the element you want to animate, and the element which
+should be its assumed parent.


 ## More about animations

-For a full breakdown of each method available on `$animate`, see the {@link ng.$animate API documentation}.
+For a full breakdown of each method available on `$animate`, see the
+{@link ng.$animate API documentation}.

-To see a complete demo, see the {@link tutorial/step_14 animation step within the AngularJS phonecat tutorial}.
+To see a complete demo, see the {@link tutorial/step_14 animation step in the phonecat tutorial}.
@@ -40,8 +40,8 @@ initialization.
        <html ng-app>

  3. If you choose to use the old style directive syntax `ng:` then include xml-namespace in `html`
-    to make IE happy. (This is here for historical reasons, and we no longer recommend use of
-    `ng:`.)
+    when running the page in the XHTML mode. (This is here for historical reasons, and we no longer
+    recommend use of `ng:`.)

        <html xmlns:ng="http://angularjs.org">

@@ -144,7 +144,7 @@ This is the sequence that your code should follow:

 ## Things to keep in mind

-There a few things to keep in mind regardless of automatic or manual bootstrapping:
+There are a few things to keep in mind regardless of automatic or manual bootstrapping:

 - While it's possible to bootstrap more than one AngularJS application per page, we don't actively
  test against this scenario. It's possible that you'll run into problems, especially with complex apps, so
@@ -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,7 +475,7 @@ 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`:

@@ -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.
@@ -547,7 +547,7 @@ must have a base URL.
  ...
 ```

-## Bootstrap AngularJS
+#### Bootstrap AngularJS

 Bootstrap the AngularJS application and add the top level App Component.

@@ -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,14 +616,14 @@ 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
 and registers the Heroes **Component**.
@@ -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,7 +811,7 @@ 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?**

@@ -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.
@@ -25,7 +25,7 @@ When not to use Components:

 ## Creating and configuring a Component

-Components can be registered using the `.component()` method of an AngularJS module (returned by {@link module `angular.module()`}). The method takes two arguments:
+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:

  * 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.)
@@ -39,14 +39,8 @@ Components can be registered using the `.component()` method of an AngularJS mod
  });
 </file>
 <file name="heroDetail.js">
-
-  function HeroDetailController() {
-
-  }
-
  angular.module('heroApp').component('heroDetail', {
    templateUrl: 'heroDetail.html',
-    controller: HeroDetailController,
    bindings: {
      hero: '='
    }
@@ -149,7 +143,7 @@ components should follow a few simple conventions:
      }
    ```

- **Components have a well-defined lifecycle**
+- **Components have a well-defined lifecycle:**
 Each component can implement "lifecycle hooks". These are methods that will be called at certain points in the life
 of the component. The following hook methods can be implemented:

@@ -451,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
@@ -462,7 +456,7 @@ The examples use the [Jasmine](http://jasmine.github.io/) testing framework.

 **Controller Test:**
 ```js
-describe('component: heroDetail', function() {
+describe('HeroDetailController', function() {
  var $componentController;

  beforeEach(module('heroApp'));
@@ -470,15 +464,6 @@ describe('component: heroDetail', function() {
    $componentController = _$componentController_;
  }));

-  it('should expose a `hero` object', function() {
-    // Here we are passing actual bindings to the component
-    var bindings = {hero: {name: 'Wolverine'}};
-    var ctrl = $componentController('heroDetail', null, bindings);
-
-    expect(ctrl.hero).toBeDefined();
-    expect(ctrl.hero.name).toBe('Wolverine');
-  });
-
  it('should call the `onDelete` binding, when deleting the hero', function() {
    var onDeleteSpy = jasmine.createSpy('onDelete');
    var bindings = {hero: {}, onDelete: onDeleteSpy};
@@ -186,7 +186,7 @@ Right now, the `InvoiceController` contains all logic of our example. When the a
 is a good practice to move view-independent logic from the controller into a
 <a name="service">{@link services service}</a>, so it can be reused by other parts
 of the application as well. Later on, we could also change that service to load the exchange rates
-from the web, e.g. by calling the Yahoo Finance API, without changing the controller.
+from the web, e.g. by calling the [exchangeratesapi.io](https://exchangeratesapi.io) exchange rate API, without changing the controller.

 Let's refactor our example and move the currency conversion into a service in another file:

@@ -300,7 +300,7 @@ to something shorter like `a`.

 ## Accessing the backend

-Let's finish our example by fetching the exchange rates from the Yahoo Finance API.
+Let's finish our example by fetching the exchange rates from the [exchangeratesapi.io](https://exchangeratesapi.io) exchange rate API.
 The following example shows how this is done with AngularJS:

 <example name="guide-concepts-3" ng-app-included="true">
@@ -323,10 +323,6 @@ The following example shows how this is done with AngularJS:
  <file name="finance3.js">
    angular.module('finance3', [])
      .factory('currencyConverter', ['$http', function($http) {
-        var YAHOO_FINANCE_URL_PATTERN =
-              '//query.yahooapis.com/v1/public/yql?q=select * from ' +
-              'yahoo.finance.xchange where pair in ("PAIRS")&format=json&' +
-              'env=store://datatables.org/alltableswithkeys';
        var currencies = ['USD', 'EUR', 'CNY'];
        var usdToForeignRates = {};

@@ -335,15 +331,10 @@ The following example shows how this is done with AngularJS:
        };

        var refresh = function() {
-          var url = YAHOO_FINANCE_URL_PATTERN.
-                     replace('PAIRS', 'USD' + currencies.join('","USD'));
+          var url = 'https://api.exchangeratesapi.io/latest?base=USD&symbols=' + currencies.join(",");
          return $http.get(url).then(function(response) {
-            var newUsdToForeignRates = {};
-            angular.forEach(response.data.query.results.rate, function(rate) {
-              var currency = rate.id.substring(3,6);
-              newUsdToForeignRates[currency] = window.parseFloat(rate.Rate);
-            });
-            usdToForeignRates = newUsdToForeignRates;
+            usdToForeignRates = response.data.rates;
+            usdToForeignRates['USD'] = 1;
          });
        };

@@ -8,13 +8,18 @@
 In AngularJS, a Controller is defined by a JavaScript **constructor function** that is used to augment the
 {@link scope AngularJS Scope}.

-When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
-directive, AngularJS 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`.
+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}.

 If the controller has been attached using the `controller as` syntax then the controller instance will
-be assigned to a property on the new scope.
+be assigned to a property on the scope.

 Use controllers to:

@@ -33,6 +38,15 @@ Do not use controllers to:
 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
@@ -102,23 +116,6 @@ objects (or primitives) assigned to the scope become model properties. Any metho
 the scope are available in the template/view, and can be invoked via AngularJS 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 AngularJS 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
@@ -262,7 +259,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}:
@@ -14,26 +14,34 @@ and providing them to other components as requested.

 ## Using Dependency Injection

-DI is pervasive throughout AngularJS. You can use it when defining components or when providing `run`
-and `config` blocks for a module.
+Dependency Injection is pervasive throughout AngularJS. You can use it when defining components
+or when providing `run` and `config` blocks for a module.

- 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 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.

- 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.
+- {@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.

- 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#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 `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#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.

-See {@link module#module-loading-dependencies Modules} for more details about `run` and `config`
-blocks.
+- 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.


 ### Factory Methods
@@ -271,15 +279,20 @@ construction and lookup of dependencies.

 Here is an example of using the injector service:

+First create an AngularJS module that will hold the service definition. (The empty array passed as
+the second parameter means that this module does not depend on any other modules.)
+
 ```js
-// Provide the wiring information in a module
+// Create a module to hold the service definition
 var myModule = angular.module('myModule', []);
 ```

-Teach the injector how to build a `greeter` service. Notice that `greeter` is dependent on the
-`$window` service. The `greeter` service is an object that contains a `greet` method.
+Teach the injector how to build a `greeter` service, which is just an object that contains a `greet`
+method. Notice that `greeter` is dependent on the `$window` service, which will be provided
+(injected into `greeter`) by the injector.

 ```js
+// Define the `greeter` service
 myModule.factory('greeter', function($window) {
  return {
    greet: function(text) {
@@ -123,7 +123,7 @@ The other forms shown above are accepted for legacy reasons but we advise you to
 `$compile` can match directives based on element names (E), attributes (A), class names (C),
 and comments (M).

-The built-in the AngularJS directives show in their documentation page which type of matching they support.
+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.
@@ -977,7 +977,7 @@ controllers using `require`.
 Otherwise use `link`.
 </div>

-### Summary
+## Summary

 Here we've seen the main use cases for directives. Each of these samples acts as a good starting
 point for creating your own directives.
@@ -5,12 +5,6 @@

 # E2E Testing

-<div class="alert alert-danger">
-**Note:** In the past, end-to-end testing could be done with a deprecated tool called
-[AngularJS Scenario Runner](http://code.angularjs.org/1.2.16/docs/guide/e2e-testing). That tool
-is now in maintenance mode.
-</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
@@ -37,7 +37,8 @@ AngularJS expressions are like JavaScript expressions with the following differe
    even inside `ng-init` directive.

  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
-    in an AngularJS expression.
+    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.

@@ -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 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)
+* **Google Cloud Platform:** [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)
@@ -139,7 +139,7 @@ You can find a larger list of AngularJS external libraries at [ngmodules.org](ht
  [CodeAcademy](http://www.codecademy.com/courses/javascript-advanced-en-2hJ3J/0/1),
  [CodeSchool](https://www.codeschool.com/courses/shaping-up-with-angular-js)
 * **Paid online:**
-  [Pluralsight (3 courses)](http://www.pluralsight.com/training/Courses/Find?highlight=true&searchTerm=angularjs),
+  [Pluralsight](https://www.pluralsight.com/search?q=angularjs),
  [Tuts+](https://tutsplus.com/course/easier-js-apps-with-angular/),
  [lynda.com](http://www.lynda.com/AngularJS-tutorials/Up-Running-AngularJS/133318-2.html),
  [WintellectNOW (4 lessons)](http://www.wintellectnow.com/Course/Detail/mastering-angularjs),
@@ -281,18 +281,18 @@ categories as you need.
 #### Selection Keywords

 The selection keywords can be either exact matches or language dependent [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html).
+categories](http://cldr.unicode.org/index/cldr-spec/plural-rules).

 Exact matches are written as the equal sign followed by the exact value. `=0`, `=1`, `=2` and
 `=123` are all examples of exact matches.  Note that there should be no space between the equal sign
 and the numeric value.

 Plural category matches are single words corresponding to the [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html) of
-the CLDR plural category spec.  These categories vary by locale.  The "en" (English) locale, for
-example, defines just "one" and "other" while the "ga" (Irish) locale defines "one", "two", "few",
-"many" and "other".  Typically, you would just write the categories for your language.  During
-translation, the translators will add or remove more categories depending on the target locale.
+categories](http://cldr.unicode.org/index/cldr-spec/plural-rules) of the CLDR plural category spec.
+These categories vary by locale.  The "en" (English) locale, for example, defines just "one" and
+"other" while the "ga" (Irish) locale defines "one", "two", "few", "many" and "other".  Typically,
+you would just write the categories for your language.  During translation, the translators will add
+or remove more categories depending on the target locale.

 Exact matches always win over keyword matches.  Therefore, if you define both `=0` and `zero`, when
 the value of the expression is zero, the `=0` message is the one that will be selected.  (The
--- a/Show More
+++ b/Show More