revert: chore(npm): Make require()-able as part of publish script

This reverts commit c5686c5271. (We wanted to get some feedback before doin this)
docs(CHANGELOG): add changes for 1.3.9 and 1.4.0-beta.0
2015-01-13 14:29:29 -05:00 · 2015-01-13 00:58:04 +00:00 · 2015-01-12 19:09:46 -05:00 · 2015-01-12 11:47:47 -08:00 · 2015-01-12 13:38:34 +00:00 · 2015-01-09 14:29:26 -08:00
1087 changed files with 24398 additions and 98520 deletions
@@ -1,5 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# JS files must always use LF for tools to work
-*.js eol=lf
@@ -1,7 +1,6 @@
 {
  "excludeFiles": ["src/ngLocale/**"],
  "disallowKeywords": ["with"],
-  "disallowKeywordsOnNewLine": ["else"],
  "disallowMixedSpacesAndTabs": true,
  "disallowMultipleLineStrings": true,
  "disallowNewlineBeforeBlockStatements": true,
@@ -12,7 +11,6 @@
  "disallowSpacesInAnonymousFunctionExpression": {
    "beforeOpeningRoundBrace": true
  },
-  "disallowSpacesInCallExpression": true,
  "disallowSpacesInFunctionDeclaration": {
    "beforeOpeningRoundBrace": true
  },
@@ -20,11 +18,6 @@
    "beforeOpeningRoundBrace": true
  },
  "disallowSpacesInsideArrayBrackets": true,
-  "requireSpaceBeforeKeywords": [
-    "else",
-    "while",
-    "catch"
-  ],
  "disallowSpacesInsideParentheses": true,
  "disallowTrailingComma": true,
  "disallowTrailingWhitespace": true,
@@ -40,9 +33,9 @@
    "afterConsequent": true,
    "beforeAlternate": true
  },
-  "requireSpacesInForStatement": true,
  "requireSpacesInFunction": {
    "beforeOpeningCurlyBrace": true
  },
-  "validateLineBreaks": "LF"
+  "validateLineBreaks": "LF",
+  "validateParameterSeparator": ", "
 }
@@ -0,0 +1,15 @@
+// This is an incomplete TODO list of checks we want to start enforcing
+//
+// The goal is to enable these checks one by one by moving them to .jscs.json along with commits
+// that correct the existing code base issues and make the new check pass.
+
+{
+  "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+  "disallowImplicitTypeConversion": ["string"],
+  "disallowMultipleLineBreaks": true,
+  "disallowKeywordsOnNewLine": ["else"],
+  "validateJSDoc": {
+    "checkParamNames": true,
+    "requireParamTypes": true
+  }
+}
@@ -1,13 +1,6 @@
 language: node_js
-sudo: false
 node_js:
-  - '4.2'
-
-cache:
-  directories:
-    - node_modules
-    - bower_components
-    - docs/bower_components
+  - '0.10'

 branches:
  except:
@@ -15,54 +8,52 @@ branches:

 env:
  matrix:
-    - JOB=ci-checks
    - 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
+    - JOB=unit BROWSER_PROVIDER=browserstack
+    - JOB=docs-e2e BROWSER_PROVIDER=browserstack
+    - JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack
+    - JOB=e2e TEST_TARGET=jquery BROWSER_PROVIDER=browserstack
  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
+    - BROWSER_STACK_USERNAME=VojtaJina
+    - BROWSER_STACK_ACCESS_KEY=QCQJ1ZpWXpBkSwEdD8ev
    - LOGS_DIR=/tmp/angular-build/logs
    - BROWSER_PROVIDER_READY_FILE=/tmp/browsersprovider-tunnel-ready

-# 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
+matrix:
+  allow_failures:
+    - env: "JOB=unit BROWSER_PROVIDER=browserstack"

 install:
-  # Check the size of caches
-  - du -sh ./node_modules ./bower_components/ ./docs/bower_components/ || true
  # - npm config set registry http://23.251.144.68
  # Disable the spinner, it looks bad on Travis
  - npm config set spin false
  # Log HTTP requests
  - npm config set loglevel http
-  #- npm install -g npm@2.5
-  # Install npm dependencies and ensure that npm cache is not stale
-  - npm install
+  - time ./scripts/travis/npm-bundle-deps.sh
+  - time npm install

 before_script:
-  - ./scripts/travis/before_build.sh
+  - mkdir -p $LOGS_DIR
+  - ./scripts/travis/start_browser_provider.sh
+  - npm install -g grunt-cli
+  - grunt package
+  - ./scripts/travis/wait_for_browser_provider.sh

 script:
  - ./scripts/travis/build.sh

 after_script:
-  - ./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_success: change  # options: [always|never|change] default: always
    on_failure: always  # options: [always|never|change] default: always
-    on_start: always    # default: false
+    on_start: false     # default: false
@@ -1,4 +1,4 @@
-# Contributing to AngularJS
+#Contributing to AngularJS

 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:
@@ -19,7 +19,7 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 ## <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].
+discussion list or [StackOverflow][stackoverflow]. We are also available on [IRC][irc].

 ## <a name="issue"></a> Found an Issue?
 If you find a bug in the source code or a mistake in the documentation, you can help us by
@@ -54,7 +54,7 @@ For large fixes, please build and test the documentation before submitting the P
 accidentally introduced any layout or formatting issues. You should also make sure that your commit message
 is labeled "docs:" and follows the **Git Commit Guidelines** outlined below.

-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 still label it according to the commit 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.
+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 still label it according to the commit 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

@@ -71,7 +71,7 @@ chances of your issue being dealt with quickly:
 * **Angular Version(s)** - is it a regression?
 * **Browsers and Operating System** - is this a problem with all browsers or only IE8?
 * **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
-  [JSFiddle][jsfiddle]) or an unambiguous set of steps.
+  [JSFiddle][jsfiddle]) or a unambiguous set of steps.
 * **Related Issues** - has a similar issue been reported before?
 * **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)
@@ -87,7 +87,7 @@ Before you submit your pull request consider the following guidelines:
  that relates to your submission. You don't want to duplicate effort.
 * Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
  requests. We cannot accept code without this.
-* Make your changes in a new git branch:
+* Make your changes in a new git branch

     ```shell
     git checkout -b my-fix-branch master
@@ -107,7 +107,7 @@ Before you submit your pull request consider the following guidelines:
     ```
  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.

-* Build your changes locally to ensure all the tests pass:
+* Build your changes locally to ensure all the tests pass

    ```shell
    grunt test
@@ -120,22 +120,16 @@ Before you submit your pull request consider the following guidelines:
    ```

 * In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then:
+* If we suggest changes then
  * 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 the PR gets too outdated we may ask you to rebase and force push to update the PR:
+  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

    ```shell
    git rebase master -i
    git push origin my-fix-branch -f
    ```

-*WARNING. Squashing or reverting commits and forced push thereafter may remove GitHub comments
-on code that were previously made by you and others in your commits.*
-
 That's it! Thank you for your contribution!

 #### After your pull request is merged
