docs(guide): update "AngularJS" book link

Added latest 2014 revision "AngularJS: Up and Running" with Amazon link.
"AngularJS" was previous 2013 version.

Closes #10920

.gitattributes

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

.jscs.json.todo

@@ -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.
+
+{
+  "validateParameterSeparator": ", ", // Re-assert this rule when JSCS allows multiple spaces
+  "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+  "disallowImplicitTypeConversion": ["string"],
+  "disallowMultipleLineBreaks": true,
+  "validateJSDoc": {
+    "checkParamNames": true,
+    "requireParamTypes": true
+  }
+}

.travis.yml

@@ -1,13 +1,6 @@
 language: node_js
-sudo: false
 node_js:
-  - '4.4'
-
-cache:
-  directories:
-    - node_modules
-    - bower_components
-    - docs/bower_components
+  - '0.10'
 
 branches:
   except:
@@ -15,47 +8,46 @@ 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:

CONTRIBUTING.md

@@ -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)
@@ -123,19 +123,13 @@ Before you submit your pull request consider the following guidelines:
 * 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
@@ -205,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:
@@ -221,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
@@ -238,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].
 
@@ -274,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

Gruntfile.js

@@ -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,17 +285,13 @@ 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,
           failOnError: true
         },
-        command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js --timeout 2000')
+        command: path.normalize('./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js')
       }
     },
 
@@ -334,15 +311,9 @@ 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']);
@@ -352,11 +323,11 @@ module.exports = function(grunt) {
   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']);
 };

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2015 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

README.closure.md

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

README.md

@@ -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
@@ -18,10 +18,10 @@ piece of cake. Best of all?? It makes development fun!
 * Developer Guide: http://docs.angularjs.org/guide
 * Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: http://dashboard.angularjs.org
- 
+
 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
 
@@ -43,26 +43,3 @@ To learn more about the grunt tasks, run `grunt --help` and also read our
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)
 
-What to Use AngularJS for and When to Use it
----------
-AngularJS is the next generation framework where each component is designed to work with every other component in an interconnected way like a well-oiled machine. AngularJS is JavaScript MVC made easy and done right. (Well it is not really MVC, read on, to understand what this means.)
-
-#### MVC, no, MV* done the right way!
-MVC, short for Model-View-Controller, is a design pattern, i.e. how the code should be organized and how the different parts of an application separated for proper readability and debugging. Model is the data and the database. View is the user interface and what the user sees. Controller is the main link between Model and View. These are the three pillars of major programming frameworks present on the market today. On the other hand AngularJS works on MV*, short for Model-View-_Whatever_. The _Whatever_ is AngularJS's way of telling that you may create any kind of linking between the Model and the View here. 
-
-Unlike other frameworks in any programming language, where MVC, the three separate components, each one has to be written and then connected by the programmer, AngularJS helps the programmer by asking him/her to just create these and everything else will be taken care of by AngularJS.
-
-#### Interconnection with HTML at the root level
-AngularJS uses HTML to define the user's interface. AngularJS also enables the programmer to write new HTML tags (AngularJS Directives) and increase the readability and understandability of the HTML code. Directives are AngularJS’s way of bringing additional functionality to HTML. Directives achieve this by enabling us to invent our own HTML elements. This also helps in making the code DRY (Don't Repeat Yourself), which means once created, a new directive can be used anywhere within the application.
-
-#### Data Handling made simple
-Data and Data Models in AngularJS are plain JavaScript objects and one can add and change properties directly on it and loop over objects and arrays at will.
-
-#### Two-way Data Binding
-One of AngularJS's strongest features. Two-way Data Binding means that if something changes in the Model, the change gets reflected in the View instantaneously, and the same happens the other way around. This is also referred to as Reactive Programming, i.e. suppose `a = b + c` is being programmed and after this, if the value of `b` and/or `c` is changed then the value of `a` will be automatically updated to reflect the change. AngularJS uses its "scopes" as a glue between the Model and View and makes these updates in one available for the other.
-
-#### Less Written Code and Easily Maintable Code
-Everything in AngularJS is created to enable the programmer ends up writing less code that is easily maintainable and readable by any other new person on the team. Believe it or not, one can write a complete working two-way data binded application in less than 10 lines of code. Try and see for yourself!
-
-#### Testing Ready
-AngularJS has Dependency Injection, i.e. it takes care of providing all the necessary dependencies to its controllers whenever required. This helps in making the AngularJS code ready for unit testing by making use of mock dependencies created and injected. This makes AngularJS more modular and easily testable thus in turn helping a team create more robust applications.

TRIAGING.md

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

angularFiles.js

@@ -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,42 +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/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'
@@ -184,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': [
@@ -206,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',
@@ -220,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'],

benchmarks/largetable-bp/main.html

@@ -14,14 +14,11 @@
       <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>interpolation + bind-once: <input type="radio" ng-model="benchmarkType" value="bindOnceInterpolation"></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>
-      <div>ngModel (const name): <input type="radio" ng-model="benchmarkType" value="ngModelConstName"></div>
-      <div>ngModel (interp name): <input type="radio" ng-model="benchmarkType" value="ngModelInterpName"></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>

benchmarks/ng-options-bp/app.js

@@ -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');
-    }
-  });
-});

benchmarks/ng-options-bp/bp.conf.js

@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};

benchmarks/ng-options-bp/main.html

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

bower.json

