test($resource): fix broken test

(Introduced while "cleaning up" the tests for in edfb691.)
refactor(*): remove ignored expensiveChecks argument passed to $parse()
2017-02-05 17:58:25 +02:00 · 2017-02-05 15:39:10 +02:00 · 2017-02-04 21:01:22 +02:00 · 2017-02-04 16:18:21 +02:00 · 2017-02-02 22:38:27 +02:00 · 2017-02-02 19:30:48 +02:00
964 changed files with 42294 additions and 55420 deletions
@@ -1,4 +1,4 @@
-# https://editorconfig.org
+# http://editorconfig.org

 root = true

@@ -1,4 +1,6 @@
+bower_components/**
 build/**
+docs/bower_components/**
 docs/app/assets/js/angular-bootstrap/**
 docs/config/templates/**
 node_modules/**
@@ -7,4 +9,3 @@ src/angular.bind.js
 src/ngParseExt/ucd.js
 i18n/closure/**
 tmp/**
-vendor/**
@@ -1,13 +1,8 @@
 {
  "extends": "./.eslintrc-base.json",
+
  "env": {
    "browser": false,
    "node": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 2017
-  },
-  "plugins": [
-    "promise"
-  ]
+  }
 }
@@ -1,37 +1,27 @@
-<!--
-IF YOU DON'T FILL OUT THE FOLLOWING INFORMATION WE MIGHT CLOSE YOUR ISSUE WITHOUT INVESTIGATION
-->
+***Note*: for support questions, please use one of these channels: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#question. This repository's issues are reserved for feature requests and bug reports.**

-<!--
- For *SUPPORT QUESTIONS*, use one of the
-[support channels](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#question).
- Before submitting, please **SEARCH GITHUB** for a similar issue or PR. -->
+**Do you want to request a *feature* or report a *bug*?**

-**I'm submitting a ...**
-<!-- (check one with "x") -->
- [ ] bug report
- [ ] feature request
- [ ] other <!--(Please do not submit support requests here - see above)-->

-**Current behavior:**
-<!-- Describe how the bug manifests / how the current features are insufficient. -->

-**Expected / new behavior:**
-<!-- Describe what the behavior would be without the bug / how the feature would improve AngularJS -->
+**What is the current behavior?**

-**Minimal reproduction of the problem with instructions:**
-<!--
-If the current behavior is a bug or you can illustrate your feature request better with an example,
-please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
-https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:yBpEi4).
-->

-**AngularJS 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/) -->

-**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 ]
-<!-- All browsers where this could be reproduced (and Operating System if relevant) -->
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://plnkr.co or similar (template: http://plnkr.co/edit/tpl:yBpEi4).**

-**Anything else:**
-<!-- e.g. stacktraces, related issues, suggestions how to fix -->
+
+
+**What is the expected behavior?**
+
+
+
+**What is the motivation / use case for changing the behavior?**
+
+
+
+**Which versions of Angular, and which browser / OS are affected by this issue? Did this work in previous versions of Angular? Please also test with the latest stable and snapshot (https://code.angularjs.org/snapshot/) versions.**
+
+
+
+**Other information (e.g. stacktraces, related issues, suggestions how to fix)**
@@ -1,4 +1,3 @@
-<!-- General PR submission guidelines https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#submit-pr -->
 **What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)**


@@ -16,9 +15,9 @@


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

 **Other information**:

@@ -1,5 +1,4 @@
 /build/
-/deploy/
 /benchpress-build/
 .DS_Store
 gen_docs.disable
@@ -10,7 +9,8 @@ performance/temp*.html
 *~
 *.swp
 angular.js.tmproj
-node_modules/
+/node_modules/
+bower_components/
 angular.xcodeproj
 .idea
 *.iml
@@ -19,6 +19,7 @@ angular.xcodeproj
 libpeerconnection.log
 npm-debug.log
 /tmp/
+/scripts/bower/bower-*
 .vscode
 *.log
-*.stackdump
+*.stackdump
@@ -1,29 +0,0 @@
-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 @@
-8
+6
@@ -1,103 +1,61 @@
 language: node_js
 sudo: false
 node_js:
-  - '8'
+  - '6'

 cache:
-  yarn: true
+  directories:
+    - node_modules
+    - bower_components
+    - docs/bower_components

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

 env:
  matrix:
    - JOB=ci-checks
-    - JOB=unit-core BROWSER_PROVIDER=saucelabs
-    - JOB=unit-jquery BROWSER_PROVIDER=saucelabs
-    - JOB=docs-app BROWSER_PROVIDER=saucelabs
+    - JOB=unit BROWSER_PROVIDER=saucelabs
+    - JOB=docs-e2e 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.3.2
-  - export PATH="$HOME/.yarn/bin:$PATH"
+  - curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
+  - export PATH=$HOME/.yarn/bin:$PATH

 before_script:
-  - du -sh ./node_modules || true
-  - "./scripts/travis/before_build.sh"
+  - du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || 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
-
-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"
-
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: always    # default: false
@@ -1,3 +0,0 @@
-# Contributor Code of Conduct
-
-The AngularJS project follows the Code of Conduct defined in [the angular/code-of-conduct repository](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md). Please read it.
@@ -3,101 +3,85 @@
 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)
-* [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)
+ - [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)

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

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

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

-### <a name="question"></a> Got a Question or Problem?
+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].

-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].
+## <a name="issue"></a> Found an Issue?

-Stack Overflow is a much better place to ask questions since:
+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.

- 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.
+**Localization Issues:** Angular.js 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].

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

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

-If you would like to implement a new feature then consider what kind of change it is:
+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:

-* **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].
+* **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.

-### <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!
+## <a name="docs"></a> Want a Doc Fix?

 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 follows the **[Commit Message Guidelines][developers.commits]**.
+commit message starts with "docs" and follows the **[Commit Message Guidelines](#commit)** outlined
+below.

-## <a name="submit"></a> Issue Submission Guidelines
+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
 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.
-
-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:
+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
-* **AngularJS Version(s)** - is it a regression?
+* **Angular Version(s)** - is it a regression?
 * **Browsers and Operating System** - is this a problem with all browsers or only specific ones?
 * **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
  [JSFiddle][jsfiddle]) or an unambiguous set of steps.
@@ -105,43 +89,41 @@ with 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!**

-## <a name="submit-pr"></a> Pull Request Submission Guidelines
+### Submitting a Pull Request
 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.
-* Create the [development environment][developers.setup]
+* Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
+  requests. We cannot accept code without this.
 * Make your changes in a new git branch:

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

-* 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
+* Create your patch, **including appropriate test cases**.
+* Follow our [Coding Rules](#rules).
+* Run the full Angular test suite, as described in the [developer documentation][dev-doc],
+  and ensure that all tests pass.
 * Commit your changes using a descriptive commit message that follows our
-  [commit message conventions][developers.commits]. Adherence to the
-  [commit message conventions][developers.commits] is required, because release notes are
-  automatically generated from these messages.
+  [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.

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

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

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

 * Push your branch to GitHub:
@@ -150,30 +132,24 @@ 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`. This will trigger the check of the
-[Contributor License Agreement](#cla) and the Travis integration.
+In GitHub, send a pull request to `angular:master`.
+If we suggest changes, then:

-* 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.
+* Make the required updates.
+* Re-run the Angular 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 we suggest changes, then:
+If the PR gets too outdated we may ask you to rebase and force push to update the PR:

-  * 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).
+```shell
+git rebase master -i
+git push origin my-fix-branch -f
+```

-    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 seperate commits are useful if the Pull Request contains
-    iterations that might be interesting to see side-by-side.
+_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._

 That's it! Thank you for your contribution!

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

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

-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!
+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 ngdocs and see [this wiki page][ngDocs].
+* With the exceptions listed below, we follow the rules contained in
+  [Google's JavaScript Style Guide][js-style-guide]:
+    * **Do not use namespaces**: Instead,  wrap the entire angular code base in an anonymous closure and
+      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!

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


-[Closure guide to i18n changes]: https://github.com/google/closure-library/wiki/Internationalization-%28i18n%29-changes-in-Closure-Library
+
+[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/
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
-[Common Locale Data Repository (CLDR)]: http://cldr.unicode.org
+[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
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[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
+[dev-doc]: https://docs.angularjs.org/guide
 [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/
-[karma-browserstack]: https://github.com/karma-runner/karma-browserstack-launcher
-[karma-saucelabs]: https://github.com/karma-runner/karma-sauce-launcher
+[list]: https://groups.google.com/forum/?fromgroups#!forum/angular
+[ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation
 [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)
@@ -1,489 +0,0 @@
-# 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 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.
-A commit with this format is automatically created by the [`git revert`][git-revert] command.
-
-### 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
@@ -13,8 +13,6 @@ var semver = require('semver');
 var exec = require('shelljs').exec;
 var pkg = require(__dirname + '/package.json');

-var docsScriptFolder = 'scripts/docs.angularjs.org-firebase';
-
 // Node.js version checks
 if (!semver.satisfies(process.version, pkg.engines.node)) {
  reportOrFail('Invalid node version (' + process.version + '). ' +
@@ -51,6 +49,7 @@ if (!process.env.TRAVIS && !process.env.JENKINS_HOME) {
  }
 }

+
 module.exports = function(grunt) {

  // this loads all the node_modules that start with `grunt-` as plugins
@@ -65,12 +64,6 @@ 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?');
@@ -164,12 +157,7 @@ module.exports = function(grunt) {

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

    eslint: {
@@ -180,11 +168,11 @@ module.exports = function(grunt) {
          'docs/**/*.js',
          'lib/**/*.js',
          'scripts/**/*.js',