@@ -193,8 +187,6 @@ We have very precise rules over how our git commit messages can be formatted.  T
 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 `npm 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**:
@@ -207,13 +199,8 @@ format that includes a **type**, a **scope** and a **subject**:
 <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.
+to read on github as well as in various git tools.

 ### Type
 Must be one of the following:
@@ -223,7 +210,7 @@ Must be one of the following:
 * **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
+* **refactor**: A code change that neither fixes a bug or adds a feature
 * **perf**: A code change that improves performance
 * **test**: Adding missing tests
 * **chore**: Changes to the build process or auxiliary tools and libraries such as documentation
@@ -240,15 +227,14 @@ The subject contains succinct description of the change:
 * 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".
+###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
+###Footer
 The footer should contain any information about **Breaking Changes** and is also the place to
 reference GitHub issues that this commit **Closes**.

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

@@ -276,7 +262,6 @@ You can find out more detailed information about contributing in the
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
 [dev-doc]: https://docs.angularjs.org/guide
 [github]: https://github.com/angular/angular.js
-[gitter]: https://gitter.im/angular/angular.js
 [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
@@ -17,6 +17,10 @@ module.exports = function(grunt) {
  NG_VERSION.cdn = versionInfo.cdnVersion;
  var dist = 'angular-'+ NG_VERSION.full;

+  //global beforeEach
+  util.init();
+
+
  //config
  grunt.initConfig({
    NG_VERSION: NG_VERSION,
@@ -115,7 +119,7 @@ module.exports = function(grunt) {
        files: { src: 'test/**/*.js' },
      },
      ng: {
-        files: { src: files['angularSrc'].concat('!src/angular.bind.js') },
+        files: { src: files['angularSrc'] },
      },
      ngAnimate: {
        files: { src: 'src/ngAnimate/**/*.js' },
@@ -126,9 +130,6 @@ module.exports = function(grunt) {
      ngLocale: {
        files: { src: 'src/ngLocale/**/*.js' },
      },
-      ngMessageFormat: {
-        files: { src: 'src/ngMessageFormat/**/*.js' },
-      },
      ngMessages: {
        files: { src: 'src/ngMessages/**/*.js' },
      },
@@ -156,13 +157,9 @@ module.exports = function(grunt) {
    },

    jscs: {
-      src: [
-        'src/**/*.js',
-        'test/**/*.js',
-        '!src/angular.bind.js' // we ignore this file since contains an early return statement
-      ],
+      src: ['src/**/*.js', 'test/**/*.js'],
      options: {
-        config: '.jscsrc'
+        config: ".jscs.json"
      }
    },

@@ -207,10 +204,6 @@ module.exports = function(grunt) {
        dest: 'build/angular-resource.js',
        src: util.wrap(files['angularModules']['ngResource'], 'module')
      },
-      messageformat: {
-        dest: 'build/angular-message-format.js',
-        src: util.wrap(files['angularModules']['ngMessageFormat'], 'module')
-      },
      messages: {
        dest: 'build/angular-messages.js',
        src: util.wrap(files['angularModules']['ngMessages'], 'module')
@@ -231,9 +224,9 @@ module.exports = function(grunt) {
        dest: 'build/angular-aria.js',
        src: util.wrap(files['angularModules']['ngAria'], 'module')
      },
-      'promises-aplus-adapter': {
+      "promises-aplus-adapter": {
        dest:'tmp/promises-aplus-adapter++.js',
-        src:['src/ng/q.js', 'lib/promises-aplus/promises-aplus-test-adapter.js']
+        src:['src/ng/q.js','lib/promises-aplus/promises-aplus-test-adapter.js']
      }
    },

@@ -243,7 +236,6 @@ module.exports = function(grunt) {
      animate: 'build/angular-animate.js',
      cookies: 'build/angular-cookies.js',
      loader: 'build/angular-loader.js',
-      messageformat: 'build/angular-message-format.js',
      messages: 'build/angular-messages.js',
      touch: 'build/angular-touch.js',
      resource: 'build/angular-resource.js',
@@ -253,28 +245,17 @@ module.exports = function(grunt) {
    },


-    'ddescribe-iit': {
+    "ddescribe-iit": {
      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: {
-        disallowed: [
-          'iit',
-          'xit',
-          'tthey',
-          'xthey',
-          'ddescribe',
-          'xdescribe'
-        ]
-      }
+        '!src/ngScenario/**/*.js'
+      ]
    },

-    'merge-conflict': {
+    "merge-conflict": {
      files: [
        'src/**/*',
        'test/**/*',
@@ -304,11 +285,7 @@ module.exports = function(grunt) {
    },

    shell: {
-      'npm-install': {
-        command: 'node scripts/npm/check-node-modules.js'
-      },
-
-      'promises-aplus-tests': {
+      "promises-aplus-tests": {
        options: {
          stdout: false,
          stderr: true,
@@ -334,29 +311,23 @@ module.exports = function(grunt) {
    }
  });

-  // global beforeEach task
-  if (!process.env.TRAVIS) {
-    grunt.task.run('shell:npm-install');
-  }
-
-

  //alias tasks
-  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package', 'test:unit', 'test:promises-aplus', 'tests:docs', 'test:protractor']);
+  grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', '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 unit tests with Karma', ['tests:jquery']);
-  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', ['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:modules']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests: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('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);

-  grunt.registerTask('minify', ['bower', 'clean', 'build', 'minall']);
+  grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
  grunt.registerTask('webserver', ['connect:devserver']);
-  grunt.registerTask('package', ['bower', 'validate-angular-files', 'clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
+  grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
  grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
  grunt.registerTask('default', ['package']);
 };
@@ -1,6 +1,6 @@
 The MIT License

-Copyright (c) 2010-2016 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2014 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
@@ -1,8 +1,8 @@
 Using AngularJS with the Closure Compiler
 =========================================

-The Closure Compiler project contains definitions for the AngularJS JavaScript
-in its `contrib/externs` directory.
+The Closure Compiler project contains externs definitions for AngularJS
+JavaScript 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
@@ -10,7 +10,7 @@ the browser how to do dependency injection and inversion of control.

 Oh yeah and it helps with server-side communication, taming async callbacks with promises and 
 deferreds. It also makes client-side navigation and deeplinking with hashbang urls or HTML5 pushState a
-piece of cake. Best of all?? It makes development fun!
+piece of cake. The best of all: it makes development fun!

 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
@@ -21,7 +21,7 @@ piece of cake. Best of all?? It makes development fun!

 Building AngularJS
 ---------
-[Once you have your environment set up](http://docs.angularjs.org/misc/contribute) just run:
+[Once you have your environment setup](http://docs.angularjs.org/misc/contribute) just run:

    grunt package

@@ -20,7 +20,7 @@ The following is done automatically so you don't have to worry about it:
 This process based on the idea of minimizing user pain
 [from this blog post](http://www.lostgarden.com/2008/05/improving-bug-triage-with-user-pain.html).

-1. Open the list of [non triaged issues](https://github.com/angular/angular.js/issues?q=is%3Aopen+sort%3Acreated-desc+no%3Amilestone)
+1. Open the list of [non triaged issues](https://github.com/angular/angular.js/issues?direction=desc&milestone=none&page=1&sort=created&state=open)
    * Sort by submit date, with the newest issues first
    * You don't have to do issues in order; feel free to pick and choose issues as you please.
    * You can triage older issues as well
@@ -55,11 +55,7 @@ This process based on the idea of minimizing user pain
    * inconvenience - causes ugly/boilerplate code in apps
 1. Label `component: *`
    * In rare cases, it's ok to have multiple components.
-1. Label `PRs plz!` - These issues are good targets for PRs from the open source community. In addition to applying this label, you must:
-    * Leave a comment explaining the problem and solution so someone can easily finish it.
-    * Assign the issue to yourself.
-    * Give feedback on PRs addressing this issue.
-    * You are responsible for mentoring contributors helping with this issue.
+1. Label `PRs plz!` - These issues are good targets for PRs from the open source community. Apply to issues where the problem and solution are well defined in the comments, and it's not too complex.
 1. Label `origin: google` for issues from Google
 1. Assign a milestone:
   * Backlog - triaged fixes and features, should be the default choice
@@ -14,15 +14,13 @@ var angularFiles = {

    'src/ng/anchorScroll.js',
    'src/ng/animate.js',
-    'src/ng/animateRunner.js',
-    'src/ng/animateCss.js',
+    'src/ng/asyncCallback.js',
    'src/ng/browser.js',
    'src/ng/cacheFactory.js',
    'src/ng/compile.js',
    'src/ng/controller.js',
    'src/ng/document.js',
    'src/ng/exceptionHandler.js',
-    'src/ng/forceReflow.js',
    'src/ng/http.js',
    'src/ng/httpBackend.js',
    'src/ng/interpolate.js',
@@ -34,7 +32,6 @@ var angularFiles = {
    'src/ng/q.js',
    'src/ng/raf.js',
    'src/ng/rootScope.js',
-    'src/ng/rootElement.js',
    'src/ng/sanitizeUri.js',
    'src/ng/sce.js',
    'src/ng/sniffer.js',
@@ -43,7 +40,6 @@ var angularFiles = {
    'src/ng/timeout.js',
    'src/ng/urlUtils.js',
    'src/ng/window.js',
-    'src/ng/cookieReader.js',

    'src/ng/filter.js',
    'src/ng/filter/filter.js',
@@ -69,7 +65,6 @@ var angularFiles = {
    'src/ng/directive/ngList.js',
    'src/ng/directive/ngModel.js',
    'src/ng/directive/ngNonBindable.js',
-    'src/ng/directive/ngOptions.js',
    'src/ng/directive/ngPluralize.js',
    'src/ng/directive/ngRepeat.js',
    'src/ng/directive/ngShowHide.js',
@@ -79,43 +74,21 @@ var angularFiles = {
    'src/ng/directive/script.js',
    'src/ng/directive/select.js',
    'src/ng/directive/style.js',
-    'src/ng/directive/validators.js',
-    'src/angular.bind.js',
-    'src/publishExternalApis.js',
-    'src/ngLocale/angular-locale_en-us.js'
+    'src/ng/directive/validators.js'
  ],

  'angularLoader': [
-    'src/stringify.js',
+    'stringify.js',
    'src/minErr.js',
    'src/loader.js'
  ],

  'angularModules': {
    'ngAnimate': [
-      'src/ngAnimate/shared.js',
-      'src/ngAnimate/rafScheduler.js',
-      'src/ngAnimate/animateChildrenDirective.js',
-      'src/ngAnimate/animateCss.js',
-      'src/ngAnimate/animateCssDriver.js',
-      'src/ngAnimate/animateJs.js',
-      'src/ngAnimate/animateJsDriver.js',
-      'src/ngAnimate/animateQueue.js',
-      'src/ngAnimate/animation.js',
-      'src/ngAnimate/ngAnimateSwap.js',
-      'src/ngAnimate/module.js'
+      'src/ngAnimate/animate.js'
    ],
    'ngCookies': [
-      'src/ngCookies/cookies.js',
-      'src/ngCookies/cookieStore.js',
-      'src/ngCookies/cookieWriter.js'
-    ],
-    'ngMessageFormat': [
-      'src/ngMessageFormat/messageFormatCommon.js',
-      'src/ngMessageFormat/messageFormatSelector.js',
-      'src/ngMessageFormat/messageFormatInterpolationParts.js',
-      'src/ngMessageFormat/messageFormatParser.js',
-      'src/ngMessageFormat/messageFormatService.js'
+      'src/ngCookies/cookies.js'
    ],
    'ngMessages': [
      'src/ngMessages/messages.js'
@@ -185,16 +158,16 @@ var angularFiles = {
    'bower_components/jquery/dist/jquery.js',
    'test/jquery_remove.js',
    '@angularSrc',
+    'src/publishExternalApis.js',
    '@angularSrcModules',
    '@angularScenario',
-    '@angularTest'
+    '@angularTest',
  ],

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

  'karmaScenario': [
@@ -207,7 +180,6 @@ var angularFiles = {
    '@angularSrcModules',
    'src/ngScenario/browserTrigger.js',
    'test/helpers/*.js',
-    'test/ngMessageFormat/*.js',
    'test/ngMock/*.js',
    'test/ngCookies/*.js',
    'test/ngRoute/**/*.js',
@@ -221,22 +193,21 @@ var angularFiles = {
    'bower_components/jquery/dist/jquery.js',
    'test/jquery_alias.js',
    '@angularSrc',
+    'src/publishExternalApis.js',
    '@angularSrcModules',
    '@angularScenario',
-    '@angularTest'
+    '@angularTest',
  ],

  'karmaJqueryExclude': [
    'src/angular-bootstrap.js',
    'src/ngScenario/angular-bootstrap.js',
-    'test/jquery_remove.js',
-    'src/angular.bind.js'
+    'test/jquery_remove.js'
  ]
 };

 angularFiles['angularSrcModules'] = [].concat(
  angularFiles['angularModules']['ngAnimate'],
-  angularFiles['angularModules']['ngMessageFormat'],
  angularFiles['angularModules']['ngMessages'],
  angularFiles['angularModules']['ngCookies'],
  angularFiles['angularModules']['ngResource'],
@@ -8,20 +8,17 @@
      Large table rendered with AngularJS
      </p>

-      <div><label><input type="radio" ng-model="benchmarkType" value="none">none: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="baselineBinding">baseline binding: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="baselineInterpolation">baseline interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBind">ngBind: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindOnce">ngBindOnce: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolation">interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation">interpolation + bind-once: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationAttr">attribute interpolation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindFn">ngBind + fnInvocation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationFn">interpolation + fnInvocation: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngBindFilter">ngBind + filter: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="interpolationFilter">interpolation + filter: </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngModelConstName">ngModel (const name): </label></div>
-      <div><label><input type="radio" ng-model="benchmarkType" value="ngModelInterpName">ngModel (interp name): </label></div>
+      <div>none: <input type="radio" ng-model="benchmarkType" value="none"></div>
+      <div>baseline binding: <input type="radio" ng-model="benchmarkType" value="baselineBinding"></div>
+      <div>baseline interpolation: <input type="radio" ng-model="benchmarkType" value="baselineInterpolation"></div>
+      <div>ngBind: <input type="radio" ng-model="benchmarkType" value="ngBind"></div>
+      <div>ngBindOnce: <input type="radio" ng-model="benchmarkType" value="ngBindOnce"></div>
+      <div>interpolation: <input type="radio" ng-model="benchmarkType" value="interpolation"></div>
+      <div>attribute interpolation: <input type="radio" ng-model="benchmarkType" value="interpolationAttr"></div>
+      <div>ngBind + fnInvocation: <input type="radio" ng-model="benchmarkType" value="ngBindFn"></div>
+      <div>interpolation + fnInvocation: <input type="radio" ng-model="benchmarkType" value="interpolationFn"></div>
+      <div>ngBind + filter: <input type="radio" ng-model="benchmarkType" value="ngBindFilter"></div>
+      <div>interpolation + filter: <input type="radio" ng-model="benchmarkType" value="interpolationFilter"></div>

      <ng-switch on="benchmarkType">
        <baseline-binding-table ng-switch-when="baselineBinding">
@@ -38,7 +35,7 @@
        </div>
        <div ng-switch-when="ngBindOnce">
          <h2>baseline binding once</h2>
-          <div ng-repeat="row in ::data">
+          <div ng-repeat="row in data">
            <span ng-repeat="column in ::row">
              <span ng-bind="::column.i"></span>:<span ng-bind="::column.j"></span>|
            </span>
@@ -50,12 +47,6 @@
            <span ng-repeat="column in row">{{column.i}}:{{column.j}}|</span>
          </div>
        </div>
-        <div ng-switch-when="bindOnceInterpolation">
-          <h2>baseline one-time interpolation</h2>
-          <div ng-repeat="row in ::data">
-            <span ng-repeat="column in ::row">{{::column.i}}:{{::column.j}}|</span>
-          </div>
-        </div>
        <div ng-switch-when="interpolationAttr">
          <h2>attribute interpolation</h2>
          <div ng-repeat="row in data">
@@ -86,20 +77,6 @@
            <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
          </div>
        </div>
-        <div ng-switch-when="ngModelConstName">
-          <h2>ngModel (const name)</h2>
-          <div ng-repeat="row in data">
-            <input type="text" ng-model="row.i" name="constName" />
-            <input type="text" ng-model="row.j" />
-          </div>
-        </div>
-        <div ng-switch-when="ngModelInterpName">
-          <h2>ngModel (interp name)</h2>
-          <div ng-repeat="(rowIdx, row) in data">
-            <input type="text" ng-model="row.i" name="input-{{rowIdx}}" />
-            <input type="text" ng-model="row.j" name="input2-{{rowIdx}}" />
-          </div>
-        </div>
      </ng-switch>
    </div>
  </div>
@@ -1,95 +0,0 @@
-"use strict";
-
-/* globals angular, benchmarkSteps */
-
-var app = angular.module('ngOptionsBenchmark', []);
-
-app.config(function($compileProvider) {
-  if ($compileProvider.debugInfoEnabled) {
-    $compileProvider.debugInfoEnabled(false);
-  }
-});
-
-
-
-app.controller('DataController', function($scope, $element) {
-  $scope.items = [];
-  $scope.count = 10000;
-
-  function changeOptions() {
-    $scope.items = [];
-    for (var i = 0; i < $scope.count; ++i) {
-      $scope.items.push({
-        id: i,
-        label: 'item-' + i,
-        group: 'group-' + i % 100
-      });
-    }
-  }
-
-  var selectElement = $element.find('select');
-  console.log(selectElement);
-
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-1',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[1000];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-2',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[10];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'remove-options',
-    fn: function() {
-      $scope.count = 100;
-      changeOptions();
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-1',
-    fn: function() {
-      selectElement.val('2000');
-      selectElement.triggerHandler('change');
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-2',
-    fn: function() {
-      selectElement.val('1000');
-      selectElement.triggerHandler('change');
-    }
-  });
-});
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};
@@ -1,10 +0,0 @@
-<div ng-app="ngOptionsBenchmark" ng-cloak>
-  <div ng-controller="DataController">
-    <div class="container-fluid">
-      <p>
-        Tests the execution of ng-options for rendering during model and option updates.
-      </p>
-      <select ng-model="x" ng-options="a as a.label group by a.group for a in items track by a.id"></select>
-    </div>
-  </div>
-</div>
@@ -1,6 +1,5 @@
 {
  "name": "AngularJS",
-  "license": "MIT",
  "devDependencies": {
    "jquery": "2.1.1",
    "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
@@ -44,7 +44,7 @@ var noArgs = function (fn) {

 var identity = function (i) { return i; };

-// like Q.all, but runs the commands in series
+// like Q.all, but runs the comands in series
 // useful for ensuring env state (like which branch is checked out)
 var allInSeries = function (fn) {
  return function (args) {
@@ -103,10 +103,10 @@ then(function (tags) {
    sort(semver.rcompare);
 }).
 then(function (tags) {
-  var major = tags[0].split('.')[0];
+  var major = tags[0].split('.')[0] + '.x';
  return tags.
    filter(function (ver) {
-      return semver(ver).major == major;
+      return semver.satisfies(ver, major);
    });
 }).
 then(function (tags) {
@@ -9,11 +9,3 @@
 ng\:form {
  display: block;
 }
-
-.ng-animate-shim {
-  visibility:hidden;
-}
-
-.ng-anchor {
-  position:absolute;
-}
@@ -56,7 +56,7 @@ li.doc-example-live {
 }

 div.syntaxhighlighter {
-  padding-bottom: 1px !important; /* fix to remove unnecessary scrollbars */
+  padding-bottom: 1px !important; /* fix to remove unnecessary scrollbars http://is.gd/gSMgC */
 }

 /* TABS - tutorial environment navigation */
@@ -124,7 +124,7 @@ h1,h2,h3,h4,h5,h6 {
  font-size:1.2em;
  padding:0;
  margin:0;
-  border-bottom:1px solid #aaa;
+  border-bottom:1px soild #aaa;
  margin-bottom:5px;
 }

@@ -315,13 +315,8 @@ iframe.example {
  color:white;
 }

-.search-results-group .search-results {
-  padding: 0 5px 0;
-  list-style-type: none;
-}
-
 .search-results-frame > .search-results-group:first-child > .search-results {
-  border-right:1px solid #222;
+  border-right:1px solid #050505;
 }

 .search-results-group.col-group-api { width:30%; }
@@ -330,57 +325,10 @@ iframe.example {
 .search-results-group.col-group-misc,
 .search-results-group.col-group-error { width:15%; float: right; }

-@supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-  .search-results-group.col-group-api .search-results {
-    -moz-column-count: 2;
-    -ms-column-count: 2;
-    -webkit-column-count: 2;
-    column-count: 2;
-    /* Prevent bullets in the second column from being hidden in Chrome and IE */
-    -webkit-column-gap: 2em;
-    -ms-column-gap: 2em;
-    column-gap: 2em;
-  }
-}
-
-.search-results-group .search-result {
-  word-wrap: break-word;
-  -webkit-hyphens: auto;
-  -moz-hyphens: auto;
-  -ms-hyphens: auto;
-  hyphens: auto;
-  -ms-column-break-inside: avoid;
-  -webkit-column-break-inside: avoid;
-  -moz-column-break-inside: avoid; /* Unsupported */
-  column-break-inside: avoid;
-  text-indent: -0.65em;  /* Make sure line wrapped words are aligned vertically */
-}
-
-@supports (-moz-column-count: 2) {
-  .search-results-group .search-result {
-    /* Prevents column breaks inside words in FF, but has adverse effects in IE11 and Chrome */
-    overflow: hidden;
-    padding-left: 1em; /* In FF the list item bullet is otherwise  hidden */
-    margin-left: -1em; /* offset the padding left */
-  }
-}
-
-.search-result:before {
-  content: "\002D\00A0"; /* Dash and non-breaking space as List item type */
-  position: relative;
-}

 .search-results-group.col-group-api .search-result {
  width:48%;
  display:inline-block;
-  padding-left: 12px;
-}
-
-@supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-  .search-results-group.col-group-api .search-result {
-    width:auto;
-    display: list-item;
-  }
 }

 .search-close {
@@ -598,10 +546,10 @@ h4 {
  margin-left:10px;
 }

-.btn:hover, .btn:focus {
-  color: black!important;
+.btn:hover {
+  color:black!important;
  border: 1px solid #ddd!important;
-  background: white!important;
+  background:white!important;
 }

 .view-source, .improve-docs {
@@ -635,18 +583,6 @@ ul.events > li {
  margin-bottom:40px;
 }

-.definition-table td {
-  padding: 8px;
-  border: 1px solid #eee;
-  vertical-align: top;
-}
-
-.table > tbody > tr.head > td,
-.table > tbody > tr.head > th {
-  border-bottom: 2px solid #ddd;
-  padding-top: 50px;
-}
-
@media only screen and (min-width: 769px) and (max-width: 991px) {
  .main-body-grid {
    margin-top: 160px;
@@ -695,7 +631,6 @@ ul.events > li {
  }
  .main-body-grid .side-navigation {
    display:block!important;
-    padding-bottom:50px;
  }
  .main-body-grid .side-navigation.ng-hide {
    display:none!important;
@@ -721,14 +656,14 @@ ul.events > li {
  }
  .toc-close {
    position: absolute;
-    bottom: 5px;
+    bottom: -50px;
    left: 50%;
    margin-left: -50%;
    text-align: center;
    padding: 5px;
    background: #eee;
    border-radius: 5px;
-    width: 100%;
+    width: 90%;
    border:1px solid #ddd;
    box-shadow:0 0 10px #bbb;
  }
@@ -740,11 +675,6 @@ ul.events > li {
    padding-bottom:60px;
    text-align:left;
  }
-
-  .search-results-frame > .search-results-group:first-child > .search-results {
-    border-right: none;
-  }
-
  .search-results-group {
    float:none!important;
    display:block!important;
@@ -752,47 +682,15 @@ ul.events > li {
    border:0!important;
    padding:0!important;
  }
-
-  @supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-    .search-results-group .search-results {
-      -moz-column-count: 2;
-      -ms-column-count: 2;
-      -webkit-column-count: 2;
-      column-count: 2;
-    }
-  }
-
  .search-results-group .search-result {
    display:inline-block!important;
    padding:0 5px;
    width:auto!important;
-    text-indent: initial;
-    margin-left: 0;
  }
-
  .search-results-group .search-result:after {
    content:", ";
  }
-
-  .search-results-group .search-result:before {
-    content: "";
-  }
-
-  @supports ((column-count: 2) or (-moz-column-count: 2) or (-ms-column-count: 2) or (-webkit-column-count: 2)) {
-    .search-results-group .search-result {
-      display: list-item !important;
-    }
-
-    .search-results-group .search-result:after {
-      content: "";
-    }
-  }
-
  #wrapper {
    padding-bottom:0px;
  }
 }
-
-iframe[name="example-anchoringExample"] {
-  height:400px;
-}
@@ -3,7 +3,7 @@
 /* global importScripts, onmessage: true, postMessage, lunr */

 // Load up the lunr library
-importScripts('../components/lunr.js-0.5.12/lunr.min.js');
+importScripts('../components/lunr.js-0.4.2/lunr.min.js');

 // Create the lunr index - the docs should be an array of object, each object containing
 // the path and search terms for a page
@@ -1,16 +1,13 @@
 angular.module('examples', [])

 .factory('formPostData', ['$document', function($document) {
-  return function(url, newWindow, fields) {
+  return function(url, fields) {
    /**
-     * If the form posts to target="_blank", pop-up blockers can cause it not to work.
-     * If a user choses to bypass pop-up blocker one time and click the link, they will arrive at
-     * a new default plnkr, not a plnkr with the desired template.  Given this undesired behavior,
-     * some may still want to open the plnk in a new window by opting-in via ctrl+click.  The
-     * newWindow param allows for this possibility.
+     * Form previously posted to target="_blank", but pop-up blockers were causing this to not work.
+     * If a user chose to bypass pop-up blocker one time and click the link, they would arrive at
+     * a new default plnkr, not a plnkr with the desired template.
     */
-    var target = newWindow ? '_blank' : '_self';
-    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="' + target + '"></form>');
+    var form = angular.element('<form style="display: none;" method="post" action="' + url + '"></form>');
    angular.forEach(fields, function(value, name) {
      var input = angular.element('<input type="hidden" name="' +  name + '">');
      input.attr('value', value);
@@ -24,29 +21,9 @@ angular.module('examples', [])


 .factory('openPlunkr', ['formPostData', '$http', '$q', function(formPostData, $http, $q) {
-
-    var COPYRIGHT = 'Copyright ' + (new Date()).getFullYear() + ' Google Inc. All Rights Reserved.\n'
-     + 'Use of this source code is governed by an MIT-style license that\n'
-     + 'can be found in the LICENSE file at http://angular.io/license';
-    var COPYRIGHT_JS_CSS = '\n\n/*\n' + COPYRIGHT + '\n*/';
-    var COPYRIGHT_HTML = '\n\n<!-- \n' + COPYRIGHT + '\n-->';
-    function getCopyright(filename) {
-      switch (filename.substr(filename.lastIndexOf('.'))) {
-        case '.html':
-          return COPYRIGHT_HTML;
-        case '.js':
-        case '.css':
-          return COPYRIGHT_JS_CSS;
-        case '.md':
-          return COPYRIGHT;
-      }
-      return '';
-    }
-
-    return function(exampleFolder, clickEvent) {
+  return function(exampleFolder) {

    var exampleName = 'AngularJS Example';
-    var newWindow = clickEvent.ctrlKey || clickEvent.metaKey;

    // Load the manifest for the example
    $http.get(exampleFolder + '/manifest.json')
@@ -86,7 +63,7 @@ angular.module('examples', [])
        var postData = {};

        angular.forEach(files, function(file) {
-          postData['files[' + file.name + ']'] = file.content + getCopyright(file.name);
+          postData['files[' + file.name + ']'] = file.content;
        });

        postData['tags[0]'] = "angularjs";
@@ -94,7 +71,7 @@ angular.module('examples', [])
        postData.private = true;
        postData.description = exampleName;

-        formPostData('http://plnkr.co/edit/?p=preview', newWindow, postData);
+        formPostData('http://plnkr.co/edit/?p=preview', postData);
      });
  };
 }]);
@@ -11,15 +11,7 @@ angular.module('search', [])
    var MIN_SEARCH_LENGTH = 2;
    if(q.length >= MIN_SEARCH_LENGTH) {
      docsSearch(q).then(function(hits) {
-        // Make sure the areas are always in the same order
-        var results = {
-          api: [],
-          guide: [],
-          tutorial: [],
-          error: [],
-          misc: []
-        };
-
+        var results = {};
        angular.forEach(hits, function(hit) {
          var area = hit.area;

@@ -35,7 +35,7 @@ angular.module('tutorials', [])
      'step': '@docTutorialReset'
    },
    template:
-      '<p><button class="btn" ng-click="show=!show">Workspace Reset Instructions  ➤</button></p>\n' +
+      '<p><a href="" ng-click="show=!show;$event.stopPropagation()">Workspace Reset Instructions  ➤</a></p>\n' +
      '<div class="alert alert-info" ng-show="show">\n' +
      '  <p>Reset the workspace to step {{step}}.</p>' +
      '  <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
@@ -43,7 +43,7 @@ angular.module('tutorials', [])
          '<a href="http://angular.github.io/angular-phonecat/step-{{step}}/app">Step {{step}} Live Demo</a>.</p>\n' +
      '</div>\n' +
      '<p>The most important changes are listed below. You can see the full diff on ' +
-        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}" title="See diff on Github">GitHub</a>\n' +
+        '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
      '</p>'
  };
 });
@@ -21,13 +21,11 @@ angular.module('versions', [])
  };

  $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path().replace(/\/$/, ''),
-        url = '';
-    if (version.isOldDocsUrl) {
-      url = version.docsUrl;
-    }else{
-      url = version.docsUrl + currentPagePath;
-    }
-    $window.location = url;
+    var currentPagePath = $location.path().replace(/\/$/, '');
+
+    // TODO: We need to do some munging of the path for different versions of the API...
+
+
+    $window.location = version.docsUrl + currentPagePath;
  };
 }]);
@@ -2,7 +2,7 @@
  "name": "AngularJS-docs-app",
  "dependencies": {
    "jquery": "2.1.1",
-    "lunr.js": "0.5.12",
+    "lunr.js": "0.4.3",
    "open-sans-fontface": "1.0.4",
    "google-code-prettify": "1.0.1",
    "bootstrap": "3.1.1"
@@ -6,18 +6,18 @@ var packagePath = __dirname;
 var Package = require('dgeni').Package;

 // Create and export a new Dgeni package called angularjs. This package depends upon
-// the ngdoc, nunjucks, and examples packages defined in the dgeni-packages npm module.
+// the ngdoc,nunjucks and examples packages defined in the dgeni-packages npm module.
 module.exports = new Package('angularjs', [
  require('dgeni-packages/ngdoc'),
  require('dgeni-packages/nunjucks'),
-  require('dgeni-packages/examples'),
-  require('dgeni-packages/git')
+  require('dgeni-packages/examples')
 ])


 .factory(require('./services/errorNamespaceMap'))
 .factory(require('./services/getMinerrInfo'))
 .factory(require('./services/getVersion'))
+.factory(require('./services/gitData'))

 .factory(require('./services/deployments/debug'))
 .factory(require('./services/deployments/default'))
@@ -26,6 +26,7 @@ module.exports = new Package('angularjs', [

 .factory(require('./inline-tag-defs/type'))

+
 .processor(require('./processors/error-docs'))
 .processor(require('./processors/index-page'))
 .processor(require('./processors/keywords'))
@@ -42,7 +43,7 @@ module.exports = new Package('angularjs', [

  readFilesProcessor.basePath = path.resolve(__dirname,'../..');
  readFilesProcessor.sourceFiles = [
-    { include: 'src/**/*.js', exclude: 'src/angular.bind.js', basePath: 'src' },
+    { include: 'src/**/*.js', basePath: 'src' },
    { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' }
  ];

@@ -124,16 +125,10 @@ module.exports = new Package('angularjs', [
  });

  computeIdsProcessor.idTemplates.push({
-    docTypes: ['error'],
-    getId: function(doc) { return 'error:' + doc.namespace + ':' + doc.name; },
-    getAliases: function(doc) { return [doc.name, doc.namespace + ':' + doc.name, doc.id]; }
-  },
-  {
-    docTypes: ['errorNamespace'],
+    docTypes: ['error', 'errorNamespace'],
    getId: function(doc) { return 'error:' + doc.name; },
    getAliases: function(doc) { return [doc.id]; }
-  }
-  );
+  });
 })

 .config(function(checkAnchorLinksProcessor) {
@@ -170,8 +165,4 @@ module.exports = new Package('angularjs', [
    jqueryDeployment,
    productionDeployment
  ];
-})
-
-.config(function(generateKeywordsProcessor) {
-  generateKeywordsProcessor.docTypesToIgnore = ['componentGroup'];
 });
@@ -16,11 +16,9 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
    ignoreWordsFile: undefined,
    areasToSearch: ['api', 'guide', 'misc', 'error', 'tutorial'],
    propertiesToIgnore: [],
-    docTypesToIgnore: [],
    $validate: {
      ignoreWordsFile: { },
      areasToSearch: { presence: true },
-      docTypesToIgnore: { },
      propertiesToIgnore: {  }
    },
    $runAfter: ['memberDocsProcessor'],
@@ -30,7 +28,6 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
      // Keywords to ignore
      var wordsToIgnore = [];
      var propertiesToIgnore;
-      var docTypesToIgnore;
      var areasToSearch;

      // Keywords start with "ng:" or one of $, _ or a letter
@@ -50,8 +47,6 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
      areasToSearch = _.indexBy(this.areasToSearch);
      propertiesToIgnore = _.indexBy(this.propertiesToIgnore);
      log.debug('Properties to ignore', propertiesToIgnore);
-      docTypesToIgnore = _.indexBy(this.docTypesToIgnore);
-      log.debug('Doc types to ignore', docTypesToIgnore);

      var ignoreWordsMap = _.indexBy(wordsToIgnore);

@@ -83,36 +78,34 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {

      // We are only interested in docs that live in the right area
      docs = _.filter(docs, function(doc) { return areasToSearch[doc.area]; });
-      docs = _.filter(docs, function(doc) { return !docTypesToIgnore[doc.docType]; });

      _.forEach(docs, function(doc) {

+      var words = [];
+      var keywordMap = _.clone(ignoreWordsMap);
+      var members = [];
+      var membersMap = {};

-        var words = [];
-        var keywordMap = _.clone(ignoreWordsMap);
-        var members = [];
-        var membersMap = {};
+      // Search each top level property of the document for search terms
+      _.forEach(doc, function(value, key) {

-        // Search each top level property of the document for search terms
-        _.forEach(doc, function(value, key) {
+        if ( _.isString(value) && !propertiesToIgnore[key] ) {
+          extractWords(value, words, keywordMap);
+        }

-          if ( _.isString(value) && !propertiesToIgnore[key] ) {
-            extractWords(value, words, keywordMap);
-          }
-
-          if ( key === 'methods' || key === 'properties' || key === 'events' ) {
-            _.forEach(value, function(member) {
-              extractWords(member.name, members, membersMap);
-            });
-          }
-        });
+        if ( key === 'methods' || key === 'properties' || key === 'events' ) {
+          _.forEach(value, function(member) {
+            extractWords(member.name, members, membersMap);
+          });
+        }
+      });


-        doc.searchTerms = {
-          titleWords: extractTitleWords(doc.name),
-          keywords: _.sortBy(words).join(' '),
-          members: _.sortBy(members).join(' ')
-        };
+      doc.searchTerms = {
+        titleWords: extractTitleWords(doc.name),
+        keywords: _.sortBy(words).join(' '),
+        members: _.sortBy(members).join(' ')
+      };

      });

@@ -0,0 +1,16 @@
+"use strict";
+
+var versionInfo = require('../../../lib/versions/version-info');
+
+/**
+ * @dgService gitData
+ * @description
+ * Information from the local git repository
+ */
+module.exports = function gitData() {
+  return {
+    version: versionInfo.currentVersion,
+    versions: versionInfo.previousVersions,
+    info: versionInfo.gitRepoInfo
+  };
+};
@@ -1,7 +1,7 @@
 {% extends "base.template.html" %}

 {% block content %}
-<h1>Error: {$ doc.namespace $}:{$ doc.name $}
+<h1>Error: {$ doc.id $}
  <div><span class='hint'>{$ doc.fullName $}</span></div>
 </h1>

@@ -3,7 +3,7 @@
 <head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="Description"
        content="AngularJS is what HTML would have been, had it been designed for building web-apps.
                 Declarative templates with data-binding, MVC, dependency injection and great
@@ -76,7 +76,7 @@
          <div class="row">
            <div class="col-md-9 header-branding">
              <a class="brand navbar-brand" href="http://angularjs.org">
-                <img width="117" height="30" class="logo" alt="Link to Angular JS Homepage" ng-src="img/angularjs-for-header-only.svg">
+                <img width="117" height="30" class="logo" ng-src="img/angularjs-for-header-only.svg">
              </a>
              <ul class="nav navbar-nav">
                <li class="divider-vertical"></li>
@@ -90,7 +90,7 @@
                    <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="http://builtwith.angularjs.org/">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>
@@ -147,13 +147,13 @@
        <div class="search-results-container" ng-show="hasResults">
          <div class="container">
            <div class="search-results-frame">
-              <div ng-repeat="(key, value) in results track by key" class="search-results-group" ng-class="colClassName + ' col-group-' + key" ng-show="value.length > 0">
+              <div ng-repeat="(key, value) in results" class="search-results-group" ng-class="colClassName + ' col-group-' + key">
                <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 class="search-results">
+                  <div ng-repeat="item in value" class="search-result">
+                    - <a ng-click="hideResults()" ng-href="{{ item.path }}">{{ item.name }}</a>
+                  </div>
+                </div>
              </div>
            </div>
            <a href="" ng-click="hideResults()" class="search-close">
@@ -220,10 +220,10 @@
        <p class="pull-right"><a back-to-top>Back to top</a></p>

        <p>
-          Super-powered by Google  ©2010-2016
+          Super-powered by Google  ©2010-2014
          ( <a id="version"
               ng-href="https://github.com/angular/angular.js/blob/master/CHANGELOG.md#{{versionNumber}}"
-               ng-bind-template="v{{version}}" title="Changelog of this version of Angular JS">
+               ng-bind-template="v{{version}}">
            </a>
          )
        </p>
@@ -1,60 +0,0 @@
-{% macro typeList(types) -%}
-{% for typeName in types %}<a href="" class="{$ typeName | typeClass $}">{$ typeName | escape $}</a>{% endfor %}
-{%- endmacro -%}
-
-{%- macro paramTable(params) %}
-<table class="variables-matrix input-arguments">
-  <thead>
-    <tr>
-      <th>Param</th>
-      <th>Type</th>
-      <th>Details</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for param in params %}
-    <tr>
-      <td>
-        {$ param.name $}
-        {% if param.alias %}| {$ param.alias $}{% endif %}
-        {% if param.optional %}<div><em>(optional)</em></div>{% endif %}
-      </td>
-      <td>
-        {$ typeList(param.typeList) $}
-      </td>
-      <td>
-        {$ param.description | marked $}
-        {% if param.defaultValue %}<p><em>(default: {$ param.defaultValue $})</em></p>{% endif %}
-      </td>
-    </tr>
-    {% endfor %}
-  </tbody>
-</table>
-{% endmacro -%}
-
-
-{%- macro directiveParam(name, type, join, sep) %}
-  {%- if type.optional %}[{% endif -%}
-  {$ name | dashCase $}{$ join $}{$ type.name $}{$ sep $}
-  {%- if type.optional %}]{% endif -%}
-{% endmacro -%}
-
-{%- macro functionSyntax(fn) %}
-  {%- set sep = joiner(', ') -%}
-  {% marked -%}
-    `{$ fn.name $}({%- for param in fn.params %}{$ sep() $}
-    {%- if param.type.optional %}[{% endif -%}
-    {$ param.name $}
-    {%- if param.type.optional %}]{% endif -%}
-    {% endfor %});`
-  {%- endmarked %}
-{% endmacro -%}
-
-{%- macro typeInfo(fn) -%}
-<table class="variables-matrix return-arguments">
-  <tr>
-    <td>{$ typeList(fn.typeList) $}</td>
-    <td>{$ fn.description | marked $}</td>
-  </tr>
-</table>
-{%- endmacro -%}
@@ -1,8 +1,8 @@
-{# Be aware that we need these extra new lines here or marked will not realize that the <div>
+{# Be aware that we need these extra new lines here or marked will not realise that the <div>
   is HTML and wrap each line in a <p> - thus breaking the HTML #}

 <div>
-  <a ng-click="openPlunkr('{$ doc.path $}', $event)" class="btn pull-right">
+  <a ng-click="openPlunkr('{$ doc.path $}')" class="btn pull-right">
    <i class="glyphicon glyphicon-edit">&nbsp;</i>
    Edit in Plunker</a>

@@ -24,5 +24,5 @@
  </div>
 </div>

-{# Be aware that we need these extra new lines here or marked will not realize that the <div>
+{# Be aware that we need these extra new lines here or marked will not realise that the <div>
   above is HTML and wrap each line in a <p> - thus breaking the HTML #}
@@ -140,7 +140,7 @@ or JavaScript callbacks.
      {@link ngAnimate#service Services / Factories}
    </td>
    <td>
-      Use {@link ng.$animate $animate} to trigger animation operations within your directive code.
+      Use {@link ngAnimate.$animate $animate} to trigger animation operations within your directive code.
    </td>
  </tr>
  <tr>
@@ -1,12 +0,0 @@
-@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 $compile:baddir
-@fullName Invalid Directive Name
-@description
-
-This error occurs when the name of a directive is not valid.
-
-Directives must start with a lowercase character and must not contain leading or trailing whitespaces.
@@ -8,7 +8,7 @@ but the required directive controller is not present on the current DOM element

 To resolve this error ensure that there is no typo in the required controller name and that the required directive controller is present on the current element.

-If the required controller is expected to be on an ancestor element, make sure that you prefix the controller name in the `require` definition with `^`.
+If the required controller is expected to be on a ancestor element, make sure that you prefix the controller name in the `require` definition with `^`.

 If the required controller is optionally requested, use `?` or `^?` to specify that.

@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:noctrl
-@fullName Controller is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller. A controller may be specified by adding a "controller"
-property to the directive definition object. Its value should be either a
-string, or an invokable object (a function, or an array whose last element is a
-function).
-
-For more information, see the {@link guide/directive directives guide}.
@@ -1,71 +0,0 @@
-@ngdoc error
-@name $compile:noident
-@fullName Controller identifier is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller identifier, which is initialized in scope with the value of
-the controller instance. This can be supplied using the "controllerAs" property
-of the directive object, or alternatively by adding " as IDENTIFIER" to the controller
-name.
-
-For example, the following directives are valid:
-
-```js
-// OKAY, because controller is a string with an identifier component.
-directive("okay", function() {
-  return {
-    bindToController: true,
-    controller: "myCtrl as $ctrl"
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// OKAY, because the directive uses the controllerAs property to override
-// the controller identifier.
-directive("okay2", function() {
-  return {
-    bindToController: true,
-    controllerAs: "$ctrl",
-    controller: function() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```
-
-While the following are invalid:
-
-```js
-// BAD, because the controller property is a string with no identifier.
-directive("bad", function() {
-  return {
-    bindToController: true,
-    controller: "noIdentCtrl",
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// BAD because the controller is not a string (therefore has no identifier),
-// and there is no controllerAs property.
-directive("bad2", function() {
-  return {
-    bindToController: true,
-    controller: function noControllerAs() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```
@@ -36,25 +36,9 @@ Following are invalid uses of this directive:
 ```


-To resolve this error, do one of the following options:
-
- use path expressions with scope properties that are two-way data-bound like so:
-
+To resolve this error, always use path expressions with scope properties that are two-way data-bound:
 ```
 <my-directive bind="some.property">
 <my-directive bind="some[3]['property']">
 ```

- Make the binding optional
-
-```
-myModule.directive('myDirective', function factory() {
-  return {
-    ...
-    scope: {
-      localValue: '=?bind' // <-- the '?' makes it optional
-    }
-    ...
-  }
-});
-```
@@ -1,46 +0,0 @@
-@ngdoc error
-@name $controller:ctrlfmt
-@fullName Badly formed controller string
-@description
-
-This error occurs when {@link ng.$controller $controller} service is called
-with a string that does not match the supported controller string formats.
-
-Supported formats:
-
-1. `__name__`
-2. `__name__ as __identifier__`
-
-Neither `__name__` or `__identifier__` may contain spaces.
-
-Example of incorrect usage that leads to this error:
-```html
-<!-- unclosed ng-controller attribute messes up the format -->
-<div ng-controller="myController>
-```
-
-or
-
-```js
-// does not match `__name__` or `__name__ as __identifier__`
-var myCtrl = $controller("mY contRoller", { $scope: newScope });
-```
-
-or
-
-```js
-directive("myDirective", function() {
-  return {
-    // does not match `__name__` or `__name__ as __identifier__`
-    controller: "mY contRoller",
-    link: function() {}
-  };
-});
-```
-
-To fix the examples above, ensure that the controller string matches the supported
-formats, and that any html attributes which are used as controller expressions are
-closed.
-
-
-Please consult the {@link ng.$controller $controller} service api docs to learn more.
@@ -1,45 +0,0 @@
-@ngdoc error
-@name $http:legacy
-@fullName The `success` and `error` methods on the promise returned from `$http` have been disabled.
-@description
-
-This error occurs when the legacy promise extensions (`success` and `error`)
-{@link $httpProvider#useLegacyPromiseExtensions legacy `$http` promise extensions} have been disabled.
-
-To resolve this error, either turn on the legacy extensions by adding
-`$httpProvider.useLegacyPromiseExtensions(true);` to your application's configuration; or refactor you
-use of `$http` to use `.then()` rather than `.success()` and `.error()`.
-
-For example if you code looked like this:
-
-```js
-// Simple GET request example :
-$http.get('/someUrl').
-   success(function(data, status, headers, config) {
-      // This callback will be called asynchronously
-      // when the response is available
-  }).
-  error(function(data, status, headers, config) {
-    // called asynchronously if an error occurs
-    // or server returns response with an error status.
-  });
-```
-
-then you would change it to look like:
-
-```js
-// Simple GET request example :
-$http.get('/someUrl').
-  then(function(response) {
-    // (The response object contains the data, status, headers and config properties)
-    // This callback will be called asynchronously
-    // when the response is available.
-  }, function(response) {
-    // called asynchronously if an error occurs
-    // or server returns response with an error status.
-  });
-```
-
-For more information, see the
-{@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`}
-documentation.
@@ -6,9 +6,6 @@
 This error occurs when a module fails to load due to some exception. The error
 message above should provide additional context.

-A common reason why the module fails to load is that you've forgotten to
-include the file with the defined module or that the file couldn't be loaded.
-
 ### Using `ngRoute`

 In AngularJS `1.2.0` and later, `ngRoute` has been moved to its own module.
@@ -27,4 +24,4 @@ angular.module('ng').filter('tel', function (){});

 Instead create your own module and add it as a dependency to your application's top-level module.
 See [#9692](https://github.com/angular/angular.js/issues/9692) and
-[#7709](https://github.com/angular/angular.js/issues/7709) for more information
+[#7709](https://github.com/angular/angular.js/issues/7709) for more information
@@ -69,18 +69,3 @@ angular.module('myModule', [])
 ```

 Use the `$controller` service if you want to instantiate controllers yourself.
-
-Attempting to inject a scope object into anything that's not a controller or a directive,
-for example a service, will also throw an `Unknown provider: $scopeProvider <- $scope` error.
-This might happen if one mistakenly registers a controller as a service, ex.:
-
-```
-angular.module('myModule', [])
-  .service('MyController', ['$scope', function($scope) {
-    // This controller throws an unknown provider error because
-    // a scope object cannot be injected into a service.
-  }]);
-```
-
-If you encounter this error only with minified code, consider using `ngStrictDi` (see
-{@link ng.directive:ngApp ngApp}) to provoke the error with the non-minified source.
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:badexpr
-@fullName Expecting end operator
-@description
-
-The Angular expression is missing the corresponding closing operator.
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:dupvalue
-@fullName Duplicate choice in plural/select
-@description
-
-You have repeated a match selection for your plural or select MessageFormat
-extension in your interpolation expression.  The different choices have to be unique.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:logicbug
-@fullName Bug in ngMessageFormat module
-@description
-
-You've just hit a bug in the ngMessageFormat module provided by angular-message-format.min.js.
-Please file a github issue for this and provide the interpolation text that caused you to hit this
-bug mentioning the exact version of AngularJS used and we will fix it!
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,17 +0,0 @@
-@ngdoc error
-@name $interpolate:nochgmustache
-@fullName Redefinition of start/endSymbol incompatible with MessageFormat extensions
-@description
-
-You have redefined `$interpolate.startSymbol`/`$interpolate.endSymbol` and also
-loaded the `ngMessageFormat` module (provided by angular-message-format.min.js)
-while creating your injector.
-
-`ngMessageFormat` currently does not support redefinition of the
-startSymbol/endSymbol used by `$interpolate`.  If this is affecting you, please
-file an issue and mention @chirayuk on it.  This is intended to be fixed in a
-future commit and the github issue will help gauge urgency.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqarg
-@fullName Missing required argument for MessageFormat
-@description
-
-You must specify the MessageFormat function that you're using right after the
-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 Angular i18n MessageFormat}
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqcomma
-@fullName Missing comma following MessageFormat plural/select keyword
-@description
-
-The MessageFormat syntax requires a comma following the "plural" or "select"
-extension keyword in the extended interpolation syntax.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendbrace
-@fullName Unterminated message for plural/select value
-@description
-
-The plural or select message for a value or keyword choice has no matching end
-brace to mark the end of the message.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendinterp
-@fullName Unterminated interpolation
-@description
-
-The interpolation text does not have an ending `endSymbol` ("}}" by default) and is unterminated.
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqopenbrace
-@fullName An opening brace was expected but not found
-@description
-
-The plural or select extension keyword or values (such as "other", "male",
-"female", "=0", "one", "many", etc.) MUST be followed by a message enclosed in
-braces.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,13 +0,0 @@
-@ngdoc error
-@name $interpolate:reqother
-@fullName Required choice "other" for select/plural in MessageFormat
-@description
-
-Your interpolation expression with a MessageFormat extension for either
-"plural" or "select" (typically used for gender selection) does not contain a
-message for the choice "other".  Using either select or plural MessageFormat
-extensions require that you provide a message for the selection "other".
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:unknarg
-@fullName Unrecognized MessageFormat extension
-@description
-
-The MessageFormat extensions provided by `ngMessageFormat` are currently
-limited to "plural" and "select".  The extension that you have used is either
-unsupported or invalid.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,10 +0,0 @@
-@ngdoc error
-@name $interpolate:unsafe
-@fullName MessageFormat extensions not allowed in secure context
-@description
-
-You have attempted to use a MessageFormat extension in your interpolation expression that is marked as a secure context.  For security purposes, this is not supported.
-
-Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
-(SCE)} and about the MessageFormat extensions at {@link
-guide/i18n#MessageFormat Angular i18n MessageFormat}.
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:untermstr
-@fullName Unterminated string literal
-@description
-
-The string literal was not terminated in your Angular expression.
@@ -1,8 +0,0 @@
-@ngdoc error
-@name $interpolate:wantstring
-@fullName Expected the beginning of a string
-@description
-
-We expected to see the beginning of a string (either a single quote or a double
-quote character) in the expression but it was not found.  The expression is
-invalid.  If this is incorrect, please file an issue on github.
@@ -1,6 +1,6 @@
@ngdoc error
@name $location:nobase
-@fullName $location in HTML5 mode requires a `<base>` tag to be present!
+@fullName $location in HTML5 mode requires a <base> tag to be present!
@description

 If you configure {@link ng.$location `$location`} to use
@@ -15,7 +15,7 @@ $locationProvider.html5Mode({
 });
 ```

-Note that removing the requirement for a `<base>` tag will have adverse side effects when resolving
+Note that removing the requirement for a <base> tag will have adverse side effects when resolving
 relative paths with `$location` in IE9.

 The base URL is then used to resolve all relative URLs throughout the application regardless of the
@@ -35,7 +35,7 @@ URL of the subcontext:

 ```html
 <head>
-  <base href="/subapp/">
+  <base href="/subapp">
  ...
 </head>
 ```
@@ -14,32 +14,3 @@ perform this check - it's up to the developer to not expose such sensitive and p
 directly on the scope chain.

 To resolve this error, avoid Window access.
-
-### Common CoffeeScript Issue
-
-Be aware that if you are using CoffeeScript, it automatically returns the value of the last statement in a
-function. So for instance
-
-```coffeescript
-  scope.foo = ->
-    window.open 'https://example.com'
-```
-
-compiles to something like
-
-```js
-  scope.foo = function() {
-    return window.open('https://example.com');
-  };
-```
-
-You can see that this function will return the result of calling `window.open`, which is a `Window`
-object.
-
-You can avoid this by explicitly returning something else from the function:
-
-```coffeescript
-  scope.foo = ->
-    window.open 'https://example.com'
-    return true;
-```
@@ -100,7 +100,7 @@ To resolve this type of issue, either fix the api to be always synchronous or as
 your callback handler to always run asynchronously by using the `$timeout` service.

 ```
-function MyController($scope, $timeout, thirdPartyComponent) {
+function MyController($scope, thirdPartyComponent) {
  thirdPartyComponent.getData(function(someData) {
    $timeout(function() {
      $scope.someData = someData;
@@ -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 Angular 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 a
 `$apply` block:

 ```
@@ -200,7 +200,7 @@ the top of the call stack.
 Once you have identified this call you work your way up the stack to see what the problem is.

 * If the second call was made in your application code then you should look at why this code has been
-called from within an `$apply`/`$digest`.  It may be a simple oversight or maybe it fits with the
+called from within a `$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 Angular directive then it is likely that it matches the second
@@ -0,0 +1,11 @@
+@ngdoc error
+@name $sanitize:badparse
+@fullName Parsing Error while Sanitizing
+@description
+
+This error occurs when the HTML string passed to '$sanitize' can't be parsed by the sanitizer.
+The error contains part of the html string that can't be parsed.
+
+The parser is more strict than a typical browser parser, so it's possible that some obscure input would produce this error despite the string being recognized as valid HTML by a browser.
+
+If a valid html code results in this error, please file a bug.
@@ -1,10 +0,0 @@
-@ngdoc error
-@name $sanitize:noinert
-@fullName Can't create an inert html document
-@description
-
-This error occurs when `$sanitize` sanitizer determines that `document.implementation.createHTMLDocument ` api is not supported by the current browser.
-
-This api is necessary for safe parsing of HTML strings into DOM trees and without it the sanitizer can't sanitize the input.
-
-The api is present in all supported browsers including IE 9.0, so the presence of this error usually indicates that Angular's `$sanitize` is being used on an unsupported platform.
@@ -1,13 +0,0 @@
-@ngdoc error
-@name $sanitize:uinput
-@fullName Failed to sanitize html because the input is unstable
-@description
-
-This error occurs when `$sanitize` sanitizer tries to check the input for possible mXSS payload and the verification
-errors due to the input mutating indefinitely. This could be a sign that the payload contains code exploiting an mXSS
-vulnerability in the browser.
-
-mXSS attack exploit browser bugs that cause some browsers parse a certain html strings into DOM, which once serialized
-doesn't match the original input. These browser bugs can be exploited by attackers to create payload which looks
-harmless to sanitizers, but due to mutations caused by the browser are turned into dangerous code once processed after
-sanitization.
@@ -1,51 +0,0 @@
-@ngdoc error
-@name filter:notarray
-@fullName Not an array
-@description
-
-This error occurs when {@link ng.filter filter} is not used with an array:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | filter:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-Filter must be used with an array so a subset of items can be returned.
-The array can be initialized asynchronously and therefore null or undefined won't throw this error.
-
-To filter an object by the value of its properties you can create your own custom filter:
-```js
-angular.module('customFilter',[])
-  .filter('custom', function() {
-    return function(input, search) {
-      if (!input) return input;
-      if (!search) return input;
-      var expected = ('' + search).toLowerCase();
-      var result = {};
-      angular.forEach(input, function(value, key) {
-        var actual = ('' + value).toLowerCase();
-        if (actual.indexOf(expected) !== -1) {
-          result[key] = value;
-        }
-      });
-      return result;
-    }
-  });
-```
-That can be used as:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | custom:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-You could as well convert the object to an array using a filter such as
-[toArrayFilter](https://github.com/petebacondarwin/angular-toArrayFilter):
-```html
-<input ng-model="search">
-<div ng-repeat="item in myObj | toArray:false | filter:search">
-  {{ item }}
-</div>
-```
@@ -1,16 +0,0 @@
-@ngdoc error
-@name linky:notstring
-@fullName Not a string
-@description
-
-This error occurs when {@link ngSanitize.linky linky} is used with a non-empty, non-string value:
-```html
-<div ng-bind-html="42 | linky"></div>
-```
-
-`linky` is supposed to be used with string values only, and therefore assumes that several methods
-(such as `.match()`) are available on the passed in value.
-The value can be initialized asynchronously and therefore null or undefined won't throw this error.
-
-If you want to pass non-string values to `linky` (e.g. Objects whose `.toString()` should be
-utilized), you need to manually convert them to strings.
@@ -1,7 +0,0 @@
-@ngdoc error
-@name ng:cpta
-@fullName Copying TypedArray
-@description
-
-Copying TypedArray's with a destination is not supported because TypedArray
-objects can not be mutated, they are fixed length.
@@ -1,28 +0,0 @@
-@ngdoc error
-@name ngModel:nopromise
-@fullName No promise
-@description
-
-The return value of an async validator, must always be a promise. If you want to return a
-non-promise value, you can convert it to a promise using {@link ng.$q#resolve `$q.resolve()`} or
-{@link ng.$q#reject `$q.reject()`}.
-
-Example:
-
-```
-.directive('asyncValidator', function($q) {
-  return {
-    require: 'ngModel',
-    link: function(scope, elem, attrs, ngModel) {
-      ngModel.$asyncValidators.myAsyncValidation = function(modelValue, viewValue) {
-        if (/* I don't need to hit the backend API */) {
-          return $q.resolve();     // to mark as valid or
-          // return $q.reject();   // to mark as invalid
-        } else {
-          // ...send a request to the backend and return a promise
-        }
-      };
-    }
-  };
-})
-```
@@ -1,56 +0,0 @@
-@ngdoc error
-@name ngModel:numfmt
-@fullName Model is not of type `number`
-@description
-
-The number input directive `<input type="number">` requires the model to be a `number`.
-
-If the model is something else, this error will be thrown.
-
-Angular does not set validation errors on the `<input>` in this case
-as this error is caused by incorrect application logic and not by bad input from the user.
-
-If your model does not contain actual numbers then it is up to the application developer
-to use a directive that will do the conversion in the `ngModel` `$formatters` and `$parsers`
-pipeline.
-
-## Example
-
-In this example, our model stores the number as a string, so we provide the `stringToNumber`
-directive to convert it into the format the `input[number]` directive expects.
-
-
-<example module="numfmt-error-module">
- <file name="index.html">
-  <table>
-    <tr ng-repeat="x in ['0', '1']">
-      <td>
-        <input type="number" string-to-number ng-model="x" /> {{ x }} : {{ typeOf(x) }}
-      </td>
-    </tr>
-  </table>
- </file>
- <file name="app.js">
-  angular.module('numfmt-error-module', [])
-
-  .run(function($rootScope) {
-    $rootScope.typeOf = function(value) {
-      return typeof value;
-    };
-  })
-
-  .directive('stringToNumber', function() {
-    return {
-      require: 'ngModel',
-      link: function(scope, element, attrs, ngModel) {
-        ngModel.$parsers.push(function(value) {
-          return '' + value;
-        });
-        ngModel.$formatters.push(function(value) {
-          return parseFloat(value, 10);
-        });
-      }
-    };
-  });
- </file>
-</example>
@@ -0,0 +1,33 @@
+@ngdoc error
+@name ngOptions:trkslct
+@fullName Comprehension expression cannot contain both `select as` and `track by` expressions.
+@description
+
+NOTE: This error was introduced in 1.3.0-rc.5, and was removed for 1.3.0-rc.6 in order to
+not break existing apps.
+
+This error occurs when 'ngOptions' is passed a comprehension expression that contains both a
+`select as` expression and a `track by` expression. These two expressions are fundamentally
+incompatible.
+
+ * Example of bad expression: `<select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected">`
+   `values: [{id: 1, label: 'aLabel', subItem: {name: 'aSubItem'}}, {id: 2, label: 'bLabel', subItem: {name: 'bSubItem'}}]`,
+   `$scope.selected = {name: 'aSubItem'};`
+ * track by is always applied to `value`, with purpose to preserve the selection,
+   (to `item` in this case)
+ * To calculate whether an item is selected, `ngOptions` does the following:
+   1. apply `track by` to the values in the array:
+      In the example: [1,2]
+   2. apply `track by` to the already selected value in `ngModel`:
+      In the example: this is not possible, as `track by` refers to `item.id`, but the selected
+      value from `ngModel` is `{name: aSubItem}`.
+
+Here's an example of how to make this example work by using `track by` without `select as`:
+
+```
+<select ng-model="selected" ng-options="item.label for item in values track by item.id">
+```
+
+Note: This would store the whole `item` as the model to `scope.selected` instead of `item.subItem`.
+
+For more information on valid expression syntax, see 'ngOptions' in {@link ng.directive:select select} directive docs.
@@ -16,8 +16,6 @@ Reserved names include:
  - `this`
  - `undefined`
  - `$parent`
-  - `$id`
-  - `$root`
  - `$even`
  - `$odd`
  - `$first`
@@ -1,52 +0,0 @@
-@ngdoc error
-@name orderBy:notarray
-@fullName Value is not array-like
-@description
-
-This error occurs when {@link ng.orderBy orderBy} is not passed an array-like value:
-```html
-<div ng-repeat="(key, value) in myObj | orderBy:someProp">
-  {{ key }} : {{ value }}
-</div>
-```
-
-`orderBy` must be used with an array-like value so a subset of items can be returned.
-The array can be initialized asynchronously and therefore `null` or `undefined` won't throw this error.
-
-To use `orderBy` to order the properties of an object, you can create your own array based on that object:
-```js
-angular.module('aModule', [])
-  .controller('aController', function($scope) {
-    var myObj = {
-      one: {id: 1, name: 'Some thing'},
-      two: {id: 2, name: 'Another thing'},
-      three: {id: 3, name: 'A third thing'}
-    };
-
-    $scope.arrFromMyObj = Object.keys(myObj).map(function(key) {
-      return myObj[key];
-    });
-  });
-```
-That can be used as:
-```html
-<label>
-  Order by:
-  <select ng-model="orderProp" ng-options="prop for prop in ['id', 'name']"></select>
-</label>
-<div ng-repeat="item in arrFromMyObj | orderBy:orderProp">
-  [{{ item.id }}] {{ item.name }}
-</div>
-```
-
-You could as well convert the object to an array using a filter such as
-[toArrayFilter](https://github.com/petebacondarwin/angular-toArrayFilter):
-```html
-<label>
-  Order by:
-  <select ng-model="orderProp" ng-options="prop for prop in ['id', 'name']"></select>
-</label>
-<div ng-repeat="item in myObj | toArray:false | orderBy:orderProp">
-  [{{ item.id }}] {{ item.name }}
-</div>
-```
@@ -165,7 +165,7 @@ encoded.

 `$location` service has two configuration modes which control the format of the URL in the browser
 address bar: **Hashbang mode** (the default) and the **HTML5 mode** which is based on using the
-[HTML5 History API](https://html.spec.whatwg.org/multipage/browsers.html#the-history-interface). Applications use the same API in
+HTML5 [History API](http://www.w3.org/TR/html5/introduction.html#history-0). Applications use the same API in
 both modes and the `$location` service will work with appropriate URL segments and browser APIs to
 facilitate the browser URL change and history management.

@@ -301,7 +301,7 @@ it('should show example', inject(
 ### Fallback for legacy browsers

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

@@ -356,15 +356,15 @@ legacy browsers and hashbang links in modern browser:

 ### Example

-Here you can see two `$location` instances that show the difference between **Html5 mode** and **Html5 Fallback mode**.
-Note that to simulate different levels of browser support, the `$location` instances are connected to
-a fakeBrowser service, which you don't have to set up in actual projects.
+Here you can see two `$location` instances, both in **Html5 mode**, but on different browsers, so
+that you can see the differences. These `$location` services are connected to a fake browsers. Each
+input represents the address bar of the browser.

-Note that when you type hashbang url into the first browser (or vice versa) it doesn't rewrite /
+Note that when you type hashbang url into first browser (or vice versa) it doesn't rewrite /
 redirect to regular / hashbang url, as this conversion happens only during parsing the initial URL
 = on page reload.

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

 #### Browser in HTML5 mode
 <example module="html5-mode" name="location-html5-mode">
@@ -389,7 +389,6 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
  <file name="app.js">
   angular.module('html5-mode', ['fake-browser', 'address-bar'])

-   // Configure the fakeBrowser. Do not set these values in actual projects.
   .constant('initUrl', 'http://www.example.com/base/path?a=b#h')
   .constant('baseHref', '/base/index.html')
   .value('$sniffer', { history: true })
@@ -539,7 +538,6 @@ In these examples we use `<base href="/base/index.html" />`. The inputs represen
  <file name="app.js">
    angular.module('hashbang-mode', ['fake-browser', 'address-bar'])

-    // Configure the fakeBrowser. Do not set these values in actual projects.
    .constant('initUrl', 'http://www.example.com/base/index.html#!/path?a=b#h')
    .constant('baseHref', '/base/index.html')
    .value('$sniffer', { history: false })
@@ -695,7 +693,7 @@ A path should always begin with forward slash (`/`); the `$location.path()` sett
 forward slash if it is missing.

 Note that the `!` prefix in the hashbang mode is not part of `$location.path()`; it is actually
-`hashPrefix`.
+hashPrefix.

 ## Crawling your app

@@ -771,8 +769,8 @@ then uses the information it obtains to compose hashbang URLs (such as
    </tr>

    <tr class="head">
-      <th>Navigation outside the app</td>
-      <th>Use lower level API</td>
+      <td>Navigation outside the app</td>
+      <td>Use lower level API</td>
    </tr>

    <tr>
@@ -786,8 +784,8 @@ then uses the information it obtains to compose hashbang URLs (such as
    </tr>

    <tr class="head">
-      <th>Read access</td>
-      <th>Change to</td>
+      <td>Read access</td>
+      <td>Change to</td>
    </tr>

    <tr>
@@ -23,9 +23,9 @@ angular.module('myApp', ['ngAria'])...
 ###Using ngAria
 Most of what ngAria does is only visible "under the hood". To see the module in action, once you've
 added it as a dependency, you can test a few things:
- * Using your favorite element inspector, look for attributes added by ngAria in your own code.
+ * Using your favorite element inspector, look for ngAria attributes in your own code.
 * Test using your keyboard to ensure `tabindex` is used correctly.
- * Fire up a screen reader such as VoiceOver or NVDA to check for ARIA support.
+ * Fire up a screen reader such as VoiceOver to listen for ARIA support.
 [Helpful screen reader tips.](http://webaim.org/articles/screenreader_testing/)

 ##Supported directives
@@ -33,20 +33,16 @@ Currently, ngAria interfaces with the following directives:

 * {@link guide/accessibility#ngmodel ngModel}
 * {@link guide/accessibility#ngdisabled ngDisabled}
- * {@link guide/accessibility#ngrequired ngRequired}
- * {@link guide/accessibility#ngvaluechecked ngChecked}
- * {@link guide/accessibility#ngvaluechecked ngValue}
 * {@link guide/accessibility#ngshow ngShow}
 * {@link guide/accessibility#nghide ngHide}
 * {@link guide/accessibility#ngclick ngClick}
 * {@link guide/accessibility#ngdblclick ngDblClick}
- * {@link guide/accessibility#ngmessages ngMessages}

 <h2 id="ngmodel">ngModel</h2>

-Much of ngAria's heavy lifting happens in the {@link ng.ngModel ngModel}
-directive. For elements using ngModel, special attention is paid by ngAria if that element also
-has a role or type of `checkbox`, `radio`, `range` or `textbox`.
+Most of ngAria's heavy lifting happens in the {@link ngModel ngModel}
+directive.  For elements using ngModel, special attention is paid by ngAria if that element also
+has a a role or type of `checkbox`, `radio`, `range` or `textbox`.

 For those elements using ngModel, ngAria will dynamically bind and update the following ARIA
 attributes (if they have not been explicitly specified by the developer):
@@ -137,75 +133,37 @@ attributes (if they have not been explicitly specified by the developer):

 ngAria will also add `tabIndex`, ensuring custom elements with these roles will be reachable from
 the keyboard. It is still up to **you** as a developer to **ensure custom controls will be
-accessible**. As a rule, any time you create a widget involving user interaction, be sure to test
-it with your keyboard and at least one mobile and desktop screen reader.
-
-<h2 id="ngvaluechecked">ngValue and ngChecked</h2>
-
-To ease the transition between native inputs and custom controls, ngAria now supports
-{@link ng.ngValue ngValue} and {@link ng.ngChecked ngChecked}.
-The original directives were created for native inputs only, so ngAria extends
-support to custom elements by managing `aria-checked` for accessibility.
-
-###Example
-
-```html
-<custom-checkbox ng-checked="val"></custom-checkbox>
-<custom-radio-button ng-value="val"></custom-radio-button>
-```
-
-Becomes:
-
-```html
-<custom-checkbox ng-checked="val" aria-checked="true"></custom-checkbox>
-<custom-radio-button ng-value="val" aria-checked="true"></custom-radio-button>
-```
+operable** from the keybard. Think of `ng-click` on a `<div>` or `<md-checkbox>`: you still need
+to bind `ng-keypress` to make it fully operable from the keyboard. As a rule, any time you create
+a widget involving user interaction, be sure to test it with your keyboard and at least one mobile
+and desktop screen reader (preferably more).

 <h2 id="ngdisabled">ngDisabled</h2>

 The `disabled` attribute is only valid for certain elements such as `button`, `input` and
 `textarea`. To properly disable custom element directives such as `<md-checkbox>` or `<taco-tab>`,
-using ngAria with {@link ng.ngDisabled ngDisabled} will also
+using ngAria with [ngDisabled](https://docs.angularjs.org/api/ng/directive/ngDisabled) will also
 add `aria-disabled`. This tells assistive technologies when a non-native input is disabled, helping
 custom controls to be more accessible.

 ###Example

 ```html
-<md-checkbox ng-disabled="disabled"></md-checkbox>
+<md-checkbox ng-disabled="disabled">
 ```

 Becomes:

 ```html
-<md-checkbox disabled aria-disabled="true"></md-checkbox>
+<md-checkbox disabled aria-disabled="true">
 ```

 >You can check whether a control is legitimately disabled for a screen reader by visiting
-[chrome://accessibility](chrome://accessibility) and inspecting [the accessibility tree](http://www.paciellogroup.com/blog/2015/01/the-browser-accessibility-tree/).
-
-<h2 id="ngrequired">ngRequired</h2>
-
-The boolean `required` attribute is only valid for native form controls such as `input` and
-`textarea`. To properly indicate custom element directives such as `<md-checkbox>` or `<custom-input>`
-as required, using ngAria with {@link ng.ngRequired ngRequired} will also add
-`aria-required`. This tells accessibility APIs when a custom control is required.
-
-###Example
-
-```html
-<md-checkbox ng-required="val"></md-checkbox>
-```
-
-Becomes:
-
-```html
-<md-checkbox ng-required="val" aria-required="true"></md-checkbox>
-```
+[chrome://accessibility](chrome://accessibility).

 <h2 id="ngshow">ngShow</h2>

->The {@link ng.ngShow ngShow} directive shows or hides the
+>The [ngShow](https://docs.angularjs.org/api/ng/directive/ngShow) directive shows or hides the
 given HTML element based on the expression provided to the `ngShow` attribute. The element is
 shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.

@@ -242,7 +200,7 @@ Becomes:

 <h2 id="nghide">ngHide</h2>

->The {@link ng.ngHide ngHide} directive shows or hides the
+>The [ngHide](https://docs.angularjs.org/api/ng/directive/ngHide) directive shows or hides the
 given HTML element based on the expression provided to the `ngHide` attribute. The element is
 shown or hidden by removing or adding the `.ng-hide` CSS class onto the element.

@@ -251,25 +209,10 @@ The default CSS for `ngHide`, the inverse method to `ngShow`, makes ngAria redun
 `display: none`. See explanation for {@link guide/accessibility#ngshow ngShow} when overriding the default CSS.

 <h2><span id="ngclick">ngClick</span> and <span id="ngdblclick">ngDblclick</span></h2>
-If `ng-click` or `ng-dblclick` is encountered, ngAria will add `tabindex="0"` to any element not in
-a node blacklist:
-
- * Button
- * Anchor
- * Input
- * Textarea
- * Select
- * Details/Summary
-
-To fix widespread accessibility problems with `ng-click` on `div` elements, ngAria will
-dynamically bind a keypress event by default as long as the element isn't in the node blacklist.
-You can turn this functionality on or off with the `bindKeypress` configuration option.
-
-ngAria will also add the `button` role to communicate to users of assistive technologies. This can
-be disabled with the `bindRoleForClick` configuration option.
-
-For `ng-dblclick`, you must still manually add `ng-keypress` and a role to non-interactive elements
-such as `div` or `taco-button` to enable keyboard access.
+If `ng-click` or `ng-dblclick` is encountered, ngAria will add `tabindex` if it isn't there already.
+Even with this, you must currently still add `ng-keypress` to non-interactive elements such as `div`
+or `taco-button` to enable keyboard access. Conversation is currently ongoing about whether ngAria
+should also bind `ng-keypress`.

 <h3>Example</h3>
 ```html
@@ -280,12 +223,13 @@ Becomes:
 ```html
 <div ng-click="toggleMenu()" tabindex="0"></div>
 ```
+*Note: ngAria still requires `ng-keypress` to be added manually to non-native controls like divs.*

 <h2 id="ngmessages">ngMessages</h2>

 The new ngMessages module makes it easy to display form validation or other messages with priority
 sequencing and animation. To expose these visual messages to screen readers,
-ngAria injects `aria-live="assertive"`, causing them to be read aloud any time a message is shown,
+ngAria injects `aria-live="polite"`, causing them to be read aloud any time a message is shown,
 regardless of the user's focus location.
 ###Example

@@ -299,7 +243,7 @@ regardless of the user's focus location.
 Becomes:

 ```html
-<div ng-messages="myForm.myName.$error" aria-live="assertive">
+<div ng-messages="myForm.myName.$error" aria-live="polite">
  <div ng-message="required">You did not enter a field</div>
  <div ng-message="maxlength">Your field is too long</div>
 </div>
@@ -310,18 +254,62 @@ The attribute magic of ngAria may not work for every scenario. To disable indivi
 you can use the {@link ngAria.$ariaProvider#config config} method. Just keep in mind this will
 tell ngAria to ignore the attribute globally.

-<example module="ngAria_ngClickExample" deps="angular-aria.js">
+<example module="ngAria_ngDisabledExample" deps="angular-aria.js">
 <file name="index.html">
-  <div ng-click="someFunction" show-attrs>
-    &lt;div&gt; with ng-click and bindRoleForClick, tabindex set to false
+  <style>
+    [role=checkbox] {
+      cursor: pointer;
+      display: inline-block;
+    }
+    [role=checkbox] .icon:before {
+      content: '\2610';
+      display: inline-block;
+      font-size: 2em;
+      line-height: 1;
+      vertical-align: middle;
+      speak: none;
+    }
+    [role=checkbox].active .icon:before {
+      content: '\2611';
+    }
+  </style>
+ <form ng-controller="formsController">
+  <div ng-model="someModel" show-attrs>
+    Div with ngModel and aria-invalid disabled
  </div>
+  <div role="checkbox" ng-model="checked" ng-class="{active: checked}"
+    aria-label="Custom Checkbox" ng-click="toggleCheckbox()" some-checkbox show-attrs>
+    <span class="icon" aria-hidden="true"></span>
+    Custom Checkbox for comparison
+  </div>
+ </form>
 <script>
-  angular.module('ngAria_ngClickExample', ['ngAria'], function config($ariaProvider) {
+  angular.module('ngAria_ngDisabledExample', ['ngAria'], function config($ariaProvider) {
    $ariaProvider.config({
-      bindRoleForClick: false,
-      tabindex: false
+      ariaInvalid: false,
+      tabindex: true
    });
  })
+  .controller('formsController', function($scope){
+    $scope.checked = false;
+    $scope.toggleCheckbox = function(){
+      $scope.checked = !$scope.checked;
+    }
+  })
+  .directive('someCheckbox', function(){
+    return {
+      restrict: 'A',
+      link: function($scope, $el, $attrs) {
+        $el.on('keypress', function(event){
+          event.preventDefault();
+          if(event.keyCode === 32 || event.keyCode === 13){
+            $scope.toggleCheckbox();
+            $scope.$apply();
+          }
+        });
+      }
+    }
+  })
  .directive('showAttrs', function() {
    return function(scope, el, attrs) {
      var pre = document.createElement('pre');
@@ -236,7 +236,7 @@ The example below shows how to perform animations during class changes:
 </file>
 </example>

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

 ## Which directives support animations?

@@ -253,7 +253,7 @@ The table below explains in detail which animation events are triggered
 | {@link ng.directive:ngClass#animations ngClass or &#123;&#123;class&#125;&#125;}    | add and remove                           |
 | {@link ng.directive:ngShow#animations ngShow & ngHide}                              | add and remove (the ng-hide class value) |

-For a full breakdown of the steps involved during each animation event, refer to the {@link ng.$animate API docs}.
+For a full breakdown of the steps involved during each animation event, refer to the {@link ngAnimate.$animate API docs}.

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

@@ -274,39 +274,8 @@ myModule.directive('my-directive', ['$animate', function($animate) {
 }]);
 ```

-## Preventing flicker before an animation starts
-
-When nesting elements with structural animations such as `ngIf` into elements that have class-based
-animations such as `ngClass`, it sometimes happens that before the actual animation starts, there is a brief flicker or flash of content
-where the animated element is briefly visible.
-
-To prevent this, you can apply styles to the `ng-[event]-prepare` class, which is added as soon as an animation is initialized,
-but removed before the actual animation starts (after waiting for a $digest). This class is only added for *structural*
-animations (`enter`, `move`, and `leave`).
-
-Here's an example where you might see flickering:
-
-```html
-<div ng-class="{red: myProp}">
-  <div ng-class="{blue: myProp}">
-    <div class="message" ng-if="myProp"></div>
-  </div>
-</div>
-```
-
-It is possible that during the `enter` event, the `.message` div will be briefly visible before it starts animating.
-In that case, you can add styles to the CSS that make sure the element stays hidden before the animation starts:
-
-```css
-.message.ng-enter-prepare {
-  opacity: 0;
-}
-
-/* Other animation styles ... */
-```
-
 ## More about animations

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

 To see a complete demo, see the {@link tutorial/step_12 animation step within the AngularJS phonecat tutorial}.
@@ -1,446 +0,0 @@
-@ngdoc overview
-@name Components
-@sortOrder 305
-@description
-
-# Understanding Components
-
-In Angular, a Component is a special kind of {@link guide/directive directive} that uses a simpler
-configuration which is suitable for a component-based application structure.
-
-This makes it easier to write an app in a way that's similar to using Web Components or using Angular
-2's style of application architecture.
-
-Advantages of Components:
- simpler configuration than plain directives
- promote sane defaults and best practices
- optimized for component-based architecture
- writing component directives will make it easier to upgrade to Angular 2
-
-When not to use Components:
-
- for directives that rely on DOM manipulation, adding event listeners etc, because the compile
-and link functions are unavailable
- when you need advanced directive definition options like priority, terminal, multi-element
- when you want a directive that is triggered by an attribute or CSS class, rather than an element
-
-## Creating and configuring a Component
-
-Components can be registered using the `.component()` method of an Angular module (returned by {@link module `angular.module()`}). The method takes two arguments:
-
-  * The name of the Component (as string).
-  * The Component config object (note that, unlike the `.directive()` method, this method does **not** take a factory function.
-
-<example name="heroComponentSimple" module="heroApp">
-<file name="index.js">
-  angular.module('heroApp', []).controller('mainCtrl', function() {
-    this.hero = {
-      name: 'Spawn'
-    };
-  });
-</file>
-<file name="heroDetail.js">
-
-  function HeroDetailController() {
-
-  }
-
-  angular.module('heroApp').component('heroDetail', {
-    templateUrl: 'heroDetail.html',
-    controller: HeroDetailController,
-    bindings: {
-      hero: '='
-    }
-  });
-</file>
-<file name="index.html">
-  <!-- components match only elements -->
-  <div ng-controller="mainCtrl as ctrl">
-    <b>Hero</b><br>
-    <hero-detail hero="ctrl.hero"></hero-detail>
-  </div>
-</file>
-<file name="heroDetail.html">
-  <span>Name: {{$ctrl.hero.name}}</span>
-</file>
-</example>
-
-It's also possible to add components via {@link $compileProvider#component} in a module's config phase.
-
-### Comparison between Directive definition and Component definition
-
-|                   | Directive            | Component       |
-|-------------------|----------------------|-----------------|
-| bindings          | No                   | Yes (binds to controller)      |
-| bindToController  | Yes (default: false) | No (use bindings instead)       |
-| compile function  | Yes                  | No       |
-| controller        | Yes                  | Yes (default `function() {}`)     |
-| controllerAs      | Yes (default: false) | Yes (default: `$ctrl`)       |
-| link functions    | Yes                  | No       |
-| multiElement      | Yes                  | No       |
-| priority          | Yes                  | No       |
-| require           | Yes                  | Yes      |
-| restrict          | Yes                  | No (restricted to elements only)      |
-| scope             | Yes (default: false) | No (scope is always isolate)      |
-| template          | Yes                  | Yes, injectable      |
-| templateNamespace | Yes                  | No       |
-| templateUrl       | Yes                  | Yes, injectable       |
-| terminal          | Yes                  | No       |
-| transclude        | Yes (default: false) | Yes (default: false)      |
-
-
-## Component-based application architecture
-
-As already mentioned, the component helper makes it easier to structure your application with
-a component-based architecture. But what makes a component beyond the options that
-the component helper has?
-
- **Components only control their own View and Data:**
-Components should never modify any data or DOM that is out of their own scope. Normally, in Angular
-it is possible to modify data anywhere in the application through scope inheritance and watches. This
-is practical, but can also lead to problems when it is not clear which part of the application is
-responsible for modifying the data. That is why component directives use an isolate scope, so a whole
-class of scope manipulation is not possible.
-
- **Components have a well-defined public API - Inputs and Outputs:**
-However, scope isolation only goes so far, because Angular uses two-way binding. So if you pass
-an object to a component like this - `bindings: {item: '='}`, and modify one of its properties, the
-change will be reflected in the parent component. For components however, only the component that owns
-the data should modify it, to make it easy to reason about what data is changed, and when. For that reason,
-components should follow a few simple conventions:
-
-  - Inputs are realized with `@` and `=` bindings
-    ```js
-      bindings: {
-        hero: `=`,
-      }
-    ```
-  - Outputs are realized with `&` bindings, which function as callbacks to component events
-    ```js
-      bindings: {
-        onDelete: '&',
-        onUpdate: '&'
-      }
-    ```
-  - Instead of manipulating Input Data, the component calls the correct Output Event with the changed data.
-    For a deletion, that means the component doesn't delete the `hero` itself, but sends it back to
-    the owner component via the correct event.
-    ```html
-        <button ng-click="$ctrl.onDelete({hero: hero})">Delete</button>
-    ```
-  - That way, the parent component can decide what to do with the event (e.g. delete an item or update the properties)
-    ```js
-      ctrl.deleteHero(hero) {
-        $http.delete(...).then(function() {
-          var idx = ctrl.list.indexOf(hero);
-          if (idx >= 0) {
-            ctrl.list.splice(idx, 1);
-          }
-        });
-      }
-    ```
-
- **An application is a tree of components:**
-Ideally, the whole application should be a tree of components that implement clearly defined inputs
-and outputs, and minimize two-way data binding. That way, it's easier to predict when data changes and what the state
-of a component is.
-
-## Example of a component tree
-
-The following example expands on the simple component example and incorporates the concepts we introduced
-above:
-
-Instead of an ngController, we now have a heroList component that holds the data of
-different heroes, and creates a heroDetail for each of them.
-
-The heroDetail component now contains the following new functionality:
- a delete button that calls the bound onDelete function of the heroList component
- an input to change the hero location, in the form of a reusable editableField component. Instead
-of manipulating the hero object itself, it sends the changes upwards to the heroDetail, which sends
-it upwards to the heroList component, which updates it.
-
-<example name="heroComponentTree" module="heroApp">
-<file name="index.js">
-  var mode = angular.module('heroApp', []);
-</file>
-
-<file name="heroList.js">
-  function HeroListController($scope, $element, $attrs) {
-    var ctrl = this;
-
-    // This would be loaded by $http etc.
-    ctrl.list = [
-      {
-        name: 'Superman',
-        location: ''
-      },
-      {
-        name: 'Batman',
-        location: 'Wayne Manor'
-      }
-    ];
-
-    ctrl.updateHero = function(hero, prop, value) {
-      hero[prop] = value;
-    };
-
-    ctrl.deleteHero = function(hero) {
-      var idx = ctrl.list.indexOf(hero);
-      if (idx >= 0) {
-        ctrl.list.splice(idx, 1);
-      }
-    };
-  }
-
-  angular.module('heroApp').component('heroList', {
-    templateUrl: 'heroList.html',
-    controller: HeroListController
-  });
-
-</file>
-
-<file name="heroDetail.js">
-  function HeroDetailController($scope, $element, $attrs) {
-    var ctrl = this;
-
-    ctrl.update = function(prop, value) {
-      ctrl.onUpdate({hero: ctrl.hero, prop: prop, value: value});
-    };
-  }
-
-  angular.module('heroApp').component('heroDetail', {
-    templateUrl: 'heroDetail.html',
-    controller: HeroDetailController,
-    bindings: {
-      hero: '=',
-      onDelete: '&',
-      onUpdate: '&'
-    }
-  });
-</file>
-
-<file name="editableField.js">
-
-  function EditableFieldController($scope, $element, $attrs) {
-    var ctrl = this;
-    this.editMode = false;
-
-    this.handleModeChange = function() {
-      if (ctrl.editMode) {
-        ctrl.onUpdate({value: ctrl.fieldValue});
-        ctrl.fieldValueCopy = ctrl.fieldValue;
-      }
-      ctrl.editMode = !ctrl.editMode;
-    };
-
-    this.reset = function() {
-      ctrl.fieldValue = ctrl.fieldValueCopy;
-    };
-
-    this.$onInit = function() {
-      // Make a copy of the initial value to be able to reset it later
-      this.fieldValueCopy = this.fieldValue;
-
-      // Set a default fieldType
-      if (!this.fieldType) {
-        this.fieldType = 'text';
-      }
-    };
-  }
-
-  angular.module('heroApp').component('editableField', {
-    templateUrl: 'editableField.html',
-    controller: EditableFieldController,
-    bindings: {
-      fieldValue: '@',
-      fieldType: '@',
-      onUpdate: '&'
-    }
-  });
-</file>
-<file name="index.html">
-  <hero-list></hero-list>
-</file>
-<file name="heroList.html">
-  <b>Heroes</b><br>
-  <hero-detail ng-repeat="hero in $ctrl.list" hero="hero" on-delete="$ctrl.deleteHero(hero)" on-update="$ctrl.updateHero(hero, prop, value)"></hero-detail>
-</file>
-<file name="heroDetail.html">
-  <hr>
-  <div>
-    Name: {{$ctrl.hero.name}}<br>
-    Location: <editable-field field-value="{{$ctrl.hero.location}}" field-type="text" on-update="$ctrl.update('location', value)"></editable-field><br>
-    <button ng-click="$ctrl.onDelete({hero: $ctrl.hero})">Delete</button>
-  </div>
-</file>
-<file name="editableField.html">
-  <span ng-switch="$ctrl.editMode">
-    <input ng-switch-when="true" type="text" ng-model="$ctrl.fieldValue">
-    <span ng-switch-default>{{$ctrl.fieldValue}}</span>
-  </span>
-  <button ng-click="$ctrl.handleModeChange()">{{$ctrl.editMode ? 'Save' : 'Edit'}}</button>
-  <button ng-if="$ctrl.editMode" ng-click="$ctrl.reset()">Reset</button>
-</file>
-</example>
-
-## Components as route templates
-Components are also useful as route templates (e.g. when using {@link ngRoute ngRoute}). In a component-based
-application, every view is a component:
-
-```js
-  var myMod = angular.module('myMod', ['ngRoute']);
-  myMod.component('home', {
-    template: '<h1>Home</h1><p>Hello, {{ $ctrl.user.name }} !</p>',
-    controller: function() {
-      this.user = {name: 'world'};
-    }
-  });
-  myMod.config(function($routeProvider) {
-    $routeProvider.when('/', {
-      template: '<home></home>'
-    });
-  });
-```
-<br />
-When using {@link ngRoute.$routeProvider $routeProvider}, you can often avoid some
-boilerplate, by assigning the resolved dependencies directly to the route scope:
-```js
-  var myMod = angular.module('myMod', ['ngRoute']);
-  myMod.component('home', {
-    template: '<h1>Home</h1><p>Hello, {{ $ctrl.user.name }} !</p>',
-    bindings: {user: '='}
-  });
-  myMod.config(function($routeProvider) {
-    $routeProvider.when('/', {
-      template: '<home user="$resolve.user"></home>',
-      resolve: {user: function($http) { return $http.get('...'); }}
-    });
-  });
-```
-
-## Intercomponent Communication
-
-Directives can require the controllers of other directives to enable communication
-between each other. This can be achieved in a component by providing an
-object mapping for the `require` property.  Here is a tab pane example built
-from components:
-
-<example module="docsTabsExample">
-  <file name="script.js">
-angular.module('docsTabsExample', [])
-  .component('myTabs', {
-    transclude: true,
-    controller: function() {
-      var panes = this.panes = [];
-      this.select = function(pane) {
-        angular.forEach(panes, function(pane) {
-          pane.selected = false;
-        });
-        pane.selected = true;
-      };
-      this.addPane = function(pane) {
-        if (panes.length === 0) {
-          this.select(pane);
-        }
-        panes.push(pane);
-      };
-    },
-    templateUrl: 'my-tabs.html'
-  })
-  .component('myPane', {
-    transclude: true,
-    require: {tabsCtrl: '^myTabs'},
-    bindings: {
-      title: '@'
-    },
-    controller: function() {
-      this.$onInit = function() {
-        this.tabsCtrl.addPane(this);
-        console.log(this);
-      };
-    },
-    templateUrl: 'my-pane.html'
-  });
-  </file>
-  <file name="index.html">
-  <my-tabs>
-    <my-pane title="Hello">
-      <h4>Hello</h4>
-      <p>Lorem ipsum dolor sit amet</p>
-    </my-pane>
-    <my-pane title="World">
-      <h4>World</h4>
-      <em>Mauris elementum elementum enim at suscipit.</em>
-      <p><a href ng-click="i = i + 1">counter: {{i || 0}}</a></p>
-    </my-pane>
-  </my-tabs>
-  </file>
-  <file name="my-tabs.html">
-  <div class="tabbable">
-    <ul class="nav nav-tabs">
-      <li ng-repeat="pane in $ctrl.panes" ng-class="{active:pane.selected}">
-        <a href="" ng-click="$ctrl.select(pane)">{{pane.title}}</a>
-      </li>
-    </ul>
-    <div class="tab-content" ng-transclude></div>
-  </div>
-  </file>
-  <file name="my-pane.html">
-    <div class="tab-pane" ng-show="$ctrl.selected" ng-transclude></div>
-  </file>
-</example>
-
-
-# Unit-testing Component Controllers
-
-The easiest way to unit-test a component controller is by using the {@link ngMock.$componentController $componentController}
-that is included in {@link ngMock}. The advantage of this method is that you do not have
-to create any DOM elements. The following example shows how to do this for the `heroDetail` component
-from above.
-
-The examples use the [Jasmine](http://jasmine.github.io/) testing framework.
-
-**Controller Test:**
-```js
-describe('component: heroDetail', function() {
-  var component, scope, hero;
-
-  beforeEach(module('simpleComponent'));
-
-  beforeEach(inject(function($rootScope, $componentController) {
-    scope = $rootScope.$new();
-    hero = {name: 'Wolverine'};
-  }));
-
-  it('should set the default values of the hero', function() {
-    // It's necessary to always pass the scope in the locals, so that the controller instance can be bound to it
-    component = $componentController('heroDetail', {$scope: scope});
-
-    expect(component.hero).toEqual({
-      name: undefined,
-      location: 'unknown'
-    });
-  });
-
-  it('should assign the name bindings to the hero object', function() {
-    // Here we are passing actual bindings to the component
-
-    component = $componentController('heroDetail',
-      {$scope: scope},
-      {hero: hero}
-    );
-    expect(component.hero.name).toBe('Wolverine');
-  });
-
-  it('should call the onDelete binding when a hero is deleted', function() {
-    component = $componentController('heroDetail',
-      {$scope: scope},
-      {hero: hero, onDelete: jasmine.createSpy('deleteSpy')}
-    );
-
-    component.onDelete({hero: component.hero});
-    expect(spy('deleteSpy')).toHaveBeenCalledWith(component.hero);
-  });
-
-});
-```
@@ -8,22 +8,22 @@
 This section briefly touches on all of the important parts of AngularJS using a simple example.
 For a more in-depth explanation, see the {@link tutorial/ tutorial}.

-| Concept                                    | Description                                                              |
-|--------------------------------------------|--------------------------------------------------------------------------|
-|{@link concepts#template Template}          | HTML with additional markup                                              |
-|{@link concepts#directive Directives}       | extend HTML with custom attributes and elements                          |
-|{@link concepts#model Model}                | the data shown to the user in the view and with which the user interacts |
-|{@link concepts#scope Scope}                | context where the model is stored so that controllers, directives and expressions can access it |
-|{@link concepts#expression Expressions}     | access variables and functions from the scope                            |
-|{@link concepts#compiler Compiler}          | parses the template and instantiates directives and expressions          |
-|{@link concepts#filter Filter}              | formats the value of an expression for display to the user               |
-|{@link concepts#view View}                  | what the user sees (the DOM)                                             |
-|{@link concepts#databinding Data Binding}   | sync data between the model and the view                                 |
-|{@link concepts#controller Controller}      | the business logic behind views                                          |
-|{@link concepts#di Dependency Injection}    | Creates and wires objects and functions                                  |
-|{@link concepts#injector Injector}          | dependency injection container                                           |
-|{@link concepts#module Module}              | a container for the different parts of an app including controllers, services, filters, directives which configures the Injector |
-|{@link concepts#service Service}            | reusable business logic independent of views                             |
+| Concept          | Description                     |
+|------------------|------------------------------------------|
+|{@link concepts#template Template}          | HTML with additional markup |
+|{@link concepts#directive Directives}        | extend HTML with custom attributes and elements |
+|{@link concepts#model Model}             | the data shown to the user in the view and with which the user interacts |
+|{@link concepts#scope Scope}             | context where the model is stored so that controllers, directives and expressions can access it |
+|{@link concepts#expression Expressions}       | access variables and functions from the scope |
+|{@link concepts#compiler Compiler}          | parses the template and instantiates directives and expressions |
+|{@link concepts#filter Filter}            | formats the value of an expression for display to the user |
+|{@link concepts#view View}              | what the user sees (the DOM) |
+|{@link concepts#databinding Data Binding}      | sync data between the model and the view |
+|{@link concepts#controller Controller}        | the business logic behind views |
+|{@link concepts#di Dependency Injection} | Creates and wires objects and functions |
+|{@link concepts#injector Injector}          | dependency injection container |
+|{@link concepts#module Module}            | a container for the different parts of an app including controllers, services, filters, directives which configures the Injector |
+|{@link concepts#service Service}           | reusable business logic independent of views |


 ## A first example: Data binding
@@ -55,11 +55,11 @@ Try out the Live Preview above, and then let's walk through the example and desc
 <img class="pull-right" style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding1.png">

 This looks like normal HTML, with some new markup. In Angular, a file like this is called a
-<a name="template">{@link templates template}</a>. When Angular starts your application, it parses and
-processes this new markup from the template using the <a name="compiler">{@link compiler compiler}</a>.
-The loaded, transformed and rendered DOM is then called the <a name="view"></a>*view*.
+<a name="template">"{@link templates template}"</a>. When Angular starts your application, it parses and
+processes this new markup from the template using the so-called <a name="compiler">"{@link compiler compiler}"</a>.
+The loaded, transformed and rendered DOM is then called the <a name="view">"view"</a>.

-The first kind of new markup are the <a name="directive">{@link directive directives}</a>.
+The first kind of new markup are the so-called <a name="directive">"{@link directive directives}"</a>.
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
 initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
@@ -75,16 +75,16 @@ stores/updates the value of the input field into/from a variable.

 The second kind of new markup are the double curly braces `{{ expression | filter }}`:
 When the compiler encounters this markup, it will replace it with the evaluated value of the markup.
-An <a name="expression">{@link expression expression}</a> in a template is a JavaScript-like code snippet that allows
-Angular to read and write variables. Note that those variables are not global variables.
+An <a name="expression">"{@link expression expression}"</a> in a template is a JavaScript-like code snippet that allows
+to read and write variables. Note that those variables are not global variables.
 Just like variables in a JavaScript function live in a scope,
-Angular provides a <a name="scope">{@link scope scope}</a> for the variables accessible to expressions.
-The values that are stored in variables on the scope are referred to as the <a name="model"></a>*model*
+Angular provides a <a name="scope">"{@link scope scope}"</a> for the variables accessible to expressions.
+The values that are stored in variables on the scope are referred to as the <a name="model">"model"</a>
 in the rest of the documentation.
 Applied to the example above, the markup directs Angular to "take the data we got from the input widgets
 and multiply them together".

-The example above also contains a <a name="filter">{@link guide/filter filter}</a>.
+The example above also contains a <a name="filter">"{@link guide/filter filter}"</a>.
 A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
@@ -92,7 +92,7 @@ into an output that looks like money.
 The important thing in the example is that Angular provides _live_ bindings:
 Whenever the input values change, the value of the expressions are automatically
 recalculated and the DOM is updated with their values.
-The concept behind this is <a name="databinding">{@link databinding two-way data binding}</a>.
+The concept behind this is <a name="databinding">"{@link databinding two-way data binding}"</a>.


 ## Adding UI logic: Controllers
@@ -150,7 +150,7 @@ different currencies and also pay the invoice.

 What changed?

-First, there is a new JavaScript file that contains a <a name="controller">{@link controller controller}</a>.
+First, there is a new JavaScript file that contains a so-called <a name="controller">"{@link controller controller}"</a>.
 More exactly, the file contains a constructor function that creates the actual controller instance.
 The purpose of controllers is to expose variables and functionality to expressions and directives.

@@ -179,11 +179,11 @@ The following graphic shows how everything works together after we introduced th

 <img style="padding-left: 3em; padding-bottom: 1em;" src="img/guide/concepts-databinding2.png">

-## View-independent business logic: Services
+## View independent business logic: Services

 Right now, the `InvoiceController` contains all logic of our example. When the application grows it
-is a good practice to move view-independent logic from the controller into a
-<a name="service">{@link services service}</a>, so it can be reused by other parts
+is a good practice to move view independent logic from the controller into a so called
+<a name="service">"{@link services service}"</a>, so it can be reused by other parts
 of the application as well. Later on, we could also change that service to load the exchange rates
 from the web, e.g. by calling the Yahoo Finance API, without changing the controller.

@@ -255,15 +255,15 @@ We moved the `convertCurrency` function and the definition of the existing curre
 into the new file `finance2.js`. But how does the controller
 get a hold of the now separated function?

-This is where <a name="di">{@link di Dependency Injection}</a> comes into play.
+This is where <a name="di">"{@link di Dependency Injection}"</a> comes into play.
 Dependency Injection (DI) is a software design pattern that
 deals with how objects and functions get created and how they get a hold of their dependencies.
 Everything within Angular (directives, filters, controllers,
 services, ...) is created and wired using dependency injection. Within Angular,
-the DI container is called the <a name="injector">{@link di injector}</a>.
+the DI container is called the <a name="injector">"{@link di injector}"</a>.

 To use DI, there needs to be a place where all the things that should work together are registered.
-In Angular, this is the purpose of the <a name="module">{@link module modules}</a>.
+In Angular, this is the purpose of the so-called <a name="module">"{@link module modules}"</a>.
 When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
 including the configuration of all modules that this module depends on.

@@ -334,9 +334,9 @@ The following example shows how this is done with Angular:
        var refresh = function() {
          var url = YAHOO_FINANCE_URL_PATTERN.
                     replace('PAIRS', 'USD' + currencies.join('","USD'));
-          return $http.jsonp(url).then(function(response) {
+          return $http.jsonp(url).success(function(data) {
            var newUsdToForeignRates = {};
-            angular.forEach(response.data.query.results.rate, function(rate) {
+            angular.forEach(data.query.results.rate, function(rate) {
              var currency = rate.id.substring(3,6);
              newUsdToForeignRates[currency] = window.parseFloat(rate.Rate);
            });
@@ -348,7 +348,8 @@ The following example shows how this is done with Angular:

        return {
          currencies: currencies,
-          convert: convert
+          convert: convert,
+          refresh: refresh
        };
      }]);
  </file>
@@ -5,16 +5,13 @@

 # Understanding Controllers

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

 When a Controller is attached to the DOM via the {@link ng.directive:ngController ng-controller}
 directive, Angular will instantiate a new Controller object, using the specified Controller's
-**constructor function**. A new **child scope** will be created and made available as an injectable
-parameter to the Controller's constructor function as `$scope`.
-
-If the controller has been attached using the `controller as` syntax then the controller instance will
-be assigned to a property on the new scope.
+**constructor function**. A new **child scope** will be available as an injectable parameter to the
+Controller's constructor function as `$scope`.

 Use controllers to:

@@ -33,12 +30,12 @@ Do not use controllers to:
 services} instead.
 - Manage the life-cycle of other components (for example, to create service instances).

-## Setting up the initial state of a `$scope` object
+# Setting up the initial state of a `$scope` object

 Typically, when you create an application you need to set up the initial state for the Angular
 `$scope`. You set up the initial state of a scope by attaching properties to the `$scope` object.
 The properties contain the **view model** (the model that will be presented by the view).  All the
-`$scope` properties will be available to the {@link templates template} at the point in the DOM where the Controller
+`$scope` properties will be available to the template at the point in the DOM where the Controller
 is registered.

 The following example demonstrates creating a `GreetingController`, which attaches a `greeting`
@@ -72,13 +69,13 @@ now be data-bound to the template:
 ```


-## Adding Behavior to a Scope Object
+# Adding Behavior to a Scope Object

 In order to react to events or execute computation in the view we must provide behavior to the
 scope. We add behavior to the scope by attaching methods to the `$scope` object.  These methods are
 then available to be called from the template/view.

-The following example uses a Controller to add a method, which doubles a number, to the scope:
+The following example uses a Controller to add a method to the scope, which doubles a number:

 ```js
 var myApp = angular.module('myApp',[]);
@@ -102,14 +99,14 @@ objects (or primitives) assigned to the scope become model properties. Any metho
 the scope are available in the template/view, and can be invoked via angular expressions
 and `ng` event handler directives (e.g. {@link ng.directive:ngClick ngClick}).

-## Using Controllers Correctly
+# Using Controllers Correctly

 In general, a Controller shouldn't try to do too much. It should contain only the business logic
 needed for a single view.

 The most common way to keep Controllers slim is by encapsulating work that doesn't belong to
 controllers into services and then using these services in Controllers via dependency injection.
-This is discussed in the {@link di Dependency Injection}  and  {@link services
+This is discussed in the {@link di Dependency Injection} {@link services
 Services} sections of this guide.


@@ -128,7 +125,7 @@ following components:
 - A model consisting of a string named `spice`
 - A Controller with two functions that set the value of `spice`

-The message in our template contains a binding to the `spice` model which, by default, is set to the
+The message in our template contains a binding to the `spice` model, which by default is set to the
 string "very". Depending on which button is clicked, the `spice` model is set to `chili` or
 `jalapeño`, and the message is automatically updated by data-binding.

@@ -165,7 +162,7 @@ scope is augmented (managed) by the `SpicyController` Controller.
 starts with capital letter and ends with "Controller".
 - Assigning a property to `$scope` creates or updates the model.
 - Controller methods can be created through direct assignment to scope (see the `chiliSpicy` method)
- The Controller methods and properties are available in the template (for both the `<div>` element and
+- The Controller methods and properties are available in the template (for the `<div>` element and
 its children).

 ## Spicy Arguments Example
@@ -262,7 +259,7 @@ Inheritance works with methods in the same way as it does with properties. So in
 examples, all of the properties could be replaced with methods that return string values.


-# Testing Controllers
+## Testing Controllers

 Although there are many ways to test a Controller, one of the best conventions, shown below,
 involves injecting the {@link ng.$rootScope $rootScope} and {@link ng.$controller $controller}:
@@ -305,7 +302,7 @@ describe('myController function', function() {
 ```


-If you need to test a nested Controller you  must create the same scope hierarchy
+If you need to test a nested Controller you need to create the same scope hierarchy
 in your test that exists in the DOM:

 ```js
@@ -3,8 +3,6 @@
@sortOrder 210
@description

-# Data Binding
-
 Data-binding in Angular apps is the automatic synchronization of data between the model and view
 components.  The way that Angular implements data-binding lets you treat the model as the
 single-source-of-truth in your application.  The view is a projection of the model at all times.
@@ -163,8 +163,8 @@ someModule.controller('MyController', function($scope, greeter) {
 });
 ```

-Given a function, the injector can infer the names of the services to inject by examining the
-function declaration and extracting the parameter names. In the above example, `$scope` and
+Given a function the injector can infer the names of the services to inject by examining the
+function declaration and extracting the parameter names. In the above example `$scope`, and
 `greeter` are two services which need to be injected into the function.

 One advantage of this approach is that there's no array of names to keep in sync with the
@@ -293,7 +293,7 @@ Create a new injector that can provide components defined in our `myModule` modu
 `greeter` service from the injector. (This is usually done automatically by angular bootstrap).

 ```js
-var injector = angular.injector(['ng', 'myModule']);
+var injector = angular.injector(['myModule', 'ng']);
 var greeter = injector.get('greeter');
 ```

@@ -19,9 +19,8 @@ how to implement them.
 ## What are Directives?

 At a high level, directives are markers on a DOM element (such as an attribute, element
-name, comment or CSS class) that tell AngularJS's **HTML compiler** ({@link ng.$compile `$compile`})
-to attach a specified behavior to that DOM element (e.g. via event listeners), or even to transform
-the DOM element and its children.
+name, comment or CSS class) that tell AngularJS's **HTML compiler** ({@link ng.$compile `$compile`}) to
+attach a specified behavior to that DOM element or even transform the DOM element and its children.

 Angular comes with a set of these directives built-in, like `ngBind`, `ngModel`, and `ngClass`.
 Much like you create controllers and services, you can create your own directives for Angular to use.
@@ -31,7 +30,7 @@ When Angular {@link guide/bootstrap bootstraps} your application, the
 <div class="alert alert-info">
 **What does it mean to "compile" an HTML template?**

-For AngularJS, "compilation" means attaching directives to the HTML to make it interactive.
+For AngularJS, "compilation" means attaching event listeners to the HTML to make it interactive.
 The reason we use the term "compile" is that the recursive process of attaching directives
 mirrors the process of compiling source code in
 [compiled programming languages](http://en.wikipedia.org/wiki/Compiled_languages).
@@ -43,29 +42,18 @@ mirrors the process of compiling source code in
 Before we can write a directive, we need to know how Angular's {@link guide/compiler HTML compiler}
 determines when to use a given directive.

-Similar to the terminology used when an [element **matches** a selector](https://developer.mozilla.org/en-US/docs/Web/API/Element.matches), we say an element **matches** a
-directive when the directive is part of its declaration.
-
-In the following example, we say that the `<input>` element **matches** the `ngModel` directive
+In the following example, we say that the `<input>` element **matches** the `ngModel` directive.

 ```html
 <input ng-model="foo">
 ```

-The following `<input>` element also **matches** `ngModel`:
+The following also **matches** `ngModel`:

 ```html
-<input data-ng-model="foo">
+<input data-ng:model="foo">
 ```

-And the following <person> element **matches** the `person` directive:
-
-```html
-<person>{{name}}</person>
-```
-
-### Normalization
-
 Angular **normalizes** an element's tag and attribute name to determine which elements match which
 directives. We typically refer to directives by their case-sensitive
 [camelCase](http://en.wikipedia.org/wiki/CamelCase) **normalized** name (e.g. `ngModel`).
@@ -99,13 +87,8 @@ For example, the following forms are all equivalent and match the {@link ngBind}
  </file>
  <file name="protractor.js" type="protractor">
    it('should show off bindings', function() {
-      var containerElm = element(by.css('div[ng-controller="Controller"]'));
-      var nameBindings = containerElm.all(by.binding('name'));
-
-      expect(nameBindings.count()).toBe(5);
-      nameBindings.each(function(elem) {
-        expect(elem.getText()).toEqual('Max Karl Ernst Ludwig Planck (April 23, 1858 – October 4, 1947)');
-      });
+      expect(element(by.css('div[ng-controller="Controller"] span[ng-bind]')).getText())
+          .toBe('Max Karl Ernst Ludwig Planck (April 23, 1858 – October 4, 1947)');
    });
  </file>
 </example>
@@ -117,8 +100,6 @@ If you want to use an HTML validating tool, you can instead use the `data`-prefi
 The other forms shown above are accepted for legacy reasons but we advise you to avoid them.
 </div>

-### Directive types
-
 `$compile` can match directives based on element names, attributes, class names, as well as comments.

 All of the Angular-provided directives match attribute name, tag name, comments, or class name.
@@ -146,6 +127,63 @@ directives when possible.
 </div>


+
+### Text and attribute bindings
+
+During the compilation process the {@link ng.$compile compiler} matches text and attributes
+using the {@link ng.$interpolate $interpolate} service to see if they contain embedded
+expressions. These expressions are registered as {@link ng.$rootScope.Scope#$watch watches}
+and will update as part of normal {@link ng.$rootScope.Scope#$digest digest} cycle. An
+example of interpolation is shown below:
+
+```html
+<a ng-href="img/{{username}}.jpg">Hello {{username}}!</a>
+```
+
+
+### `ngAttr` attribute bindings
+
+Web browsers are sometimes picky about what values they consider valid for attributes.
+
+For example, considering this template:
+
+```html
+<svg>
+  <circle cx="{{cx}}"></circle>
+</svg>
+```
+
+We would expect Angular to be able to bind to this, but when we check the console we see
+something like `Error: Invalid value for attribute cx="{{cx}}"`. Because of the SVG DOM API's
+restrictions, you cannot simply write `cx="{{cx}}"`.
+
+With `ng-attr-cx` you can work around this problem.
+
+If an attribute with a binding is prefixed with the `ngAttr` prefix (denormalized as `ng-attr-`)
+then during the binding it will be applied to the corresponding unprefixed attribute. This allows
+you to bind to attributes that would otherwise be eagerly processed by browsers
+(e.g. an SVG element's `circle[cx]` attributes). When using `ngAttr`, the `allOrNothing` flag of
+{@link ng.$interpolate $interpolate} is used, so if any expression in the interpolated string
+results in `undefined`, the attribute is removed and not added to the element.
+
+For example, we could fix the example above by instead writing:
+
+```html
+<svg>
+  <circle ng-attr-cx="{{cx}}"></circle>
+</svg>
+```
+
+If one wants to modify a camelcased attribute (SVG elements have valid camelcased attributes), such as `viewBox` on the `svg` element, one can use underscores to denote that the attribute to bind to is naturally camelcased.
+
+For example, to bind to `viewBox`, we can write:
+
+```html
+<svg ng-attr-view_box="{{viewBox}}">
+</svg>
+```
+
+
 ## Creating Directives

 First let's talk about the {@link ng.$compileProvider#directive API for registering directives}. Much like
@@ -303,7 +341,6 @@ The `restrict` option is typically set to:
 * `'A'` - only matches attribute name
 * `'E'` - only matches element name
 * `'C'` - only matches class name
-* `'M'` - only matches comment

 These restrictions can all be combined as needed:

@@ -407,7 +444,7 @@ This is clearly not a great solution.

 What we want to be able to do is separate the scope inside a directive from the scope
 outside, and then map the outer scope to a directive's inner scope. We can do this by creating what
-we call an **isolate scope**. To do this, we can use a {@link $compile#-scope- directive's `scope`} option:
+we call an **isolate scope**. To do this, we can use a directive's `scope` option:

 <example module="docsIsolateScopeDirective">
  <file name="script.js">
@@ -536,24 +573,14 @@ want to reuse throughout your app.
 In this example we will build a directive that displays the current time.
 Once a second, it updates the DOM to reflect the current time.

-Directives that want to modify the DOM typically use the `link` option to register DOM listeners
-as well as update the DOM. It is executed after the template has been cloned and is where
-directive logic will be put.
-
- `link` takes a function with the following signature,
-`function link(scope, element, attrs, controller, transcludeFn) { ... }`, where:
+Directives that want to modify the DOM typically use the `link` option.
+`link` takes a function with the following signature, `function link(scope, element, attrs) { ... }`
+where:

 * `scope` is an Angular scope object.
 * `element` is the jqLite-wrapped element that this directive matches.
 * `attrs` is a hash object with key-value pairs of normalized attribute names and their
  corresponding attribute values.
-* `controller` is the directive's required controller instance(s) or its own controller (if any).
-  The exact value depends on the directive's require property.
-* `transcludeFn` is a transclude linking function pre-bound to the correct transclusion scope.
-
-<div class="alert alert-info">
-For more details on the `link` option refer to the {@link ng.$compile#-link- `$compile` API} page.
-</div>

 In our `link` function, we want to update the displayed time once a second, or whenever a user
 changes the time formatting string that our directive binds to. We will use the `$interval` service
@@ -647,7 +674,6 @@ To do this, we need to use the `transclude` option.
        return {
          restrict: 'E',
          transclude: true,
-          scope: {},
          templateUrl: 'my-dialog.html'
        };
      });
@@ -658,7 +684,8 @@ To do this, we need to use the `transclude` option.
    </div>
  </file>
  <file name="my-dialog.html">
-    <div class="alert" ng-transclude></div>
+    <div class="alert" ng-transclude>
+    </div>
  </file>
 </example>

@@ -680,7 +707,7 @@ that redefines `name` as `Jeff`. What do you think the `{{name}}` binding will r
          transclude: true,
          scope: {},
          templateUrl: 'my-dialog.html',
-          link: function (scope) {
+          link: function (scope, element) {
            scope.name = 'Jeff';
          }
        };
@@ -692,7 +719,8 @@ that redefines `name` as `Jeff`. What do you think the `{{name}}` binding will r
    </div>
  </file>
  <file name="my-dialog.html">
-    <div class="alert" ng-transclude></div>
+    <div class="alert" ng-transclude>
+    </div>
  </file>
 </example>

@@ -703,7 +731,7 @@ The `transclude` option changes the way scopes are nested. It makes it so that t
 transcluded directive have whatever scope is outside the directive, rather than whatever scope is on
 the inside. In doing so, it gives the contents access to the outside scope.

-Note that if the directive did not create its own scope, then `scope` in `scope.name = 'Jeff'` would
+Note that if the directive did not create its own scope, then `scope` in `scope.name = 'Jeff';` would
 reference the outside scope and we would see `Jeff` in the output.

 This behavior makes sense for a directive that wraps some content, because otherwise you'd have to
@@ -723,12 +751,9 @@ own behavior to it.
    angular.module('docsIsoFnBindExample', [])
      .controller('Controller', ['$scope', '$timeout', function($scope, $timeout) {
        $scope.name = 'Tobias';
-        $scope.message = '';
-        $scope.hideDialog = function (message) {
-          $scope.message = message;
+        $scope.hideDialog = function () {
          $scope.dialogIsHidden = true;
          $timeout(function () {
-            $scope.message = '';
            $scope.dialogIsHidden = false;
          }, 2000);
        };
@@ -746,15 +771,14 @@ own behavior to it.
  </file>
  <file name="index.html">
    <div ng-controller="Controller">
-      {{message}}
-      <my-dialog ng-hide="dialogIsHidden" on-close="hideDialog(message)">
+      <my-dialog ng-hide="dialogIsHidden" on-close="hideDialog()">
        Check out the contents, {{name}}!
      </my-dialog>
    </div>
  </file>
  <file name="my-dialog-close.html">
    <div class="alert">
-      <a href class="close" ng-click="close({message: 'closing for now'})">&times;</a>
+      <a href class="close" ng-click="close()">&times;</a>
      <div ng-transclude></div>
    </div>
  </file>
@@ -771,15 +795,9 @@ callback functions to directive behaviors.

 When the user clicks the `x` in the dialog, the directive's `close` function is called, thanks to
 `ng-click.`  This call to `close` on the isolated scope actually evaluates the expression
-`hideDialog(message)` in the context of the original scope, thus running `Controller`'s `hideDialog`
+`hideDialog()` in the context of the original scope, thus running `Controller`'s `hideDialog`
 function.

-Often it's desirable to pass data from the isolate scope via an expression to the
-parent scope, this can be done by passing a map of local variable names and values into the expression
-wrapper function. For example, the `hideDialog` function takes a message to display when the dialog
-is hidden. This is specified in the directive by calling `close({message: 'closing for now'})`.
-Then the local variable `message` will be available within the `on-close` expression.
-
 <div class="alert alert-success">
 **Best Practice:** use `&attr` in the `scope` option when you want your directive
 to expose an API for binding to behaviors.
@@ -799,45 +817,43 @@ element?
  <file name="script.js">
    angular.module('dragModule', [])
      .directive('myDraggable', ['$document', function($document) {
-        return {
-          link: function(scope, element, attr) {
-            var startX = 0, startY = 0, x = 0, y = 0;
+        return function(scope, element, attr) {
+          var startX = 0, startY = 0, x = 0, y = 0;

+          element.css({
+           position: 'relative',
+           border: '1px solid red',
+           backgroundColor: 'lightgrey',
+           cursor: 'pointer'
+          });
+
+          element.on('mousedown', function(event) {
+            // Prevent default dragging of selected content
+            event.preventDefault();
+            startX = event.pageX - x;
+            startY = event.pageY - y;
+            $document.on('mousemove', mousemove);
+            $document.on('mouseup', mouseup);
+          });
+
+          function mousemove(event) {
+            y = event.pageY - startY;
+            x = event.pageX - startX;
            element.css({
-             position: 'relative',
-             border: '1px solid red',
-             backgroundColor: 'lightgrey',
-             cursor: 'pointer'
+              top: y + 'px',
+              left:  x + 'px'
            });
+          }

-            element.on('mousedown', function(event) {
-              // Prevent default dragging of selected content
-              event.preventDefault();
-              startX = event.pageX - x;
-              startY = event.pageY - y;
-              $document.on('mousemove', mousemove);
-              $document.on('mouseup', mouseup);
-            });
-
-            function mousemove(event) {
-              y = event.pageY - startY;
-              x = event.pageX - startX;
-              element.css({
-                top: y + 'px',
-                left:  x + 'px'
-              });
-            }
-
-            function mouseup() {
-              $document.off('mousemove', mousemove);
-              $document.off('mouseup', mouseup);
-            }
+          function mouseup() {
+            $document.off('mousemove', mousemove);
+            $document.off('mouseup', mouseup);
          }
        };
      }]);
  </file>
  <file name="index.html">
-    <span my-draggable>Drag Me</span>
+    <span my-draggable>Drag ME</span>
  </file>
 </example>

@@ -860,7 +876,7 @@ to which tab is active.
          restrict: 'E',
          transclude: true,
          scope: {},
-          controller: ['$scope', function($scope) {
+          controller: function($scope) {
            var panes = $scope.panes = [];

            $scope.select = function(pane) {
@@ -876,13 +892,13 @@ to which tab is active.
              }
              panes.push(pane);
            };
-          }],
+          },
          templateUrl: 'my-tabs.html'
        };
      })
      .directive('myPane', function() {
        return {
-          require: '^^myTabs',
+          require: '^myTabs',
          restrict: 'E',
          transclude: true,
          scope: {
@@ -898,9 +914,11 @@ to which tab is active.
  <file name="index.html">
    <my-tabs>
      <my-pane title="Hello">
+        <h4>Hello</h4>
        <p>Lorem ipsum dolor sit amet</p>
      </my-pane>
      <my-pane title="World">
+        <h4>World</h4>
        <em>Mauris elementum elementum enim at suscipit.</em>
        <p><a href ng-click="i = i + 1">counter: {{i || 0}}</a></p>
      </my-pane>
@@ -917,25 +935,22 @@ to which tab is active.
    </div>
  </file>
  <file name="my-pane.html">
-    <div class="tab-pane" ng-show="selected">
-      <h4>{{title}}</h4>
-      <div ng-transclude></div>
+    <div class="tab-pane" ng-show="selected" ng-transclude>
    </div>
  </file>
 </example>

-The `myPane` directive has a `require` option with value `^^myTabs`. When a directive uses this
-option, `$compile` will throw an error unless the specified controller is found. The `^^` prefix
-means that this directive searches for the controller on its parents. (A `^` prefix would make the
-directive look for the controller on its own element or its parents; without any prefix, the
-directive would look on its own element only.)
+The `myPane` directive has a `require` option with value `^myTabs`. When a directive uses this
+option, `$compile` will throw an error unless the specified controller is found. The `^` prefix
+means that this directive searches for the controller on its parents (without the `^` prefix, the
+directive would look for the controller on just its own element).

 So where does this `myTabs` controller come from? Directives can specify controllers using
 the unsurprisingly named `controller` option. As you can see, the `myTabs` directive uses this
 option. Just like `ngController`, this option attaches a controller to the template of the directive.

-If it is necessary to reference the controller or any functions bound to the controller from the
-template, you can use the option `controllerAs` to specify the name of the controller as an alias.
+If it is necessary to reference the controller or any functions bound to the controller's scope in
+the template, you can use the option `controllerAs` to specify the name of the controller as an alias.
 The directive needs to define a scope for this configuration to be used. This is particularly useful
 in the case when the directive is used as a component.

@@ -950,7 +965,7 @@ The corresponding parameter being sent to the `link` function will also be an ar
 angular.module('docsTabsExample', [])
  .directive('myPane', function() {
    return {
-      require: ['^^myTabs', 'ngModel'],
+      require: ['^myTabs', '^ngModel'],
      restrict: 'E',
      transclude: true,
      scope: {
@@ -986,3 +1001,4 @@ available in the {@link guide/compiler compiler guide}.

 The {@link ng.$compile `$compile` API} page has a comprehensive list of directive options for
 reference.
+
@@ -5,9 +5,8 @@

 # Angular Expressions

-Angular expressions are JavaScript-like code snippets that are mainly placed in
-interpolation bindings such as `<span title="{{ attrBinding }}">{{ textBinding }}</span>`,
-but also used directly in directive attributes such as `ng-click="functionExpression()"`.
+Angular expressions are JavaScript-like code snippets that are usually placed in bindings such as
+`{{ expression }}`.

 For example, these are valid expressions in Angular:

@@ -29,16 +28,14 @@ Angular expressions are like JavaScript expressions with the following differenc

  * **No Control Flow Statements:** You cannot use the following in an Angular expression:
    conditionals, loops, or exceptions.
-
+	
  * **No Function Declarations:** You cannot declare functions in an Angular expression,
    even inside `ng-init` directive.
-
-  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions
+	
+  * **No RegExp Creation With Literal Notation:** You cannot create regular expressions 
    in an Angular expression.
-
-  * **No Object Creation With New Operator:** You cannot use `new` operator in an Angular expression.
-
-  * **No Comma And Void Operators:** You cannot use `,` or `void` operators in an Angular expression.
+	
+  * **No Comma And Void Operators:** You cannot use `,` or `void` in an Angular expression.

  * **Filters:** You can use {@link guide/filter filters} within expressions to format data before
    displaying it.
@@ -73,7 +70,7 @@ You can try evaluating different expressions here:
      <ul>
       <li ng-repeat="expr in exprs track by $index">
         [ <a href="" ng-click="removeExp($index)">X</a> ]
-         <code>{{expr}}</code> => <span ng-bind="$parent.$eval(expr)"></span>
+         <tt>{{expr}}</tt> => <span ng-bind="$parent.$eval(expr)"></span>
        </li>
      </ul>
    </div>
@@ -116,9 +113,6 @@ This restriction is intentional. It prevents accidental access to the global sta
 Instead use services like `$window` and `$location` in functions called from expressions. Such services
 provide mockable access to globals.

-It is possible to access the context object using the identifier `this` and the locals object using the
-identifier `$locals`.
-
 <example module="expressionExample">
  <file name="index.html">
    <div class="example2" ng-controller="ExampleController">
@@ -147,9 +141,6 @@ identifier `$locals`.
      }
      element(by.css('[ng-click="greet()"]')).click();

-      // We need to give the browser time to display the alert
-      browser.wait(protractor.ExpectedConditions.alertIsPresent(), 1000);
-
      var alertDialog = browser.switchTo().alert();

      expect(alertDialog.getText()).toEqual('Hello World');
@@ -184,7 +175,7 @@ expression, delegate to a JavaScript method instead.
 ## No function declarations or RegExp creation with literal notation

 You can't declare functions or create regular expressions from within AngularJS expressions. This is
-to avoid complex model transformation logic inside templates. Such logic is better placed in a
+to avoid complex model transformation logic inside templates. Such logic is better placed in a 
 controller or in a dedicated filter where it can be tested properly.

 ## `$event`
@@ -286,7 +277,7 @@ result is a non-undefined value (see value stabilization algorithm below).
 </example>


-### Reasons for using one-time binding
+### Why this feature

 The main purpose of one-time binding expression is to provide a way to create a binding
 that gets deregistered and frees up resources once the binding is stabilized.
@@ -306,29 +297,25 @@ then the expression is not fulfilled and will remain watched.
  2. If V is not undefined, mark the result of the expression as stable and schedule a task
     to deregister the watch for this expression when we exit the digest loop
  3. Process the digest loop as normal
-  4. When digest loop is done and all the values have settled, process the queue of watch
-     deregistration tasks. For each watch to be deregistered, check if it still evaluates
-     to a value that is not `undefined`. If that's the case, deregister the watch. Otherwise,
+  4. When digest loop is done and all the values have settled process the queue of watch
+     deregistration tasks. For each watch to be deregistered check if it still evaluates
+     to value that is not `undefined`. If that's the case, deregister the watch. Otherwise
     keep dirty-checking the watch in the future digest loops by following the same
     algorithm starting from step 1

-#### Special case for object literals
-
-Unlike simple values, object-literals are watched until every key is defined.
-See http://www.bennadel.com/blog/2760-one-time-data-bindings-for-object-literal-expressions-in-angularjs-1-3.htm

 ### How to benefit from one-time binding

-If the expression will not change once set, it is a candidate for one-time binding.
+If the expression will not change once set, it is a candidate for one-time binding. 
 Here are three example cases.

 When interpolating text or attributes:

 ```html
-  <div name="attr: {{::color}}">text: {{::name | uppercase}}</div>
+  <div name="attr: {{::color}}">text: {{::name}}</div>
 ```

-When using a directive with bidirectional binding and parameters that will not change:
+When using a directive with bidirectional binding and the parameters will not change:

 ```js
 someModule.directive('someDirective', function() {
@@ -351,6 +338,7 @@ When using a directive that takes an expression:

 ```html
 <ul>
-  <li ng-repeat="item in ::items | orderBy:'name'">{{item.name}};</li>
+  <li ng-repeat="item in ::items">{{item.name}};</li>
 </ul>
 ```
+
@@ -32,13 +32,10 @@ E.g. the markup `{{ 1234 | number:2 }}` formats the number 1234 with 2 decimal p

 ## Using filters in controllers, services, and directives

-You can also use filters in controllers, services, and directives.
-
-<div class="alert alert-info">
-For this, inject a dependency with the name `<filterName>Filter` into your controller/service/directive.
-E.g. a filter called `number` is injected by using the dependency `numberFilter`. The injected argument
-is a function that takes the value to format as first argument, and filter parameters starting with the second argument.
-</div>
+You can also use filters in controllers, services, and directives. For this, inject a dependency
+with the name `<filterName>Filter` to your controller/service/directive. E.g. using the dependency
+`numberFilter` will inject the number filter. The injected argument is a function that takes the
+value to format as first argument and filter parameters starting with the second argument.

 The example below uses the filter called {@link ng.filter:filter `filter`}.
 This filter reduces arrays into sub arrays based on
@@ -95,10 +92,8 @@ means that it should be stateless and idempotent. Angular relies on these proper
 the filter only when the inputs to the function change.

 <div class="alert alert-warning">
-**Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
-Names with special characters, such as hyphens and dots, are not allowed.  If you wish to namespace
-your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
-(`myapp_subsection_filterx`).
+**Note:** filter names must be valid angular expression identifiers, such as `uppercase` or `orderBy`.
+Names with special characters, such as hyphens and dots, are not allowed.
 </div>

 The following sample filter reverses a text string. In addition, it conditionally makes the
@@ -111,7 +106,6 @@ text upper-case.
      No filter: {{greeting}}<br>
      Reverse: {{greeting|reverse}}<br>
      Reverse + uppercase: {{greeting|reverse:true}}<br>
-      Reverse, filtered in controller: {{filteredGreeting}}<br>
    </div>
  </file>

@@ -131,9 +125,8 @@ text upper-case.
          return out;
        };
      })
-      .controller('MyController', ['$scope', 'reverseFilter', function($scope, reverseFilter) {
+      .controller('MyController', ['$scope', function($scope) {
        $scope.greeting = 'hello';
-        $scope.filteredGreeting = reverseFilter($scope.greeting);
      }]);
  </file>
 </example>
@@ -3,20 +3,17 @@
@sortOrder 290
@description

-# Forms
-
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
 A Form is a collection of controls for the purpose of grouping related controls together.

-Form and controls provide validation services, so that the user can be notified of invalid input
-before submitting a form. This provides a better user experience than server-side validation alone
-because the user gets instant feedback on how to correct the error. Keep in mind that while
-client-side validation plays an important role in providing good user experience, it can easily
-be circumvented and thus can not be trusted. Server-side validation is still necessary for a
-secure application.
+Form and controls provide validation services, so that the user can be notified of invalid input.
+This provides a better user experience, because the user gets instant feedback on how to
+correct the error. Keep in mind that while client-side validation plays an important role
+in providing good user experience, it can easily be circumvented and thus can not be trusted.
+Server-side validation is still necessary for a secure application.


-## Simple form
+# Simple form
 The key directive in understanding two-way data-binding is {@link ng.directive:ngModel ngModel}.
 The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view,
 as well as view to the model. In addition it provides an {@link ngModel.NgModelController API}
@@ -33,7 +30,7 @@ for other directives to augment its behavior.
        <input type="button" ng-click="reset()" value="Reset" />
        <input type="submit" ng-click="update(user)" value="Save" />
      </form>
-      <pre>user = {{user | json}}</pre>
+      <pre>form = {{user | json}}</pre>
      <pre>master = {{master | json}}</pre>
    </div>

@@ -64,7 +61,7 @@ For example: inputs of type `email` must have a value in the form of `user@domai



-## Using CSS classes
+# Using CSS classes

 To allow styling of form as well as controls, `ngModel`  adds these CSS classes:

@@ -95,8 +92,6 @@ and failing to satisfy its validity.
        <input type="button" ng-click="reset()" value="Reset" />
        <input type="submit" ng-click="update(user)" value="Save" />
      </form>
-      <pre>user = {{user | json}}</pre>
-      <pre>master = {{master | json}}</pre>
    </div>

    <style type="text/css">
@@ -130,7 +125,7 @@ and failing to satisfy its validity.



-## Binding to form and control state
+# Binding to form and control state

 A form is an instance of {@link form.FormController FormController}.
 The form instance can optionally be published into the scope using the `name` attribute.
@@ -185,8 +180,6 @@ didn't interact with a control
        <input type="button" ng-click="reset(form)" value="Reset" />
        <input type="submit" ng-click="update(user)" value="Save" />
      </form>
-      <pre>user = {{user | json}}</pre>
-      <pre>master = {{master | json}}</pre>
    </div>
  </file>

@@ -214,7 +207,7 @@ didn't interact with a control



-## Custom model update triggers
+# Custom model update triggers

 By default, any change to the content will trigger a model update and form validation. You can
 override this behavior using the {@link ng.directive:ngModelOptions ngModelOptions} directive to
@@ -255,7 +248,7 @@ will update the model only when the control loses focus (blur event).



-## Non-immediate (debounced) model updates
+# Non-immediate (debounced) model updates

 You can delay the model update/validation by using the `debounce` key with the
 {@link ng.directive:ngModelOptions ngModelOptions} directive. This delay will also apply to
@@ -296,7 +289,7 @@ after last change.
  </file>
 </example>

-## Custom Validation
+# Custom Validation

 Angular provides basic implementation for most common HTML5 {@link ng.directive:input input}
 types: ({@link input[text] text}, {@link input[number] number}, {@link input[url] url},
@@ -383,7 +376,7 @@ In the following example we create two directives:
      return {
        require: 'ngModel',
        link: function(scope, elm, attrs, ctrl) {
-          var usernames = ['Jim', 'John', 'Jill', 'Jackie'];
+        var usernames = ['Jim', 'John', 'Jill', 'Jackie'];

          ctrl.$asyncValidators.username = function(modelValue, viewValue) {

@@ -413,7 +406,7 @@ In the following example we create two directives:
  </file>
 </example>

-## Modifying built-in validators
+# Modifying built-in validators

 Since Angular itself uses `$validators`, you can easily replace or remove built-in validators,
 should you find it necessary. The following example shows you how to overwrite the email validator
@@ -458,7 +451,7 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
 </example>


-## Implementing custom form controls (using `ngModel`)
+# Implementing custom form controls (using `ngModel`)
 Angular implements all of the basic HTML form controls ({@link ng.directive:input input},
 {@link ng.directive:select select}, {@link ng.directive:textarea textarea}),
 which should be sufficient for most cases. However, if you need more flexibility,
@@ -495,7 +488,9 @@ The following example shows how to add two-way data-binding to contentEditable e
        link: function(scope, elm, attrs, ctrl) {
          // view -> model
          elm.on('blur', function() {
-            ctrl.$setViewValue(elm.html());
+            scope.$apply(function() {
+              ctrl.$setViewValue(elm.html());
+            });
          });

          // model -> view
@@ -18,10 +18,8 @@ application means providing translations and localized formats for the abstracte
 Angular supports i18n/l10n for {@link ng.filter:date date}, {@link ng.filter:number number} and
 {@link ng.filter:currency currency} filters.

-Localizable pluralization is supported via the {@link ng.directive:ngPluralize `ngPluralize`
-directive}.  Additionally, you can use {@link guide/i18n#messageformat-extensions MessageFormat extensions} to
-`$interpolate` for localizable pluralization and gender support in all interpolations via the
-`ngMessageFormat` module.
+Additionally, Angular supports localizable pluralization support through the {@link
+ng.directive:ngPluralize `ngPluralize` directive}.

 All localizable Angular components depend on locale-specific rule sets managed by the {@link
 ng.$locale `$locale` service}.
@@ -139,328 +137,3 @@ The Angular datetime filter uses the time zone settings of the browser. The same
 application will show different time information depending on the time zone settings of the
 computer that the application is running on. Neither JavaScript nor Angular currently supports
 displaying the date with a timezone specified by the developer.
-
-
-<a name="MessageFormat"></a>
-## MessageFormat extensions
-
-You can write localizable plural and gender based messages in Angular interpolation expressions and
-`$interpolate` calls.
-
-This syntax extension is provided by way of the `ngMessageFormat` module that your application can
-depend upon (shipped separately as `angular-message-format.min.js` and `angular-message-format.js`.)
-A current limitation of the `ngMessageFormat` module, is that it does not support redefining the
-`$interpolate` start and end symbols. Only the default `{{` and `}}` are allowed.
-
-The syntax extension is based on a subset of the ICU MessageFormat syntax that covers plurals and
-gender selections.  Please refer to the links in the “Further Reading” section at the bottom of this
-section.
-
-You may find it helpful to play with the following example as you read the explanations below:
-
-<example name="message-format-example" module="messageFormatExample" deps="angular-message-format.js">
-  <file name="index.html">
-    <div ng-controller="ckCtrl">
-      <b>Set number of recipients</b>
-      <button ng-click="setNumRecipients(0)">None</button>
-      <button ng-click="setNumRecipients(1)">One</button>
-      <button ng-click="setNumRecipients(2)">Two</button>
-      <button ng-click="setNumRecipients(3)">Three</button>
-
-
-      <br><br>
-      <b>Sender's</b> name: <input ng-model="sender.name"> &nbsp;&nbsp;
-
-      <br><br><b>Recipients</b><br>
-      <div ng-repeat="recipient in recipients">
-        Name: <input ng-model="recipient.name"> &nbsp;&nbsp;
-        Gender: <button ng-click="setGender(recipient, 'male')">male</button>
-                <button ng-click="setGender(recipient, 'female')">female</button>
-                <button ng-click="setGender(recipient, 'other')">other</button>
-      </div>
-
-      <br><br><b>Message</b><br>
-      {{recipients.length, plural, offset:1
-          =0 {You ({{sender.name}}) gave no gifts}
-          =1 { {{ recipients[0].gender, select,
-                    male {You ({{sender.name}}) gave him ({{recipients[0].name}}) a gift.}
-                    female {You ({{sender.name}}) gave her ({{recipients[0].name}}) a gift.}
-                    other {You ({{sender.name}}) gave them ({{recipients[0].name}}) a gift.}
-                }}
-             }
-          one { {{ recipients[0].gender, select,
-                    male {You ({{sender.name}}) gave him ({{recipients[0].name}}) and one other person a gift.}
-                    female {You ({{sender.name}}) gave her ({{recipients[0].name}}) and one other person a gift.}
-                    other {You ({{sender.name}}) gave them ({{recipients[0].name}}) and one other person a gift.}
-                }}
-             }
-             other {You ({{sender.name}}) gave {{recipients.length}} people gifts. }
-      }}
-
-      <br><br><b>In an attribute</b><br>
-      <div attrib="{{recipients.length, plural, offset:1
-                      =0 {You ({{sender.name}}) gave no gifts}
-                      =1 { {{ recipients[0].gender, select,
-                                male {You ({{sender.name}}) gave him ({{recipients[0].name}}) a gift.}
-                                female {You ({{sender.name}}) gave her ({{recipients[0].name}}) a gift.}
-                                other {You ({{sender.name}}) gave them ({{recipients[0].name}}) a gift.}
-                            }}
-                         }
-                      one { {{ recipients[0].gender, select,
-                                male {You ({{sender.name}}) gave him ({{recipients[0].name}}) and one other person a gift.}
-                                female {You ({{sender.name}}) gave her ({{recipients[0].name}}) and one other person a gift.}
-                                other {You ({{sender.name}}) gave them ({{recipients[0].name}}) and one other person a gift.}
-                            }}
-                         }
-                         other {You ({{sender.name}}) gave {{recipients.length}} people gifts. }
-                   }}">
-          This div has an attribute interpolated with messageformat.  Use the DOM inspector to check it out.
-      </div>
-    </div>
-  </file>
-  <file name="app.js">
-    function Person(name, gender) {
-      this.name = name;
-      this.gender = gender;
-    }
-
-    angular.module('messageFormatExample', ['ngMessageFormat'])
-      .controller('ckCtrl', function ($scope, $injector, $parse) {
-        var people = [ new Person("Alice", "female"),
-                       new Person("Bob", "male"),
-                       new Person("Charlie", "male") ];
-
-        $scope.sender = new Person("Harry Potter", "male");
-        $scope.recipients = people.slice();
-
-        $scope.setNumRecipients = function(n) {
-          n = n > people.length ? people.length : n;
-          $scope.recipients = people.slice(0, n);
-        };
-
-        $scope.setGender = function(person, gender) {
-          person.gender = gender;
-        };
-      });
-  </file>
-</example>
-
-### Plural Syntax
-
-The syntax for plural based message selection looks like the following:
-
-```text
-{{NUMERIC_EXPRESSION, plural,
-    =0 {MESSAGE_WHEN_VALUE_IS_0}
-    =1 {MESSAGE_WHEN_VALUE_IS_1}
-    =2 {MESSAGE_WHEN_VALUE_IS_2}
-    =3 {MESSAGE_WHEN_VALUE_IS_3}
-    ...
-    zero {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ZERO}
-    one {MESSAGE_WHEN_PLURAL_CATEGORY_IS_ONE}
-    two {MESSAGE_WHEN_PLURAL_CATEGORY_IS_TWO}
-    few {MESSAGE_WHEN_PLURAL_CATEGORY_IS_FEW}
-    many {MESSAGE_WHEN_PLURAL_CATEGORY_IS_MANY}
-    other {MESSAGE_WHEN_THERE_IS_NO_MATCH}
-}}
-```
-
-Please note that whitespace (including newline) is generally insignificant except as part of the
-actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
-
-Here, `NUMERIC_EXPRESSION` is an expression that evaluates to a numeric value based on which the
-displayed message should change based on pluralization rules.
-
-Following the Angular expression, you would denote the plural extension syntax by the `, plural,`
-syntax element.  The spaces there are optional.
-
-This is followed by a list of selection keyword and corresponding message pairs.  The "other"
-keyword and corresponding message are **required** but you may have as few or as many of the other
-categories as you need.
-
-#### Selection Keywords
-
-The selection keywords can be either exact matches or language dependent [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html).
-
-Exact matches are written as the equal sign followed by the exact value. `=0`, `=1`, `=2` and
-`=123` are all examples of exact matches.  Note that there should be no space between the equal sign
-and the numeric value.
-
-Plural category matches are single words corresponding to the [plural
-categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html) of
-the CLDR plural category spec.  These categories vary by locale.  The "en" (English) locale, for
-example, defines just "one" and "other" while the "ga" (Irish) locale defines "one", "two", "few",
-"many" and "other".  Typically, you would just write the categories for your language.  During
-translation, the translators will add or remove more categories depending on the target locale.
-
-Exact matches always win over keyword matches.  Therefore, if you define both `=0` and `zero`, when
-the value of the expression is zero, the `=0` message is the one that will be selected.  (The
-duplicate keyword categories are helpful when used with the optional `offset` syntax described
-later.)
-
-
-#### Messages
-
-Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
-In addition, the `#` symbol is a placeholder for the actual numeric value of the expression.
-
-### Simple plural example
-
-```text
-{{numMessages, plural,
-      =0 {You have no new messages}
-      =1 {You have one new message}
-   other {You have # new messages}
-}}
-```
-
-Because these messages can themselves contain Angular expressions, you could also write this as
-follows:
-
-```text
-{{numMessages, plural,
-      =0 {You have no new messages}
-      =1 {You have one new message}
-   other {You have {{numMessages}} new messages}
-}}
-```
-
-
-### Plural syntax with optional `offset`
-
-The plural syntax supports an optional `offset` syntax that is used in matching.  It's simpler to
-explain this with an example.
-
-```text
-{{recipients.length, plural, offset:1
-    =0    {You gave no gifts}
-    =1    {You gave {{recipients[0].name}} a gift}
-    one   {You gave {{recipients[0].name}} and one other person a gift}
-    other {You gave {{recipients[0].name}} and # other people a gift}
-}}
-```
-
-When an `offset` is specified, the matching works as follows.  First, the exact value of the Angular
-expression is matched against the exact matches (i.e. `=N` selectors) to find a match.  If there is
-one, that message is used.  If there was no match, then the offset value is subtracted from the
-value of the expression and locale specific pluralization rules are applied to this new value to
-obtain its plural category (such as “one”, “few”, “many”, etc.) and a match is attempted against the
-keyword selectors and the matching message is used.  If there was no match, then the “other”
-category (required) is used.  The value of the `#` character inside a message is the value of
-original expression reduced by the offset value that was specified.
-
-### Escaping / Quoting
-
-You will need to escape curly braces or the `#` character inside message texts if you want them to
-be treated literally with no special meaning.  You may quote/escape any character in your message
-text by preceding it with a `\` (backslash) character.  The backslash character removes any special
-meaning to the character that immediately follows it.  Therefore, you can escape or quote the
-backslash itself by preceding it with another backslash character.
-
-
-### Gender (aka select) Syntax
-
-The gender support is provided by the more generic "select" syntax that is more akin to a switch
-statement.  It is general enough to support use for gender based messages.
-
-The syntax for gender based message selection looks like the following:
-
-```text
-{{EXPRESSION, select,
-    male {MESSAGE_WHEN_EXPRESSION_IS_MALE}
-    female {MESSAGE_WHEN_EXPRESSION_IS_FEMALE}
-    ...
-    other {MESSAGE_WHEN_THERE_IS_NO_GENDER_MATCH}
-}}
-```
-
-Please note that whitespace (including newline) is generally insignificant except as part of the
-actual message text that occurs in curly braces.  Whitespace is generally used to aid readability.
-
-Here, `EXPRESSION` is an Angular expression that evaluates to the gender of the person that
-is used to select the message that should be displayed.
-
-The Angular expression is followed by `, select,` where the spaces are optional.
-
-This is followed by a list of selection keyword and corresponding message pairs.  The "other"
-keyword and corresponding message are **required** but you may have as few or as many of the other
-gender values as you need (i.e. it isn't restricted to male/female.)  Note however, that the
-matching is **case-sensitive**.
-
-#### Selection Keywords
-
-Selection keywords are simple words like "male" and "female".  The keyword, "other", and its
-corresponding message are required while others are optional.  It is used when the Angular
-expression does not match (case-insensitively) any of the other keywords specified.
-
-#### Messages
-
-Messages immediately follow a selection keyword and are optionally preceded by whitespace.  They are
-written in single curly braces (`{}`).  They may contain Angular interpolation syntax inside them.
-
-### Simple gender example
-
-```text
-{{friendGender, select,
-       male {Invite him}
-     female {Invite her}
-      other {Invite them}
-}}
-```
-
-### Nesting
-
-As mentioned in the syntax for plural and select, the embedded messages can contain Angular
-interpolation syntax.  Since you can use MessageFormat extensions in Angular interpolation, this
-allows you to nest plural and gender expressions in any order.
-
-Please note that if these are intended to reach a translator and be translated, it is recommended
-that the messages appear as a whole and not be split up.
-
-### Demonstration of nesting
-
-This is taken from the above example.
-
-```text
-{{recipients.length, plural, offset:1
-    =0 {You ({{sender.name}}) gave no gifts}
-    =1 { {{ recipients[0].gender, select,
-              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) a gift.}
-              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) a gift.}
-              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) a gift.}
-          }}
-       }
-    one { {{ recipients[0].gender, select,
-              male {You ({{sender.name}}) gave him ({{recipients[0].name}}) and one other person a gift.}
-              female {You ({{sender.name}}) gave her ({{recipients[0].name}}) and one other person a gift.}
-              other {You ({{sender.name}}) gave them ({{recipients[0].name}}) and one other person a gift.}
-          }}
-       }
-    other {You ({{sender.name}}) gave {{recipients.length}} people gifts. }
-}}
-```
-
-### Differences from the ICU MessageFormat syntax
-
-This section is useful to you if you're already familiar with the ICU MessageFormat syntax.
-
-This syntax extension, while based on MessageFormat, has been designed to be backwards compatible
-with existing AngularJS interpolation expressions.  The key rule is simply this: **All
-interpolations are done inside double curlies.** The top level comma operator after an expression
-inside the double curlies causes MessageFormat extensions to be recognized.  Such a top level comma
-is otherwise illegal in an Angular expression and is used by MessageFormat to specify the function
-(such as plural/select) and it's related syntax.
-
-To understand the extension, take a look at the ICU MessageFormat syntax as specified by the ICU
-documentation.  Anywhere in that MessageFormat that you have regular message text and you want to
-substitute an expression, just put it in double curlies instead of single curlies that MessageFormat
-dictates.  This has a huge advantage.  **You are no longer limited to simple identifiers for
-substitutions**.  Because you are using double curlies, you can stick in any arbitrary interpolation
-syntax there, including nesting more MessageFormat expressions!
-
-### Further Reading
-For more details, please refer to our [design doc](https://docs.google.com/a/google.com/document/d/1pbtW2yvtmFBikfRrJd8VAsabiFkKezmYZ_PbgdjQOVU/edit).
-You can read more about the ICU MessageFormat syntax at
-[Formatting Messages | ICU User Guide](http://userguide.icu-project.org/formatparse/messages#TOC-MessageFormat).
@@ -53,7 +53,7 @@ In Angular applications, you move the job of filling page templates with data fr

 ## Specific Topics

-* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Facebook library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
+* **Login: **[Google example](https://developers.google.com/+/photohunt/python), [AngularJS Faceb0ok library](https://github.com/pc035860/angular-easyfb), [Facebook example](http://blog.brunoscopelliti.com/facebook-authentication-in-your-angularjs-web-app), [authentication strategy](http://blog.brunoscopelliti.com/deal-with-users-authentication-in-an-angularjs-web-app), [unix-style authorization](http://frederiknakstad.com/authentication-in-single-page-applications-with-angular-js/)
 * **Mobile:** [Angular on Mobile Guide](http://www.ng-newsletter.com/posts/angular-on-mobile.html), [PhoneGap](http://devgirl.org/2013/06/10/quick-start-guide-phonegap-and-angularjs/)
 * **Other Languages:** [CoffeeScript](http://www.coffeescriptlove.com/2013/08/angularjs-and-coffeescript-tutorials.html), [Dart](https://github.com/angular/angular.dart.tutorial/wiki)
 * **Realtime: **[Socket.io](http://www.creativebloq.com/javascript/angularjs-collaboration-board-socketio-2132885), [OmniBinder](https://github.com/jeffbcross/omnibinder)
@@ -102,7 +102,7 @@ This is a short list of libraries with specific support and documentation for wo
 ## Learning Resources

 ###Books
-* [AngularJS: Up and Running](http://www.amazon.com/AngularJS-Running-Enhanced-Productivity-Structured/dp/1491901942) by Brad Green and Shyam Seshadri
+* [AngularJS](http://www.amazon.com/AngularJS-Brad-Green/dp/1449344852) by Brad Green and Shyam Seshadri
 * [Mastering Web App Development](http://www.amazon.com/Mastering-Web-Application-Development-AngularJS/dp/1782161821) by Pawel Kozlowski and Pete Bacon Darwin
 * [AngularJS Directives](http://www.amazon.com/AngularJS-Directives-Alex-Vanston/dp/1783280336) by Alex Vanston
 * [Recipes With AngularJS](http://www.amazon.co.uk/Recipes-Angular-js-Frederik-Dietz-ebook/dp/B00DK95V48) by Frederik Dietz
@@ -1,142 +0,0 @@
-@ngdoc overview
-@name Interpolation
-@sortOrder 275
-@description
-
-# Interpolation and data-binding
-
-Interpolation markup with embedded {@link guide/expression expressions} is used by Angular to
-provide data-binding to text nodes and attribute values.
-
-An example of interpolation is shown below:
-
-```html
-<a ng-href="img/{{username}}.jpg">Hello {{username}}!</a>
-```
-
-### How text and attribute bindings work
-
-During the compilation process the {@link ng.$compile compiler} uses the {@link ng.$interpolate $interpolate}
-service to see if text nodes and element attributes contain interpolation markup with embedded expressions.
-
-If that is the case, the compiler adds an interpolateDirective to the node and
-registers {@link ng.$rootScope.Scope#$watch watches} on the computed interpolation function,
-which will update the corresponding text nodes or attribute values as part of the
-normal {@link ng.$rootScope.Scope#$digest digest} cycle.
-
-Note that the interpolateDirective has a priority of 100 and sets up the watch in the preLink function.
-
-### Binding to boolean attributes
-
-Attributes such as `disabled` are called `boolean` attributes, because their presence means `true` and
-their absence means `false`. We cannot use normal attribute bindings with them, because the HTML
-specification does not require browsers to preserve the values of boolean attributes. This means that
-if we put an Angular interpolation expression into such an attribute then the binding information
-would be lost, because the browser ignores the attribute value.
-
-In the following example, the interpolation information would be ignored and the browser would simply
-interpret the attribute as present, meaning that the button would always be disabled.
-
- ```html
-  Disabled: <input type="checkbox" ng-model="isDisabled" />
-  <button disabled="{{isDisabled}}">Disabled</button>
-```
-
-For this reason, Angular provides special `ng`-prefixed directives for the following boolean attributes:
-{@link ngDisabled `disabled`}, {@link ngRequired `required`}, {@link ngSelected `selected`},
-{@link ngChecked `checked`}, {@link ngReadonly `readOnly`} , and {@link ngOpen `open`}.
-
-These directives take an expression inside the attribute, and set the corresponding boolean attribute
-to true when the expression evaluates to truthy.
-
- ```html
-  Disabled: <input type="checkbox" ng-model="isDisabled" />
-  <button ng-disabled="isDisabled">Disabled</button>
-```
-
-### `ngAttr` for binding to arbitrary attributes
-
-Web browsers are sometimes picky about what values they consider valid for attributes.
-
-For example, considering this template:
-
-```html
-<svg>
-  <circle cx="{{cx}}"></circle>
-</svg>
-```
-
-We would expect Angular to be able to bind to this, but when we check the console we see
-something like `Error: Invalid value for attribute cx="{{cx}}"`. Because of the SVG DOM API's
-restrictions, you cannot simply write `cx="{{cx}}"`.
-
-With `ng-attr-cx` you can work around this problem.
-
-If an attribute with a binding is prefixed with the `ngAttr` prefix (denormalized as `ng-attr-`)
-then during the binding it will be applied to the corresponding unprefixed attribute. This allows
-you to bind to attributes that would otherwise be eagerly processed by browsers
-(e.g. an SVG element's `circle[cx]` attributes). When using `ngAttr`, the `allOrNothing` flag of
-{@link ng.$interpolate $interpolate} is used, so if any expression in the interpolated string
-results in `undefined`, the attribute is removed and not added to the element.
-
-For example, we could fix the example above by instead writing:
-
-```html
-<svg>
-  <circle ng-attr-cx="{{cx}}"></circle>
-</svg>
-```
-
-If one wants to modify a camelcased attribute (SVG elements have valid camelcased attributes),
-such as `viewBox` on the `svg` element, one can use underscores to denote that the attribute to bind
-to is naturally camelcased.
-
-For example, to bind to `viewBox`, we can write:
-
-```html
-<svg ng-attr-view_box="{{viewBox}}">
-</svg>
-```
-
-The following attributes are also known to cause problems when used with normal bindings:
-
- **size** in `<select>` elements (see [Github issue 1619](https://github.com/angular/angular.js/issues/1619))
- **placeholder** in `<textarea>` in Internet Explorer 10/11 (see [Github issue 5025](https://github.com/angular/angular.js/issues/5025))
-
-
-### Embedding interpolation markup inside expressions
-
-Angular directives take either expressions or interpolation markup with embedded expressions. So the
-following example which embeds interpolation inside an expression is a bad practice:
-
-```html
-<div ng-show="form{{$index}}.$invalid"></div>
-```
-
-You should instead delegate the computation of complex expressions to the scope, like this:
-
-```html
-<div ng-show="getForm($index).$invalid"></div>
-```
-
-```js
-  function getForm() {
-    return $scope['form' + $index];
-  }
-```
-
-You can also access the `scope` with `this` in your templates:
-
-```html
-<div ng-show="this['form' + $index].$invalid"></div>
-```
-
-#### Why mixing interpolation and expressions is bad practice:
-
- It increases the complexity of the markup
- There is no guarantee that it works for every directive, because interpolation itself is a directive.
-If another directive accesses attribute data before interpolation has run, it will get the raw
-interpolation markup and not data.
- It impacts performance, as interpolation adds another watcher to the scope.
- Since this is not recommended usage, we do not test for this, and changes to
-Angular core may break your code.
@@ -12,7 +12,7 @@ succinctly. Angular's data binding and dependency injection eliminate much of th
 would otherwise have to write. And it all happens within the browser, making it
 an ideal partner with any server technology.

-Angular is what HTML would have been, had it been designed for applications. HTML is a great
+Angular is what HTML would have been had it been designed for applications. HTML is a great
 declarative language for static documents. It does not contain much in the way of creating
 applications, and as a result building web applications is an exercise in *what do I have to do
 to trick the browser into doing what I want?*
@@ -28,10 +28,10 @@ The impedance mismatch between dynamic applications and static documents is ofte

 Angular takes another approach. It attempts to minimize the impedance mismatch between document
 centric HTML and what an application needs by creating new HTML constructs. Angular teaches the
-browser new syntax through a construct we call *directives*. Examples include:
+browser new syntax through a construct we call directives. Examples include:

  * Data binding, as in `{{}}`.
-  * DOM control structures for repeating, showing and hiding DOM fragments.
+  * DOM control structures for repeating/hiding DOM fragments.
  * Support for forms and form validation.
  * Attaching new behavior to DOM elements, such as DOM event handling.
  * Grouping of HTML into reusable components.
@@ -42,20 +42,20 @@ browser new syntax through a construct we call *directives*. Examples include:

 Angular is not a single piece in the overall puzzle of building the client-side of a web
 application. It handles all of the DOM and AJAX glue code you once wrote by hand and puts it in a
-well-defined structure. This makes Angular opinionated about how a CRUD (Create, Read, Update, Delete)
-application should be built. But while it is opinionated, it also tries to make sure that its opinion 
-is just a starting point you can easily change. Angular comes with the following out-of-the-box:
+well-defined structure. This makes Angular opinionated about how a CRUD application should be
+built. But while it is opinionated, it also tries to make sure that its opinion is just a
+starting point you can easily change. Angular comes with the following out-of-the-box:

-  * Everything you need to build a CRUD app in a cohesive set: Data-binding, basic templating
-    directives, form validation, routing, deep-linking, reusable components and dependency injection.
-  * Testability story: Unit-testing, end-to-end testing, mocks and test harnesses.
+  * Everything you need to build a CRUD app in a cohesive set: data-binding, basic templating
+    directives, form validation, routing, deep-linking, reusable components, dependency injection.
+  * Testability story: unit-testing, end-to-end testing, mocks, test harnesses.
  * Seed application with directory layout and test scripts as a starting point.


-## Angular's sweet spot
+## Angular Sweet Spot

 Angular simplifies application development by presenting a higher level of abstraction to the
-developer. Like any abstraction, it comes at a cost of flexibility. In other words, not every app
+developer. Like any abstraction, it comes at a cost of flexibility. In other words not every app
 is a good fit for Angular. Angular was built with the CRUD application in mind. Luckily CRUD
 applications represent the majority of web applications. To understand what Angular is
 good at, though, it helps to understand when an app is not a good fit for Angular.
@@ -78,7 +78,7 @@ expressing business logic.
  * It is an excellent idea to decouple the client side of an app from the server side. This
    allows development work to progress in parallel, and allows for reuse of both sides.
  * It is very helpful indeed if the framework guides developers through the entire journey of
-    building an app: From designing the UI, through writing the business logic, to testing.
+    building an app: from designing the UI, through writing the business logic, to testing.
  * It is always good to make common tasks trivial and difficult tasks possible.


@@ -3,619 +3,19 @@
@sortOrder 550
@description

-# Migrating an App to a newer version
-
 Minor version releases in AngularJS introduce several breaking changes that may require changes to your
 application's source code; for instance from 1.0 to 1.2 and from 1.2 to 1.3.

-Although we try to avoid breaking changes, there are some cases where it is unavoidable:
+Although we try to avoid breaking changes, there are some cases where it is unavoidable.

 * AngularJS has undergone thorough security reviews to make applications safer by default,
 which drives many of these changes.
 * Several new features, especially animations, would not be possible without a few changes.
 * Finally, some outstanding bugs were best fixed by changing an existing API.

-<hr />
+# Migrating from 1.2 to 1.3

-## Contents
-
-<ul class="nav nav-list">
-  <li>{@link guide/migration#migrating-from-1-4-to-1-5 Migrating from 1.4 to 1.5}</li>
-  <li>{@link guide/migration#migrating-from-1-3-to-1-4 Migrating from 1.3 to 1.4}</li>
-  <li>{@link guide/migration#migrating-from-1-2-to-1-3 Migrating from 1.2 to 1.3}</li>
-  <li>{@link guide/migration#migrating-from-1-0-to-1-2 Migrating from 1.0 to 1.2}</li>
-</ul>
-
-
-
-
-
-## Migrating from 1.4 to 1.5
-
-Angular 1.5 takes a big step towards preparing developers for a smoother transition to Angular 2 in
-the future. Architecturing your applications using components, multi-slot transclusion, one-way
-bindings in isolate scopes, using lifecycle hooks in directive controllers and relying on native ES6
-features (such as classes and arrow functions) are now all possible with Angular 1.5.
-
-
-This release includes numerous bug and security fixes, as well as performance improvements to core
-services, directives, filters and helper functions. Existing applications can start enjoying the
-benefits of such changes in `$compile`, `$parse`, `$animate`, `$animateCss`, `$sanitize`, `ngOptions`,
-`currencyFilter`, `numberFilter`, `copy()` (to name but a few) without any change in code.
-
-New features have been added to more than a dozen services, directives and filters across 8 modules.
-Among them, a few stand out:
-
-* `angular.component()`: Introducing "components", a special sort of directive that are easy to
-  configure and promote best practices (plus can bring Angular 1 applications closer to Angular 2's
-  style of architecture).
-* Multi-slot transclusion: Enabling the design of more powerful and complex UI elements with a much
-  simpler configuration and reduced boilerplate.
-* `$onInit` lifecycle hook: Introducing a new lifecycle hook for directive controllers, called after
-  all required controllers have been constructed. This enables access to required controllers from
-  a directive's controller, without having to rely on the linking function.
-* `ngAnimateSwap`: A new directive in `ngAnimate`, making it super easy to create rotating
-  banner-like components.
-* Testing helpers: New helper functions in `ngMock`, simplifying testing for animations, component
-  controllers and routing.
-
-Also, notable is the improved support for ES6 features, such as classes and arrow functions. These
-features are now more reliably detected and correctly handled within the core.
-
-
-All this goodness doesn't come without a price, though. Below is a list of breaking changes (grouped
-by module) that need to be taken into account while migrating from 1.4. Fortunately, the majority of
-them should have a pretty low impact on most applications.
-
-
-### Core
-
-We tried to keep the breaking changes inside the core components to a bare minimum. Still, a few of
-them were unavoidable.
-
-#### Services (`$parse`)
-
-Due to [0ea53503](https://github.com/angular/angular.js/commit/0ea535035a3a1a992948490c3533bffb83235052),
-a new special property, `$locals`, will be available for accessing the locals from an expression.
-This is a breaking change, only if a `$locals` property does already exist (and needs to be
-referenced) either on the `scope` or on the `locals` object. Your expressions should be changed to
-access such existing properties as `this.$locals` and `$locals.$locals` respectively.
-
-
-#### Directives (`ngOptions`)
-
-A fair amount of work has been put into the `ngOptions` directive, fixing bugs and corner-cases and
-neutralizing browser quirks. A couple of breaking changes were made in the process:
-
-Due to [b71d7c3f](https://github.com/angular/angular.js/commit/b71d7c3f3c04e65b02d88b33c22dd90ae3cdfc27),
-falsy values (`''`, `0`, `false` and `null`) are properly recognized as option group identifiers for
-options passed to `ngOptions`. Previously, all of these values were ignored and the option was not
-assigned to any group. `undefined` is still interpreted as "no group".
-If you have options with falsy group indentifiers that should still not be assigned to any group,
-then you must filter the values before passing them to `ngOptions`, converting falsy values to
-`undefined`.
-
-Due to [ded25187](https://github.com/angular/angular.js/commit/ded2518756d4409fdfda0d4af243f2125bea01b5),
-`ngOptions` now explicitly requires `ngModel` on the same element, thus an error will be thrown if
-`ngModel` is not found. Previously, `ngOptions` would silently fail, which could lead to
-hard-to-debug errors.
-This is not expected to have any significant impact on applications, since `ngOptions` didn't work
-without `ngModel` before either. The main difference is that now it will fail with a more
-informative error message.
-
-
-#### Filters (`orderBy`)
-
-Due to [2a85a634](https://github.com/angular/angular.js/commit/2a85a634f86c84f15b411ce009a3515fca7ba580),
-passing a non-array-like value (other than `undefined` or `null`) through the `orderBy` filter will
-throw an error. Previously, the input was returned unchanged, which could lead to hard-to-spot bugs
-and was not consistent with other filters (e.g. `filter`).
-Objects considered array-like include: arrays, array subclasses, strings, NodeLists,
-jqLite/jQuery collections
-
-
-### ngMessages (`ngMessage`)
-
-Due to [4971ef12](https://github.com/angular/angular.js/commit/4971ef12d4c2c268cb8d26f90385dc96eba19db8),
-the `ngMessage` directive is now compiled with a priority of 1, which means directives on the same
-element as `ngMessage` with a priority lower than 1 will be applied when `ngMessage` calls its
-`$transclude` function. Previously, they were applied during the initial compile phase and were
-passed the comment element created by the transclusion of `ngMessage`.
-If you have custom directives that relied on the previous behavior, you need to give them a priority
-of 1 or greater.
-
-
-### ngResource (`$resource`)
-
-The `$resource` service underwent a minor internal refactoring to finally solve a long-standing bug
-preventing requests from being cancelled using promises. Due to the nature of `$resource`'s
-configuration, it was not possible to follow the `$http` convention. A new `$cancelRequest()` method
-was introduced instead.
-
-Due to [98528be3](https://github.com/angular/angular.js/commit/98528be311b48269ba0e15ba4e3e2ad9b89693a9),
-using a promise as `timeout` in `$resource` is no longer supported and will log a warning. This is
-hardly expected to affect the behavior of your application, since a promise as `timeout` didn't work
-before either, but it will now warn you explicitly when trying to pass one.
-If you need to be able to cancel pending requests, you can now use the new `$cancelRequest()` that
-will be available on `$resource` instances.
-
-
-### ngRoute (`ngView`)
-
-Due to [983b0598](https://github.com/angular/angular.js/commit/983b0598121a8c5a3a51a30120e114d7e3085d4d),
-a new property will be available on the scope of the route, allowing easy access to the route's
-resolved values from the view's template. The default name for this property is `$resolve`. This is
-a breaking change, only if a `$resolve` property is already available on the scope, in which case
-the existing property will be hidden or overwritten.
-To fix this, you should choose a custom name for this property, that does not collide with other
-properties on the scope, by specifying the `resolveAs` property on the route.
-
-
-### ngSanitize (`$sanitize`, `linky`)
-
-The HTML sanitizer has been re-implemented using inert documents, increasing security, fixing some
-corner-cases that were difficult to handle and reducing its size by about 20% (in terms of loc). In
-order to make it more secure by default, a couple of breaking changes have been introduced:
-
-Due to [181fc567](https://github.com/angular/angular.js/commit/181fc567d873df065f1e84af7225deb70a8d2eb9),
-SVG support in `$sanitize` is now an opt-in feature (i.e. disabled by default), as it could make
-an application vulnerable to click-hijacking attacks. If your application relies on it, you can
-still turn it on with `$sanitizeProvider.enableSvg(true)`, but you extra precautions need to be
-taken in order to keep your application secure. Read the documentation for more information about
-the dangers and ways to mitigate them.
-
-Due to [7a668cdd](https://github.com/angular/angular.js/commit/7a668cdd7d08a7016883eb3c671cbcd586223ae8),
-the `$sanitize` service will now remove instances of the `<use>` tag from the content passed to it.
-This element is used to import external SVG resources, which is a security risk as the `$sanitize`
-service does not have access to the resource in order to sanitize it.
-
-Similarly, due to [234053fc](https://github.com/angular/angular.js/commit/234053fc9ad90e0d05be7e8359c6af66be94c094),
-the `$sanitize` service will now also remove instances of the `usemap` attribute from any elements
-passed to it. This attribute is used to reference another element by `name` or `id`. Since the
-`name` and `id` attributes are already blacklisted, a sanitized `usemap` attribute could only
-reference unsanitized content, which is a security risk.
-
-Due to [98c2db7f](https://github.com/angular/angular.js/commit/98c2db7f9c2d078a408576e722407d518c7ee10a),
-passing a non-string value (other than `undefined` or `null`) through the `linky` filter will throw
-an error. This is not expected to have any significant impact on applications, since the input was
-always assumed to be of type 'string', so passing non-string values never worked correctly anyway.
-The main difference is that now it will fail faster and with a more informative error message.
-
-
-## ngTouch (`ngClick`)
-
-Due to [0dfc1dfe](https://github.com/angular/angular.js/commit/0dfc1dfebf26af7f951f301c4e3848ac46f05d7f),
-the `ngClick` override directive from the `ngTouch` module is **deprecated and disabled by default**.
-This means that on touch-based devices, users might now experience a 300ms delay before a click
-event is fired.
-
-If you rely on this directive, you can still enable it using
-`$touchProvider.ngClickOverrideEnabled()`:
-
-```js
-angular.module('myApp').config(function($touchProvider) {
-  $touchProvider.ngClickOverrideEnabled(true);
-});
-```
-
-Going forward, we recommend using [FastClick](https://github.com/ftlabs/fastclick) or perhaps one of
-the [Angular 3rd party touch-related modules](http://ngmodules.org/tags/touch) that provide similar
-functionality.
-
-Also note that modern browsers already remove the 300ms delay under some circumstances:
-
- **Chrome and Firefox for Android** remove the 300ms delay when the well-known
-  `<meta name="viewport" content="width=device-width">` is set.
- **Internet Explorer** removes the delay, when the `touch-action` css property is set to `none` or
-  `manipulation`.
- Since **iOS 8, Safari** removes the delay on so-called "slow taps".
-
-For more info on the topic, you can take a look at this
-[article by Telerik](http://developer.telerik.com/featured/300-ms-click-delay-ios-8/).
-
-<div class="alert alert-warning">
-  **Note:** This change does **not** affect the `ngSwipe` directive.
-</div>
-
-
-
-
-
-## Migrating from 1.3 to 1.4
-
-Angular 1.4 fixes major animation issues and introduces a new API for `ngCookies`. Further, there
-are changes to `ngMessages`, `$compile`, `ngRepeat`, `ngOptions `and some fixes to core filters:
-`limitTo` and `filter`.
-
-The reason for the ngAnimate refactor was to fix timing issues and to expose new APIs to allow
-for developers to construct more versatile animations.  We now have access to `$animateCss`
-and the many timing-oriented bugs were fixed which results in smoother animations.
-If animation is something of interest, then please read over the breaking changes below for animations when
-`ngAnimate` is used.
-
-`ngMessages` has been upgraded to allow for dynamic message resolution. This handy feature allows for developers
-to render error messages with ngMessages that are listed with a directive such as ngRepeat. A great usecase for this
-involves pulling error message data from a server and then displaying that data via the mechanics of ngMessages. Be
-sure to read the breaking change involved with `ngMessagesInclude` to upgrade your template code.
-
-Other changes, such as the ordering of elements with ngRepeat and ngOptions, may also affect the behavior of your
-application. And be sure to also read up on the changes to `$cookies`. The migration jump from 1.3 to 1.4 should be
-relatively straightforward otherwise.
-
-
-
-
-### Animation (`ngAnimate`)
-
-Animations in 1.4 have been refactored internally, but the API has stayed much the same. There are, however,
-some breaking changes that need to be addressed when upgrading to 1.4.
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-JavaScript and CSS animations can no longer be run in
-parallel. With earlier versions of ngAnimate, both CSS and JS animations
-would be run together when multiple animations were detected. This
-feature has been removed, however, the same effect, with even more
-possibilities, can be achieved by injecting `$animateCss` into a
-JavaScript-defined animation and creating custom CSS-based animations
-from there.
-
-By using `$animateCss` inside of a JavaScript animation in Angular 1.4, we can trigger custom CSS-based animations
-directly from our JavaScript code.
-
-```js
-ngModule.animation('.slide-animation', ['$animateCss', function($animateCss) {
-  return {
-    enter: function(element, doneFn) {
-      // this will trigger a `.ng-enter` and `.ng-enter-active` CSS animation
-      var animation = $animateCss(element, {
-        event: 'enter'
-        // any other CSS-related properties
-        //   addClass: 'some-class',
-        //   removeClass: 'some-other-class',
-        //   from: {},
-        //   to: {}
-      });
-
-      // make sure to read the ngAnimate docs to understand how this works
-      animation.start().done(doneFn);
-    }
-  }
-}]);
-```
-
-{@link ngAnimate.$animateCss Click here to learn how to use $animateCss in your animation code}
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-animation-related callbacks are now fired on `$animate.on` instead of directly being on the element.
-
-```js
-// < 1.4
-element.on('$animate:before', function(e, data) {
-  if (data.event === 'enter') { ... }
-});
-element.off('$animate:before', fn);
-
-// 1.4+
-$animate.on('enter', element, function(data) {
-  //...
-});
-$animate.off('enter', element, fn);
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-the function params for `$animate.enabled()` when an element is used are now flipped. This fix allows
-the function to act as a getter when a single element param is provided.
-
-```js
-// < 1.4
-$animate.enabled(false, element);
-
-// 1.4+
-$animate.enabled(element, false);
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-in addition to disabling the children of the element, `$animate.enabled(element, false)` will now also
-disable animations on the element itself.
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-there is no need to call `$scope.$apply` or `$scope.$digest` inside of a animation promise callback anymore
-since the promise is resolved within a digest automatically. (Not to worry, any extra digests will not be
-run unless the promise is used.)
-
-```js
-// < 1.4
-$animate.enter(element).then(function() {
-  $scope.$apply(function() {
-    $scope.explode = true;
-  });
-});
-
-// 1.4+
-$animate.enter(element).then(function() {
-  $scope.explode = true;
-});
-```
-
-Due to [c8700f04](https://github.com/angular/angular.js/commit/c8700f04fb6fb5dc21ac24de8665c0476d6db5ef),
-when an enter, leave or move animation is triggered then it will always end any pending or active parent
-class based animations (animations triggered via ngClass) in order to ensure that any CSS styles are resolved in time.
-
-
-
-
-### Forms (`ngMessages`, `ngOptions`, `select`)
-
-#### ngMessages
-The ngMessages module has also been subject to an internal refactor to allow it to be more flexible
-and compatible with dynamic message data. The `ngMessage` directive now supports a new attribute
-called `ng-message-exp` which will evaluate an expression and will keep track of that expression
-as it changes in order to re-evaluate the listed messages.
-
-[Click here to learn more about dynamic ng-messages](https://docs.angularjs.org/api/ngMessages#dynamic-messaging)
-
-There is only one breaking change. Please consider the following when including remote
-message templates via `ng-messages-include`:
-
-Due to [c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
-the `ngMessagesInclude` attribute has now been removed and cannot be used in the same element containing
-the `ngMessages` directive. Instead, `ngMessagesInclude` is to be used on its own element inline with
-other inline messages situated as children within the `ngMessages` container directive.
-
-```html
-<!-- AngularJS 1.3.x -->
-<div ng-messages="model.$error" ng-messages-include="remote.html">
-  <div ng-message="required">Your message is required</div>
-</div>
-
-<!-- AngularJS 1.4.x -->
-<div ng-messages="model.$error">
-  <div ng-message="required">Your message is required</div>
-  <div ng-messages-include="remote.html"></div>
-</div>
-```
-
-Depending on where the `ngMessagesInclude` directive is placed it will be prioritized inline with the other messages
-before and after it.
-
-Also due to [c9a4421f](https://github.com/angular/angular.js/commit/c9a4421fc3c97448527eadef1f42eb2f487ec2e0),
-it is no longer possible to use interpolation inside the `ngMessages` attribute expression. This technique
-is generally not recommended, and can easily break when a directive implementation changes. In cases
-where a simple expression is not possible, you can delegate accessing the object to a function:
-
-```html
-<div ng-messages="ctrl.form['field_{{$index}}'].$error">...</div>
-```
-would become
-```html
-<div ng-messages="ctrl.getMessages($index)">...</div>
-```
-where `ctrl.getMessages()`
-```javascript
-ctrl.getMessages = function($index) {
-  return ctrl.form['field_' + $index].$error;
-}
-```
-
-#### ngOptions
-
-The `ngOptions` directive has also been refactored and as a result some long-standing bugs
-have been fixed. The breaking changes are comparatively minor and should not affect most applications.
-
-Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-when `ngOptions` renders the option values within the DOM, the resulting HTML code is different.
-Normally this should not affect your application at all, however, if your code relies on inspecting
-the value property of `<option>` elements (that `ngOptions` generates) then be sure
-to [read the details](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef).
-
-Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-when iterating over an object's properties using the `(key, value) in obj` syntax
-the order of the elements used to be sorted alphabetically. This was an artificial
-attempt to create a deterministic ordering since browsers don't guarantee the order.
-But in practice this is not what people want and so this change iterates over properties
-in the order they are returned by Object.keys(obj), which is almost always the order
-in which the properties were defined.
-
-Also due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-setting the ngOptions attribute expression after the element is compiled, will no longer trigger the ngOptions behavior.
-This worked previously because the ngOptions logic was part of the select directive, while
-it is now implemented in the ngOptions directive itself.
-
-#### select
-
-Due to [7fda214c](https://github.com/angular/angular.js/commit/7fda214c4f65a6a06b25cf5d5aff013a364e9cef),
-the `select` directive will now use strict comparison of the `ngModel` scope value against `option`
-values to determine which option is selected. This means non-string scope values (such as `Number` or `Boolean`)
-will not be matched against equivalent option strings (such as the strings `"123"`, `"true"` or `"false"`).
-
-In Angular 1.3.x, setting `scope.x = 200` would select the option with the value 200 in the following `select`:
-
-```
-<select ng-model="x">
-  <option value="100">100</option>
-  <option value="200">200</option>
-</select>
-```
-
-In Angular 1.4.x, the 'unknown option' will be selected.
-
-To remedy this, you can initialize the model as a string: `scope.x = '200'`, or if you want to
-keep the model as a `Number`, you can do the conversion via `$formatters` and `$parsers` on `ngModel`:
-
-```js
-ngModelCtrl.$parsers.push(function(value) {
-  return parseInt(value, 10); // Convert option value to number
-});
-
-ngModelCtrl.$formatters.push(function(value) {
-  return value.toString(); // Convert scope value to string
-});
-```
-
-### Templating (`ngRepeat`, `$compile`)
-
-#### ngRepeat
-
-Due to [c260e738](https://github.com/angular/angular.js/commit/c260e7386391877625eda086480de73e8a0ba921),
-previously, the order of items when using ngRepeat to iterate over object properties was guaranteed to be consistent
-by sorting the keys into alphabetic order.
-
-Now, the order of the items is browser dependent based on the order returned
-from iterating over the object using the `for key in obj` syntax.
-
-It seems that browsers generally follow the strategy of providing
-keys in the order in which they were defined, although there are exceptions
-when keys are deleted and reinstated. See
-https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_issues
-
-The best approach is to convert Objects into Arrays by a filter such as
-https://github.com/petebacondarwin/angular-toArrayFilter
-or some other mechanism, and then sort them manually in the order you need.
-
-
-#### $compile
-
-Due to [6a38dbfd](https://github.com/angular/angular.js/commit/6a38dbfd3c34c8f9efff503d17eb3cbeb666d422),
-previously, '&' expressions would always set up a function in the isolate scope. Now, if the binding
-is marked as optional and the attribute is not specified, no function will be added to the isolate scope.
-
-Due to [62d514b](https://github.com/angular/angular.js/commit/62d514b06937cc7dd86e973ea11165c88343b42d),
-returning an object from a controller constructor function will now override the scope. Views that use the
-controllerAs method will no longer get the this reference, but the returned object.
-
-
-### Cookies (`ngCookies`)
-
-Due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
-`$cookies` will no longer expose properties that represent the current browser cookie
-values. `$cookies` no longer polls the browser for changes to the cookies and ***no longer copies
-cookie values onto the `$cookies` object***.
-
-This was changed because the polling is expensive and caused issues with the `$cookies` properties
-not synchronizing correctly with the actual browser cookie values (The reason the polling
-was originally added was to allow communication between different tabs,
-but there are better ways to do this today, for example `localStorage`.)
-
-The new API on `$cookies` is as follows:
-
- * `get`
- * `put`
- * `getObject`
- * `putObject`
- * `getAll`
- * `remove`
-
-You must explictly use the methods above in order to access cookie data. This also means that
-you can no longer watch the properties on `$cookies` to detect changes
-that occur on the browsers cookies.
-
-This feature is generally only needed if a 3rd party library was programmatically
-changing the cookies at runtime. If you rely on this then you must either write code that
-can react to the 3rd party library making the changes to cookies or implement your own polling
-mechanism.
-
-**DEPRECATION NOTICE**
-
-`$cookieStore` is now deprecated as all the useful logic
-has been moved to `$cookies`, to which `$cookieStore` now simply
-delegates calls.
-
-
-
-
-### Server Requests (`$http`)
-
-Due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
-`transformRequest` functions can no longer modify request headers.
-
-Before this commit `transformRequest` could modify request headers, ex.:
-
-```javascript
-function requestTransform(data, headers) {
-    headers = angular.extend(headers(), {
-      'X-MY_HEADER': 'abcd'
-    });
-  }
-  return angular.toJson(data);
-}
-```
-
-This behavior was unintended and undocumented, so the change should affect very few applications. If one
-needs to dynamically add / remove headers it should be done in a header function, for example:
-
-```javascript
-$http.get(url, {
-  headers: {
-    'X-MY_HEADER': function(config) {
-      return 'abcd'; //you've got access to a request config object to specify header value dynamically
-    }
-  }
-})
-```
-
-
-
-
-### Filters (`filter`, `limitTo`)
-
-#### `filter` filter
-Due to [cea8e751](https://github.com/angular/angular.js/commit/cea8e75144e6910b806b63a6ec2a6d118316fddd),
-the `filter` filter will throw an error when used with a non-array. Beforehand it would silently
-return an empty array.
-
-If necessary, this can be worked around by converting an object to an array,
-using a filter such as https://github.com/petebacondarwin/angular-toArrayFilter.
-
-#### `limitTo` filter
-Due to [a3c3bf33](https://github.com/angular/angular.js/commit/a3c3bf3332e5685dc319c46faef882cb6ac246e1),
-the limitTo filter has changed behavior when the provided limit value is invalid.
-Now, instead of returning empty object/array, it returns unchanged input.
-
-
-
-
-
-## Migrating from 1.2 to 1.3
-
-### Controllers
-
-Due to [3f2232b5](https://github.com/angular/angular.js/commit/3f2232b5a181512fac23775b1df4a6ebda67d018),
-`$controller` will no longer look for controllers on `window`.
-The old behavior of looking on `window` for controllers was originally intended
-for use in examples, demos, and toy apps. We found that allowing global controller
-functions encouraged poor practices, so we resolved to disable this behavior by
-default.
-
-To migrate, register your controllers with modules rather than exposing them
-as globals:
-
-Before:
-
-```javascript
-function MyController() {
-  // ...
-}
-```
-
-After:
-
-```javascript
-angular.module('myApp', []).controller('MyController', [function() {
-  // ...
-}]);
-```
-
-Although it's not recommended, you can re-enable the old behavior like this:
-
-```javascript
-angular.module('myModule').config(['$controllerProvider', function($controllerProvider) {
-  // this option might be handy for migrating old apps, but please don't use it
-  // in new ones!
-  $controllerProvider.allowGlobals();
-}]);
-```
-
-### Angular Expression Parsing (`$parse` + `$interpolate`)
+## Angular Expression Parsing (`$parse` + `$interpolate`)

 - due to [77ada4c8](https://github.com/angular/angular.js/commit/77ada4c82d6b8fc6d977c26f3cdb48c2f5fbe5a5),

@@ -673,7 +73,7 @@ expression parser; there are six of them: false, null, undefined, NaN, 0 and "".



-### Miscellaneous Angular helpers
+## Miscellaneous Angular helpers

 - **Angular.copy:** due to [b59b04f9](https://github.com/angular/angular.js/commit/b59b04f98a0b59eead53f6a53391ce1bbcbe9b57),

@@ -704,14 +104,15 @@ This change also makes our forEach behave more like Array#forEach.


 - **angular.toJson:** due to [c054288c](https://github.com/angular/angular.js/commit/c054288c9722875e3595e6e6162193e0fb67a251),
-  `toJson()` will no longer strip properties starting with a single `$`. If you relied on
-`toJson()`'s stripping these types of properties before, you will have to do it manually now.
-It will still strip properties starting with `$$` though.
+
+If you expected `toJson` to strip these types of properties before, you will have to
+manually do this yourself now.




-### jqLite / JQuery
+
+## jqLite / JQuery

 - **jqLite:** due to [a196c8bc](https://github.com/angular/angular.js/commit/a196c8bca82a28c08896d31f1863cf4ecd11401c),
  previously it was possible to set jqLite data on Text/Comment
@@ -727,7 +128,7 @@ jQuery. We don't expect that app code actually depends on this accidental featur



-### Angular HTML Compiler (`$compile`)
+## Angular HTML Compiler (`$compile`)


 - due to [2ee29c5d](https://github.com/angular/angular.js/commit/2ee29c5da81ffacdc1cabb438f5d125d5e116cb9),
@@ -791,40 +192,10 @@ After:
      };
    });

-  - due to [531a8de7](https://github.com/angular/angular.js/commit/531a8de72c439d8ddd064874bf364c00cedabb11),
-`$observe` no longer registers on undefined attributes. For example, if you were using `$observe` on
-an absent optional attribute to set a default value, the following would not work anymore:
-
-```html
-<my-dir></my-dir>
-```
-
-```js
-// Link function for directive myDir
-link: function(scope, element, attr) {
-  attr.$observe('myAttr', function(newVal) {
-    scope.myValue = newVal ? newVal : 'myDefaultValue';
-  })
-}
-```
-
-Instead, check if the attribute is set before registering the observer:
-
-```js
-link: function(scope, element, attr) {
-  if (attr.myAttr) {
-    // register the observer
-  } else {
-    // set the default
-  }
-}
-```



-
-
-### Forms, Inputs and ngModel
+## Forms, Inputs and ngModel

 - due to [1be9bb9d](https://github.com/angular/angular.js/commit/1be9bb9d3527e0758350c4f7417a4228d8571440),

@@ -893,18 +264,11 @@ $scope.resetWithCancel = function (e) {
   [#5864](https://github.com/angular/angular.js/issues/5864))


- {@link input[checkbox] `input[checkbox]`} now supports constant expressions in `ngTrueValue` and
-  `ngFalseValue`, making it now possible to e.g. use boolean and integer values. Previously, these attributes would
-  always be treated as strings, whereas they are now parsed as expressions, and will throw if an expression
-  is non-constant. To convert non-constant strings into constant expressions, simply wrap them in an
-  extra pair of quotes, like so:
-
-    `<input type="checkbox" ng-model="..." ng-true-value="'truthyValue'">`
-
-  See [c90cefe1614](https://github.com/angular/angular.js/commit/c90cefe16142d973a123e945fc9058e8a874c357)


-### Scopes and Digests (`$scope`)
+
+
+## Scopes and Digests (`$scope`)

 - due to [8c6a8171](https://github.com/angular/angular.js/commit/8c6a8171f9bdaa5cdabc0cc3f7d3ce10af7b434d),
  Scope#$id is now of type number rather than string. Since the
@@ -924,7 +288,7 @@ anyone.



-### Server Requests (`$http`, `$resource`)
+## Server Requests (`$http`, `$resource`)
 - **$http:** due to [ad4336f9](https://github.com/angular/angular.js/commit/ad4336f9359a073e272930f8f9bcd36587a8648f),


@@ -991,7 +355,7 @@ More details on the new interceptors API (which has been around as of v1.1.4) ca



-### Modules and Injector (`$inject`)
+## Modules and Injector (`$inject`)

 - due to [c0b4e2db](https://github.com/angular/angular.js/commit/c0b4e2db9cbc8bc3164cedc4646145d3ab72536e),

@@ -1033,7 +397,7 @@ app. This is no longer possible within a single module.



-### Animation (`ngAnimate`)
+## Animation (`ngAnimate`)


 - due to [1cb8584e](https://github.com/angular/angular.js/commit/1cb8584e8490ecdb1b410a8846c4478c6c2c0e53),
@@ -1086,7 +450,7 @@ After:
 Please view the documentation for ngAnimate for more info.


-### Testing
+## Testing

 - due to [85880a64](https://github.com/angular/angular.js/commit/85880a64900fa22a61feb926bf52de0965332ca5), some deprecated features of
 Protractor tests no longer work.
@@ -1125,7 +489,7 @@ or simply use:
    var el = element(by.repeater('foo in foos').row(2))


-### Internet Explorer 8
+## Internet Explorer 8

 - due to [eaa1d00b](https://github.com/angular/angular.js/commit/eaa1d00b24008f590b95ad099241b4003688cdda),
  As communicated before, IE8 is no longer supported.
@@ -1135,7 +499,7 @@ or simply use:



-## Migrating from 1.0 to 1.2
+# Migrating from 1.0 to 1.2


 <div class="alert alert-warning">
@@ -1178,7 +542,7 @@ below should still apply, but you may want to consult the
 </ul>


-### ngRoute has been moved into its own module
+## ngRoute has been moved into its own module

 Just like `ngResource`, `ngRoute` is now its own module.

@@ -1209,7 +573,7 @@ var myApp = angular.module('myApp', ['ngRoute', 'someOtherModule']);
 See [5599b55b](https://github.com/angular/angular.js/commit/5599b55b04788c2e327d7551a4a699d75516dd21).


-### Templates no longer automatically unwrap promises
+## Templates no longer automatically unwrap promises

 `$parse` and templates in general will no longer automatically unwrap promises.

@@ -1243,7 +607,7 @@ See [5dc35b52](https://github.com/angular/angular.js/commit/5dc35b527b3c99f6544b
 [b6a37d11](https://github.com/angular/angular.js/commit/b6a37d112b3e1478f4d14a5f82faabf700443748).


-### Syntax for named wildcard parameters changed in `$route`
+## Syntax for named wildcard parameters changed in `$route`

 To migrate the code, follow the example below. Here, `*highlight` becomes `:highlight*`

@@ -1264,7 +628,7 @@ $routeProvider.when('/Book1/:book/Chapter/:chapter/:highlight*/edit',
 See [04cebcc1](https://github.com/angular/angular.js/commit/04cebcc133c8b433a3ac5f72ed19f3631778142b).


-### You can only bind one expression to `*[src]`, `*[ng-src]` or `action`
+## You can only bind one expression to `*[src]`, `*[ng-src]` or `action`

 With the exception of `<a>` and `<img>` elements, you cannot bind more than one expression to the
 `src` or `action` attribute of elements.
@@ -1339,7 +703,7 @@ scope.getIframeSrc = function() {
 See [38deedd6](https://github.com/angular/angular.js/commit/38deedd6e3d806eb8262bb43f26d47245f6c2739).


-### Interpolations inside DOM event handlers are now disallowed
+## Interpolations inside DOM event handlers are now disallowed

 DOM event handlers execute arbitrary Javascript code. Using an interpolation for such handlers
 means that the interpolated value is a JS string that is evaluated. Storing or generating such
@@ -1366,7 +730,7 @@ HTML: <div ng-click="foo()">
 See [39841f2e](https://github.com/angular/angular.js/commit/39841f2ec9b17b3b2920fd1eb548d444251f4f56).


-### Directives cannot end with -start or -end
+## Directives cannot end with -start or -end

 This change was necessary to enable multi-element directives. The best fix is to rename existing
 directives so that they don't end with these suffixes.
@@ -1374,7 +738,7 @@ directives so that they don't end with these suffixes.
 See [e46100f7](https://github.com/angular/angular.js/commit/e46100f7097d9a8f174bdb9e15d4c6098395c3f2).


-### In $q, promise.always has been renamed promise.finally
+## In $q, promise.always has been renamed promise.finally

 The reason for this change is to align `$q` with the [Q promise
 library](https://github.com/kriskowal/q), despite the fact that this makes it a bit more difficult
@@ -1406,7 +770,7 @@ $http.get('/foo')['finally'](doSomething);
 See [f078762d](https://github.com/angular/angular.js/commit/f078762d48d0d5d9796dcdf2cb0241198677582c).


-### ngMobile is now ngTouch
+## ngMobile is now ngTouch

 Many touch-enabled devices are not mobile devices, so we decided to rename this module to better
 reflect its concerns.
@@ -1417,7 +781,7 @@ To migrate, replace all references to `ngMobile` with `ngTouch` and `angular-mob
 See [94ec84e7](https://github.com/angular/angular.js/commit/94ec84e7b9c89358dc00e4039009af9e287bbd05).


-### resource.$then has been removed
+## resource.$then has been removed

 Resource instances do not have a `$then` function anymore. Use the `$promise.then` instead.

@@ -1436,7 +800,7 @@ Resource.query().$promise.then(callback);
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).


-### Resource methods return the promise
+## Resource methods return the promise

 Methods of a resource instance return the promise rather than the instance itself.

@@ -1456,7 +820,7 @@ resource.chaining = true;
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).


-### Resource promises are resolved with the resource instance
+## Resource promises are resolved with the resource instance

 On success, the resource promise is resolved with the resource instance rather than HTTP response object.

@@ -1487,7 +851,7 @@ var Resource = $resource('/url', {}, {
 See [05772e15](https://github.com/angular/angular.js/commit/05772e15fbecfdc63d4977e2e8839d8b95d6a92d).


-### $location.search supports multiple keys
+## $location.search supports multiple keys

 {@link ng.$location#search `$location.search`} now supports multiple keys with the
 same value provided that the values are stored in an array.
@@ -1504,7 +868,7 @@ passing it to `$location`.
 See [80739409](https://github.com/angular/angular.js/commit/807394095b991357225a03d5fed81fea5c9a1abe).


-### ngBindHtmlUnsafe has been removed and replaced by ngBindHtml
+## ngBindHtmlUnsafe has been removed and replaced by ngBindHtml

 `ngBindHtml` provides `ngBindHtmlUnsafe` like
 behavior (evaluate an expression and innerHTML the result into the DOM) when bound to the result
@@ -1520,7 +884,7 @@ trusted.
 See [dae69473](https://github.com/angular/angular.js/commit/dae694739b9581bea5dbc53522ec00d87b26ae55).


-### Form names that are expressions are evaluated
+## Form names that are expressions are evaluated

 If you have form names that will evaluate as an expression:

@@ -1552,7 +916,7 @@ Supporting the previous behavior offers no benefit.
 See [8ea802a1](https://github.com/angular/angular.js/commit/8ea802a1d23ad8ecacab892a3a451a308d9c39d7).


-### hasOwnProperty disallowed as an input name
+## hasOwnProperty disallowed as an input name

 Inputs with name equal to `hasOwnProperty` are not allowed inside form or ngForm directives.

@@ -1563,7 +927,7 @@ and bad practice. To migrate, change your input name.
 See [7a586e5c](https://github.com/angular/angular.js/commit/7a586e5c19f3d1ecc3fefef084ce992072ee7f60).


-### Directives: Order of postLink functions reversed
+## Directives: Order of postLink functions reversed

 The order of postLink fn is now mirror opposite of the order in which corresponding preLinking and compile functions execute.

@@ -1619,7 +983,7 @@ attribute interpolation directive was adjusted.
 See [31f190d4](https://github.com/angular/angular.js/commit/31f190d4d53921d32253ba80d9ebe57d6c1de82b).


-### Directive priority
+## Directive priority

 the priority of ngRepeat, ngSwitchWhen, ngIf, ngInclude and ngView has changed. This could affect directives that explicitly specify their priority.

@@ -1637,7 +1001,7 @@ ngView           | 1000         | 400
 See [b7af76b4](https://github.com/angular/angular.js/commit/b7af76b4c5aa77648cc1bfd49935b48583419023).


-### ngScenario
+## ngScenario

 browserTrigger now uses an eventData object instead of direct parameters for mouse events.
 To migrate, place the `keys`,`x` and `y` parameters inside of an object and place that as the
@@ -1646,7 +1010,7 @@ third parameter for the browserTrigger function.
 See [28f56a38](https://github.com/angular/angular.js/commit/28f56a383e9d1ff378e3568a3039e941c7ffb1d8).


-### ngInclude and ngView replace its entire element on update
+## ngInclude and ngView replace its entire element on update

 Previously `ngInclude` and `ngView` only updated its element's content. Now these directives will
 recreate the element every time a new content is included.
@@ -1658,7 +1022,7 @@ See [7d69d52a](https://github.com/angular/angular.js/commit/7d69d52acff8578e0f7d
 [aa2133ad](https://github.com/angular/angular.js/commit/aa2133ad818d2e5c27cbd3933061797096356c8a).


-### URLs are now sanitized against a whitelist
+## URLs are now sanitized against a whitelist

 A whitelist configured via `$compileProvider` can be used to configure what URLs are considered safe.
 By default all common protocol prefixes are whitelisted including `data:` URIs with mime types `image/*`.
@@ -1668,7 +1032,7 @@ See [1adf29af](https://github.com/angular/angular.js/commit/1adf29af13890d612868
 [3e39ac7e](https://github.com/angular/angular.js/commit/3e39ac7e1b10d4812a44dad2f959a93361cd823b).


-### Isolate scope only exposed to directives with `scope` property
+## Isolate scope only exposed to directives with `scope` property

 If you declare a scope option on a directive, that directive will have an
 [isolate scope](https://github.com/angular/angular.js/wiki/Understanding-Scopes). In Angular 1.0, if a
@@ -1741,7 +1105,7 @@ See [909cabd3](https://github.com/angular/angular.js/commit/909cabd36d779598763c
 [#2500](https://github.com/angular/angular.js/issues/2500).


-### Change to interpolation priority
+## Change to interpolation priority

 Previously, the interpolation priority was `-100` in 1.2.0-rc.2, and `100` before 1.2.0-rc.2.
 Before this change the binding was setup in the post-linking phase.
@@ -1754,7 +1118,7 @@ See [79223eae](https://github.com/angular/angular.js/commit/79223eae502283889334
 [#4528](https://github.com/angular/angular.js/issues/4528), and
 [#4649](https://github.com/angular/angular.js/issues/4649)

-### Underscore-prefixed/suffixed properties are non-bindable
+## Underscore-prefixed/suffixed properties are non-bindable

 <div class="alert alert-info">
 <p>**Reverted**: This breaking change has been reverted in 1.2.1, and so can be ignored if you're using **version 1.2.1 or higher**</p>
@@ -1793,7 +1157,7 @@ are actually needed by the expressions.
 See [3d6a89e8](https://github.com/angular/angular.js/commit/3d6a89e8888b14ae5cb5640464e12b7811853c7e).


-### You cannot bind to select[multiple]
+## You cannot bind to select[multiple]

 Switching between `select[single]` and `select[multiple]` has always been odd due to browser quirks.
 This feature never worked with two-way data-binding so it's not expected that anyone is using it.
@@ -1803,7 +1167,7 @@ If you are interested in properly adding this feature, please submit a pull requ
 See [d87fa004](https://github.com/angular/angular.js/commit/d87fa0042375b025b98c40bff05e5f42c00af114).


-### Uncommon region-specific local files were removed from i18n
+## Uncommon region-specific local files were removed from i18n

 AngularJS uses the Google Closure library's locale files. The following locales were removed from
 Closure, so Angular is not able to continue to support them:
@@ -1819,7 +1183,7 @@ load and use your copy of the locale file provided that you maintain it yourself

 See [6382e21f](https://github.com/angular/angular.js/commit/6382e21fb28541a2484ac1a241d41cf9fbbe9d2c).

-### Services can now return functions
+## Services can now return functions

 Previously, the service constructor only returned objects regardless of whether a function was returned.

@@ -75,8 +75,9 @@ that you break your application to multiple modules like this:
  * And an application level module which depends on the above modules and contains any
    initialization code.

-You can find a community  
-[style guide](https://github.com/johnpapa/angular-styleguide) to help yourself when application grows.
+We've also
+[written a document](http://blog.angularjs.org/2014/02/an-angularjs-style-guide-and-best.html)
+on how we organize large apps at Google.

 The above is a suggestion. Tailor it to your needs.

@@ -139,7 +140,7 @@ The above is a suggestion. Tailor it to your needs.
 # Module Loading & Dependencies

 A module is a collection of configuration and run blocks which get applied to the application
-during the bootstrap process. In its simplest form the module consists of a collection of two kinds
+during the bootstrap process. In its simplest form the module consist of a collection of two kinds
 of blocks:

  1. **Configuration blocks** - get executed during the provider registrations and configuration
@@ -196,14 +197,14 @@ Then Angular applies configuration blocks in the same order they were registered
 ## Run Blocks

 Run blocks are the closest thing in Angular to the main method. A run block is the code which
-needs to run to kickstart the application. It is executed after all of the services have been
+needs to run to kickstart the application. It is executed after all of the service have been
 configured and the injector has been created. Run blocks typically contain code which is hard
 to unit-test, and for this reason should be declared in isolated modules, so that they can be
 ignored in the unit-tests.

 ## Dependencies

-Modules can list other modules as their dependencies. Depending on a module implies that the required
+Modules can list other modules as their dependencies. Depending on a module implies that required
 module needs to be loaded before the requiring module is loaded. In other words the configuration
 blocks of the required modules execute before the configuration blocks of the requiring module.
 The same is true for the run blocks. Each module can only be loaded once, even if multiple other
@@ -10,13 +10,13 @@ There are a few things you might consider when running your AngularJS applicatio

 ## Disabling Debug Data

-By default AngularJS attaches information about binding and scopes to DOM nodes,
-and adds CSS classes to data-bound elements:
+By default AngularJS attaches information about scopes to DOM nodes, and adds CSS classes
+to data-bound elements. The information that is not included is:

- As a result of `ngBind`, `ngBindHtml` or `{{...}}` interpolations, binding data and CSS class
-`ng-binding` are attached to the corresponding element.
+As a result of `ngBind`, `ngBindHtml` or `{{...}}` interpolations, binding data and CSS class
+`ng-class` is attached to the corresponding element.

- Where the compiler has created a new scope, the scope and either `ng-scope` or `ng-isolated-scope`
+Where the compiler has created a new scope, the scope and either `ng-scope` or `ng-isolated-scope`
 CSS class are attached to the corresponding element. These scope references can then be accessed via
 `element.scope()` and `element.isolateScope()`.

@@ -44,7 +44,7 @@ and {@link angular.reloadWithDebugInfo `angular.reloadWithDebugInfo`}.

 ## Strict DI Mode

-Using strict di mode in your production application will throw errors when an injectable
+Using strict di mode in your production application will throw errors when a injectable
 function is not
 {@link di#dependency-annotation annotated explicitly}. Strict di mode is intended to help
 you make sure that your code will work when minified. However, it also will force you to
@@ -5,7 +5,7 @@

 # What are Scopes?

-{@link ng.$rootScope.Scope Scope} is an object that refers to the application
+{@link ng.$rootScope.Scope scope} is an object that refers to the application
 model. It is an execution context for {@link expression expressions}. Scopes are
 arranged in hierarchical structure which mimic the DOM structure of the application. Scopes can
 watch {@link guide/expression expressions} and propagate events.
@@ -245,7 +245,7 @@ of the `$watch` expressions and compares them with the previous value. This dirt
 asynchronously. This means that assignment such as `$scope.username="angular"` will not
 immediately cause a `$watch` to be notified, instead the `$watch` notification is delayed until
 the `$digest` phase. This delay is desirable, since it coalesces multiple model updates into one
-`$watch` notification as well as guarantees that during the `$watch` notification no other
+`$watch` notification as well as it guarantees that during the `$watch` notification no other
 `$watch`es are running. If a `$watch` changes the value of the model, it will force additional
 `$digest` cycle.

@@ -264,7 +264,7 @@ the `$digest` phase. This delay is desirable, since it coalesces multiple model
  3. **Model mutation**

     For mutations to be properly observed, you should make them only within the {@link
-     ng.$rootScope.Scope#$apply scope.$apply()}. Angular APIs do this
+     ng.$rootScope.Scope#$apply scope.$apply()}. (Angular APIs do this
     implicitly, so no extra `$apply` call is needed when doing synchronous work in controllers,
     or asynchronous work with {@link ng.$http $http}, {@link ng.$timeout $timeout}
     or {@link ng.$interval $interval} services.
@@ -391,7 +391,7 @@ implementing custom event callbacks, or when working with third-party library ca
  5. The {@link ng.$rootScope.Scope#$watch $watch} list is a set of expressions
     which may have changed since last iteration. If a change is detected then the `$watch`
     function is called which typically updates the DOM with the new value.
-  6. Once the Angular {@link ng.$rootScope.Scope#$digest $digest} loop finishes, 
+  6. Once the Angular {@link ng.$rootScope.Scope#$digest $digest} loop finishes
     the execution leaves the Angular and JavaScript context. This is followed by the browser
     re-rendering the DOM to reflect any changes.

@@ -419,4 +419,4 @@ user enters text into the text field.
        which in turn updates the DOM.
     6. Angular exits the execution context, which in turn exits the `keydown` event and with it
        the JavaScript execution context.
-     7. The browser re-renders the view with the updated text.
+     7. The browser re-renders the view with update text.
@@ -39,7 +39,7 @@ In general, we recommend against this because it can create unintended XSS vecto

 However, it's ok to mix server-side templating in the bootstrap template (`index.html`) as long
 as user input cannot be used on the server to output html that would then be processed by Angular
-in a way that would allow for arbitrary code execution.
+in a way that would cause allow for arbitrary code execution.

 For instance, you can use server-side templating to dynamically generate CSS, URLs, etc, but not
 for generating templates that are bootstrapped/compiled by Angular.
@@ -82,7 +82,7 @@ on the service.
 ### Registering Services

 Services are registered to modules via the {@link angular.Module Module API}.
-Typically you use the {@link angular.Module#factory Module factory} API to register a service:
+Typically you use the {@link angular.module Module#factory} API to register a service:

 ```js
 var myModule = angular.module('myModule', []);
@@ -181,7 +181,7 @@ of a real browser alert.

 ```js
 var mock, notify;
-beforeEach(module('myServiceModule'));
+
 beforeEach(function() {
  mock = {alert: jasmine.createSpy()};

@@ -6,7 +6,7 @@
 JavaScript is a dynamically typed language which comes with great power of expression, but it also
 comes with almost no help from the compiler. For this reason we feel very strongly that any code
 written in JavaScript needs to come with a strong set of tests. We have built many features into
-Angular which make testing your Angular applications easy. With Angular, there is no excuse for not testing.
+Angular which makes testing your Angular applications easy. So there is no excuse for not testing.

 ## Separation of Concerns

@@ -20,13 +20,13 @@ related pieces such as the DOM elements, or making any XHR calls to fetch the da

 While this may seem obvious it can be very difficult to call an individual function on a
 typical project. The reason is that the developers often mix concerns resulting in a
-piece of code which does everything. It makes an XHR request, it sorts the response data, and then it
+piece of code which does everything. It makes an XHR request, it sorts the response data and then it
 manipulates the DOM.

-With Angular, we try to make it easy for you to do the right thing. For your XHR requests, we
-provide dependency injection, so your requests can be simulated. For the DOM, we abstract it, so you can
-test your model without having to manipulate the DOM directly. Your tests can then
-assert that the data has been sorted without having to create or look at the state of the DOM or to
+With Angular we try to make it easy for you to do the right thing, and so we
+provide dependency injection for your XHR requests, which can be mocked, and we provide abstractions which
+allow you to test your model without having to resort to manipulating the DOM. The test can then
+assert that the data has been sorted without having to create or look at the state of the DOM or
 wait for any XHR requests to return data. The individual sort function can be tested in isolation.

 ## With great power comes great responsibility
@@ -62,7 +62,7 @@ are available on [the Karma website](http://karma-runner.github.io/0.12/intro/in

 ### Jasmine

-[Jasmine](http://jasmine.github.io/1.3/introduction.html) is a behavior driven development framework for
+[Jasmine](http://jasmine.github.io/1.3/introduction.html) is a test driven development framework for
 JavaScript that has become the most popular choice for testing Angular applications. Jasmine
 provides functions to help with structuring your tests and also making assertions. As your tests
 grow, keeping them well structured and documented is vital, and Jasmine helps achieve this.
@@ -260,13 +260,6 @@ myModule.filter('length', function() {
 });

 describe('length filter', function() {
-
-  var $filter;
-
-  beforeEach(inject(function(_$filter_){
-    $filter = _$filter_;
-  }));
-
  it('returns 0 when given null', function() {
    var length = $filter('length');
    expect(length(null)).toEqual(0);
@@ -359,7 +352,7 @@ element, to which it can then insert the transcluded content into its template.

 Before compilation:
 ```html
-<div transclude-directive>
+<div translude-directive>
  Some transcluded content
 </div>
 ```
@@ -153,7 +153,7 @@ grunt test:unit --browsers Opera,Firefox

 Note there should be _no spaces between browsers_. `Opera, Firefox` is INVALID.

-During development, however, it's more productive to continuously run unit tests every time the source or test files
+During development it's however 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:
@@ -15,14 +15,14 @@ development.
 production.

 To point your code to an angular script on the Google CDN server, use the following template.  This
-example points to the minified version 1.4.5:
+example points to the minified version 1.2.0:

 ```
  <!doctype html>
  <html ng-app>
    <head>
      <title>My Angular App</title>
-      <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
+      <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
    </head>
    <body>
    </body>
@@ -46,7 +46,7 @@ Download the version you want and have fun.
 Each directory under <http://code.angularjs.org/> includes the following set of files:

 * __`angular.js`__ — This file is non-obfuscated, non-minified, and human-readable by
-opening it in any editor or browser. In order to get better error messages during development, you
+opening it it any editor or browser. In order to get better error messages during development, you
 should always use this non-minified angular script.

 * __`angular.min.js`__ — This is a minified and obfuscated version of
@@ -20,42 +20,6 @@ AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop
 So it's definitely not a plugin or some other native browser extension.


-### What is the AngularJS versioning strategy?
-
-In Angular 1 we do not allow intentional breaking changes to appear in versions where only the "patch"
-number changes. For example between 1.3.12 and 1.3.13 there can be no breaking changes. We do allow
-breaking changes happen between "minor" number changes. For example between 1.3.15 and 1.4.0 there
-will be a number of breaking changes. We also allow breaking changes between beta releases of Angular.
-For example between 1.4.0-beta.4 and 1.4.0-beta.5 there may be breaking changes. We try hard to minimize
-these kinds of change only to those where there is a strong use case such as a strongly requested feature
-improvement, a considerable simplification of the code or a measurable performance improvement.
-
-When adding new code to branches of Angular, have a very stringent commit policy:
-
- Every commit must contain tests and documentation updates alongside the code changes and that all the
-tests must pass;
- Commit messages must be written in a specific manner that allows us to parse them and extract the changes
-for release notes.
-
-The Angular code base has a very large set of unit tests (over 4000) and end to end tests, which are pretty
-comprehensive. This means that a breaking change will require one or more tests to be changed to allow the
-tests to pass. So when a commit includes tests that are being removed or modified, this is a flag that the
-code might include a breaking change. When reviewing the commit we can then decide whether there really is
-a breaking change and if it is appropriate for the branch to which it is being merged. If so, then we
-require that the commit message contains an appropriate breaking change message.
-
-Additionally, when a commit lands in our master repository it is synced to Google where we test it against
-over 2000 applications using the test suites of these applications. This allows us to catch regressions
-quickly before a release. We've had a pretty good experience with this setup. Only bugs that affect features
-not used at Google or without sufficient test coverage, have a chance of making it through.
-
-Lastly, when we are making a release we generate updates to the changelog directly from the commits. This
-generated update contains a highlighted section that contains all the breaking changes that have been
-extracted from the commits. We can quickly see in the new changelog exactly what commits contain breaking
-changes and so can application developers when they are deciding whether to update to a new version of
-Angular.
-
-
 ### Is AngularJS a templating system?

 At the highest level, Angular does look like just another templating system. But there is one
@@ -69,7 +33,7 @@ templating systems.
 ### Do I need to worry about security holes in AngularJS?

 Like any other technology, AngularJS is not impervious to attack. Angular does, however, provide
-built-in protection from basic security holes, including cross-site scripting and HTML injection
+built-in protection from basic security holes including cross-site scripting and HTML injection
 attacks. AngularJS does round-trip escaping on all strings for you and even offers XSRF protection
 for server-side communication.

@@ -86,15 +50,9 @@ Yes. See instructions in {@link downloading}.

 ### What browsers does Angular work with?

-We run our extensive test suite against the following browsers: the latest versions of Chrome,
-Firefox, Safari, and Safari for iOs, as well as Internet Explorer versions 9-11. See {@link guide/ie
-Internet Explorer Compatibility} for more details on supporting legacy IE browsers.
-
-If a browser is untested, it doesn't mean it won't work; for example, older Android (2.3.x)
-is supported in the sense that we avoid the dot notation for reserved words as property names,
-but we don't actively test changes against it. You can also expect browsers to work that share
-a large part of their codebase with a browser we test, such as Opera > version 12
-(uses the Blink engine), or the various Firefox derivatives.
+We run our extensive test suite against the following browsers: Safari, Chrome, Firefox, Opera 15,
+IE9 and mobile browsers (Android, Chrome Mobile, iOS Safari). See {@link guide/ie Internet
+Explorer Compatibility} for more details in supporting legacy IE browsers.


 ### What's Angular's performance like?
@@ -103,13 +61,13 @@ The startup time heavily depends on your network connection, state of the cache,
 available hardware, but typically we measure bootstrap time in tens or hundreds of milliseconds.

 The runtime performance will vary depending on the number and complexity of bindings on the page
-as well as the speed of your backend (for apps that fetch data from the backend). For an
-illustration, we typically build snappy apps with hundreds or thousands of active bindings.
+as well as the speed of your backend (for apps that fetch data from the backend). Just for an
+illustration we typically build snappy apps with hundreds or thousands of active bindings.


 ### How big is the angular.js file that I need to include?

-The size of the file is ~50KB compressed and minified.
+The size of the file is < 36KB compressed and minified.


 ### Can I use the open-source Closure Library with Angular?
@@ -130,7 +88,7 @@ but we don't guarantee that.

 ### What is testability like in Angular?

-Very testable and designed this way from the ground up. It has an integrated dependency injection
+Very testable and designed this way from ground up. It has an integrated dependency injection
 framework, provides mocks for many heavy dependencies (server-side communication). See
 {@link ngMock} for details.

@@ -200,7 +158,7 @@ Conditionally showing and hiding things using jQuery is a common pattern in othe
 `ng-show` (and `ng-hide`) conditionally show and hide elements based on boolean expressions.
 Describe the conditions for showing and hiding an element in terms of `$scope` variables:

-    <div ng-show="!loggedIn"><a href="#/login">Click here to log in</a></div>
+    <div ng-show="!loggedIn">Click <a href="#/login">here</a> to log in</div>

 Note also the counterpart `ng-hide` and similar `ng-disabled`.
 Note especially the powerful `ng-switch` that should be used instead of several mutually exclusive `ng-show`s.
@@ -231,7 +189,7 @@ Then whenever a value on a scope changes, all `$watch`es observing that element

 Sometimes, usually when you're writing a custom directive, you will have to define your own `$watch` on a scope value to make the directive react to changes.

-On the flip side, sometimes you change a scope value in some code, but the app doesn't react to it.
+On the flip side, sometimes you change a scope value in some code but the app doesn't react to it.
 Angular checks for scope variable changes after pieces of your code have finished running; for example, when `ng-click` calls a function on your scope, Angular will check for changes and react.
 However, some code is outside of Angular and you'll have to call `scope.$apply()` yourself to trigger the update.
 This is most commonly seen in event handlers in custom directives.
@@ -61,7 +61,7 @@ a few git commands.

 ### Install Git

-You can download and install Git from http://git-scm.com/download. Once installed, you should have
+You can download and install Git from http://git-scm.com/download. Once installed you should have
 access to the `git` command line tool.  The main commands that you will need to use are:

 - `git clone ...` : clone a remote repository onto your local machine
@@ -123,14 +123,13 @@ npm --version
  </a>.
 </div>

-Once you have Node.js installed on your machine, you can download the tool dependencies by running:
+Once you have Node.js installed on your machine you can download the tool dependencies by running:

 ```
 npm install
 ```

-This command reads angular-phonecat's `package.json` file and downloads the following tools
-into the `node_modules` directory:
+This command will download the following tools, into the `node_modules` directory:

 - [Bower][bower] - client-side code package manager
 - [Http-Server][http-server] - simple local static web server
@@ -198,8 +197,8 @@ http://localhost:8000/app/index.html
 ```

 <div class="alert alert-info">
-To serve the web app on a different IP address or port, edit the "start" script within package.json.
-You can use `-a` to set the address and `-p` to set the port.
+To serve the web app on a different ip address or port, edit the "start" script within package.json.
+You can `-a` to set the address and `-p` to set the port.
 </div>

 ### Running Unit Tests
@@ -246,15 +245,6 @@ npm run update-webdriver

 *(You should only need to do this once.)*

-You will need to have Java present on your dev machine to allow the Selenium standalone to be started.
-Check if you already have java installed by opening a terminal/command line window and typing
-'''
-java -version
-'''
-If java is already installed and exists in the PATH then you will be shown the version installed,
-if, however you receive a message that "java is not recognized as an internal command or external
-command" you will need to install [java].
-
 Since Protractor works by interacting with a running application, we need to start our web server:

 ```
@@ -280,7 +270,6 @@ It is good to run the end to end tests whenever you make changes to the HTML vie
 that the application as a whole is executing correctly.  It is very common to run End to End tests
 before pushing a new commit of changes to a remote repository.

-Now that you have set up your local machine, let's get started with the tutorial: {@link step_00 Step 0 - Bootstrapping}

 [git]: http://git-scm.com/
 [node]: http://nodejs.org/
@@ -289,4 +278,3 @@ Now that you have set up your local machine, let's get started with the tutorial
 [bower]: http://bower.io/
 [http-server]: https://github.com/nodeapps/http-server
 [karma]: https://github.com/karma-runner/karma
-[java]: https://www.java.com/en/download/help/download_options.xml
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Caitlin Potter	e4adebd07a	revert: chore(npm): Make require()-able as part of publish script This reverts commit `c5686c5271`. (We wanted to get some feedback before doin this)	2015-01-13 14:29:29 -05:00
Peter Bacon Darwin	ac94f6125f	docs(CHANGELOG): add changes for 1.3.9 and 1.4.0-beta.0	2015-01-13 00:58:04 +00:00
Ben Clinkinbeard	c5686c5271	chore(npm): Make require()-able as part of publish script (This has not been tested locally with browserify --- but it should work! If it doesn't, please file a bug rather than just leaving a comment on this commit :) Closes #10731	2015-01-12 19:09:46 -05:00
Julie Ralph	7fdb54d12b	chore(testing): bump protractor to version 1.6.0	2015-01-12 11:47:47 -08:00
Jason Bedard	869008140a	fix($parse): allow use of locals in assignments Fixes #4664	2015-01-12 13:38:34 +00:00
Julie Ralph	26ee32ec79	chore(travis): split out the docs e2e tests into their own travis job Previously, they were in the 'unit' job to save travis VMs, but this was confusing and made it more difficult to track down errors easily.	2015-01-09 14:29:26 -08:00
Julie Ralph	a06193f97b	chore(travis): make browserstack unit tests allowed failures	2015-01-09 10:45:23 -08:00
Uri Goldshtein	ba9dee170c	docs(guide/index): add angular-easyfb with Facebook login to login libraries Merci~ Closes #5792	2015-01-06 13:41:45 -05:00
Andrey Pushkarev	d4b60ada1e	fix(filterFilter): use isArray() to determine array type In JavaScript, an array is a special type of object, therefore typeof [] returns object. Added corresponding unit tests. Changed condition for array type to isArray. Closes #10621	2015-01-02 13:26:51 -05:00
Rus1	b839f73ad0	docs(ngInclude): replace <tt> with <code> Using obsolete <tt> HTML tag may not be good for Angular examples Closes #10594	2014-12-30 15:48:19 -05:00
Peter Bacon Darwin	aee32931fd	test(input): split tests into smaller files This is complement to the previous commit. It also refactors the input compile helpers to make it cleaner and more consistent.	2014-12-24 23:26:34 +00:00
Peter Bacon Darwin	7ee5f46bbc	refact(input): split input.js into smaller files The input.js file is unnecessarily large, containing many directives including the vast `ngModel`. This change moves ngModel and a few other directives into their own files, which will make maintenance easier.	2014-12-24 13:01:03 +00:00
David Souther	2b97854bf4	feat(ngMock/$exceptionHandler): log errors when rethrowing Now the `rethrow` mode will also record a log of the error in the same way as the `log` mode. Closes #10540 Closes #10564	2014-12-23 18:35:49 +00:00
David Souther	316ee8f7ca	test($exceptionHandlerProvider): call `inject()` to run tests In the current angular-mocksSpec, the tests for $exceptionHandlerProvider call `module` to run tests on `$exceptionHandlerProvider.mode()`, but do not call `inject()` to pump the module definitions. Closes #10563	2014-12-23 18:11:21 +00:00
gokulkrishh	2e18f44fcd	docs(guide/*): spelling/grammar improvements Closes #10552	2014-12-22 10:44:54 -05:00
Caitlin Potter	c85d064ecf	docs($rootScope): remove erroneous closing parenthesis Closes #10549	2014-12-22 08:34:29 -05:00
Kevin Primat	7b9b82281a	docs(guide/location): add missing definite article The sentence was missing a definite article so was unclear. Added one to clarify. Closes #10547	2014-12-22 08:25:24 -05:00
Olivier Giulieri	aab632b330	docs(guide): fix spaces Closes #10539	2014-12-22 01:08:06 +00:00
gdi2290	4c8d8ad508	perf(ngStyleDirective): use $watchCollection Since we are simply watching a flat object collection it is more performant to use $watchCollection than a deepWatch... Closes #10535	2014-12-22 00:58:45 +00:00
Dan Cancro	3a8f3dc9ea	docs(guide/index): Link to starter options Add a link to a comparison spreadsheet of alternative generators, examples, tutorials and seeds that one can use to get started on a new Angular project. Closes #10526	2014-12-22 00:30:30 +00:00
Robert Haritonov	c139e68d99	docs(tutorial/12): fix path to jquery in bower Closes #10504	2014-12-22 00:21:27 +00:00