@@ -1,6 +1,5 @@
 {
   "name": "AngularJS",
-  "license": "MIT",
   "devDependencies": {
     "jquery": "2.1.1",
     "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",

compare-master-to-stable.js

@@ -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) {

css/angular.css

@@ -9,11 +9,3 @@
 ng\:form {
   display: block;
 }
-
-.ng-animate-shim {
-  visibility:hidden;
-}
-
-.ng-anchor {
-  position:absolute;
-}

docs/app/assets/css/doc_widgets.css

@@ -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 */

docs/app/assets/css/docs.css

@@ -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;
 }
 
@@ -415,7 +415,7 @@ iframe.example {
 
 .main-body-grid .side-navigation {
   position:relative;
-  padding-bottom:120px;
+  padding-bottom:50px;
 }
 
 .main-body-grid .side-navigation.ng-hide {
@@ -583,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;
@@ -643,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;
@@ -707,7 +694,3 @@ ul.events > li {
     padding-bottom:0px;
   }
 }
-
-iframe[name="example-anchoringExample"] {
-  height:400px;
-}

docs/app/assets/js/angular-bootstrap/bootstrap.js

@@ -0,0 +1,442 @@
+'use strict';
+
+var directive = {};
+
+directive.runnableExample = ['$templateCache', '$document', function($templateCache, $document) {
+  var exampleClassNameSelector = '.runnable-example-file';
+  var doc = $document[0];
+  var tpl =
+    '<nav class="runnable-example-tabs" ng-if="tabs">' +
+    '  <a ng-class="{active:$index==activeTabIndex}"' +
+         'ng-repeat="tab in tabs track by $index" ' +
+         'href="" ' +
+         'class="btn"' +
+         'ng-click="setTab($index)">' +
+    '    {{ tab }}' +
+    '  </a>' +
+    '</nav>';
+
+  return {
+    restrict: 'C',
+    scope : true,
+    controller : ['$scope', function($scope) {
+      $scope.setTab = function(index) {
+        var tab = $scope.tabs[index];
+        $scope.activeTabIndex = index;
+        $scope.$broadcast('tabChange', index, tab);
+      };
+    }],
+    compile : function(element) {
+      element.html(tpl + element.html());
+      return function(scope, element) {
+        var node = element[0];
+        var examples = node.querySelectorAll(exampleClassNameSelector);
+        var tabs = [], now = Date.now();
+        angular.forEach(examples, function(child, index) {
+          tabs.push(child.getAttribute('name'));
+        });
+
+        if(tabs.length > 0) {
+          scope.tabs = tabs;
+          scope.$on('tabChange', function(e, index, title) {
+            angular.forEach(examples, function(child) {
+              child.style.display = 'none';
+            });
+            var selected = examples[index];
+            selected.style.display = 'block';
+          });
+          scope.setTab(0);
+        }
+      }
+    }
+  };
+}];
+
+directive.dropdownToggle =
+          ['$document', '$location', '$window',
+  function ($document,   $location,   $window) {
+    var openElement = null, close;
+    return {
+      restrict: 'C',
+      link: function(scope, element, attrs) {
+        scope.$watch(function dropdownTogglePathWatch(){return $location.path();}, function dropdownTogglePathWatchAction() {
+          close && close();
+        });
+
+        element.parent().on('click', function(event) {
+          close && close();
+        });
+
+        element.on('click', function(event) {
+          event.preventDefault();
+          event.stopPropagation();
+
+          var iWasOpen = false;
+
+          if (openElement) {
+            iWasOpen = openElement === element;
+            close();
+          }
+
+          if (!iWasOpen){
+            element.parent().addClass('open');
+            openElement = element;
+
+            close = function (event) {
+              event && event.preventDefault();
+              event && event.stopPropagation();
+              $document.off('click', close);
+              element.parent().removeClass('open');
+              close = null;
+              openElement = null;
+            }
+
+            $document.on('click', close);
+          }
+        });
+      }
+    };
+  }];
+
+directive.syntax = function() {
+  return {
+    restrict: 'A',
+    link: function(scope, element, attrs) {
+      function makeLink(type, text, link, icon) {
+        return '<a href="' + link + '" class="btn syntax-' + type + '" target="_blank" rel="nofollow">' +
+                '<span class="' + icon + '"></span> ' + text +
+               '</a>';
+      };
+
+      var html = '';
+      var types = {
+        'github' : {
+          text : 'View on Github',
+          key : 'syntaxGithub',
+          icon : 'icon-github'
+        },
+        'plunkr' : {
+          text : 'View on Plunkr',
+          key : 'syntaxPlunkr',
+          icon : 'icon-arrow-down'
+        },
+        'jsfiddle' : {
+          text : 'View on JSFiddle',
+          key : 'syntaxFiddle',
+          icon : 'icon-cloud'
+        }
+      };
+      for(var type in types) {
+        var data = types[type];
+        var link = attrs[data.key];
+        if(link) {
+          html += makeLink(type, data.text, link, data.icon);
+        }
+      };
+
+      var nav = document.createElement('nav');
+      nav.className = 'syntax-links';
+      nav.innerHTML = html;
+
+      var node = element[0];
+      var par = node.parentNode;
+      par.insertBefore(nav, node);
+    }
+  }
+}
+
+directive.tabbable = function() {
+  return {
+    restrict: 'C',
+    compile: function(element) {
+      var navTabs = angular.element('<ul class="nav nav-tabs"></ul>'),
+          tabContent = angular.element('<div class="tab-content"></div>');
+
+      tabContent.append(element.contents());
+      element.append(navTabs).append(tabContent);
+    },
+    controller: ['$scope', '$element', function($scope, $element) {
+      var navTabs = $element.contents().eq(0),
+          ngModel = $element.controller('ngModel') || {},
+          tabs = [],
+          selectedTab;
+
+      ngModel.$render = function() {
+        var $viewValue = this.$viewValue;
+
+        if (selectedTab ? (selectedTab.value != $viewValue) : $viewValue) {
+          if(selectedTab) {
+            selectedTab.paneElement.removeClass('active');
+            selectedTab.tabElement.removeClass('active');
+            selectedTab = null;
+          }
+          if($viewValue) {
+            for(var i = 0, ii = tabs.length; i < ii; i++) {
+              if ($viewValue == tabs[i].value) {
+                selectedTab = tabs[i];
+                break;
+              }
+            }
+            if (selectedTab) {
+              selectedTab.paneElement.addClass('active');
+              selectedTab.tabElement.addClass('active');
+            }
+          }
+
+        }
+      };
+
+      this.addPane = function(element, attr) {
+        var li = angular.element('<li><a href></a></li>'),
+            a = li.find('a'),
+            tab = {
+              paneElement: element,
+              paneAttrs: attr,
+              tabElement: li
+            };
+
+        tabs.push(tab);
+
+        attr.$observe('value', update)();
+        attr.$observe('title', function(){ update(); a.text(tab.title); })();
+
+        function update() {
+          tab.title = attr.title;
+          tab.value = attr.value || attr.title;
+          if (!ngModel.$setViewValue && (!ngModel.$viewValue || tab == selectedTab)) {
+            // we are not part of angular
+            ngModel.$viewValue = tab.value;
+          }
+          ngModel.$render();
+        }
+
+        navTabs.append(li);
+        li.on('click', function(event) {
+          event.preventDefault();
+          event.stopPropagation();
+          if (ngModel.$setViewValue) {
+            $scope.$apply(function() {
+              ngModel.$setViewValue(tab.value);
+              ngModel.$render();
+            });
+          } else {
+            // we are not part of angular
+            ngModel.$viewValue = tab.value;
+            ngModel.$render();
+          }
+        });
+
+        return function() {
+          tab.tabElement.remove();
+          for(var i = 0, ii = tabs.length; i < ii; i++ ) {
+            if (tab == tabs[i]) {
+              tabs.splice(i, 1);
+            }
+          }
+        };
+      }
+    }]
+  };
+};
+
+directive.table = function() {
+  return {
+    restrict: 'E',
+    link: function(scope, element, attrs) {
+      if (!attrs['class']) {
+        element.addClass('table table-bordered table-striped code-table');
+      }
+    }
+  };
+};
+
+var popoverElement = function() {
+  var object = {
+    init : function() {
+      this.element = angular.element(
+        '<div class="popover popover-incode top">' +
+          '<div class="arrow"></div>' +
+          '<div class="popover-inner">' +
+            '<div class="popover-title"><code></code></div>' +
+            '<div class="popover-content"></div>' +
+          '</div>' +
+        '</div>'
+      );
+      this.node = this.element[0];
+      this.element.css({
+        'display':'block',
+        'position':'absolute'
+      });
+      angular.element(document.body).append(this.element);
+
+      var inner = this.element.children()[1];
+      this.titleElement   = angular.element(inner.childNodes[0].firstChild);
+      this.contentElement = angular.element(inner.childNodes[1]);
+
+      //stop the click on the tooltip
+      this.element.on('click', function(event) {
+        event.preventDefault();
+        event.stopPropagation();
+      });
+
+      var self = this;
+      angular.element(document.body).on('click',function(event) {
+        if(self.visible()) self.hide();
+      });
+    },
+
+    show : function(x,y) {
+      this.element.addClass('visible');
+      this.position(x || 0, y || 0);
+    },
+
+    hide : function() {
+      this.element.removeClass('visible');
+      this.position(-9999,-9999);
+    },
+
+    visible : function() {
+      return this.position().y >= 0;
+    },
+
+    isSituatedAt : function(element) {
+      return this.besideElement ? element[0] == this.besideElement[0] : false;
+    },
+
+    title : function(value) {
+      return this.titleElement.html(value);
+    },
+
+    content : function(value) {
+      if(value && value.length > 0) {
+        value = marked(value);
+      }
+      return this.contentElement.html(value);
+    },
+
+    positionArrow : function(position) {
+      this.node.className = 'popover ' + position;
+    },
+
+    positionAway : function() {
+      this.besideElement = null;
+      this.hide();
+    },
+
+    positionBeside : function(element) {
+      this.besideElement = element;
+
+      var elm = element[0];
+      var x = elm.offsetLeft;
+      var y = elm.offsetTop;
+      x -= 30;
+      y -= this.node.offsetHeight + 10;
+      this.show(x,y);
+    },
+
+    position : function(x,y) {
+      if(x != null && y != null) {
+        this.element.css('left',x + 'px');
+        this.element.css('top', y + 'px');
+      }
+      else {
+        return {
+          x : this.node.offsetLeft,
+          y : this.node.offsetTop
+        };
+      }
+    }
+  };
+
+  object.init();
+  object.hide();
+
+  return object;
+};
+
+directive.popover = ['popoverElement', function(popover) {
+  return {
+    restrict: 'A',
+    priority : 500,
+    link: function(scope, element, attrs) {
+      element.on('click',function(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        if(popover.isSituatedAt(element) && popover.visible()) {
+          popover.title('');
+          popover.content('');
+          popover.positionAway();
+        }
+        else {
+          popover.title(attrs.title);
+          popover.content(attrs.content);
+          popover.positionBeside(element);
+        }
+      });
+    }
+  }
+}];
+
+directive.tabPane = function() {
+  return {
+    require: '^tabbable',
+    restrict: 'C',
+    link: function(scope, element, attrs, tabsCtrl) {
+      element.on('$remove', tabsCtrl.addPane(element, attrs));
+    }
+  };
+};
+
+directive.foldout = ['$http', '$animate','$window', function($http, $animate, $window) {
+  return {
+    restrict: 'A',
+    priority : 500,
+    link: function(scope, element, attrs) {
+      var container, loading, url = attrs.url;
+      if(/\/build\//.test($window.location.href)) {
+        url = '/build/docs' + url;
+      }
+      element.on('click',function() {
+        scope.$apply(function() {
+          if(!container) {
+            if(loading) return;
+
+            loading = true;
+            var par = element.parent();
+            container = angular.element('<div class="foldout">loading...</div>');
+            $animate.enter(container, null, par);
+
+            $http.get(url, { cache : true }).success(function(html) {
+              loading = false;
+
+              html = '<div class="foldout-inner">' +
+                      '<div calss="foldout-arrow"></div>' +
+                      html +
+                     '</div>';
+              container.html(html);
+
+              //avoid showing the element if the user has already closed it
+              if(container.css('display') == 'block') {
+                container.css('display','none');
+                $animate.addClass(container, 'ng-hide');
+              }
+            });
+          }
+          else {
+            container.hasClass('ng-hide') ? $animate.removeClass(container, 'ng-hide') : $animate.addClass(container, 'ng-hide');
+          }
+        });
+      });
+    }
+  }
+}];
+
+angular.module('bootstrap', [])
+  .directive(directive)
+  .factory('popoverElement', popoverElement)
+  .run(function() {
+    marked.setOptions({
+      gfm: true,
+      tables: true
+    });
+  });

docs/app/assets/js/angular-bootstrap/dropdown-toggle.js

@@ -54,9 +54,7 @@ angular.module('ui.bootstrap.dropdown', [])
     }
   };
 