-          '!scripts/*/*/node_modules/**',
          'src/**/*.js',
          'test/**/*.js',
          'i18n/**/*.js',
          '!docs/app/assets/js/angular-bootstrap/**',
+          '!docs/bower_components/**',
          '!docs/config/templates/**',
          '!src/angular.bind.js',
          '!i18n/closure/**',
@@ -194,6 +182,16 @@ module.exports = function(grunt) {
    },

    build: {
+      scenario: {
+        dest: 'build/angular-scenario.js',
+        src: [
+          'bower_components/jquery/dist/jquery.js',
+          util.wrap([files['angularSrc'], files['angularScenario']], 'ngScenario/angular')
+        ],
+        styles: {
+          css: ['css/angular.css', 'css/angular-scenario.css']
+        }
+      },
      angular: {
        dest: 'build/angular.js',
        src: util.wrap([files['angularSrc']], 'angular'),
@@ -279,7 +277,9 @@ module.exports = function(grunt) {
      files: [
        'src/**/*.js',
        'test/**/*.js',
+        '!test/ngScenario/DescribeSpec.js',
        '!src/ng/directive/attrs.js', // legitimate xit here
+        '!src/ngScenario/**/*.js',
        '!test/helpers/privateMocks*.js'
      ],
      options: {
@@ -311,54 +311,7 @@ module.exports = function(grunt) {
    copy: {
      i18n: {
        files: [
-          {
-            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
-          }
+          { src: 'src/ngLocale/**', dest: 'build/i18n/', expand: true, flatten: true }
        ]
      }
    },
@@ -372,16 +325,6 @@ 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 + '/'
      }
    },

@@ -416,78 +359,24 @@ 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']);
  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', [
-    'clean',
-    'build',
-    'minall'
-  ]);
+  grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter', 'shell:promises-aplus-tests']);
+
+  grunt.registerTask('minify', ['bower', 'clean', 'build', 'minall']);
  grunt.registerTask('webserver', ['connect:devserver']);
-  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('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('default', ['package']);
 };

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

-Copyright (c) 2010-2018 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2017 Google, Inc. http://angularjs.org

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,7 +7,7 @@ in its `contrib/externs` directory.
 The definitions contain externs for use with the Closure compiler (aka
 JSCompiler). Passing these files to the --externs parameter of a compiler
 pass allows using type annotations for AngularJS objects. For example,
-AngularJS's $scope objects can be annotated as:
+Angular's $scope objects can be annotated as:
 ```js
 /** @type {angular.Scope} */
 var scope = $scope;
@@ -8,42 +8,43 @@ 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 deferred objects,
-and it makes client-side navigation and deep linking with hashbang urls or HTML5 pushState a
+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
 piece of cake. Best of all? It makes development fun!

--------------------
-
-##### AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018: [Find out more](https://docs.angularjs.org/misc/version-support-status)
-
-##### Looking for the new Angular? Go here: https://github.com/angular/angular
-
--------------------
-
 * Web site: https://angularjs.org
 * Tutorial: https://docs.angularjs.org/tutorial
 * API Docs: https://docs.angularjs.org/api
 * Developer Guide: https://docs.angularjs.org/guide
-* Contribution guidelines: [CONTRIBUTING.md](CONTRIBUTING.md)
-* Core Development: [DEVELOPERS.md](DEVELOPERS.md)
+* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: https://dashboard.angularjs.org

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

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

-Contribute
+    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
 --------------------

-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).
+We've set up a separate document for our [contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).


 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)
@@ -79,7 +80,7 @@ HTML is also used to determine the wiring of the app. Special attributes in the
 to load the app, which components or controllers to use for each element, etc. We specify "what"
 gets loaded, but not "how". This declarative approach greatly simplifies app development in a sort
 of WYSIWYG way. Rather than spending time on how the program flows and orchestrating the various
-moving parts, we simply define what we want and AngularJS will take care of the dependencies.
+moving parts, we simply define what we want and Angular will take care of the dependencies.

 #### Data Handling made simple
 Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties
@@ -1,6 +1,6 @@
 # Triage new issues/PRs on github

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


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

 > Thanks for submitting this issue!
 > Unfortunately, we don't think this functionality belongs in core.
-> The good news is that you could easily implement this as a third-party module and publish it to the npm registry.
+> The good news is that you could easily implement this as a third-party module and publish it on Bower and/or to the npm repository.


 ## Assigning Work
@@ -28,7 +28,6 @@ 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',
@@ -41,7 +40,6 @@ 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',
@@ -76,7 +74,6 @@ var angularFiles = {
    'src/ng/directive/ngNonBindable.js',
    'src/ng/directive/ngOptions.js',
    'src/ng/directive/ngPluralize.js',
-    'src/ng/directive/ngRef.js',
    'src/ng/directive/ngRepeat.js',
    'src/ng/directive/ngShowHide.js',
    'src/ng/directive/ngStyle.js',
@@ -106,13 +103,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': [
@@ -134,7 +131,6 @@ var angularFiles = {
    ],
    'ngRoute': [
      'src/shallowCopy.js',
-      'src/routeToRegExp.js',
      'src/ngRoute/route.js',
      'src/ngRoute/routeParams.js',
      'src/ngRoute/directive/ngView.js'
@@ -144,13 +140,13 @@ var angularFiles = {
      'src/ngSanitize/filter/linky.js'
    ],
    'ngMock': [
-      'src/routeToRegExp.js',
      'src/ngMock/angular-mocks.js',
      'src/ngMock/browserTrigger.js'
    ],
    'ngTouch': [
      'src/ngTouch/touch.js',
      'src/ngTouch/swipe.js',
+      'src/ngTouch/directive/ngClick.js',
      'src/ngTouch/directive/ngSwipe.js'
    ],
    'ngAria': [
@@ -158,8 +154,26 @@ var angularFiles = {
    ]
  },

+  'angularScenario': [
+    'src/ngScenario/Scenario.js',
+    'src/ngScenario/Application.js',
+    'src/ngScenario/Describe.js',
+    'src/ngScenario/Future.js',
+    'src/ngScenario/ObjectModel.js',
+    'src/ngScenario/Runner.js',
+    'src/ngScenario/SpecRunner.js',
+    'src/ngScenario/dsl.js',
+    'src/ngScenario/matchers.js',
+    'src/ngScenario/output/Html.js',
+    'src/ngScenario/output/Json.js',
+    'src/ngScenario/output/Xml.js',
+    'src/ngScenario/output/Object.js'
+  ],
+
  'angularTest': [
    'test/helpers/*.js',
+    'test/ngScenario/*.js',
+    'test/ngScenario/output/*.js',
    'test/*.js',
    'test/auto/*.js',
    'test/ng/**/*.js',
@@ -176,19 +190,26 @@ var angularFiles = {
  ],

  'karma': [
-    'node_modules/jquery/dist/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
    'test/jquery_remove.js',
    '@angularSrc',
    '@angularSrcModules',
+    '@angularScenario',
    '@angularTest'
  ],

  'karmaExclude': [
    'test/jquery_alias.js',
    'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
    'src/angular.bind.js'
  ],

+  'karmaScenario': [
+    'build/angular-scenario.js',
+    'build/docs/docs-scenario.js'
+  ],
+
  'karmaModules': [
    'build/angular.js',
    '@angularSrcModules',
@@ -207,15 +228,17 @@ var angularFiles = {
  ],

  'karmaJquery': [
-    'node_modules/jquery/dist/jquery.js',
+    'bower_components/jquery/dist/jquery.js',
    'test/jquery_alias.js',
    '@angularSrc',
    '@angularSrcModules',
+    '@angularScenario',
    '@angularTest'
  ],

  'karmaJqueryExclude': [
    'src/angular-bootstrap.js',
+    'src/ngScenario/angular-bootstrap.js',
    'test/jquery_remove.js',
    'src/angular.bind.js'
  ]
@@ -225,8 +248,8 @@ var angularFiles = {
  angularFiles['karmaJquery' + jQueryVersion] = []
    .concat(angularFiles.karmaJquery)
    .map(function(path) {
-      if (path.startsWith('node_modules/jquery')) {
-        return path.replace(/^node_modules\/jquery/, 'node_modules/jquery-' + jQueryVersion);
+      if (path.startsWith('bower_components/jquery')) {
+        return path.replace(/^bower_components\/jquery/, 'bower_components/jquery-' + jQueryVersion);
      }
      return path;
    });
@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
@@ -1 +1 @@
-// Override me with ?jquery=/node_modules/jquery/dist/jquery.js
+// Override me with ?jquery=/bower_components/jquery/dist/jquery.js
@@ -29,16 +29,19 @@ app.directive('bmPeWatch', function() {
  };
 });

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

@@ -16,6 +16,12 @@
          <label for="complexPath">Complex Paths</label>
        </li>

+        <li>
+          <input type="radio" ng-model="expressionType" value="constructorPath" id="constructorPath">
+          <label for="constructorPath">Constructor Paths</label>
+          ($parse special cases "constructor" for security)
+        </li>
+
        <li>
          <input type="radio" ng-model="expressionType" value="fieldAccess" id="fieldAccess">
          <label for="fieldAccess">Field Accessors</label>
@@ -60,16 +66,6 @@
          <input type="radio" ng-model="expressionType" value="arrayLiterals" id="arrayLiterals">
          <label for="arrayLiterals">Array Literals</label>
        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollection" id="watchCollection">
-          <label for="watchCollection">$watchCollection</label>
-        </li>
-
-        <li>
-          <input type="radio" ng-model="expressionType" value="watchCollectionLiterals" id="watchCollectionLiterals">
-          <label for="watchCollectionLiterals">$watchCollection Literals</label>
-        </li>
      </ul>

      <!--
@@ -92,6 +88,17 @@
          <span bm-pe-watch="row.keys"></span>
        </li>

+        <li ng-switch-when="constructorPath" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="row.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+          <span bm-pe-watch="row.constructor.constructor.constructor.index"></span>
+        </li>
+
        <li ng-switch-when="complexPath" ng-repeat="(rowIdx, row) in ::data">
          <span bm-pe-watch="row.index"></span>
          <span bm-pe-watch="row.num0"></span>
@@ -208,44 +215,27 @@
        </li>

        <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="{foo: rowIdx}"></span>
-          <span bm-pe-watch="{foo: row, bar: rowIdx}"></span>
-          <span bm-pe-watch="{0: row, 1: rowIdx, 2: 3}"></span>
-          <span bm-pe-watch="{str: 'foo', num: rowIdx, b: true}"></span>
-          <span bm-pe-watch="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
-          <span bm-pe-watch="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: row, bar: rowIdx}"></span>
+          <span bm-pe-watch-literal="{0: row, 1: rowIdx, 2: 3}"></span>
+          <span bm-pe-watch-literal="{str: 'foo', num: rowIdx, b: true}"></span>
+          <span bm-pe-watch-literal="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
+          <span bm-pe-watch-literal="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
        </li>

        <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch="[rowIdx]"></span>
-          <span bm-pe-watch="[rowIdx, 0]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2]"></span>
-          <span bm-pe-watch="[rowIdx, 0, 1, 2, 3]"></span>
-          <span bm-pe-watch="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
-          <span bm-pe-watch="[rowIdx, undefined, null, true, false]"></span>
-          <span bm-pe-watch="[[][0], [0][0], [][rowIdx]]"></span>
-          <span bm-pe-watch="[0, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, rowIdx]"></span>
-          <span bm-pe-watch="[0, 1, 2, 3, rowIdx]"></span>
-        </li>
-
-        <li ng-switch-when="watchCollection" ng-repeat="(rowIdx, row) in data">
-          <span bm-pe-watch-collection="data"></span>
-          <span bm-pe-watch-collection="row.keys"></span>
-          <span bm-pe-watch-collection="thisProbablyDoesntHaveAValue"></span>
-        </li>
-
-        <li ng-switch-when="watchCollectionLiterals" ng-repeat="(rowIdx, row) in ::data">
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, row, num0, str0, date0, obj, g, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, b: row, c: num0, d: str0, e: date0, f: obj, g: g, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
-
-          <!-- primitive/valueOf-compatible -->
-          <span bm-pe-watch-collection="[rowIdx, row]"></span>
-          <span bm-pe-watch-collection="[rowIdx, num0, str0, date0, date1, h, i, j, k, l, m, n, o, p]"></span>
-          <span bm-pe-watch-collection="{a: rowIdx, c: num0, d: str0, e: date0, g: date1, h: h, i: i, j: j, k: k, l: l, m: m, n: n, o: o, p: p}"></span>
+          <span bm-pe-watch-literal="[rowIdx]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2, 3]"></span>
+          <span bm-pe-watch-literal="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
+          <span bm-pe-watch-literal="[rowIdx, undefined, null, true, false]"></span>
+          <span bm-pe-watch-literal="[[][0], [0][0], [][rowIdx]]"></span>
+          <span bm-pe-watch-literal="[0, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, 3, rowIdx]"></span>
        </li>
      </ul>
    </div>
@@ -0,0 +1,11 @@
+{
+  "name": "angularjs",
+  "license": "MIT",
+  "devDependencies": {
+    "jquery": "3.1.0",
+    "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,8 +13,7 @@ body {
  text-align: center;
 }

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

@@ -1,11 +1,7 @@
@charset "UTF-8";

-[ng\:cloak],
-[ng-cloak],
-[data-ng-cloak],
-[x-ng-cloak],
-.ng-cloak,
-.x-ng-cloak,
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+.ng-cloak, .x-ng-cloak,
 .ng-hide:not(.ng-hide-animate) {
  display: none !important;
 }
@@ -1 +0,0 @@
-.visible-phone{display:none}.visible-desktop{display:block}.navbar{display:block}.navbar .container{padding:0 16px;width:auto}.navbar .brand{float:left;margin:8px 80px 0 8px;padding:0}.navbar .brand a{display:block;height:30px;margin:6px 0 5px 0;overflow:hidden;padding:0;width:117px}.navbar .nav{float:right}.navbar .nav .dropdown-toggle{color:rgba(255,255,255,0.87);font-size:16px;font-weight:300;line-height:56px;padding:0 24px;text-transform:uppercase;transition:all .3s}.navbar .nav .dropdown-toggle:hover,.navbar .nav .dropdown-toggle:active,.navbar .nav .dropdown-toggle:focus{background:#37474F;color:#fff}.navbar .nav .dropdown-menu{background:#37474F;border:none;border-radius:0;box-shadow:0 0 16px rgba(0,0,0,0.12),0 16px 16px rgba(0,0,0,0.24);color:#fff;left:auto;margin:0;padding:0;right:0}.navbar .nav .dropdown-menu:after,.navbar .nav .dropdown-menu:before{display:none}.navbar .nav .dropdown-menu li{border-bottom:1px solid rgba(38,50,56,0.56);box-sizing:border-box;line-height:48px}.navbar .nav .dropdown-menu li:last-child{border:none}.navbar .nav .dropdown-menu a{background:#37474F;color:#fff;font-weight:300;line-height:48px;padding:0 16px;transition:all .2s}.navbar .nav .dropdown-menu a:hover,.navbar .nav .dropdown-menu a:focus{background:#455A64}.navbar .navbar-search{left:200px;margin:0;position:absolute;right:440px;top:8px;width:auto}.navbar .navbar-search i{color:#546E7A;font-size:16px;left:12px;position:absolute;top:11px}.navbar .navbar-search .search-query{background:#37474F;border:none;border-radius:2px;box-shadow:none;box-sizing:border-box;color:#546E7A;font-size:14px;height:40px;width:100%;padding:0 16px 0 32px;text-shadow:none;transition:all .3s}.navbar .navbar-search .search-query:-webkit-autofill,.navbar .navbar-search .search-query:-webkit-autofill:hover,.navbar .navbar-search .search-query:-webkit-autofill:focus{background-color:#fff;transition:background-color 5000s ease-in-out 0s;-webkit-text-fill-color:#455A64}.navbar .navbar-search .search-query:hover,.navbar .navbar-search .search-query:active,.navbar .navbar-search .search-query:focus{background:#fff;box-shadow:inset 0 2px 4px rgba(0,0,0,0.24);color:#2196F3}.navbar .navbar-search .search-query::-webkit-input-placeholder{color:#546E7A}.navbar .navbar-search .search-query::-moz-placeholder{color:#546E7A}.navbar .navbar-search .search-query:-ms-input-placeholder{color:#546E7A}.navbar .navbar-search .search-query:-moz-placeholder{color:#546E7A}#navbar-main .navbar-inner{background:#263238;height:56px}#navbar-notice{z-index:1029;top:56px}#navbar-notice .navbar-inner{background:#ECEFF1;box-shadow:0 0 3px rgba(0,0,0,0.12),0 3px 3px rgba(0,0,0,0.24);height:auto}.site-notice{padding:4px 0;text-align:center;font-size:13px;margin:0}@media handheld and (max-width: 800px), screen and (max-device-width: 800px), screen and (max-width: 800px){.visible-phone{display:block}.visible-desktop{display:none}}@media handheld and (max-width: 800px), screen and (max-device-width: 800px), screen and (max-width: 800px){.homepage .container{padding:16px;width:auto}.homepage .span1{width:auto}.homepage .span2{width:auto}.homepage .span3{width:auto}.homepage .span4{width:auto}.homepage .span5{width:auto}.homepage .span6{width:auto}.homepage .span7{width:auto}.homepage .span8{width:auto}.homepage .span9{width:auto}.homepage .span10{width:auto}.homepage .navbar .container{padding:0 8px}.homepage #navbar-main .navbar-inner{height:40px}.homepage #navbar-main .brand{margin:6px 0 0 0}.homepage #navbar-main .brand a{margin:0}.homepage #navbar-main .nav{margin:0}.homepage #navbar-main .nav .dropdown-toggle{font-size:12px;line-height:40px;padding:0 8px}.homepage #navbar-main .dropdown-menu a{padding:0 8px}.homepage #navbar-main .navbar-search{background:#263238;border-bottom:1px solid #263238;left:0;right:0;top:100%}.homepage #navbar-main .navbar-search i{left:12px;top:7px}.homepage #navbar-main .navbar-search .search-query{border-radius:0;height:32px}.homepage #navbar-notice{top:40px}.homepage #navbar-notice .site-notice{font-size:11px}.homepage .hero{padding:80px 32px 32px 32px}.homepage .hero h2{background-size:230px 60px;height:60px;width:230px}}
@@ -1,37 +1,3 @@
-@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%;
@@ -87,13 +53,13 @@ h1,h2,h3,h4,h5,h6 {
 }

 .header .brand {
+  padding-top: 6px;
  padding-bottom: 0px;
 }

 .header .brand img {
-  margin-top: 0;
-  height: auto;
-  vertical-align: top;
+  margin-top: 5px;
+  height: 30px;
 }

 .docs-search {
@@ -116,11 +82,6 @@ h1,h2,h3,h4,h5,h6 {
  margin-right: 10px;
 }

-.navbar .navbar-search i {
-  top: 13px;
-  font-size: 12px;
-}
-
 .docs-search > .search-query:focus {
  outline: 0;
 }
@@ -336,7 +297,6 @@ iframe.example {
 }

 .search-results-container {
-  position: relative;
  padding-bottom: 1em;
  border-top: 1px solid #111;
  background: #181818;
@@ -475,17 +435,15 @@ iframe.example {
  background: #f1f1f1;
 }

-#navbar-sub {
+.sup-header {
  padding-top: 10px;
  padding-bottom: 5px;
  background: rgba(245,245,245,0.88);
  box-shadow: 0 0 2px #999;
-  z-index: 1028;
-  top: 83px;
 }

 .main-body-grid {
-  margin-top: 144px;
+  margin-top: 120px;
  position: relative;
 }

@@ -496,7 +454,7 @@ iframe.example {

 .main-body-grid > .grid-left {
  position: fixed;
-  top: 144px;
+  top: 120px;
  bottom: 0;
  overflow: auto;
 }
@@ -713,14 +671,14 @@ ul.events > li {
  margin-right: 5px;
 }

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

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

-@media only screen and (max-width: 767px) {
+@media only screen and (max-width : 768px) {
  .picker, .picker select {
    width: auto;
    display: block;
@@ -869,123 +827,3 @@ ul.events > li {
 iframe[name="example-anchoringExample"] {
  height: 400px;
 }
-
-/*
-  angular-topnav.css and bootstrap overrides
- */
-
-.navbar .navbar-inner .container {
-  padding: 0 16px;
-  width: auto;
-  height: auto;
-}
-
-.navbar .nav > li {
-  float: left;
-}
-
-.navbar-nav .open .dropdown-menu {
-  position: absolute;
-  float: left;
-}
-
-.navbar-nav .open .dropdown-menu > li > a {
-  line-height: 48px;
-}
-
-#navbar-main .navbar-inner, #navbar-notice .navbar-inner {
-  box-shadow: none;
-}
-
-#navbar-sub .container {
-  max-width: 970px;
-}
-
-.nav .open > a, .nav .open > a:hover, .nav .open > a:focus {
-  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;
-  }
-
-  .search-results-container {
-    top: 32px;
-    overflow: auto;
-    max-height: 85vh;
-    padding-bottom: 0;
-    position: static;
-  }
-
-  .search-close {
-    right: 1px;
-    margin-left: 0;
-    top: 41px;
-    padding: 5px 10px;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-    box-shadow: none;
-    width: auto;
-    bottom: auto;
-    left: auto;
-  }
-
-  .navbar-nav .open .dropdown-menu > li > a, .navbar-nav .open .dropdown-menu .dropdown-header {
-    padding: 0 8px;
-  }
-
-  .homepage #navbar-notice {
-    top: 72px;
-  }
-
-  #navbar-notice .navbar-inner {
-    box-shadow: 0 0 3px rgba(0, 0, 0, .12), 0 3px 3px rgba(0, 0, 0, .24)
-  }
-
-  #navbar-sub {
-    position: relative;
-    top: 17px;
-    margin-top: 80px;
-    padding-bottom: 0;
-    margin-bottom: 0;
-  }
-
-}
@@ -1,4 +0,0 @@
-User-agent: *
-
-# The map files are not required by the app
-Disallow: /*.map$
@@ -9,7 +9,6 @@
  },

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

-describe('API pages', function() {
+describe('doc.angularjs.org', 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/);
+  describe('API pages', function() {

-    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 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 change the page content when clicking a link to a service', function() {
-    browser.get('build/docs/index.html');
+      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+/);
+    });

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

-    var mainHeader = element(by.css('.main-body h1 '));
-    expect(mainHeader.getText()).toEqual('ngClick');
-  });
+      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+      ngBindLink.click();
+
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.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+$/);
+      });
    });
  });
 });
@@ -1,58 +0,0 @@
-'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,9 +21,6 @@ describe('docs.angularjs.org', function() {
        console.log('browser console errors: ' + require('util').inspect(filteredLog));
      }
    });
-
-    browser.ignoreSynchronization = false;
-    browser.clearMockModules();
  });


@@ -47,50 +44,30 @@ describe('docs.angularjs.org', function() {
      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 pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('ngClick');
    });


-    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/');
-
-      var mainHeader = element(by.css('.main-body h1 '));
-      expect(mainHeader.getText()).toEqual('angular.noop');
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('angular.noop');
    });


    it('should be resilient to trailing "index"', function() {
      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/index');
-      var mainHeader = element(by.css('.main-body h1 '));
-      expect(mainHeader.getText()).toEqual('angular.noop');
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('angular.noop');
    });


    it('should be resilient to trailing "index/"', function() {
      browser.get('build/docs/index-production.html#!/api/ng/function/angular.noop/index/');
-      var mainHeader = element(by.css('.main-body h1 '));
-      expect(mainHeader.getText()).toEqual('angular.noop');
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('angular.noop');
    });


@@ -101,68 +78,7 @@ describe('docs.angularjs.org', function() {

    it('should display an error if the page does not exist', function() {
      browser.get('build/docs/index-production.html#!/api/does/not/exist');
-      var mainHeader = element(by.css('.main-body h1 '));
-      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);
-        });
-      });
-
-
+      expect(element(by.css('h1')).getText()).toBe('Oops!');
    });

  });
@@ -1,130 +0,0 @@
-'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,8 +1,7 @@
 'use strict';

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

-directivesModule
 /**
 * backToTop Directive
 * @param  {Function} $anchorScroll
@@ -48,136 +47,4 @@ directivesModule
      }
    }
  };
-})
-
-.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,8 +8,6 @@ angular.module('DocsController', ['currentVersionData'])
  function($scope, $rootScope, $location, $window, $cookies,
              NG_PAGES, NG_NAVIGATION, CURRENT_NG_VERSION) {

-  var errorPartialPath = 'Error404.html';
-
  $scope.navClass = function(navItem) {
    return {
      active: navItem.href && this.currentPage && this.currentPage.path,
@@ -18,6 +16,8 @@ angular.module('DocsController', ['currentVersionData'])
    };
  };

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

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

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

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

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

-  $scope.hasError = function() {
-    return $scope.partialPath === errorPartialPath || $scope.loadingError;
-  };
-
  /**********************************
   Initialize
   ***********************************/

  $scope.versionNumber = CURRENT_NG_VERSION.full;
  $scope.version = CURRENT_NG_VERSION.full + ' ' + CURRENT_NG_VERSION.codeName;
-  $scope.loading = false;
-  $scope.loadingError = false;
+  $scope.loading = 0;
+

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


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

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

      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,50 +1,40 @@
 'use strict';

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

+  var any = jasmine.any;

  beforeEach(module('directives'));

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

-  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 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);
-    });
+  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 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,7 +22,6 @@ module.exports = new Package('angularjs', [
 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
 .factory(require('./services/deployments/jquery'))
-.factory(require('./services/deployments/test'))
 .factory(require('./services/deployments/production'))

 .factory(require('./inline-tag-defs/type'))
@@ -32,7 +31,6 @@ module.exports = new Package('angularjs', [
 .processor(require('./processors/keywords'))
 .processor(require('./processors/pages-data'))
 .processor(require('./processors/versions-data'))
-.processor(require('./processors/sitemap'))


 .config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
@@ -148,7 +146,6 @@ module.exports = new Package('angularjs', [

 .config(function(checkAnchorLinksProcessor) {
  checkAnchorLinksProcessor.base = '/';
-  checkAnchorLinksProcessor.errorOnUnmatchedLinks = true;
  // We are only interested in docs that have an area (i.e. they are pages)
  checkAnchorLinksProcessor.checkDoc = function(doc) { return doc.area; };
 })
@@ -159,14 +156,12 @@ module.exports = new Package('angularjs', [
  generateProtractorTestsProcessor,
  generateExamplesProcessor,
  debugDeployment, defaultDeployment,
-  jqueryDeployment, testDeployment,
-  productionDeployment) {
+  jqueryDeployment, productionDeployment) {

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

@@ -5,36 +5,18 @@
 * @description
 * Process "error" docType docs and generate errorNamespace docs
 */
-module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrInfo) {
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
  return {
    $runAfter: ['tags-extracted'],
    $runBefore: ['extra-docs-added'],
    $process: function(docs) {

-      // Get the extracted min errors to compare with the error docs, and report any mismatch
-      var collectedErrors = require('../../../build/errors.json').errors;
-      var flatErrors = [];
-
-      for (var namespace in collectedErrors) {
-        for (var error in collectedErrors[namespace]) {
-          flatErrors.push(namespace + ':' + error);
-        }
-      }
-
      // Create error namespace docs and attach error docs to each
      docs.forEach(function(doc) {
        var parts, namespaceDoc;

        if (doc.docType === 'error') {

-          var matchingMinErr = flatErrors.indexOf(doc.name);
-
-          if (matchingMinErr === -1) {
-            log.warn('Error doc: ' + doc.name + ' has no matching min error');
-          } else {
-            flatErrors.splice(matchingMinErr, 1);
-          }
-
          // Parse out the error info from the id
          parts = doc.name.split(':');
          doc.namespace = parts[0];
@@ -59,10 +41,6 @@ module.exports = function errorDocsProcessor(log, errorNamespaceMap, getMinerrIn
        }
      });

-      flatErrors.forEach(function(value) {
-        log.warn('No error doc exists for min error: ' + value);
-      });
-
      errorNamespaceMap.forEach(function(errorNamespace) {
        docs.push(errorNamespace);
      });
@@ -1,25 +0,0 @@
-'use strict';
-
-var exclusionRegex = /^index|examples\/|ptore2e\//;
-
-module.exports = function createSitemap() {
-  return {
-    $runAfter: ['paths-computed'],
-    $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.push({
-        id: 'sitemap.xml',
-        path: 'sitemap.xml',
-        outputPath: '../sitemap.xml',
-        template: 'sitemap.template.xml',
-        urls: docs.filter(function(doc) {
-          return doc.path &&
-            doc.outputPath &&
-            !exclusionRegex.test(doc.outputPath);
-        }).map(function(doc) {
-          return doc.path;
-        })
-      });
-    }
-  };
-};
@@ -47,14 +47,6 @@ 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;
@@ -78,28 +70,10 @@ 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'); });

-        // 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
+        return [makeOption({version: 'snapshot'}, 'Latest', 'master')]
            .concat(latest)
            .concat(versions);
      }
@@ -129,19 +103,6 @@ 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,8 +30,8 @@ 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',
      'css/animations.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') + '/marked.min.js',
+      'components/marked-' + getVersion('marked') + '/lib/marked.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,8 +30,8 @@ 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',
      'css/animations.css'
    ]
@@ -34,8 +34,8 @@ 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',
      'css/animations.css'
    ]
@@ -7,25 +7,24 @@ var angularCodeUrl = '//code.angularjs.org/';

 var cdnUrl = googleCdnUrl + versionInfo.cdnVersion;

-// 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 || versionInfo.currentVersion.version);
-var examplesDependencyPath = angularCodeUrl + versionPath + '/';
+// 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));

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

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

-<h2 id="description">Description</h2>
+<h2>Description</h2>
 <div class="description">
  {$ doc.description | marked $}
 </div>
@@ -11,18 +11,6 @@
  <meta name="fragment" content="!">
  <title ng-bind-template="AngularJS: {{ currentArea.name }}: {{ currentPage.name || 'Error: Page not found'}}">AngularJS</title>

-  <script type="text/javascript">
-    (function() {
-      // Dynamically, pre-emptively, add `noindex`, which will be removed when the doc is ready and valid
-      ['googlebot', 'robots'].forEach(function(bot) {
-        var tag = document.createElement('meta');
-        tag.name = bot;
-        tag.content = 'noindex';
-        tag.setAttribute('ng-if', 'hasError()');
-        document.head.appendChild(tag);
-      });
-    })();
-  </script>
  <script type="text/javascript">
    // dynamically add base tag as well as css and javascript files.
    // we can't add css/js the usual way, because some browsers (FF) eagerly prefetch resources
@@ -80,96 +68,101 @@
    })();
  </script>
 </head>
-<body class="homepage">
+<body>
  <div id="wrapper">
-    <header class="header">
-      <nav id="navbar-main" class="navbar navbar-fixed-top">
-        <div class="navbar-inner" ng-controller="DocsSearchCtrl">
-          <div class="container">
-            <h1 class="brand"><a href="http://angularjs.org"><img width="117" height="30" src="img/angularjs-for-header-only.svg" alt="AngularJS"></a></h1>
-
-            <form class="navbar-search" ng-submit="submit()">
-              <i class="glyphicon glyphicon-search search-icon"></i>
-              <input type="text" name="as_q" class="search-query" placeholder="SEARCH"
-                 ng-focus="focus=true"
-                 ng-blur="focus=false"
-                 ng-change="search(q)"
-                 ng-model="q"
-                 ng-model-options="{debounce: 150}"
-                 docs-search-input
-                 autocomplete="off">
-            </form>
-
-            <ul class="nav navbar-nav">
-              <li class="dropdown" uib-dropdown>
-                <a href="#" class="dropdown-toggle" uib-dropdown-toggle>Learn</a>
-                <ul class="dropdown-menu" uib-dropdown-menu>
-                  <li><a href="tutorial">Tutorial</a></li>
-                  <li><a href="misc/faq">FAQ</a></li>
-                  <li><a href="https://www.youtube.com/user/angularjs">Videos</a></li>
-                  <li><a href="http://angular.codeschool.com/">Free Course</a></li>
-                  <li><a href="https://www.madewithangular.com/">Case Studies</a></li>
-                </ul>
-              </li>
-              <li class="dropdown" uib-dropdown>
-                <a href="#" class="dropdown-toggle" uib-dropdown-toggle>Develop</a>
-                <ul class="dropdown-menu" uib-dropdown-menu>
-                  <li><a href="guide">Developer Guide</a></li>
-                  <li><a href="api">API Reference</a></li>
-                  <li><a href="error">Error Reference</a></li>
-                  <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>
-              <li class="dropdown" uib-dropdown>
-                <a href="#" class="dropdown-toggle" uib-dropdown-toggle>Discuss</a>
-                <ul class="dropdown-menu" uib-dropdown-menu>
-                  <li><a href="http://blog.angularjs.org">Blog</a></li>
-                  <li><a href="https://twitter.com/angular">Twitter</a></li>
-                  <li><a href="https://plus.google.com/110323587230527980117">Google+</a></li>
-                  <li><a href="https://github.com/angular/angular.js/issues">Feature &amp; Bug Tracker</a></li>
-                  <li><a href="http://groups.google.com/group/angular">Mailing List</a></li>
-                  <li><a href="http://webchat.freenode.net/?channels=angularjs&uio=d4">IRC</a></li>
-                  <li><a href="https://gitter.im/angular/angular.js">Gitter</a></li>
-                </ul>
-              </li>
-            </ul>
-
-          </div>
-          <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="handleResultClicked($event)" ng-href="{{ item.path }}">{{ item.name }}</a></li>
-                  </ul>
-                </div>
-              </div>
-              <a href="" ng-click="hideResults()" class="search-close">
-                <span class="glyphicon glyphicon-remove search-close-icon"></span> Close
+    <header scroll-y-offset-element class="header header-fixed">
+      <section class="navbar navbar-inverse docs-navbar-primary" ng-controller="DocsSearchCtrl">
+        <div class="container">
+          <div class="row">
+            <div class="col-md-9 header-branding">
+              <a class="brand navbar-brand" href="http://angularjs.org">
+                <img width="117" height="30" class="logo" alt="Link to Angular JS Homepage" ng-src="img/angularjs-for-header-only.svg">
              </a>
+              <ul class="nav navbar-nav">
+                <li class="divider-vertical"></li>
+                <li><a href="http://angularjs.org"><i class="icon-home icon-white"></i> Home</a></li>
+                <li class="divider-vertical"></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                    <i class="icon-eye-open icon-white"></i> Learn <b class="caret"></b>
+                  </a>
+                  <ul class="dropdown-menu">
+                    <li class="disabled"><a href="http://angularjs.org/">Why AngularJS?</a></li>
+                    <li><a href="http://www.youtube.com/user/angularjs">Watch</a></li>
+                    <li><a href="tutorial">Tutorial</a></li>
+                    <li><a href="https://www.madewithangular.com/">Case Studies</a></li>
+                    <li><a href="https://github.com/angular/angular-seed">Seed App project template</a></li>
+                    <li><a href="misc/faq">FAQ</a></li>
+                  </ul>
+                </li>
+                <li class="divider-vertical"></li>
+                <li class="dropdown active">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                    <i class="icon-book icon-white"></i> Develop <b class="caret"></b>
+                  </a>
+                  <ul class="dropdown-menu">
+                    <li><a href="tutorial">Tutorial</a></li>
+                    <li><a href="guide">Developer Guide</a></li>
+                    <li><a href="api">API Reference</a></li>
+                    <li><a href="error">Error Reference</a></li>
+                    <li><a href="misc/contribute">Contribute</a></li>
+                    <li><a href="http://code.angularjs.org/">Download</a></li>
+                  </ul>
+                </li>
+                <li class="divider-vertical"></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                    <i class="icon-comment icon-white"></i> Discuss <b class="caret"></b>
+                  </a>
+                  <ul class="dropdown-menu">
+                    <li><a href="http://blog.angularjs.org">Blog</a></li>
+                    <li><a href="http://groups.google.com/group/angular">Mailing List</a></li>
+                    <li><a href="http://webchat.freenode.net/?channels=angularjs&uio=d4">Chat Room</a></li>
+                    <li class="divider"></li>
+                    <li><a href="https://twitter.com/#!/angularjs">Twitter</a></li>
+                    <li><a href="https://plus.google.com/110323587230527980117">Google+</a></li>
+                    <li class="divider"></li>
+                    <li><a href="https://github.com/angular/angular.js">GitHub</a></li>
+                    <li><a href="https://github.com/angular/angular.js/issues">Issue Tracker</a></li>
+                  </ul>
+                </li>
+                <li class="divider-vertical"></li>
+              </ul>
            </div>
+            <form ng-class="{focus:focus}" class="navbar-search col-md-3 docs-search" ng-submit="submit()">
+              <span class="glyphicon glyphicon-search search-icon"></span>
+              <input type="text"
+                     name="as_q"
+                     class="search-query"
+                     placeholder="Click or press / to search"
+                     ng-focus="focus=true"
+                     ng-blur="focus=false"
+                     ng-change="search(q)"
+                     ng-model="q"
+                     docs-search-input
+                     autocomplete="off" />
+            </form>
          </div>
        </div>
-      </nav>
-      <nav id="navbar-notice" class="navbar navbar-fixed-top">
-        <div class="navbar-inner">
+        <div class="search-results-container" ng-show="hasResults">
          <div class="container">
-            <p class="site-notice visible-phone">
-              This site refers to AngularJS (v1.x). <a href="https://angular.io/">Go to the latest Angular</a>.
-            </p>
-            <p class="site-notice visible-desktop">
-              This site and all of its contents are referring to AngularJS (version 1.x),
-              if you are looking for the latest Angular, please visit <a href="https://angular.io/">angular.io</a>.
-            </p>
+            <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">
+                  <!-- Do not insert a line break between li and a. Chrome will insert an actual line-break, which breaks the list item view.
+                  TODO: use a html minifier instead -->
+                  <li ng-repeat="item in value" class="search-result"><a ng-click="hideResults()" ng-href="{{ item.path }}">{{ item.name }}</a></li>
+                </ul>
+              </div>
+            </div>
+            <a href="" ng-click="hideResults()" class="search-close">
+              <span class="glyphicon glyphicon-remove search-close-icon"></span> Close
+            </a>
          </div>
        </div>
-      </nav>
-      <nav id="navbar-sub" class="sup-header navbar navbar-fixed-top" scroll-y-offset-element ng-cloak>
+      </section>
+      <section class="sup-header">
        <div class="container main-grid main-header-grid">
          <div class="grid-left">
            <version-picker></version-picker>
@@ -183,10 +176,10 @@
            </ul>
          </div>
        </div>
-      </nav>
+      </section>
    </header>

-    <section role="main" class="container main-body" ng-cloak>
+    <section role="main" class="container main-body">
      <div class="main-grid main-body-grid">
        <div class="grid-left">
          <a class="btn toc-toggle visible-xs" ng-click="toc=!toc">Show / Hide Table of Contents</a>
@@ -210,9 +203,8 @@
          </div>
        </div>
        <div class="grid-right">
-          <div ng-show="loading">Loading &hellip;</div>
-          <div ng-show="loadingError">There was an error loading this resource. Please try again later.</div>
-          <div ng-hide="loading" ng-include="partialPath" toc-collector autoscroll></div>
+          <div id="loading" ng-show="loading">Loading...</div>
+          <div ng-hide="loading" ng-include="partialPath" autoscroll></div>
        </div>
      </div>
    </section>
@@ -222,10 +214,10 @@
        <p class="pull-right"><a back-to-top>Back to top</a></p>

        <p>
-          Super-powered by Google ©2010-2018
+          Super-powered by Google ©2010-2017
          (<a id="version"
               ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
-               ng-bind-template="v{{version}}" title="Changelog of this version of AngularJS">
+               ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
           </a>)
        </p>
        <p>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {%- for url in doc.urls %}
-  <url>
-    <loc>https://docs.angularjs.org/{$ url $}</loc>
-  </url>{% endfor %}
-</urlset>
@@ -23,7 +23,6 @@

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

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

 {% block additional %}
-  <h2 id="{$ doc.name $}-info">Directive Info</h2>
+  <h2>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,6 +18,9 @@
    <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 %}
@@ -29,23 +32,10 @@
      </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 %}>
@@ -56,14 +46,10 @@
    {% 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 id="usage">Usage</h2>
+  <h2>Usage</h2>
  <h3>In HTML Template Binding</h3>
  {% if doc.usage %}
    {$ doc.usage | code $}
@@ -8,7 +8,7 @@

 {$ x.deprecatedBlock(doc) $}

-<h2 id="module-installation">Installation</h2>
+<h2>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 id="module-components">Module Components</h2>
+  <h2>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 id="module-usage">Usage</h2>
+  <h2>Usage</h2>
  {$ doc.usage | marked $}
 {% endif %}

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

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

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

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

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

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

 {%- if doc.properties %}
-<h2 id="{$ doc.name $}-properties">Properties</h2>
+<h2>Properties</h2>
 <ul class="properties">
  {%- for property in doc.properties %}
-  <li>
-    <h3 id="{$ property.name $}">{$ property.name | code $}</h3>
+  <li id="{$ property.name $}">
+    <h3>{$ 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 id="{$ doc.name $}-returns">Returns</h3>
+<h3>Returns</h3>
 {$ lib.typeInfo(doc.returns) $}
 {%- endif %}
@@ -3,15 +3,7 @@
@description

 # AngularJS API Docs
-
-<div class="alert alert-warning">
-**AngularJS will be moving to Long Term Support (LTS) mode on July 1st 2018.**: [Find out more](misc/version-support-status).
-</div>
-
-## Welcome to the AngularJS API docs page.
-
-These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
-
+Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.

 The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
 These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
@@ -19,14 +11,14 @@ These components are {@link guide/directive directives}, {@link guide/services s
 There is also a {@link guide/index guide} with articles on various topics, and a list of external resources.

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

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

-## AngularJS Modules
+## Angular Modules


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

 ## {@link ngAnimate ngAnimate}

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

@@ -222,7 +214,11 @@ Use the ngCookies module to handle cookie management within your application.
      {@link ngCookies#service Services / Factories}
    </td>
    <td>
-      The {@link ngCookies.$cookies $cookies} service is a convenient wrapper to store simple data within browser cookies.
+      The following services are used for cookie management:
+      <ul>
+        <li>The {@link ngCookies.$cookies $cookie} service is a convenient wrapper to store simple data within browser cookies.</li>
+        <li>{@link ngCookies.$cookieStore $cookieStore} is used to store more complex data using serialization.</li>
+      </ul>
    </td>
  </tr>
 </table>
@@ -0,0 +1,12 @@
+@ngdoc error
+@name $animate:nocb
+@fullName Do not pass a callback to animate methods
+@description
+
+Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
+Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes.
+
+If you are getting this error then you need to update your code to use the promise-based API.
+
+See https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9 for information about
+the change to the animation API and the changes you need to make.
@@ -1,8 +0,0 @@
-@ngdoc error
-@name $animate:nongcls
-@fullName `ng-animate` class not allowed
-@description
-
-This error occurs, when trying to set `$animateProvider.classNameFilter()` to a RegExp containing
-the reserved `ng-animate` class. Since `.ng-animate` will be added/removed by `$animate` itself,
-using it as part of the `classNameFilter` RegExp is not allowed.
@@ -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 or more of the following characters:
+The directive restrict property must be a string including one of more of the following characters:
 * E (element)
 * A (attribute)
 * C (class)
@@ -15,4 +15,4 @@ For example:
 ```javascript
 restrict: 'E'
 restrict: 'EAC'
-```
+```
@@ -1,13 +0,0 @@
-@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
-```
@@ -5,7 +5,7 @@

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

 For example, the situation can occur by setting up a `$onChanges()` hook which triggers an event on the component, which subsequently
 triggers the component's bound inputs to be updated:
@@ -10,15 +10,13 @@ myModule.directive('directiveName', function factory() {
  return {
    ...
    scope: {
-      'localName': '@', // OK
-      'localName2': '&attr', // OK
-      'localName3': '<?attr', // OK
-      'localName4': ' = attr', // OK
-      'localName5': ' =*attr', // OK      
-      'localName6': 'attr',    // ERROR: missing mode @&=<
-      'localName7': 'attr=',   // ERROR: must be prefixed with @&=<
-      'localName8': '=attr?',  // ERROR: ? must come directly after the mode
-      'localName9': '<*'  // ERROR: * is only valid with =
+      'attrName': '@', // OK
+      'attrName2': '=localName', // OK
+      'attrName3': '<?localName', // OK
+      'attrName4': ' = name', // OK
+      'attrName5': 'name',    // ERROR: missing mode @&=
+      'attrName6': 'name=',   // ERROR: must be prefixed with @&=
+      'attrName7': '=name?',  // ERROR: ? must come directly after the mode
    }
    ...
  }
@@ -1,36 +0,0 @@
-@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 Event Attribute/Property Binding
+@fullName Interpolated Event Attributes
@description

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

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


 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`).
+
@@ -1,38 +0,0 @@
-@ngdoc error
-@name $compile:noslot
-@fullName No matching slot in parent directive
-@description
-
-This error occurs when declaring a specific slot in a {@link ng.ngTransclude `ngTransclude`} 
-which does not map to a specific slot defined in the transclude property of the directive.
-
-In this example the template has declared a slot missing from the transclude definition.
-This example will generate a noslot error.
-```js
-var componentConfig = {
-  template: '<div>' +
-                '<div ng-transclude="slotProvided"></div>' +
-                '<div ng-transclude="noSlotProvided"></div>' +
-            '</div>',
-  transclude: {
-  	// The key value pairs here are considered "slots" that are provided for components to slot into.
-    slotProvided: 'slottedComponent', // mandatory transclusion
-    // There is no slot provided here for the transclude 'noSlotProvided' declared in the above template.
-  }
-};
-```
-
-If we make the following change we will no longer get the noslot error.
-```js
-var componentConfig = {
-  template: '<div>' +
-                '<div ng-transclude="slotProvided"></div>' +
-                '<div ng-transclude="noSlotProvided"></div>' +
-            '</div>',
-  transclude: {
-    slotProvided: 'slottedComponent',
-    noSlotProvided: 'otherComponent' // now it is declared and the error should cease
-  }
-};
-
-```
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:srcset
-@fullName Invalid value passed to `attr.$set('srcset', value)`
-@description
-
-This error occurs if you try to programmatically set the `srcset` attribute with a non-string value.
-
-This can be the case if you tried to avoid the automatic sanitization of the `srcset` value by
-passing a "trusted" value provided by calls to `$sce.trustAsMediaUrl(value)`.
-
-If you want to programmatically set explicitly trusted unsafe URLs, you should use `$sce.trustAsHtml`
-on the whole `img` tag and inject it into the DOM using the `ng-bind-html` directive.
@@ -0,0 +1,11 @@
+@ngdoc error
+@name $compile:tpload
+@fullName Error Loading Template
+@description
+
+This error occurs when {@link ng.$compile `$compile`} attempts to fetch a template from some URL, and the request fails.
+
+To resolve this error, ensure that the URL of the template is spelled correctly and resolves to correct absolute URL.
+The [Chrome Developer Tools](https://developers.google.com/chrome-developer-tools/docs/network#network_panel_overview) might also be helpful in determining why the request failed.
+
+If you are using {@link ng.$templateCache} to pre-load templates, ensure that the cache was populated with the template.
@@ -1,14 +0,0 @@
-@ngdoc error
-@name $http:baddata
-@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
-valid JSON-stringified object or array.
-This error occurs when that data is not a valid JSON object.
-
-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,9 +9,9 @@ value is `JSON_CALLBACK`.

 `$http` JSONP requests need to attach a callback query parameter to the URL. The name of this
 parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam`
-property. You must not provide your own parameter with this name in the configuration of the request.
+property. You must not provide your own parameter with this name in the configuratio of the request.

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

 To resolve this error, remove any parameters that have the same name as the `jsonpCallbackParam`;
@@ -15,7 +15,7 @@ In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module.
 If you are getting this error after upgrading to `1.2.x` or later, be sure that you've
 installed {@link ngRoute `ngRoute`}.

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

 This error can also occur if you have tried to add your own components to the `ng` module.
 This has never been supported and from `1.3.0` it will actually trigger this error.
@@ -3,4 +3,4 @@
@fullName Expecting end operator
@description

-The AngularJS expression is missing the corresponding closing operator.
+The Angular expression is missing the corresponding closing operator.
@@ -8,4 +8,4 @@ extension in your interpolation expression.  The different choices have to be un

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -9,4 +9,4 @@ bug mentioning the exact version of AngularJS used and we will fix it!

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -14,4 +14,4 @@ future commit and the github issue will help gauge urgency.

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

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

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -8,4 +8,4 @@ extension keyword in the extended interpolation syntax.

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -8,4 +8,4 @@ brace to mark the end of the message.

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

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -10,4 +10,4 @@ extensions require that you provide a message for the selection "other".

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -9,4 +9,4 @@ unsupported or invalid.

 For more information about the MessageFormat syntax in interpolation
 expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat AngularJS i18n MessageFormat}
+{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -7,4 +7,4 @@ You have attempted to use a MessageFormat extension in your interpolation expres

 Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
 (SCE)} and about the MessageFormat extensions at {@link
-guide/i18n#MessageFormat AngularJS i18n MessageFormat}.
+guide/i18n#MessageFormat Angular i18n MessageFormat}.
@@ -3,4 +3,4 @@
@fullName Unterminated string literal
@description

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

-Before AngularJS 1.3 we didn't have this hard requirement and it was easy to write apps that worked
+Before Angular 1.3 we didn't have this hard requirement and it was easy to write apps that worked
 when deployed in the root context but were broken when moved to a sub-context because in the
 sub-context all absolute urls would resolve to the root context of the app. To prevent this,
 use relative URLs throughout your app:
@@ -1,10 +0,0 @@
-@ngdoc error
-@name $parse:esc
-@fullName Value cannot be escaped
-@description
-
-Occurs when the parser tries to escape a value that is not known.
-
-This should never occur in practice. If it does then that indicates a programming
-error in the AngularJS `$parse` service itself and should be reported as an issue
-at https://github.com/angular/angular.js/issues.
@@ -7,4 +7,4 @@ Occurs when an expression has a lexical error, for example a malformed number (0

 The error message contains a more precise error.

-To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.
+To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
@@ -1,13 +0,0 @@
-@ngdoc error
-@name $parse:lval
-@fullName Trying to assign a value to a non l-value
-@description
-
-Occurs when an expression is trying to assign a value to a non-assignable expression.
-
-This can happen if the left side of an assigment is not a valid reference to a variable
-or property. E.g. In the following snippet `1+2` is not assignable.
-
-```
-(1+2) = 'hello';
-```
@@ -6,4 +6,4 @@
 Occurs when there is a syntax error in an expression.  These errors are thrown while compiling the expression.
 The error message contains a more precise description of the error, including the location (column) in the expression where the error occurred.

-To resolve, learn more about {@link guide/expression AngularJS expressions}, identify the error and fix the expression's syntax.
+To resolve, learn more about {@link guide/expression Angular expressions}, identify the error and fix the expression's syntax.
@@ -8,5 +8,5 @@ Occurs when an expression is missing tokens at the end of the expression.
 For example, forgetting to close a bracket or failing to properly escape quotes in an expression
 will trigger this error.

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

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

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

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

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

@@ -10,17 +10,17 @@ the error.

 ## Background

-AngularJS uses a dirty-checking digest mechanism to monitor and update values of the scope during
+Angular uses a dirty-checking digest mechanism to monitor and update values of the scope during
 the processing of your application.  The digest works by checking all the values that are being
 watched against their previous value and running any watch handlers that have been defined for those
 values that have changed.

 This digest mechanism is triggered by calling `$digest` on a scope object.  Normally you do not need
 to trigger a digest manually, because every external action that can trigger changes in your
-application, such as mouse events, timeouts or server responses, wrap the AngularJS application code
+application, such as mouse events, timeouts or server responses, wrap the Angular application code
 in a block of code that will run `$digest` when the code completes.

-You wrap AngularJS code in a block that will be followed by a `$digest` by calling `$apply` on a scope
+You wrap Angular code in a block that will be followed by a `$digest` by calling `$apply` on a scope
 object.  So, in pseudo-code, the process looks like this:

 ```
@@ -45,20 +45,20 @@ $apply = function(fn) {

 ## Digest Phases

-AngularJS keeps track of what phase of processing we are in, the relevant ones being `$apply` and
+Angular keeps track of what phase of processing we are in, the relevant ones being `$apply` and
 `$digest`.  Trying to reenter a `$digest` or `$apply` while one of them is already in progress is
-typically a sign of programming error that needs to be fixed. So AngularJS will throw this error when
+typically a sign of programming error that needs to be fixed. So Angular will throw this error when
 that occurs.

 In most situations it should be well defined whether a piece of code will be run inside an `$apply`,
 in which case you should not be calling `$apply` or `$digest`, or it will be run outside, in which
-case you should wrap any code that will be interacting with AngularJS scope or services, in a call to
+case you should wrap any code that will be interacting with Angular scope or services, in a call to
 `$apply`.

-As an example, all Controller code should expect to be run within AngularJS, so it should have no need
+As an example, all Controller code should expect to be run within Angular, so it should have no need
 to call `$apply` or `$digest`.  Conversely, code that is being trigger directly as a call back to
 some external event, from the DOM or 3rd party library, should expect that it is never called from
-within AngularJS, and so any AngularJS application code that it calls should first be wrapped in a call
+within Angular, and so any Angular application code that it calls should first be wrapped in a call
 to $apply.

 ## Common Causes
@@ -84,8 +84,8 @@ function MyController($scope, thirdPartyComponent) {
 }
 ```

-We expect that our callback will be called asynchronously, and so from outside AngularJS. Therefore, we
-correctly wrap our application code that interacts with AngularJS in a call to `$apply`.
+We expect that our callback will be called asynchronously, and so from outside Angular. Therefore, we
+correctly wrap our application code that interacts with Angular in a call to `$apply`.

 The problem comes if `getData()` decides to call the callback handler synchronously; perhaps it has
 the data already cached in memory and so it immediately calls the callback to return the data,
@@ -116,7 +116,7 @@ that the code will be called in a single `$apply` block.
 ### Triggering Events Programmatically

 The other situation that often leads to this error is when you trigger code (such as a DOM event)
-programmatically (from within AngularJS), which is normally called by an external trigger.
+programmatically (from within Angular), which is normally called by an external trigger.

 For example, consider a directive that will set focus on an input control when a value in the scope
 is true:
@@ -161,7 +161,7 @@ In this second scenario, we are already inside a `$digest` when the ngFocus dire
 call to `$apply()`, causing this error to be thrown.

 It is possible to workaround this problem by moving the call to set the focus outside of the digest,
-by using `$timeout(fn, 0, false)`, where the `false` value tells AngularJS not to wrap this `fn` in an
+by using `$timeout(fn, 0, false)`, where the `false` value tells Angular not to wrap this `fn` in an
 `$apply` block:

 ```
@@ -203,7 +203,7 @@ Once you have identified this call you work your way up the stack to see what th
 called from within an `$apply`/`$digest`.  It may be a simple oversight or maybe it fits with the
 sync/async scenario described earlier.

-* If the second call was made inside an AngularJS directive then it is likely that it matches the second
+* If the second call was made inside an Angular directive then it is likely that it matches the second
 programmatic event trigger scenario described earlier.  In this case you may need to look further up
 the tree to what triggered the event in the first place.

@@ -259,11 +259,11 @@ $get.g.$apply angular.js:12742                   <--- $apply
 q angular.js:320
 ```

-We can see (even though the AngularJS code is minified) that there were two calls to `$apply`, first
+We can see (even though the Angular code is minified) that there were two calls to `$apply`, first
 on line `19833`, then on line `12738` of `angular.js`.

 It is this second call that caused the error.  If we look at the angular.js code, we can see that
-this call is made by an AngularJS directive.
+this call is made by an Angular directive.

 ```
 var ngEventDirectives = {};
@@ -308,5 +308,5 @@ We can now see that the second `$apply` was caused by us programmatically trigge
 `$timeout` as described above.

 ## Further Reading
-To learn more about AngularJS processing model please check out the
+To learn more about Angular processing model please check out the
 {@link guide/concepts concepts doc} as well as the {@link ng.$rootScope.Scope api} doc.
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				.visible-phone{display:none}.visible-desktop{display:block}.navbar{display:block}.navbar .container{padding:0 16px;width:auto}.navbar .brand{float:left;margin:8px 80px 0 8px;padding:0}.navbar .brand a{display:block;height:30px;margin:6px 0 5px 0;overflow:hidden;padding:0;width:117px}.navbar .nav{float:right}.navbar .nav .dropdown-toggle{color:rgba(255,255,255,0.87);font-size:16px;font-weight:300;line-height:56px;padding:0 24px;text-transform:uppercase;transition:all .3s}.navbar .nav .dropdown-toggle:hover,.navbar .nav .dropdown-toggle:active,.navbar .nav .dropdown-toggle:focus{background:#37474F;color:#fff}.navbar .nav .dropdown-menu{background:#37474F;border:none;border-radius:0;box-shadow:0 0 16px rgba(0,0,0,0.12),0 16px 16px rgba(0,0,0,0.24);color:#fff;left:auto;margin:0;padding:0;right:0}.navbar .nav .dropdown-menu:after,.navbar .nav .dropdown-menu:before{display:none}.navbar .nav .dropdown-menu li{border-bottom:1px solid rgba(38,50,56,0.56);box-sizing:border-box;line-height:48px}.navbar .nav .dropdown-menu li:last-child{border:none}.navbar .nav .dropdown-menu a{background:#37474F;color:#fff;font-weight:300;line-height:48px;padding:0 16px;transition:all .2s}.navbar .nav .dropdown-menu a:hover,.navbar .nav .dropdown-menu a:focus{background:#455A64}.navbar .navbar-search{left:200px;margin:0;position:absolute;right:440px;top:8px;width:auto}.navbar .navbar-search i{color:#546E7A;font-size:16px;left:12px;position:absolute;top:11px}.navbar .navbar-search .search-query{background:#37474F;border:none;border-radius:2px;box-shadow:none;box-sizing:border-box;color:#546E7A;font-size:14px;height:40px;width:100%;padding:0 16px 0 32px;text-shadow:none;transition:all .3s}.navbar .navbar-search .search-query:-webkit-autofill,.navbar .navbar-search .search-query:-webkit-autofill:hover,.navbar .navbar-search .search-query:-webkit-autofill:focus{background-color:#fff;transition:background-color 5000s ease-in-out 0s;-webkit-text-fill-color:#455A64}.navbar .navbar-search .search-query:hover,.navbar .navbar-search .search-query:active,.navbar .navbar-search .search-query:focus{background:#fff;box-shadow:inset 0 2px 4px rgba(0,0,0,0.24);color:#2196F3}.navbar .navbar-search .search-query::-webkit-input-placeholder{color:#546E7A}.navbar .navbar-search .search-query::-moz-placeholder{color:#546E7A}.navbar .navbar-search .search-query:-ms-input-placeholder{color:#546E7A}.navbar .navbar-search .search-query:-moz-placeholder{color:#546E7A}#navbar-main .navbar-inner{background:#263238;height:56px}#navbar-notice{z-index:1029;top:56px}#navbar-notice .navbar-inner{background:#ECEFF1;box-shadow:0 0 3px rgba(0,0,0,0.12),0 3px 3px rgba(0,0,0,0.24);height:auto}.site-notice{padding:4px 0;text-align:center;font-size:13px;margin:0}@media handheld and (max-width: 800px), screen and (max-device-width: 800px), screen and (max-width: 800px){.visible-phone{display:block}.visible-desktop{display:none}}@media handheld and (max-width: 800px), screen and (max-device-width: 800px), screen and (max-width: 800px){.homepage .container{padding:16px;width:auto}.homepage .span1{width:auto}.homepage .span2{width:auto}.homepage .span3{width:auto}.homepage .span4{width:auto}.homepage .span5{width:auto}.homepage .span6{width:auto}.homepage .span7{width:auto}.homepage .span8{width:auto}.homepage .span9{width:auto}.homepage .span10{width:auto}.homepage .navbar .container{padding:0 8px}.homepage #navbar-main .navbar-inner{height:40px}.homepage #navbar-main .brand{margin:6px 0 0 0}.homepage #navbar-main .brand a{margin:0}.homepage #navbar-main .nav{margin:0}.homepage #navbar-main .nav .dropdown-toggle{font-size:12px;line-height:40px;padding:0 8px}.homepage #navbar-main .dropdown-menu a{padding:0 8px}.homepage #navbar-main .navbar-search{background:#263238;border-bottom:1px solid #263238;left:0;right:0;top:100%}.homepage #navbar-main .navbar-search i{left:12px;top:7px}.homepage #navbar-main .navbar-search .search-query{border-radius:0;height:32px}.homepage #navbar-notice{top:40px}.homepage #navbar-notice .site-notice{font-size:11px}.homepage .hero{padding:80px 32px 32px 32px}.homepage .hero h2{background-size:230px 60px;height:60px;width:230px}}