-  var closeDropdown = function(evt) {
-    if (evt && evt.which === 3) return;
-
+  var closeDropdown = function() {
     openScope.$apply(function() {
       openScope.isOpen = false;
     });

docs/app/src/app.js

@@ -13,6 +13,7 @@ angular.module('docsApp', [
   'search',
   'tutorials',
   'versions',
+  'bootstrap',
   'ui.bootstrap.dropdown'
 ])
 

docs/app/src/directives.js

@@ -34,15 +34,4 @@ angular.module('directives', [])
   return function(scope, element) {
     $anchorScroll.yOffset = element;
   };
-}])
-
-.directive('table', function() {
-  return {
-    restrict: 'E',
-    link: function(scope, element, attrs) {
-      if (!attrs['class']) {
-        element.addClass('table table-bordered table-striped code-table');
-      }
-    }
-  };
-});
+}]);

docs/app/src/errors.js

@@ -13,10 +13,10 @@ angular.module('errors', ['ngSanitize'])
   };
 
   return function (text, target) {
-    if (!text) return text;
-
     var targetHtml = target ? ' target="' + target + '"' : '';
 
+    if (!text) return text;
+
     return $sanitize(text.replace(LINKY_URL_REGEXP, function (url) {
       if (STACK_TRACE_REGEXP.test(url)) {
         return url;
@@ -34,10 +34,6 @@ angular.module('errors', ['ngSanitize'])
 
 
 .directive('errorDisplay', ['$location', 'errorLinkFilter', function ($location, errorLinkFilter) {
-  var encodeAngleBrackets = function (text) {
-    return text.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-  };
-
   var interpolate = function (formatString) {
     var formatArgs = arguments;
     return formatString.replace(/\{\d+\}/g, function (match) {
@@ -55,15 +51,12 @@ angular.module('errors', ['ngSanitize'])
     link: function (scope, element, attrs) {
       var search = $location.search(),
         formatArgs = [attrs.errorDisplay],
-        formattedText,
         i;
 
       for (i = 0; angular.isDefined(search['p'+i]); i++) {
         formatArgs.push(search['p'+i]);
       }
-
-      formattedText = encodeAngleBrackets(interpolate.apply(null, formatArgs));
-      element.html(errorLinkFilter(formattedText, '_blank'));
+      element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
     }
   };
 }]);

docs/app/src/examples.js

@@ -1,55 +1,5 @@
 angular.module('examples', [])
 
-.directive('runnableExample', ['$templateCache', '$document', function($templateCache, $document) {
-  var exampleClassNameSelector = '.runnable-example-file';
-  var doc = $document[0];
-  var tpl =
-    '<nav class="runnable-example-tabs" ng-if="tabs">' +
-    '  <a ng-class="{active:$index==activeTabIndex}"' +
-         'ng-repeat="tab in tabs track by $index" ' +
-         'href="" ' +
-         'class="btn"' +
-         'ng-click="setTab($index)">' +
-    '    {{ tab }}' +
-    '  </a>' +
-    '</nav>';
-
-  return {
-    restrict: 'C',
-    scope : true,
-    controller : ['$scope', function($scope) {
-      $scope.setTab = function(index) {
-        var tab = $scope.tabs[index];
-        $scope.activeTabIndex = index;
-        $scope.$broadcast('tabChange', index, tab);
-      };
-    }],
-    compile : function(element) {
-      element.html(tpl + element.html());
-      return function(scope, element) {
-        var node = element[0];
-        var examples = node.querySelectorAll(exampleClassNameSelector);
-        var tabs = [], now = Date.now();
-        angular.forEach(examples, function(child, index) {
-          tabs.push(child.getAttribute('name'));
-        });
-
-        if(tabs.length > 0) {
-          scope.tabs = tabs;
-          scope.$on('tabChange', function(e, index, title) {
-            angular.forEach(examples, function(child) {
-              child.style.display = 'none';
-            });
-            var selected = examples[index];
-            selected.style.display = 'block';
-          });
-          scope.setTab(0);
-        }
-      };
-    }
-  };
-}])
-
 .factory('formPostData', ['$document', function($document) {
   return function(url, newWindow, fields) {
     /**

docs/app/src/tutorials.js

@@ -11,7 +11,8 @@ angular.module('tutorials', [])
     scope: {},
     template:
       '<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
-      '<a ng-href="https://github.com/angular/angular-phonecat/compare/1.4-step-{{diffLo}}...1.4-step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
+      '<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
+      '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
       '<a ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
     link: function(scope, element, attrs) {
       var seq = 1 * attrs.docTutorialNav;
@@ -34,14 +35,15 @@ 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 1.4-step-{{step}}</pre></p>\n' +
-      '  <p>Refresh your browser to see the changes.</p>\n' +
+      '  <p><pre>git checkout -f step-{{step}}</pre></p>\n' +
+      '  <p>Refresh your browser or check out this step online: '+
+          '<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/1.4-step-{{step ? (step - 1) : \'0~1\'}}...1.4-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>'
   };
-});
+});

docs/app/src/versions.js

@@ -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;
   };
 }]);

docs/app/test/.jshintrc

@@ -1,25 +0,0 @@
-{
-  "extends": "../../../.jshintrc-base",
-  "browser": true,
-  "globals": {
-    // AngularJS
-    "angular": false,
-
-    // ngMocks
-    "module": false,
-    "inject": true,
-
-    // Jasmine
-    "jasmine": false,
-    "describe": false,
-    "ddescribe": false,
-    "xdescribe": false,
-    "it": false,
-    "iit": false,
-    "xit": false,
-    "beforeEach": false,
-    "afterEach": false,
-    "spyOn": false,
-    "expect": false
-  }
-}

docs/app/test/errorsSpec.js

@@ -1,166 +0,0 @@
-'use strict';
-
-describe('errors', function() {
-  // Mock `ngSanitize` module
-  angular.
-    module('ngSanitize', []).
-    value('$sanitize', jasmine.createSpy('$sanitize').andCallFake(angular.identity));
-
-  beforeEach(module('errors'));
-
-
-  describe('errorDisplay', function() {
-    var $sanitize;
-    var errorLinkFilter;
-
-    beforeEach(inject(function(_$sanitize_, _errorLinkFilter_) {
-      $sanitize = _$sanitize_;
-      errorLinkFilter = _errorLinkFilter_;
-    }));
-
-
-    it('should return empty input unchanged', function() {
-      var inputs = [undefined, null, false, 0, ''];
-      var remaining = inputs.length;
-
-      inputs.forEach(function(falsyValue) {
-        expect(errorLinkFilter(falsyValue)).toBe(falsyValue);
-        remaining--;
-      });
-
-      expect(remaining).toBe(0);
-    });
-
-
-    it('should recognize URLs and convert them to `<a>`', function() {
-      var urls = [
-        ['ftp://foo/bar?baz#qux'],
-        ['http://foo/bar?baz#qux'],
-        ['https://foo/bar?baz#qux'],
-        ['mailto:foo_bar@baz.qux', null, 'foo_bar@baz.qux'],
-        ['foo_bar@baz.qux', 'mailto:foo_bar@baz.qux', 'foo_bar@baz.qux']
-      ];
-      var remaining = urls.length;
-
-      urls.forEach(function(values) {
-        var actualUrl = values[0];
-        var expectedUrl = values[1] || actualUrl;
-        var expectedText = values[2] || expectedUrl;
-        var anchor = '<a href="' + expectedUrl + '">' + expectedText + '</a>';
-
-        var input = 'start ' + actualUrl + ' end';
-        var output = 'start ' + anchor + ' end';
-
-        expect(errorLinkFilter(input)).toBe(output);
-        remaining--;
-      });
-
-      expect(remaining).toBe(0);
-    });
-
-
-    it('should not recognize stack-traces as URLs', function() {
-      var urls = [
-        'ftp://foo/bar?baz#qux:4:2',
-        'http://foo/bar?baz#qux:4:2',
-        'https://foo/bar?baz#qux:4:2',
-        'mailto:foo_bar@baz.qux:4:2',
-        'foo_bar@baz.qux:4:2'
-      ];
-      var remaining = urls.length;
-
-      urls.forEach(function(url) {
-        var input = 'start ' + url + ' end';
-
-        expect(errorLinkFilter(input)).toBe(input);
-        remaining--;
-      });
-
-      expect(remaining).toBe(0);
-    });
-
-
-    it('should should set `[target]` if specified', function() {
-      var url = 'https://foo/bar?baz#qux';
-      var target = '_blank';
-      var outputWithoutTarget = '<a href="' + url + '">' + url + '</a>';
-      var outputWithTarget = '<a target="' + target + '" href="' + url + '">' + url + '</a>';
-
-      expect(errorLinkFilter(url)).toBe(outputWithoutTarget);
-      expect(errorLinkFilter(url, target)).toBe(outputWithTarget);
-    });
-
-
-    it('should truncate the contents of the generated `<a>` to 60 characters', function() {
-      var looongUrl = 'https://foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo';
-      var truncatedUrl = 'https://foooooooooooooooooooooooooooooooooooooooooooooooo...';
-      var output = '<a href="' + looongUrl + '">' + truncatedUrl + '</a>';
-
-      expect(looongUrl.length).toBeGreaterThan(60);
-      expect(truncatedUrl.length).toBe(60);
-      expect(errorLinkFilter(looongUrl)).toBe(output);
-    });
-
-
-    it('should pass the final string through `$sanitize`', function() {
-      $sanitize.reset();
-
-      var input = 'start https://foo/bar?baz#qux end';
-      var output = errorLinkFilter(input);
-
-      expect($sanitize.callCount).toBe(1);
-      expect($sanitize).toHaveBeenCalledWith(output);
-    });
-  });
-
-
-  describe('errorDisplay', function() {
-    var $compile;
-    var $location;
-    var $rootScope;
-    var errorLinkFilter;
-
-    beforeEach(module(function($provide) {
-      $provide.decorator('errorLinkFilter', function() {
-        errorLinkFilter = jasmine.createSpy('errorLinkFilter');
-        errorLinkFilter.andCallFake(angular.identity);
-
-        return errorLinkFilter;
-      });
-    }));
-    beforeEach(inject(function(_$compile_, _$location_, _$rootScope_) {
-      $compile = _$compile_;
-      $location = _$location_;
-      $rootScope = _$rootScope_;
-    }));
-
-
-    it('should set the element\s HTML', function() {
-      var elem = $compile('<span error-display="bar">foo</span>')($rootScope);
-      expect(elem.html()).toBe('bar');
-    });
-
-
-    it('should interpolate the contents against `$location.search()`', function() {
-      spyOn($location, 'search').andReturn({p0: 'foo', p1: 'bar'});
-
-      var elem = $compile('<span error-display="foo = {0}, bar = {1}"></span>')($rootScope);
-      expect(elem.html()).toBe('foo = foo, bar = bar');
-    });
-
-
-    it('should pass the interpolated text through `errorLinkFilter`', function() {
-      $location.search = jasmine.createSpy('search').andReturn({p0: 'foo'});
-
-      var elem = $compile('<span error-display="foo = {0}"></span>')($rootScope);
-      expect(errorLinkFilter.callCount).toBe(1);
-      expect(errorLinkFilter).toHaveBeenCalledWith('foo = foo', '_blank');
-    });
-
-
-    it('should encode `<` and `>`', function() {
-      var elem = $compile('<span error-display="&lt;xyz&gt;"></span>')($rootScope);
-      expect(elem.text()).toBe('<xyz>');
-    });
-  });
-});

docs/config/index.js

@@ -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'];
 });

docs/config/processors/keywords.js

@@ -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(' ')
+      };
 
       });
 

docs/config/services/deployments/debug.js

@@ -18,6 +18,7 @@ module.exports = function debugDeployment(getVersion) {
       '../angular-touch.js',
       '../angular-animate.js',
       'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
       'js/angular-bootstrap/dropdown-toggle.js',
       'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
       'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',

docs/config/services/deployments/default.js

@@ -18,6 +18,7 @@ module.exports = function defaultDeployment(getVersion) {
       '../angular-touch.min.js',
       '../angular-animate.min.js',
       'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.min.js',
       'js/angular-bootstrap/dropdown-toggle.min.js',
       'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
       'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',

docs/config/services/deployments/jquery.js

@@ -22,6 +22,7 @@ module.exports = function jqueryDeployment(getVersion) {
       '../angular-touch.min.js',
       '../angular-animate.min.js',
       'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.min.js',
       'js/angular-bootstrap/dropdown-toggle.min.js',
       'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
       'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',

docs/config/services/deployments/production.js

@@ -21,6 +21,7 @@ module.exports = function productionDeployment(getVersion) {
       cdnUrl + '/angular-touch.min.js',
       cdnUrl + '/angular-animate.min.js',
       'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.min.js',
       'js/angular-bootstrap/dropdown-toggle.min.js',
       'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
       'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',

docs/config/services/gitData.js

@@ -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
+  };
+};

docs/config/templates/error.template.html

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

docs/config/templates/indexPage.template.html

@@ -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>
@@ -220,10 +220,10 @@
         <p class="pull-right"><a back-to-top>Back to top</a></p>
 
         <p>
-          Super-powered by Google  ©2010-2015
+          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>

docs/config/templates/lib/macros.html

@@ -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 -%}

docs/config/templates/runnableExample.template.html

@@ -1,4 +1,4 @@
-{# 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>
@@ -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 #}

docs/content/api/index.ngdoc

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

docs/content/error/$animate/nocb.ngdoc

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

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

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

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

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

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

@@ -12,11 +12,9 @@ myModule.directive('directiveName', function factory() {
     scope: {
       'attrName': '@', // OK
       'attrName2': '=localName', // OK
-      'attrName3': '&?localName', // OK
-      'attrName4': ' = name', // OK
-      'attrName5': 'name',    // ERROR: missing mode @&=
-      'attrName6': 'name=',   // ERROR: must be prefixed with @&=
-      'attrName7': '=name?',  // ERROR: ? must come directly after the mode
+      'attrName3': 'name',    // ERROR: missing mode @&=
+      'attrName4': ' = name', // ERROR: extra spaces
+      'attrName5': 'name=',   // ERROR: must be prefixed with @&=
     }
     ...
   }

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

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

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

@@ -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"
-    }
-  };
-});
-```

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

@@ -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
-    }
-    ...
-  }
-});
-```

docs/content/error/$controller/ctrlfmt.ngdoc

@@ -11,7 +11,7 @@ Supported formats:
 1. `__name__`
 2. `__name__ as __identifier__`
 
-Neither `__name__` or `__identifier__` may contain spaces.
+N'either `__name__` or `__identifier__` may contain spaces.
 
 Example of incorrect usage that leads to this error:
 ```html

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:badexpr
-@fullName Expecting end operator
-@description
-
-The Angular expression is missing the corresponding closing operator.

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

@@ -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}

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

@@ -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}

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

@@ -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}

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

@@ -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}

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

@@ -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}

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

@@ -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}

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

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

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

@@ -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}

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

@@ -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}

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

@@ -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}

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

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

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

@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:untermstr
-@fullName Unterminated string literal
-@description
-
-The string literal was not terminated in your Angular expression.

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

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

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

@@ -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>
 ```

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

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

docs/content/error/filter/notarray.ngdoc

@@ -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>
-```

docs/content/error/ng/cpta.ngdoc

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

docs/content/error/ngModel/nopromise.ngdoc

@@ -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
-        }
-      };
-    }
-  };
-})
-```

docs/content/error/ngModel/numfmt.ngdoc

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

docs/content/error/ngOptions/trkslct.ngdoc

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

docs/content/guide/$location.ngdoc

@@ -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.
 
@@ -330,8 +330,8 @@ reload to the original link.
 ### Relative links
 
 Be sure to check all relative links, images, scripts etc. Angular requires you to specify the url
-base in the head of your main html file (`<base href="/my-base/index.html">`) unless `html5Mode.requireBase`
-is set to `false` in the html5Mode definition object passed to `$locationProvider.html5Mode()`. With
+base in the head of your main html file (`<base href="/my-base">`) unless `html5Mode.requireBase` is
+set to `false` in the html5Mode definition object passed to `$locationProvider.html5Mode()`. With
 that, relative urls will always be resolved to this base url, even if the initial url of the
 document was different.
 
@@ -339,7 +339,6 @@ There is one exception: Links that only contain a hash fragment (e.g. `<a href="
 will only change `$location.hash()` and not modify the url otherwise. This is useful for scrolling
 to anchors on the same page without needing to know on which page the user currently is.
 
-
 ### Server side
 
 Using this mode requires URL rewriting on server side, basically you have to rewrite all your links
@@ -347,20 +346,6 @@ to entry point of your application (e.g. index.html). Requiring a `<base>` tag i
 this case, as it allows Angular to differentiate between the part of the url that is the application
 base and the path that should be handled by the application.
 
-### Base href constraints
-
-The `$location` service is not able to function properly if the current URL is outside the URL given
-as the base href. This can have subtle confusing consequences...
-
-Consider a base href set as follows: `<base href="/base/">` (i.e. the application exists in the "folder"
-called `/base`). The URL `/base` is actually outside the application (it refers to the `base` file found
-in the root `/` folder).
-
-If you wish to be able to navigate to the application via a URL such as `/base` then you should ensure that
-you server is setup to redirect such requests to `/base/`.
-
-See https://github.com/angular/angular.js/issues/14018 for more information.
-
 ### Sending links among different browsers
 
 Because of rewriting capability in HTML5 mode, your users will be able to open regular url links in
@@ -371,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">
@@ -404,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 })
@@ -554,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 })
@@ -710,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
 
@@ -786,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>
@@ -801,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>

docs/content/guide/accessibility.ngdoc

@@ -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
@@ -37,13 +37,12 @@ Currently, ngAria interfaces with the following directives:
  * {@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.directive: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):
@@ -134,14 +133,16 @@ 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.
+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.directive: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.
 
@@ -158,11 +159,11 @@ Becomes:
 ```
 
 >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/).
+[chrome://accessibility](chrome://accessibility).
 
 <h2 id="ngshow">ngShow</h2>
 
->The {@link ng.directive: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.
 
@@ -199,7 +200,7 @@ Becomes:
 
 <h2 id="nghide">ngHide</h2>
 
->The {@link ng.directive: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.
 
@@ -208,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
@@ -237,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
 
@@ -256,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>
@@ -267,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');

docs/content/guide/animations.ngdoc

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

docs/content/guide/concepts.ngdoc

@@ -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.
 
@@ -348,7 +348,8 @@ The following example shows how this is done with Angular:
 
         return {
           currencies: currencies,
-          convert: convert
+          convert: convert,
+          refresh: refresh
         };
       }]);
   </file>

docs/content/guide/controller.ngdoc

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

docs/content/guide/databinding.ngdoc

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

docs/content/guide/decorators.ngdoc

@@ -1,486 +0,0 @@
-@ngdoc overview
-@name Decorators
-@sortOrder 345
-@description
-
-# Decorators in AngularJS
-
-<div class="alert alert-warning">
-  **NOTE:** This guide is targeted towards developers who are already familiar with AngularJS basics.
-  If you're just getting started, we recommend the {@link tutorial/ tutorial} first.
-</div>
-
-## What are decorators?
-
-Decorators are a design pattern that is used to separate modification or *decoration* of a class without modifying the
-original source code. In Angular, decorators are functions that allow a service, directive or filter to be modified
-prior to its usage.
-
-## How to use decorators
-
-There are two ways to register decorators
-
-- `$provide.decorator`, and
-- `module.decorator`
-
-Each provide access to a `$delegate`, which is the instantiated service/directive/filter, prior to being passed to the
-service that required it.
-
-### $provide.decorator
-
-The {@link api/auto/service/$provide#decorator decorator function} allows access to a $delegate of the service once it
-has been instantiated. For example:
-
-```js
-angular.module('myApp', [])
-
-.config([ '$provide', function($provide) {
-
-  $provide.decorator('$log', [
-    '$delegate',
-    function $logDecorator($delegate) {
-
-      var originalWarn = $delegate.warn;
-      $delegate.warn = function decoratedWarn(msg) {
-        msg = 'Decorated Warn: ' + msg;
-        originalWarn.apply($delegate, arguments);
-      };
-
-      return $delegate;
-    }
-  ]);
-}]);
-```
-
-After the `$log` service has been instantiated the decorator is fired. The decorator function has a `$delegate` object
-injected to provide access to the service that matches the selector in the decorator. This `$delegate` will be the
-service you are decorating. The return value of the function *provided to the decorator* will take place of the service,
-directive, or filter being decorated.
-
-<hr>
-
-The `$delegate` may be either modified or completely replaced. Given a service `myService` with a method `someFn`, the
-following could all be viable solutions:
-
-
-#### Completely Replace the $delegate
-```js
-angular.module('myApp', [])
-
-.config([ '$provide', function($provide) {
-
-  $provide.decorator('myService', [
-    '$delegate',
-    function myServiceDecorator($delegate) {
-
-      var myDecoratedService = {
-        // new service object to replace myService
-      };
-      return myDecoratedService;
-    }
-  ]);
-}]);
-```
-
-#### Patch the $delegate
-```js
-angular.module('myApp', [])
-
-.config([ '$provide', function($provide) {
-
-  $provide.decorator('myService', [
-    '$delegate',
-    function myServiceDecorator($delegate) {
-
-      var someFn = $delegate.someFn;
-
-      function aNewFn() {
-        // new service function
-        someFn.apply($delegate, arguments);
-      }
-
-      $delegate.someFn = aNewFn;
-      return $delegate;
-    }
-  ]);
-}]);
-```
-
-#### Augment the $delegate
-```js
-angular.module('myApp', [])
-
-.config([ '$provide', function($provide) {
-
-  $provide.decorator('myService', [
-    '$delegate',
-    function myServiceDecorator($delegate) {
-
-      function helperFn() {
-        // an additional fn to add to the service
-      }
-
-      $delegate.aHelpfulAddition = helperFn;
-      return $delegate;
-    }
-  ]);
-}]);
-```
-
-<div class="alert alert-info">
-  Note that whatever is returned by the decorator function will replace that which is being decorated. For example, a
-  missing return statement will wipe out the entire object being decorated.
-</div>
-
-<hr>
-
-Decorators have different rules for different services. This is because services are registered in different ways.
-Services are selected by name, however filters and directives are selected by appending `"Filter"` or `"Directive"` to
-the end of the name. The `$delegate` provided is dictated by the type of service.
-
-| Service Type | Selector                      | $delegate                                                             |
-|--------------|-------------------------------|-----------------------------------------------------------------------|
-| Service      | `serviceName`                 | The `object` or `function` returned by the service                    |
-| Directive    | `directiveName + 'Directive'` | An `Array.<DirectiveObject>`<sub>{@link guide/decorators#drtvArray 1}</sub> |
-| Filter       | `filterName + 'Filter'`       | The `function` returned by the filter                                 |
-
-<small id="drtvArray">1. Multiple directives may be registered to the same selector/name</small>
-
-<div class="alert alert-warning">
-  **NOTE:** Developers should take care in how and why they are modifying the `$delegate` for the service. Not only
-  should expectations for the consumer be kept, but some functionality (such as directive registration) does not take
-  place after decoration, but during creation/registration of the original service. This means, for example, that
-  an action such as pushing a directive object to a directive `$delegate` will likely result in unexpected behavior.
-
-  Furthermore, great care should be taken when decorating core services, directives, or filters as this may unexpectedly
-  or adversely affect the functionality of the framework.
-</div>
-
-### module.decorator
-
-This {@link api/ng/type/angular.Module#decorator function} is the same as the `$provide.decorator` function except it is
-exposed through the module API. This allows you to separate your decorator patterns from your module config blocks. The
-main caveat here is that you will need to take note the order in which you create your decorators.
-
-Unlike in the module config block (which allows configuration of services prior to their creation), the service must be
-registered prior to the decorator (see {@link guide/providers#provider-recipe Provider Recipe}). For example, the
-following would not work because you are attempting to decorate outside of the configuration phase and the service
-hasn't been created yet:
-
-```js
-// will cause an error since 'someService' hasn't been registered
-angular.module('myApp').decorator('someService', ...);
-
-angular.module('myApp').factory('someService', ...);
-```
-
-## Example Applications
-
-The following sections provide examples each of a service decorator, a directive decorator, and a filter decorator.
-
-### Service Decorator Example
-
-This example shows how we can replace the $log service with our own to display log messages.
-
-<example module="myServiceDecorator" name="service-decorator">
-  <file name="script.js">
-    angular.module('myServiceDecorator', []).
-
-      controller('Ctrl', [
-        '$scope',
-        '$log',
-        '$timeout',
-        function($scope, $log, $timeout) {
-          var types = ['error', 'warn', 'log', 'info' ,'debug'], i;
-
-          for (i = 0; i < types.length; i++) {
-            $log[types[i]](types[i] + ': message ' + (i + 1));
-          }
-
-          $timeout(function() {
-            $log.info('info: message logged in timeout');
-          });
-        }
-      ]).
-
-      directive('myLog', [
-        '$log',
-        function($log) {
-          return {
-            restrict: 'E',
-            template: '<ul id="myLog"><li ng-repeat="l in myLog" class="{{l.type}}">{{l.message}}</li></ul>',
-            scope: {},
-            compile: function() {
-              return function(scope) {
-                scope.myLog = $log.stack;
-              };
-            }
-          };
-        }
-      ]).
-
-      config([
-        '$provide',
-        function($provide) {
-
-          $provide.decorator('$log', [
-            '$delegate',
-            function logDecorator($delegate) {
-
-              var myLog = {
-                warn: function(msg) {
-                  log(msg, 'warn');
-                },
-                error: function(msg) {
-                  log(msg, 'error');
-                },
-                info: function(msg) {
-                  log(msg, 'info');
-                },
-                debug: function(msg) {
-                  log(msg, 'debug');
-                },
-                log: function(msg) {
-                  log(msg, 'log');
-                },
-                stack: []
-              };
-
-              function log(msg, type) {
-                myLog.stack.push({ type: type, message: msg.toString() });
-                if (console && console[type]) console[type](msg);
-              }
-
-              return myLog;
-
-            }
-          ]);
-
-        }
-      ]);
-  </file>
-
-  <file name="index.html">
-    <div ng-controller="Ctrl">
-      <h1>Logs</h1>
-      <my-log></my-log>
-    </div>
-  </file>
-
-  <file name="style.css">
-    li.warn { color: yellow; }
-    li.error { color: red; }
-    li.info { color: blue }
-    li.log { color: black }
-    li.debug { color: green }
-  </file>
-
-  <file name="protractor.js" type="protractor">
-    it('should display log messages in dom', function() {
-      element.all(by.repeater('l in myLog')).count().then(function(count) {
-        expect(count).toEqual(6);
-      });
-    });
-  </file>
-</example>
-
-### Directive Decorator Example
-
-Failed interpolated expressions in `ng-href` attributes can easily go unnoticed. We can decorate `ngHref` to warn us of
-those conditions.
-
-<example module="urlDecorator" name="directive-decorator">
-  <file name="script.js">
-    angular.module('urlDecorator', []).
-
-      controller('Ctrl', ['$scope', function ($scope) {
-        $scope.id = 3;
-        $scope.warnCount = 0; // for testing
-      }]).
-
-      config(['$provide', function($provide) {
-
-        // matchExpressions looks for interpolation markup in the directive attribute, extracts the expressions
-        // from that markup (if they exist) and returns an array of those expressions
-        function matchExpressions(str) {
-          var exps = str.match(/{{([^}]+)}}/g);
-
-          // if there isn't any, get out of here
-          if (exps === null) return;
-
-          exps = exps.map(function(exp) {
-            var prop = exp.match(/[^{}]+/);
-            return prop === null ? null : prop[0];
-          });
-
-          return exps;
-        }
-
-        // remember: directives must be selected by appending 'Directive' to the directive selector
-        $provide.decorator('ngHrefDirective', [
-          '$delegate',
-          '$log',
-          '$parse',
-          function($delegate, $log, $parse) {
-
-            // store the original link fn
-            var originalLinkFn = $delegate[0].link;
-
-            // replace the compile fn
-            $delegate[0].compile = function(tElem, tAttr) {
-
-              // store the original exp in the directive attribute for our warning message
-              var originalExp = tAttr.ngHref;
-
-              // get the interpolated expressions
-              var exps = matchExpressions(originalExp);
-
-              // create and store the getters using $parse
-              var getters = exps.map(function(el) {
-                if (el) return $parse(el);
-              });
-
-              return function newLinkFn(scope, elem, attr) {
-                // fire the originalLinkFn
-                originalLinkFn.apply($delegate[0], arguments);
-
-                // observe the directive attr and check the expressions
-                attr.$observe('ngHref', function(val) {
-
-                  // if we have getters and getters is an array...
-                  if (getters && angular.isArray(getters)) {
-
-                    // loop through the getters and process them
-                    angular.forEach(getters, function(g, idx) {
-
-                      // if val is truthy, then the warning won't log
-                      var val = angular.isFunction(g) ? g(scope) : true;
-                      if (!val) {
-                        $log.warn('NgHref Warning: "' + exps[idx] + '" in the expression "' + originalExp +
-                          '" is falsy!');
-
-                        scope.warnCount++; // for testing
-                      }
-
-                    });
-
-                  }
-
-                });
-
-              };
-
-            };
-
-            // get rid of the old link function since we return a link function in compile
-            delete $delegate[0].link;
-
-            // return the $delegate
-            return $delegate;
-
-          }
-
-        ]);
-
-      }]);
-  </file>
-
-  <file name="index.html">
-    <div ng-controller="Ctrl">
-      <a ng-href="/products/{{ id }}/view" id="id3">View Product {{ id }}</a>
-      - <strong>id == 3</strong>, so no warning<br>
-      <a ng-href="/products/{{ id + 5 }}/view" id="id8">View Product {{ id + 5 }}</a>
-      - <strong>id + 5 == 8</strong>, so no warning<br>
-      <a ng-href="/products/{{ someOtherId }}/view" id="someOtherId">View Product {{ someOtherId }}</a>
-      - <strong style="background-color: #ffff00;">someOtherId == undefined</strong>, so warn<br>
-      <a ng-href="/products/{{ someOtherId + 5 }}/view" id="someOtherId5">View Product {{ someOtherId + 5 }}</a>
-      - <strong>someOtherId + 5 == 5</strong>, so no warning<br>
-      <div>Warn Count: {{ warnCount }}</div>
-    </div>
-  </file>
-
-  <file name="protractor.js" type="protractor">
-    it('should warn when an expression in the interpolated value is falsy', function() {
-      var id3 = element(by.id('id3'));
-      var id8 = element(by.id('id8'));
-      var someOther = element(by.id('someOtherId'));
-      var someOther5 = element(by.id('someOtherId5'));
-
-      expect(id3.getText()).toEqual('View Product 3');
-      expect(id3.getAttribute('href')).toContain('/products/3/view');
-
-      expect(id8.getText()).toEqual('View Product 8');
-      expect(id8.getAttribute('href')).toContain('/products/8/view');
-
-      expect(someOther.getText()).toEqual('View Product');
-      expect(someOther.getAttribute('href')).toContain('/products//view');
-
-      expect(someOther5.getText()).toEqual('View Product 5');
-      expect(someOther5.getAttribute('href')).toContain('/products/5/view');
-
-      expect(element(by.binding('warnCount')).getText()).toEqual('Warn Count: 1');
-    });
-  </file>
-</example>
-
-### Filter Decorator Example
-
-Let's say we have created an app that uses the default format for many of our `Date` filters. Suddenly requirements have
-changed (that never happens) and we need all of our default dates to be `'shortDate'` instead of `'mediumDate'`.
-
-<example module="filterDecorator" name="filter-decorator">
-  <file name="script.js">
-    angular.module('filterDecorator', []).
-
-      controller('Ctrl', ['$scope', function ($scope) {
-        $scope.genesis = new Date(2010, 0, 5);
-        $scope.ngConf = new Date(2016, 4, 4);
-      }]).
-
-      config(['$provide', function($provide) {
-
-        $provide.decorator('dateFilter', [
-          '$delegate',
-          function dateDecorator($delegate) {
-
-            // store the original filter
-            var originalFilter = $delegate;
-
-            // return our filter
-            return shortDateDefault;
-
-            // shortDateDefault sets the format to shortDate if it is falsy
-            function shortDateDefault(date, format, timezone) {
-              if (!format) format = 'shortDate';
-
-              // return the result of the original filter
-              return originalFilter(date, format, timezone);
-            }
-
-          }
-
-        ]);
-
-      }]);
-  </file>
-
-  <file name="index.html">
-    <div ng-controller="Ctrl">
-      <div id="genesis">Initial Commit default to short date: {{ genesis | date }}</div>
-      <div>ng-conf 2016 default short date: {{ ngConf | date }}</div>
-      <div id="ngConf">ng-conf 2016 with full date format: {{ ngConf | date:'fullDate' }}</div>
-    </div>
-  </file>
-
-  <file name="protractor.js" type="protractor">
-    it('should default date filter to short date format', function() {
-      expect(element(by.id('genesis')).getText())
-        .toMatch(/Initial Commit default to short date: \d{1,2}\/\d{1,2}\/\d{2}/);
-    });
-
-    it('should still allow dates to be formatted', function() {
-      expect(element(by.id('ngConf')).getText())
-        .toMatch(/ng-conf 2016 with full date format\: [A-Za-z]+, [A-Za-z]+ \d{1,2}, \d{4}/);
-    });
-  </file>
-</example>

docs/content/guide/di.ngdoc

@@ -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');
 ```
 

docs/content/guide/directive.ngdoc

@@ -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
@@ -776,9 +804,9 @@ 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.
+wrapper fn. 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
@@ -799,45 +827,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 +886,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 +902,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 +924,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 +945,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 +975,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 +1011,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.
+

docs/content/guide/expression.ngdoc

@@ -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>
@@ -144,9 +141,6 @@ provide mockable access to globals.
       }
       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');
@@ -181,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`
@@ -283,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.
@@ -303,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() {
@@ -348,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>
 ```
+

docs/content/guide/filter.ngdoc

@@ -3,8 +3,6 @@
 @sortOrder 280
 @description
 
-# Filters
-
 A filter formats the value of an expression for display to the user. They can be used in view templates,
 controllers or services and it is easy to define your own filter.
 
@@ -34,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
@@ -97,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
@@ -113,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>
 
@@ -133,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>

docs/content/guide/forms.ngdoc

@@ -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
@@ -440,7 +433,8 @@ Note that you can alternatively use `ng-pattern` to further restrict the validat
       var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+/=?^_`{|}~.-]+@example\.com$/i;
 
       return {
-        require: '?ngModel',
+        require: 'ngModel',
+        restrict: '',
         link: function(scope, elm, attrs, ctrl) {
           // only apply the validator if ngModel is present and Angular has added the email validator
           if (ctrl && ctrl.$validators.email) {
@@ -457,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,
@@ -494,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

docs/content/guide/i18n.ngdoc

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

docs/content/guide/index.ngdoc

@@ -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)
@@ -91,7 +91,7 @@ This is a short list of libraries with specific support and documentation for wo
 ### Server-Specific
 
 * **Django:** [Tutorial](http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework), [Integrating AngularJS with Django](http://django-angular.readthedocs.org/en/latest/integration.html), [Getting Started with Django Rest Framework and AngularJS](http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html)
-* **FireBase:** [AngularFire](http://angularfire.com/), [Firebase Foundations for AngularJS](http://blog.watchandcode.com/firebase-foundations/), [Realtime Apps with AngularJS and FireBase (video)](http://www.youtube.com/watch?v=C7ZI7z7qnHU)
+* **FireBase:** [AngularFire](http://angularfire.com/), [Realtime Apps with AngularJS and FireBase (video)](http://www.youtube.com/watch?v=C7ZI7z7qnHU)
 * **Google Cloud Platform: **[with Cloud Endpoints](https://cloud.google.com/developers/articles/angularjs-cloud-endpoints-recipe-for-building-modern-web-applications/), [with Go](https://github.com/GoogleCloudPlatform/appengine-angular-gotodos)
 * **Hood.ie:** [60 Minutes to Awesome](http://www.roberthorvick.com/2013/06/30/todomvc-angularjs-hood-ie-60-minutes-to-awesome/)
 * **MEAN Stack: **[Blog post](http://blog.mongodb.org/post/49262866911/the-mean-stack-mongodb-expressjs-angularjs-and), [Setup](http://thecodebarbarian.wordpress.com/2013/07/22/introduction-to-the-mean-stack-part-one-setting-up-your-tools/), [GDL Video](https://developers.google.com/live/shows/913996610)
@@ -101,7 +101,7 @@ This is a short list of libraries with specific support and documentation for wo
 
 ## Learning Resources
 
-### Books
+###Books
 * [AngularJS: Up and Running](http://www.amazon.com/AngularJS-Running-Enhanced-Productivity-Structured/dp/1491901942) 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
@@ -111,12 +111,10 @@ This is a short list of libraries with specific support and documentation for wo
 * [AngularJS : Novice to Ninja](http://www.amazon.in/AngularJS-Novice-Ninja-Sandeep-Panda/dp/0992279453) by Sandeep Panda
 * [AngularJS UI Development](http://www.amazon.com/AngularJS-UI-Development-Amit-Ghart-ebook/dp/B00OXVAK7A) by Amit Gharat and Matthias Nehlsen
 * [Responsive Web Design with AngularJS](http://www.amazon.com/Responsive-Design-AngularJS-Sandeep-Kumar/dp/178439842X) by Sandeep Kumar Patel
-* [Professional AngularJS](http://www.amazon.com/Professional-AngularJS-Valeri-Karpov/dp/1118832078/)
 
-### Videos:
+###Videos:
 * [egghead.io](http://egghead.io/)
 * [Angular on YouTube](http://youtube.com/angularjs)
-* [Firebase Foundations for AngularJS](http://blog.watchandcode.com/firebase-foundations/)
 
 ### Courses
 * **Free online:**
@@ -124,7 +122,6 @@ This is a short list of libraries with specific support and documentation for wo
   [CodeAcademy](http://www.codecademy.com/courses/javascript-advanced-en-2hJ3J/0/1),
   [CodeSchool](https://www.codeschool.com/courses/shaping-up-with-angular-js)
 * **Paid online:**
-  [The Angular Course (115 videos that show you how to build a full app)](http://watchandcode.com/courses/angular-course/),
   [Pluralsite (3 courses)](http://www.pluralsight.com/training/Courses/Find?highlight=true&searchTerm=angularjs),
   [Tuts+](https://tutsplus.com/course/easier-js-apps-with-angular/),
   [lynda.com](http://www.lynda.com/AngularJS-tutorials/Up-Running-AngularJS/133318-2.html),

docs/content/guide/interpolation.ngdoc

@@ -1,146 +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>
-```
-
-Other attributes may also not work as expected when they contain interpolation markup, and
-can be used with `ngAttr` instead. The following is a list of known problematic attributes:
-
-- **size** in `<select>` elements (see [issue 1619](https://github.com/angular/angular.js/issues/1619))
-- **placeholder** in `<textarea>` in Internet Explorer 10/11 (see [issue 5025](https://github.com/angular/angular.js/issues/5025))
-- **type** in `<button>` in Internet Explorer 11 (see [issue 14117](https://github.com/angular/angular.js/issues/5025))
-
-
-### Embedding interpolation markup inside expressions
-
-<div class="alert alert-danger">
-**Note:** Angular directive attributes take either expressions *or* interpolation markup with embedded expressions.
-It is considered **bad practice** to embed interpolation markup inside an expression:
-</div>
-
-```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(index) {
-    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.

docs/content/guide/migration.ngdoc

@@ -13,433 +13,6 @@ 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.
 
-# 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
-});
-```
-
-### form
-
-Due to [94533e57](https://github.com/angular/angular.js/commit/94533e570673e6b2eb92073955541fa289aabe02),
-the `name` attribute of `form` elements can now only contain characters that can be evaluated as part
-of an Angular expression. This is because Angular uses the value of `name` as an assignable expression
-to set the form on the `$scope`. For example, `name="myForm"` assigns the form to `$scope.myForm` and
-`name="myObj.myForm"` assigns it to `$scope.myObj.myForm`.
-
-Previously, it was possible to also use names such `name="my:name"`, because Angular used a special setter
-function for the form name. Now the general, more robust `$parse` setter is used.
-
-The easiest way to migrate your code is therefore to remove all special characters from the `name` attribute.
-
-If you need to keep the special characters, you can use the following directive, which will replace
-the `name` with a value that can be evaluated as an expression in the compile function, and then
-re-set the original name in the postLink function. This ensures that (1), the form is published on
-the scope, and (2), the form has the original name, which might be important if you are doing server-side
-form submission.
-
-```js
-angular.module('myApp').directive('form', function() {
-  return {
-    restrict: 'E',
-    priority: 1000,
-    compile: function(element, attrs) {
-      var unsupportedCharacter = ':'; // change accordingly
-      var originalName = attrs.name;
-      if (attrs.name && attrs.name.indexOf(unsupportedCharacter) > 0) {
-        attrs.$set('name', 'this["' + originalName + '"]');
-      }
-
-      return postLinkFunction(scope, element) {
-        // Don't trigger $observers
-        element.setAttribute('name', originalName);
-      }
-    }
-  };
-});
-```
-
-## Templating (`ngRepeat`, `$compile`, `ngInclude`)
-
-### 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.
-
-
-### ngInclude:
-Due to [3c6e8ce044446735eb2e70d0061db8c6db050289](https://github.com/angular/angular.js/commit/3c6e8ce044446735eb2e70d0061db8c6db050289), the `src` attribute of ngInclude no longer accepts an
-expression that returns the result of `$sce.trustAsResourceUrl`. This will now cause an infinite digest:
-
-Before:
-```html
-<div ng-include="findTemplate('https://example.com/templates/myTemplate.html')"></div>
-```
-
-```js
-$scope.findTemplate = function(templateName) {
-  return $sce.trustAsResourceUrl(templateName);
-};
-```
-
-To migrate, either cache the result of `trustAsResourceUrl()`, or put the template url in the resource
-whitelist in the `config()` function:
-
-After:
-
-```js
-var templateCache = {};
-$scope.findTemplate = function(templateName) {
-  if (!templateCache[templateName]) {
-    templateCache[templateName] = $sce.trustAsResourceUrl(templateName);
-  }
-
-  return templateCache[templateName];
-};
-
-// Alternatively, use `$sceDelegateProvider.resourceUrlWhitelist()`, which means you don't
-// have to use `$sce.trustAsResourceUrl()` at all:
-
-angular.module('myApp', []).config(function($sceDelegateProvider) {
-  $sceDelegateProvider.resourceUrlWhitelist(['self', 'https://example.com/templates/**'])
-});
-```
-
-
-## 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
@@ -657,36 +230,6 @@ 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
-  }
-}
-```
-
-
 
 
 
@@ -759,15 +302,8 @@ $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`)

docs/content/guide/module.ngdoc

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

docs/content/guide/production.ngdoc

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

docs/content/guide/scope.ngdoc

@@ -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.
 
@@ -257,14 +257,14 @@ the `$digest` phase. This delay is desirable, since it coalesces multiple model
 
   2. **Watcher registration**
 
-     During template linking, directives register {@link
+     During template linking directives register {@link
      ng.$rootScope.Scope#$watch watches} on the scope. These watches will be
      used to propagate model values to the DOM.
 
   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.

docs/content/guide/security.ngdoc

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

docs/content/guide/services.ngdoc

@@ -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', []);
@@ -138,13 +138,9 @@ batchModule.factory('batchLog', ['$interval', '$log', function($interval, $log)
  */
 batchModule.factory('routeTemplateMonitor', ['$route', 'batchLog', '$rootScope',
   function($route, batchLog, $rootScope) {
-    return {
-      startMonitoring: function() {
-        $rootScope.$on('$routeChangeSuccess', function() {
-          batchLog($route.current ? $route.current.template : null);
-        });
-      }
-    };
+    $rootScope.$on('$routeChangeSuccess', function() {
+      batchLog($route.current ? $route.current.template : null);
+    });
   }]);
 
 ```
@@ -185,7 +181,7 @@ of a real browser alert.
 
 ```js
 var mock, notify;
-beforeEach(module('myServiceModule'));
+
 beforeEach(function() {
   mock = {alert: jasmine.createSpy()};
 

docs/content/guide/templates.ngdoc

@@ -3,8 +3,6 @@
 @sortOrder 260
 @description
 
-# Templates
-
 In Angular, templates are written with HTML that contains Angular-specific elements and attributes.
 Angular combines the template with information from the model and controller to render the dynamic
 view that a user sees in the browser.

docs/content/guide/unit-testing.ngdoc

@@ -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>
 ```

docs/content/misc/contribute.ngdoc

@@ -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:

docs/content/misc/downloading.ngdoc

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