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

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

-cache:
-  directories:
-    - node_modules
-    - bower_components
-    - docs/bower_components
-
 branches:
  except:
    - /^g3_.*$/
@@ -34,21 +27,15 @@ env:
 matrix:
  allow_failures:
    - env: "JOB=unit BROWSER_PROVIDER=browserstack"
-    - env: "JOB=docs-e2e BROWSER_PROVIDER=browserstack"
-    - env: "JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=browserstack"
-    - env: "JOB=e2e TEST_TARGET=jquery 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
-  # Instal npm dependecies and ensure that npm cache is not stale
-  - scripts/npm/install-dependencies.sh
+  - time ./scripts/travis/npm-bundle-deps.sh
+  - time npm install

 before_script:
  - mkdir -p $LOGS_DIR
@@ -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:
@@ -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

@@ -87,7 +87,7 @@ Before you submit your pull request consider the following guidelines:
  that relates to your submission. You don't want to duplicate effort.
 * Please sign our [Contributor License Agreement (CLA)](#cla) before sending pull
  requests. We cannot accept code without this.
-* Make your changes in a new git branch:
+* Make your changes in a new git branch

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

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

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

 * In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then:
+* If we suggest changes then
  * Make the required updates.
  * Re-run the Angular test suite to ensure tests are still passing.
  * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
@@ -227,11 +227,11 @@ The subject contains succinct description of the change:
 * don't capitalize first letter
 * no dot (.) at the end

-### Body
+###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**.

@@ -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,
@@ -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' },
      },
@@ -158,7 +159,7 @@ module.exports = function(grunt) {
    jscs: {
      src: ['src/**/*.js', 'test/**/*.js'],
      options: {
-        config: ".jscsrc"
+        config: ".jscs.json"
      }
    },

@@ -203,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')
@@ -239,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',
@@ -255,19 +251,8 @@ module.exports = function(grunt) {
        '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": {
@@ -300,10 +285,6 @@ module.exports = function(grunt) {
    },

    shell: {
-      "npm-install": {
-        command: path.normalize('scripts/npm/install-dependencies.sh')
-      },
-
      "promises-aplus-tests": {
        options: {
          stdout: false,
@@ -330,18 +311,14 @@ 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:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
  grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
-  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['build', 'tests:modules']);
+  grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
  grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
-  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['test:jqlite', 'test:jquery', 'test:modules']);
+  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
  grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
  grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
  grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
@@ -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
@@ -1,8 +1,8 @@
 Using AngularJS with the Closure Compiler
 =========================================

-The Closure Compiler project contains definitions for the AngularJS JavaScript
-in its `contrib/externs` directory.
+The Closure Compiler project contains externs definitions for AngularJS
+JavaScript in its `contrib/externs` directory.

 The definitions contain externs for use with the Closure compiler (aka
 JSCompiler). Passing these files to the --externs parameter of a compiler
@@ -10,7 +10,7 @@ the browser how to do dependency injection and inversion of control.

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

 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
@@ -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
@@ -40,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',
@@ -66,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',
@@ -87,29 +85,10 @@ var angularFiles = {

  '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/animateRunner.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'
@@ -182,7 +161,7 @@ var angularFiles = {
    'src/publishExternalApis.js',
    '@angularSrcModules',
    '@angularScenario',
-    '@angularTest'
+    '@angularTest',
  ],

  'karmaExclude': [
@@ -201,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',
@@ -218,7 +196,7 @@ var angularFiles = {
    'src/publishExternalApis.js',
    '@angularSrcModules',
    '@angularScenario',
-    '@angularTest'
+    '@angularTest',
  ],

  'karmaJqueryExclude': [
@@ -230,7 +208,6 @@ var angularFiles = {

 angularFiles['angularSrcModules'] = [].concat(
  angularFiles['angularModules']['ngAnimate'],
-  angularFiles['angularModules']['ngMessageFormat'],
  angularFiles['angularModules']['ngMessages'],
  angularFiles['angularModules']['ngCookies'],
  angularFiles['angularModules']['ngResource'],
@@ -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>
@@ -1,95 +0,0 @@
-"use strict";
-
-/* globals angular, benchmarkSteps */
-
-var app = angular.module('ngOptionsBenchmark', []);
-
-app.config(function($compileProvider) {
-  if ($compileProvider.debugInfoEnabled) {
-    $compileProvider.debugInfoEnabled(false);
-  }
-});
-
-
-
-app.controller('DataController', function($scope, $element) {
-  $scope.items = [];
-  $scope.count = 10000;
-
-  function changeOptions() {
-    $scope.items = [];
-    for (var i = 0; i < $scope.count; ++i) {
-      $scope.items.push({
-        id: i,
-        label: 'item-' + i,
-        group: 'group-' + i % 100
-      });
-    }
-  }
-
-  var selectElement = $element.find('select');
-  console.log(selectElement);
-
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-1',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[1000];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-model-2',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.x = $scope.items[10];
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'remove-options',
-    fn: function() {
-      $scope.count = 100;
-      changeOptions();
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'add-options',
-    fn: function() {
-      $scope.$apply(function() {
-        $scope.count = 10000;
-        changeOptions();
-      });
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-1',
-    fn: function() {
-      selectElement.val('2000');
-      selectElement.triggerHandler('change');
-    }
-  });
-
-  benchmarkSteps.push({
-    name: 'set-view-2',
-    fn: function() {
-      selectElement.val('1000');
-      selectElement.triggerHandler('change');
-    }
-  });
-});
@@ -1,11 +0,0 @@
-module.exports = function(config) {
-  config.set({
-    scripts: [    {
-      id: 'angular',
-      src: '/build/angular.js'
-    },
-    {
-      src: 'app.js',
-    }]
-  });
-};
@@ -1,10 +0,0 @@
-<div ng-app="ngOptionsBenchmark" ng-cloak>
-  <div ng-controller="DataController">
-    <div class="container-fluid">
-      <p>
-        Tests the execution of ng-options for rendering during model and option updates.
-      </p>
-      <select ng-model="x" ng-options="a as a.label group by a.group for a in items track by a.id"></select>
-    </div>
-  </div>
-</div>
@@ -103,10 +103,10 @@ then(function (tags) {
    sort(semver.rcompare);
 }).
 then(function (tags) {
-  var major = tags[0].split('.')[0];
+  var major = tags[0].split('.')[0] + '.x';
  return tags.
    filter(function (ver) {
-      return semver(ver).major == major;
+      return semver.satisfies(ver, major);
    });
 }).
 then(function (tags) {
@@ -9,11 +9,3 @@
 ng\:form {
  display: block;
 }
-
-.ng-animate-shim {
-  visibility:hidden;
-}
-
-.ng-anchor {
-  position:absolute;
-}
@@ -546,10 +546,10 @@ h4 {
  margin-left:10px;
 }

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

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

-.definition-table td {
-  padding: 8px;
-  border: 1px solid #eee;
-  vertical-align: top;
-}
-
@media only screen and (min-width: 769px) and (max-width: 991px) {
  .main-body-grid {
    margin-top: 160px;
@@ -637,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;
@@ -663,14 +656,14 @@ ul.events > li {
  }
  .toc-close {
    position: absolute;
-    bottom: 5px;
+    bottom: -50px;
    left: 50%;
    margin-left: -50%;
    text-align: center;
    padding: 5px;
    background: #eee;
    border-radius: 5px;
-    width: 100%;
+    width: 90%;
    border:1px solid #ddd;
    box-shadow:0 0 10px #bbb;
  }
@@ -701,7 +694,3 @@ ul.events > li {
    padding-bottom:0px;
  }
 }
-
-iframe[name="example-anchoringExample"] {
-  height:400px;
-}
@@ -1,16 +1,13 @@
 angular.module('examples', [])

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


 .factory('openPlunkr', ['formPostData', '$http', '$q', function(formPostData, $http, $q) {
-  return function(exampleFolder, clickEvent) {
+  return function(exampleFolder) {

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

    // Load the manifest for the example
    $http.get(exampleFolder + '/manifest.json')
@@ -75,7 +71,7 @@ angular.module('examples', [])
        postData.private = true;
        postData.description = exampleName;

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

  $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path().replace(/\/$/, ''),
-        url = '';
-    if (version.isOldDocsUrl) {
-      url = version.docsUrl;
-    }else{
-      url = version.docsUrl + currentPagePath;
-    }
-    $window.location = url;
+    var currentPagePath = $location.path().replace(/\/$/, '');
+
+    // TODO: We need to do some munging of the path for different versions of the API...
+
+
+    $window.location = version.docsUrl + currentPagePath;
  };
 }]);
@@ -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'))
@@ -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) {
@@ -0,0 +1,16 @@
+"use strict";
+
+var versionInfo = require('../../../lib/versions/version-info');
+
+/**
+ * @dgService gitData
+ * @description
+ * Information from the local git repository
+ */
+module.exports = function gitData() {
+  return {
+    version: versionInfo.currentVersion,
+    versions: versionInfo.previousVersions,
+    info: versionInfo.gitRepoInfo
+  };
+};
@@ -1,7 +1,7 @@
 {% extends "base.template.html" %}

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

@@ -3,7 +3,7 @@
 <head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="Description"
        content="AngularJS is what HTML would have been, had it been designed for building web-apps.
                 Declarative templates with data-binding, MVC, dependency injection and great
@@ -76,7 +76,7 @@
          <div class="row">
            <div class="col-md-9 header-branding">
              <a class="brand navbar-brand" href="http://angularjs.org">
-                <img width="117" height="30" class="logo" alt="Link to Angular JS Homepage" ng-src="img/angularjs-for-header-only.svg">
+                <img width="117" height="30" class="logo" ng-src="img/angularjs-for-header-only.svg">
              </a>
              <ul class="nav navbar-nav">
                <li class="divider-vertical"></li>
@@ -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>
@@ -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 -%}
@@ -2,7 +2,7 @@
   is HTML and wrap each line in a <p> - thus breaking the HTML #}

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

@@ -140,7 +140,7 @@ or JavaScript callbacks.
      {@link ngAnimate#service Services / Factories}
    </td>
    <td>
-      Use {@link ng.$animate $animate} to trigger animation operations within your directive code.
+      Use {@link ngAnimate.$animate $animate} to trigger animation operations within your directive code.
    </td>
  </tr>
  <tr>
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $animate:nocb
-@fullName Do not pass a callback to animate methods
-@description
-
-Since Angular 1.3, the methods of {@link ng.$animate} do not accept a callback as the last parameter.
-Instead, they return a promise to which you can attach `then` handlers to be run when the animation completes.
-
-If you are getting this error then you need to update your code to use the promise-based API.
-
-See https://github.com/angular/angular.js/commit/bf0f5502b1bbfddc5cdd2f138efd9188b8c652a9 for information about
-the change to the animation API and the changes you need to make.
@@ -1,8 +0,0 @@
-@ngdoc error
-@name $compile:baddir
-@fullName Invalid Directive Name
-@description
-
-This error occurs when the name of a directive is not valid.
-
-Directives must start with a lowercase character and must not contain leading or trailing whitespaces.
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $compile:noctrl
-@fullName Controller is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller. A controller may be specified by adding a "controller"
-property to the directive definition object. Its value should be either a
-string, or an invokable object (a function, or an array whose last element is a
-function).
-
-For more information, see the {@link guide/directive directives guide}.
@@ -1,71 +0,0 @@
-@ngdoc error
-@name $compile:noident
-@fullName Controller identifier is required.
-@description
-
-When using the `bindToController` feature of AngularJS, a directive is required
-to have a Controller identifier, which is initialized in scope with the value of
-the controller instance. This can be supplied using the "controllerAs" property
-of the directive object, or alternatively by adding " as IDENTIFIER" to the controller
-name.
-
-For example, the following directives are valid:
-
-```js
-// OKAY, because controller is a string with an identifier component.
-directive("okay", function() {
-  return {
-    bindToController: true,
-    controller: "myCtrl as $ctrl"
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// OKAY, because the directive uses the controllerAs property to override
-// the controller identifier.
-directive("okay2", function() {
-  return {
-    bindToController: true,
-    controllerAs: "$ctrl",
-    controller: function() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```
-
-While the following are invalid:
-
-```js
-// BAD, because the controller property is a string with no identifier.
-directive("bad", function() {
-  return {
-    bindToController: true,
-    controller: "noIdentCtrl",
-    scope: {
-      text: "@text"
-    }
-  };
-});
-
-
-// BAD because the controller is not a string (therefore has no identifier),
-// and there is no controllerAs property.
-directive("bad2", function() {
-  return {
-    bindToController: true,
-    controller: function noControllerAs() {
-
-    },
-    scope: {
-      text: "@text"
-    }
-  };
-});
-```
@@ -36,25 +36,9 @@ Following are invalid uses of this directive:
 ```


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

- Make the binding optional
-
-```
-myModule.directive('myDirective', function factory() {
-  return {
-    ...
-    scope: {
-      localValue: '=?bind' // <-- the '?' makes it optional
-    }
-    ...
-  }
-});
-```
@@ -1,46 +0,0 @@
-@ngdoc error
-@name $controller:ctrlfmt
-@fullName Badly formed controller string
-@description
-
-This error occurs when {@link ng.$controller $controller} service is called
-with a string that does not match the supported controller string formats.
-
-Supported formats:
-
-1. `__name__`
-2. `__name__ as __identifier__`
-
-N'either `__name__` or `__identifier__` may contain spaces.
-
-Example of incorrect usage that leads to this error:
-```html
-<!-- unclosed ng-controller attribute messes up the format -->
-<div ng-controller="myController>
-```
-
-or
-
-```js
-// does not match `__name__` or `__name__ as __identifier__`
-var myCtrl = $controller("mY contRoller", { $scope: newScope });
-```
-
-or
-
-```js
-directive("myDirective", function() {
-  return {
-    // does not match `__name__` or `__name__ as __identifier__`
-    controller: "mY contRoller",
-    link: function() {}
-  };
-});
-```
-
-To fix the examples above, ensure that the controller string matches the supported
-formats, and that any html attributes which are used as controller expressions are
-closed.
-
-
-Please consult the {@link ng.$controller $controller} service api docs to learn more.
@@ -69,15 +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.
-  }]);
-```
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:badexpr
-@fullName Expecting end operator
-@description
-
-The Angular expression is missing the corresponding closing operator.
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:dupvalue
-@fullName Duplicate choice in plural/select
-@description
-
-You have repeated a match selection for your plural or select MessageFormat
-extension in your interpolation expression.  The different choices have to be unique.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:logicbug
-@fullName Bug in ngMessageFormat module
-@description
-
-You've just hit a bug in the ngMessageFormat module provided by angular-message-format.min.js.
-Please file a github issue for this and provide the interpolation text that caused you to hit this
-bug mentioning the exact version of AngularJS used and we will fix it!
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,17 +0,0 @@
-@ngdoc error
-@name $interpolate:nochgmustache
-@fullName Redefinition of start/endSymbol incompatible with MessageFormat extensions
-@description
-
-You have redefined `$interpolate.startSymbol`/`$interpolate.endSymbol` and also
-loaded the `ngMessageFormat` module (provided by angular-message-format.min.js)
-while creating your injector.
-
-`ngMessageFormat` currently does not support redefinition of the
-startSymbol/endSymbol used by `$interpolate`.  If this is affecting you, please
-file an issue and mention @chirayuk on it.  This is intended to be fixed in a
-future commit and the github issue will help gauge urgency.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqarg
-@fullName Missing required argument for MessageFormat
-@description
-
-You must specify the MessageFormat function that you're using right after the
-comma following the Angular expression.  Currently, the supported functions are
-"plural" and "select" (for gender selections.)
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqcomma
-@fullName Missing comma following MessageFormat plural/select keyword
-@description
-
-The MessageFormat syntax requires a comma following the "plural" or "select"
-extension keyword in the extended interpolation syntax.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,11 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendbrace
-@fullName Unterminated message for plural/select value
-@description
-
-The plural or select message for a value or keyword choice has no matching end
-brace to mark the end of the message.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:reqendinterp
-@fullName Unterminated interpolation
-@description
-
-The interpolation text does not have an ending `endSymbol` ("}}" by default) and is unterminated.
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:reqopenbrace
-@fullName An opening brace was expected but not found
-@description
-
-The plural or select extension keyword or values (such as "other", "male",
-"female", "=0", "one", "many", etc.) MUST be followed by a message enclosed in
-braces.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,13 +0,0 @@
-@ngdoc error
-@name $interpolate:reqother
-@fullName Required choice "other" for select/plural in MessageFormat
-@description
-
-Your interpolation expression with a MessageFormat extension for either
-"plural" or "select" (typically used for gender selection) does not contain a
-message for the choice "other".  Using either select or plural MessageFormat
-extensions require that you provide a message for the selection "other".
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,12 +0,0 @@
-@ngdoc error
-@name $interpolate:unknarg
-@fullName Unrecognized MessageFormat extension
-@description
-
-The MessageFormat extensions provided by `ngMessageFormat` are currently
-limited to "plural" and "select".  The extension that you have used is either
-unsupported or invalid.
-
-For more information about the MessageFormat syntax in interpolation
-expressions, please refer to MessageFormat extensions section at
-{@link guide/i18n#MessageFormat Angular i18n MessageFormat}
@@ -1,10 +0,0 @@
-@ngdoc error
-@name $interpolate:unsafe
-@fullName MessageFormat extensions not allowed in secure context
-@description
-
-You have attempted to use a MessageFormat extension in your interpolation expression that is marked as a secure context.  For security purposes, this is not supported.
-
-Read more about secure contexts at {@link ng.$sce Strict Contextual Escaping
-(SCE)} and about the MessageFormat extensions at {@link
-guide/i18n#MessageFormat Angular i18n MessageFormat}.
@@ -1,6 +0,0 @@
-@ngdoc error
-@name $interpolate:untermstr
-@fullName Unterminated string literal
-@description
-
-The string literal was not terminated in your Angular expression.
@@ -1,8 +0,0 @@
-@ngdoc error
-@name $interpolate:wantstring
-@fullName Expected the beginning of a string
-@description
-
-We expected to see the beginning of a string (either a single quote or a double
-quote character) in the expression but it was not found.  The expression is
-invalid.  If this is incorrect, please file an issue on github.
@@ -35,7 +35,7 @@ URL of the subcontext:

 ```html
 <head>
-  <base href="/subapp/">
+  <base href="/subapp">
  ...
 </head>
 ```
@@ -1,51 +0,0 @@
-@ngdoc error
-@name filter:notarray
-@fullName Not an array
-@description
-
-This error occurs when {@link ng.filter filter} is not used with an array:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | filter:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-Filter must be used with an array so a subset of items can be returned.
-The array can be initialized asynchronously and therefore null or undefined won't throw this error.
-
-To filter an object by the value of its properties you can create your own custom filter:
-```js
-angular.module('customFilter',[])
-  .filter('custom', function() {
-    return function(input, search) {
-      if (!input) return input;
-      if (!search) return input;
-      var expected = ('' + search).toLowerCase();
-      var result = {};
-      angular.forEach(input, function(value, key) {
-        var actual = ('' + value).toLowerCase();
-        if (actual.indexOf(expected) !== -1) {
-          result[key] = value;
-        }
-      });
-      return result;
-    }
-  });
-```
-That can be used as:
-```html
-<input ng-model="search">
-<div ng-repeat="(key, value) in myObj | custom:search">
-  {{ key }} : {{ value }}
-</div>
-```
-
-You could as well convert the object to an array using a filter such as
-[toArrayFilter](https://github.com/petebacondarwin/angular-toArrayFilter):
-```html
-<input ng-model="search">
-<div ng-repeat="item in myObj | toArray:false | filter:search">
-  {{ item }}
-</div>
-```
@@ -1,7 +0,0 @@
-@ngdoc error
-@name ng:cpta
-@fullName Copying TypedArray
-@description
-
-Copying TypedArray's with a destination is not supported because TypedArray
-objects can not be mutated, they are fixed length.
@@ -1,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>
@@ -16,8 +16,6 @@ Reserved names include:
  - `this`
  - `undefined`
  - `$parent`
-  - `$id`
-  - `$root`
  - `$even`
  - `$odd`
  - `$first`
@@ -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.

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

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

 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 role or type of `checkbox`, `radio`, `range` or `textbox`.
+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):
@@ -210,16 +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"` if it isn't there
-already.
-
-To fix widespread accessibility problems with `ng-click` on div elements, ngAria will dynamically
-bind keypress by default as long as the element isn't an anchor, button, input or textarea.
-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.
-
-For `ng-dblclick`, you must still manually add `ng-keypress` and 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
@@ -230,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

@@ -249,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>
@@ -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?

@@ -276,6 +276,6 @@ myModule.directive('my-directive', ['$animate', function($animate) {

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

@@ -30,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`
@@ -69,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',[]);
@@ -99,7 +99,7 @@ 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.
@@ -125,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.

@@ -259,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}:
@@ -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.
@@ -51,11 +51,9 @@ In the following example, we say that the `<input>` element **matches** the `ngM
 The following also **matches** `ngModel`:

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

-### 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`).
@@ -102,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.
@@ -755,12 +751,9 @@ own behavior to it.
    angular.module('docsIsoFnBindExample', [])
      .controller('Controller', ['$scope', '$timeout', function($scope, $timeout) {
        $scope.name = 'Tobias';
-        $scope.message = '';
-        $scope.hideDialog = function (message) {
-          $scope.message = message;
+        $scope.hideDialog = function () {
          $scope.dialogIsHidden = true;
          $timeout(function () {
-            $scope.message = '';
            $scope.dialogIsHidden = false;
          }, 2000);
        };
@@ -778,15 +771,14 @@ own behavior to it.
  </file>
  <file name="index.html">
    <div ng-controller="Controller">
-      {{message}}
-      <my-dialog ng-hide="dialogIsHidden" on-close="hideDialog(message)">
+      <my-dialog ng-hide="dialogIsHidden" on-close="hideDialog()">
        Check out the contents, {{name}}!
      </my-dialog>
    </div>
  </file>
  <file name="my-dialog-close.html">
    <div class="alert">
-      <a href class="close" ng-click="close({message: 'closing for now'})">&times;</a>
+      <a href class="close" ng-click="close()">&times;</a>
      <div ng-transclude></div>
    </div>
  </file>
@@ -803,15 +795,9 @@ callback functions to directive behaviors.

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

-Often it's desirable to pass data from the isolate scope via an expression to the
-parent scope, this can be done by passing a map of local variable names and values into the expression
-wrapper 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
 to expose an API for binding to behaviors.
@@ -831,39 +817,37 @@ 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);
          }
        };
      }]);
@@ -28,13 +28,13 @@ 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 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
@@ -175,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`
@@ -297,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() {
@@ -342,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>
-```
+```
+
@@ -92,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
@@ -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}
@@ -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:

@@ -128,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.
@@ -210,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
@@ -251,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
@@ -292,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},
@@ -409,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
@@ -454,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,
@@ -491,7 +488,9 @@ The following example shows how to add two-way data-binding to contentEditable e
        link: function(scope, elm, attrs, ctrl) {
          // view -> model
          elm.on('blur', function() {
-            ctrl.$setViewValue(elm.html());
+            scope.$apply(function() {
+              ctrl.$setViewValue(elm.html());
+            });
          });

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

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

 All localizable Angular components depend on locale-specific rule sets managed by the {@link
 ng.$locale `$locale` service}.
@@ -139,242 +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 our [Plnkr Example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview)
-as you read the examples below.
-
-### 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.
-
-### More complex example that demonstrates nesting
-
-This is taken from the [plunker example](http://plnkr.co/edit/QBVRQ70dvKZDWmHW9RyR?p=preview) linked to earlier.
-
-```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).
@@ -102,7 +102,7 @@ This is a short list of libraries with specific support and documentation for wo
 ## Learning Resources

 ###Books
-* [AngularJS: Up and Running](http://www.amazon.com/AngularJS-Running-Enhanced-Productivity-Structured/dp/1491901942) by Brad Green and Shyam Seshadri
+* [AngularJS](http://www.amazon.com/AngularJS-Brad-Green/dp/1449344852) by Brad Green and Shyam Seshadri
 * [Mastering Web App Development](http://www.amazon.com/Mastering-Web-Application-Development-AngularJS/dp/1782161821) by Pawel Kozlowski and Pete Bacon Darwin
 * [AngularJS Directives](http://www.amazon.com/AngularJS-Directives-Alex-Vanston/dp/1783280336) by Alex Vanston
 * [Recipes With AngularJS](http://www.amazon.co.uk/Recipes-Angular-js-Frederik-Dietz-ebook/dp/B00DK95V48) by Frederik Dietz
@@ -12,7 +12,7 @@ succinctly. Angular's data binding and dependency injection eliminate much of th
 would otherwise have to write. And it all happens within the browser, making it
 an ideal partner with any server technology.

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

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

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

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

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


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

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


@@ -13,375 +13,8 @@ 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.
-
-### 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.
-
-
-### 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 `Number` scope values will not be matched
-against numeric option strings.
-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 simply initialize the model as a string: `scope.x = '200'`, or if you want to
-keep the model as a `Number`, you can do the conversion via `$formatters` and `$parsers` on `ngModel`:
-
-```js
-ngModelCtrl.$parsers.push(function(value) {
-  return parseInt(value, 10); // Convert option value to number
-});
-
-ngModelCtrl.$formatters.push(function(value) {
-  return value.toString(); // Convert scope value to string
-});
-```
-
-## Templating (`ngRepeat`, `$compile`)
-
-### ngRepeat
-
-Due to [c260e738](https://github.com/angular/angular.js/commit/c260e7386391877625eda086480de73e8a0ba921),
-previously, the order of items when using ngRepeat to iterate over object properties was guaranteed to be consistent
-by sorting the keys into alphabetic order.
-
-Now, the order of the items is browser dependent based on the order returned
-from iterating over the object using the `for key in obj` syntax.
-
-It seems that browsers generally follow the strategy of providing
-keys in the order in which they were defined, although there are exceptions
-when keys are deleted and reinstated. See
-https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_issues
-
-The best approach is to convert Objects into Arrays by a filter such as
-https://github.com/petebacondarwin/angular-toArrayFilter
-or some other mechanism, and then sort them manually in the order you need.
-
-
-### $compile
-
-Due to [6a38dbfd](https://github.com/angular/angular.js/commit/6a38dbfd3c34c8f9efff503d17eb3cbeb666d422),
-previously, '&' expressions would always set up a function in the isolate scope. Now, if the binding
-is marked as optional and the attribute is not specified, no function will be added to the isolate scope.
-
-Due to [62d514b](https://github.com/angular/angular.js/commit/62d514b06937cc7dd86e973ea11165c88343b42d),
-returning an object from a controller constructor function will now override the scope. Views that use the
-controllerAs method will no longer get the this reference, but the returned object. 
-
-
-## Cookies (`ngCookies`)
-
-Due to [38fbe3ee](https://github.com/angular/angular.js/commit/38fbe3ee8370fc449b82d80df07b5c2ed2cd5fbe),
-`$cookies` will no longer expose properties that represent the current browser cookie
-values. `$cookies` no longer polls the browser for changes to the cookies and ***no longer copies
-cookie values onto the `$cookies` object***.
-
-This was changed because the polling is expensive and caused issues with the `$cookies` properties
-not synchronizing correctly with the actual browser cookie values (The reason the polling
-was originally added was to allow communication between different tabs,
-but there are better ways to do this today, for example `localStorage`.)
-
-The new API on `$cookies` is as follows:
-
- * `get`
- * `put`
- * `getObject`
- * `putObject`
- * `getAll`
- * `remove`
-
-You must explictly use the methods above in order to access cookie data. This also means that
-you can no longer watch the properties on `$cookies` to detect changes
-that occur on the browsers cookies.
-
-This feature is generally only needed if a 3rd party library was programmatically
-changing the cookies at runtime. If you rely on this then you must either write code that
-can react to the 3rd party library making the changes to cookies or implement your own polling
-mechanism.
-
-**DEPRECATION NOTICE**
-
-`$cookieStore` is now deprecated as all the useful logic
-has been moved to `$cookies`, to which `$cookieStore` now simply
-delegates calls.
-
-
-
-
-## Server Requests (`$http`)
-
-Due to [5da1256](https://github.com/angular/angular.js/commit/5da1256fc2812d5b28fb0af0de81256054856369),
-`transformRequest` functions can no longer modify request headers.
-
-Before this commit `transformRequest` could modify request headers, ex.:
-
-```javascript
-function requestTransform(data, headers) {
-    headers = angular.extend(headers(), {
-      'X-MY_HEADER': 'abcd'
-    });
-  }
-  return angular.toJson(data);
-}
-```
-
-This behavior was unintended and undocumented, so the change should affect very few applications. If one
-needs to dynamically add / remove headers it should be done in a header function, for example:
-
-```javascript
-$http.get(url, {
-  headers: {
-    'X-MY_HEADER': function(config) {
-      return 'abcd'; //you've got access to a request config object to specify header value dynamically
-    }
-  }
-})
-```
-
-
-
-
-## Filters (`filter`, `limitTo`)
-
-### `filter` filter
-Due to [cea8e751](https://github.com/angular/angular.js/commit/cea8e75144e6910b806b63a6ec2a6d118316fddd),
-the `filter` filter will throw an error when used with a non-array. Beforehand it would silently
-return an empty array.
-
-If necessary, this can be worked around by converting an object to an array,
-using a filter such as https://github.com/petebacondarwin/angular-toArrayFilter.
-
-### `limitTo` filter
-Due to [a3c3bf33](https://github.com/angular/angular.js/commit/a3c3bf3332e5685dc319c46faef882cb6ac246e1),
-the limitTo filter has changed behavior when the provided limit value is invalid.
-Now, instead of returning empty object/array, it returns unchanged input.
-
-
-
-
-
 # Migrating from 1.2 to 1.3

-## Controllers
-
-Due to [3f2232b5](https://github.com/angular/angular.js/commit/3f2232b5a181512fac23775b1df4a6ebda67d018),
-`$controller` will no longer look for controllers on `window`.
-The old behavior of looking on `window` for controllers was originally intended
-for use in examples, demos, and toy apps. We found that allowing global controller
-functions encouraged poor practices, so we resolved to disable this behavior by
-default.
-
-To migrate, register your controllers with modules rather than exposing them
-as globals:
-
-Before:
-
-```javascript
-function MyController() {
-  // ...
-}
-```
-
-After:
-
-```javascript
-angular.module('myApp', []).controller('MyController', [function() {
-  // ...
-}]);
-```
-
-Although it's not recommended, you can re-enable the old behavior like this:
-
-```javascript
-angular.module('myModule').config(['$controllerProvider', function($controllerProvider) {
-  // this option might be handy for migrating old apps, but please don't use it
-  // in new ones!
-  $controllerProvider.allowGlobals();
-}]);
-```
-
 ## Angular Expression Parsing (`$parse` + `$interpolate`)

 - due to [77ada4c8](https://github.com/angular/angular.js/commit/77ada4c82d6b8fc6d977c26f3cdb48c2f5fbe5a5),
@@ -140,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
@@ -197,14 +197,14 @@ Then Angular applies configuration blocks in the same order they were registered
 ## Run Blocks

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

 ## Dependencies

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

 ## Disabling Debug Data

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

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

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

@@ -5,7 +5,7 @@

 # What are Scopes?

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

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

     For mutations to be properly observed, you should make them only within the {@link
-     ng.$rootScope.Scope#$apply scope.$apply()}. Angular APIs do this
+     ng.$rootScope.Scope#$apply scope.$apply()}. (Angular APIs do this
     implicitly, so no extra `$apply` call is needed when doing synchronous work in controllers,
     or asynchronous work with {@link ng.$http $http}, {@link ng.$timeout $timeout}
     or {@link ng.$interval $interval} services.
@@ -39,7 +39,7 @@ In general, we recommend against this because it can create unintended XSS vecto

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

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

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

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

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

@@ -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);
@@ -153,7 +153,7 @@ grunt test:unit --browsers Opera,Firefox

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

-During development, however, it's more productive to continuously run unit tests every time the source or test files
+During development it's however more productive to continuously run unit tests every time the source or test files
 change. To execute tests in this mode run:

 1. To start the Karma server, capture Chrome browser and run unit tests, run:
@@ -15,14 +15,14 @@ development.
 production.

 To point your code to an angular script on the Google CDN server, use the following template.  This
-example points to the minified version 1.3.14:
+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.3.14/angular.min.js"></script>
+      <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
    </head>
    <body>
    </body>
@@ -20,42 +20,6 @@ AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop
 So it's definitely not a plugin or some other native browser extension.


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

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

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

@@ -88,7 +52,7 @@ Yes. See instructions in {@link downloading}.

 We run our extensive test suite against the following browsers: Safari, Chrome, Firefox, Opera 15,
 IE9 and mobile browsers (Android, Chrome Mobile, iOS Safari). See {@link guide/ie Internet
-Explorer Compatibility} for more details on supporting legacy IE browsers.
+Explorer Compatibility} for more details in supporting legacy IE browsers.


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

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


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

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


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

 ### What is testability like in Angular?

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

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

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

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

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

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

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

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

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

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

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

 [git]: http://git-scm.com/
 [node]: http://nodejs.org/
@@ -31,10 +31,7 @@ npm install

 To see the app running in a browser, open a *separate* terminal/command line tab or window, then
 run `npm start` to start the web server. Now, open a browser window for the app and navigate to
-<a href="http://localhost:8000/app/" target="_blank" title="Open app on localhost">`http://localhost:8000/app/`</a>
-
-Note that if you already ran the master branch app prior to checking out step-0, you may see the cached
-master version of the app in your browser window at this point. Just hit refresh to re-load the page.
+<a href="http://localhost:8000/app/" target="_blank">`http://localhost:8000/app/`</a>

 You can now see the page in your browser. It's not very exciting, but that's OK.

@@ -65,7 +62,7 @@ __`app/index.html`:__

 ## What is the code doing?

-**`ng-app` directive:**
+* `ng-app` directive:

          <html ng-app>

@@ -77,41 +74,41 @@ __`app/index.html`:__
  This gives application developers the freedom to tell Angular if the entire html page or only a
  portion of it should be treated as the Angular application.

-**AngularJS script tag:**
+* AngularJS script tag:

          <script src="bower_components/angular/angular.js">

-  This code downloads the `angular.js` script which registers a callback that will be executed by the
+  This code downloads the `angular.js` script and registers a callback that will be executed by the
 browser when the containing HTML page is fully downloaded. When the callback is executed, Angular
 looks for the {@link ng.directive:ngApp ngApp} directive. If
 Angular finds the directive, it will bootstrap the application with the root of the application DOM
 being the element on which the `ngApp` directive was defined.

-**Double-curly binding with an expression:**
+* Double-curly binding with an expression:

          Nothing here {{'yet' + '!'}}

-This line demonstrates two core features of Angular's templating capabilities:
+  This line demonstrates two core features of Angular's templating capabilities:

-  * a binding, denoted by double-curlies `{{ }}`
-  * a simple expression `'yet' + '!'` used in this binding.
+    * a binding, denoted by double-curlies `{{ }}`
+    * a simple expression `'yet' + '!'` used in this binding.

-The binding tells Angular that it should evaluate an expression and insert the result into the
-DOM in place of the binding. Rather than a one-time insert, as we'll see in the next steps, a
-binding will result in efficient continuous updates whenever the result of the expression
-evaluation changes.
+  The binding tells Angular that it should evaluate an expression and insert the result into the
+  DOM in place of the binding. Rather than a one-time insert, as we'll see in the next steps, a
+  binding will result in efficient continuous updates whenever the result of the expression
+  evaluation changes.

-{@link guide/expression Angular expression} is a JavaScript-like code snippet that is
-evaluated by Angular in the context of the current model scope, rather than within the scope of
-the global context (`window`).
+  {@link guide/expression Angular expression} is a JavaScript-like code snippet that is
+  evaluated by Angular in the context of the current model scope, rather than within the scope of
+  the global context (`window`).

-As expected, once this template is processed by Angular, the html page contains the text:
-"Nothing here yet!".
+  As expected, once this template is processed by Angular, the html page contains the text:
+  "Nothing here yet!".

 ## Bootstrapping AngularJS apps

 Bootstrapping AngularJS apps automatically using the `ngApp` directive is very easy and suitable
-for most cases. In advanced cases, such as when using script loaders, you can use the
+for most cases. In advanced cases, such as when using script loaders, you can use
 {@link guide/bootstrap imperative / manual way} to bootstrap the app.

 There are 3 important things that happen during the app bootstrap:
@@ -11,7 +11,7 @@ multiple views by adding routing, using an Angular module called 'ngRoute'.

 * When you now navigate to `app/index.html`, you are redirected to `app/index.html/#/phones`
  and the phone list appears in the browser.
-* When you click on a phone link, the url changes to that specific phone and the stub of a
+* When you click on a phone link the url changes to one specific to that phone and the stub of a
  phone detail page is displayed.

 <div doc-tutorial-reset="7"></div>
@@ -21,7 +21,7 @@ multiple views by adding routing, using an Angular module called 'ngRoute'.
 The routing functionality added by this step is provided by angular in the `ngRoute` module, which
 is distributed separately from the core Angular framework.

-We are using [Bower][bower] to install client-side dependencies.  This step updates the
+We are using [Bower][bower] to install client side dependencies.  This step updates the
 `bower.json` configuration file to include the new dependency:

 ```json
@@ -46,7 +46,7 @@ The new dependency `"angular-route": "~1.3.0"` tells bower to install a version
 angular-route component that is compatible with version 1.3.x.  We must tell bower to download
 and install this dependency.

-If you have bower installed globally, then you can run `bower install` but for this project, we have
+If you have bower installed globally then you can run `bower install` but for this project we have
 preconfigured npm to run bower install for us:

 ```
@@ -70,7 +70,7 @@ the current "route" — the view that is currently displayed to the user.
 Application routes in Angular are declared via the {@link ngRoute.$routeProvider $routeProvider},
 which is the provider of the {@link ngRoute.$route $route service}. This service makes it easy to
 wire together controllers, view templates, and the current URL location in the browser. Using this
-feature, we can implement [deep linking](http://en.wikipedia.org/wiki/Deep_linking), which lets us
+feature we can implement [deep linking](http://en.wikipedia.org/wiki/Deep_linking), which lets us
 utilize the browser's history (back and forward navigation) and bookmarks.


@@ -81,7 +81,7 @@ AngularJS, so it's important for you to understand a thing or two about how it w

 When the application bootstraps, Angular creates an injector that will be used to find and inject all
 of the services that are required by your app. The injector itself doesn't know anything about what
-`$http` or `$route` services do. In fact, the injector doesn't even know about the existence of these services
+`$http` or `$route` services do, in fact it doesn't even know about the existence of these services
 unless it is configured with proper module definitions.

 The injector only carries out the following steps :
@@ -295,7 +295,7 @@ phonecatControllers.controller('PhoneDetailCtrl', ['$scope', '$routeParams',

 Again, note that we created a new module called `phonecatControllers`. For small AngularJS
 applications, it's common to create just one module for all of your controllers if there are just a
-few. As your application grows, it is quite common to refactor your code into additional modules.
+few. As your application grows it is quite common to refactor your code into additional modules.
 For larger apps, you will probably want to create separate modules for each major feature of
 your app.

@@ -349,7 +349,7 @@ the same binding into the `phone-list.html` template, the binding will work as e

 <div style="display: none">
 * In `PhoneCatCtrl`, create a new model called "`hero`" with `this.hero = 'Zoro'`. In
-`PhoneListCtrl`, let's shadow it with `this.hero = 'Batman'`. In `PhoneDetailCtrl`, we'll use
+`PhoneListCtrl` let's shadow it with `this.hero = 'Batman'`, and in `PhoneDetailCtrl` we'll use
 `this.hero = "Captain Proton"`. Then add the `<p>hero = {{hero}}</p>` to all three of our templates
 (`index.html`, `phone-list.html`, and `phone-detail.html`). Open the app and you'll see scope
 inheritance and model property shadowing do some wonders.
@@ -31,7 +31,7 @@ phonecatControllers.controller('PhoneDetailCtrl', ['$scope', '$routeParams', '$h

    $scope.setImage = function(imageUrl) {
      $scope.mainImageUrl = imageUrl;
-    };
+    }
  }]);
 ```

@@ -288,5 +288,5 @@ learn how to improve this application with animations.
 <ul doc-tutorial-nav="11"></ul>

 [restful]: http://en.wikipedia.org/wiki/Representational_State_Transfer
-[jasmine-matchers]: http://jasmine.github.io/1.3/introduction.html#section-Matchers
+[jasmine-matchers]: https://github.com/pivotal/jasmine/wiki/Matchers
 [bower]: http://bower.io/
@@ -225,7 +225,7 @@ inserted into and removed from the list:
  * The `ng-leave` class is applied when they're removed from the list.

 The phone listing items are added and removed depending on the data passed to the `ng-repeat` attribute.
-For example, if the filter data changes, the items will be animated in and out of the repeat list.
+For example, if the filter data changes the items will be animated in and out of the repeat list.

 Something important to note is that when an animation occurs, two sets of CSS classes
 are added to the element:
@@ -233,7 +233,7 @@ are added to the element:
  1. a "starting" class that represents the style at the beginning of the animation
  2. an "active" class that represents the style at the end of the animation

-The name of the starting class is the name of the event that is fired (like `enter`, `move` or `leave`) prefixed with
+The name of the starting class is the name of event that is fired (like `enter`, `move` or `leave`) prefixed with
 `ng-`. So an `enter` event will result in a class called `ng-enter`.

 The active class name is the same as the starting class's but with an `-active` suffix.
@@ -2912,12 +2912,16 @@ goog.i18n.DateTimeSymbols_my = {
    'ဇွန်', 'ဇူလိုင်', 'ဩဂုတ်',
    'စက်တင်ဘာ', 'အောက်တိုဘာ',
    'နိုဝင်ဘာ', 'ဒီဇင်ဘာ'],
-  SHORTMONTHS: ['ဇန်', 'ဖေ', 'မတ်', 'ဧပြီ', 'မေ',
-    'ဇွန်', 'ဇူ', 'ဩ', 'စက်', 'အောက်',
-    'နို', 'ဒီ'],
-  STANDALONESHORTMONTHS: ['ဇန်', 'ဖေ', 'မတ်', 'ဧပြီ',
-    'မေ', 'ဇွန်', 'ဇူ', 'ဩ', 'စက်', 'အောက်',
-    'နို', 'ဒီ'],
+  SHORTMONTHS: ['ဇန်နဝါရီ', 'ဖေဖော်ဝါရီ',
+    'မတ်', 'ဧပြီ', 'မေ', 'ဇွန်',
+    'ဇူလိုင်', 'ဩဂုတ်', 'စက်တင်ဘာ',
+    'အောက်တိုဘာ', 'နိုဝင်ဘာ',
+    'ဒီဇင်ဘာ'],
+  STANDALONESHORTMONTHS: ['ဇန်နဝါရီ',
+    'ဖေဖော်ဝါရီ', 'မတ်', 'ဧပြီ', 'မေ',
+    'ဇွန်', 'ဇူလိုင်', 'ဩဂုတ်',
+    'စက်တင်ဘာ', 'အောက်တိုဘာ',
+    'နိုဝင်ဘာ', 'ဒီဇင်ဘာ'],
  WEEKDAYS: ['တနင်္ဂနွေ', 'တနင်္လာ',
    'အင်္ဂါ', 'ဗုဒ္ဓဟူး',
    'ကြာသပတေး', 'သောကြာ', 'စနေ'],
@@ -2941,7 +2945,7 @@ goog.i18n.DateTimeSymbols_my = {
    'တတိယ သုံးလပတ်',
    'စတုတ္ထ သုံးလပတ်'],
  AMPMS: ['နံနက်', 'ညနေ'],
-  DATEFORMATS: ['EEEE, dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
+  DATEFORMATS: ['EEEE, y MMMM dd', 'y MMMM d', 'y MMM d', 'yy/MM/dd'],
  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
  DATETIMEFORMATS: ['{1}မှာ {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
  FIRSTDAYOFWEEK: 6,
@@ -14493,12 +14493,16 @@ goog.i18n.DateTimeSymbols_my_MM = {
    'ဇွန်', 'ဇူလိုင်', 'ဩဂုတ်',
    'စက်တင်ဘာ', 'အောက်တိုဘာ',
    'နိုဝင်ဘာ', 'ဒီဇင်ဘာ'],
-  SHORTMONTHS: ['ဇန်', 'ဖေ', 'မတ်', 'ဧပြီ', 'မေ',
-    'ဇွန်', 'ဇူ', 'ဩ', 'စက်', 'အောက်',
-    'နို', 'ဒီ'],
-  STANDALONESHORTMONTHS: ['ဇန်', 'ဖေ', 'မတ်', 'ဧပြီ',
-    'မေ', 'ဇွန်', 'ဇူ', 'ဩ', 'စက်', 'အောက်',
-    'နို', 'ဒီ'],
+  SHORTMONTHS: ['ဇန်နဝါရီ', 'ဖေဖော်ဝါရီ',
+    'မတ်', 'ဧပြီ', 'မေ', 'ဇွန်',
+    'ဇူလိုင်', 'ဩဂုတ်', 'စက်တင်ဘာ',
+    'အောက်တိုဘာ', 'နိုဝင်ဘာ',
+    'ဒီဇင်ဘာ'],
+  STANDALONESHORTMONTHS: ['ဇန်နဝါရီ',
+    'ဖေဖော်ဝါရီ', 'မတ်', 'ဧပြီ', 'မေ',
+    'ဇွန်', 'ဇူလိုင်', 'ဩဂုတ်',
+    'စက်တင်ဘာ', 'အောက်တိုဘာ',
+    'နိုဝင်ဘာ', 'ဒီဇင်ဘာ'],
  WEEKDAYS: ['တနင်္ဂနွေ', 'တနင်္လာ',
    'အင်္ဂါ', 'ဗုဒ္ဓဟူး',
    'ကြာသပတေး', 'သောကြာ', 'စနေ'],
@@ -14522,7 +14526,7 @@ goog.i18n.DateTimeSymbols_my_MM = {
    'တတိယ သုံးလပတ်',
    'စတုတ္ထ သုံးလပတ်'],
  AMPMS: ['နံနက်', 'ညနေ'],
-  DATEFORMATS: ['EEEE, dd MMMM y', 'd MMMM y', 'd MMM y', 'dd-MM-yy'],
+  DATEFORMATS: ['EEEE, y MMMM dd', 'y MMMM d', 'y MMM d', 'yy/MM/dd'],
  TIMEFORMATS: ['HH:mm:ss zzzz', 'HH:mm:ss z', 'HH:mm:ss', 'HH:mm'],
  DATETIMEFORMATS: ['{1}မှာ {0}', '{1} {0}', '{1} {0}', '{1} {0}'],
  FIRSTDAYOFWEEK: 6,
@@ -2112,7 +2112,7 @@ goog.i18n.NumberFormatSymbols_lt = {
  SCIENTIFIC_PATTERN: '#E0',
  PERCENT_PATTERN: '#,##0\u00A0%',
  CURRENCY_PATTERN: '#,##0.00\u00A0\u00A4',
-  DEF_CURRENCY_CODE: 'EUR'
+  DEF_CURRENCY_CODE: 'LTL'
 };


@@ -184,11 +184,7 @@ describe("extractDateTimeSymbols", function() {
                      'nov.', 'déc.'],
                  DAY: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
                  SHORTDAY: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-                  FIRSTDAYOFWEEK: 6,
-                  WEEKENDRANGE: [5, 6],
                  AMPMS: ['AM', 'PM'],
-                  ERAS: ['av. J.-C.', 'ap. J.-C.'],
-                  ERANAMES: ['avant Jésus-Christ', 'après Jésus-Christ'],
                  medium: 'yyyy-MM-dd HH:mm:ss',
                  short: 'yy-MM-dd HH:mm',
                  fullDate: 'EEEE d MMMM y',
@@ -42,10 +42,6 @@ function convertDatetimeData(dataObj) {
  datetimeFormats.DAY = dataObj.WEEKDAYS;
  datetimeFormats.SHORTDAY = dataObj.SHORTWEEKDAYS;
  datetimeFormats.AMPMS = dataObj.AMPMS;
-  datetimeFormats.FIRSTDAYOFWEEK = dataObj.FIRSTDAYOFWEEK;
-  datetimeFormats.WEEKENDRANGE = dataObj.WEEKENDRANGE;
-  datetimeFormats.ERAS = dataObj.ERAS;
-  datetimeFormats.ERANAMES = dataObj.ERANAMES;


  datetimeFormats.medium      = dataObj.DATEFORMATS[2] + ' ' + dataObj.TIMEFORMATS[2];
@@ -35,18 +35,18 @@ module.exports = function(config, specificOptions) {
      'SL_Chrome': {
        base: 'SauceLabs',
        browserName: 'chrome',
-        version: '39'
+        version: '34'
      },
      'SL_Firefox': {
        base: 'SauceLabs',
        browserName: 'firefox',
-        version: '31'
+        version: '26'
      },
      'SL_Safari': {
        base: 'SauceLabs',
        browserName: 'safari',
-        platform: 'OS X 10.10',
-        version: '8'
+        platform: 'OS X 10.9',
+        version: '7'
      },
      'SL_IE_9': {
        base: 'SauceLabs',
@@ -66,24 +66,18 @@ module.exports = function(config, specificOptions) {
        platform: 'Windows 8.1',
        version: '11'
      },
-      'SL_iOS': {
-        base: "SauceLabs",
-        browserName: "iphone",
-        platform: "OS X 10.10",
-        version: "8.1"
-      },

      'BS_Chrome': {
        base: 'BrowserStack',
        browser: 'chrome',
        os: 'OS X',
-        os_version: 'Yosemite'
+        os_version: 'Mountain Lion'
      },
      'BS_Safari': {
        base: 'BrowserStack',
        browser: 'safari',
        os: 'OS X',
-        os_version: 'Yosemite'
+        os_version: 'Mountain Lion'
      },
      'BS_Firefox': {
        base: 'BrowserStack',
@@ -111,12 +105,6 @@ module.exports = function(config, specificOptions) {
        browser_version: '11.0',
        os: 'Windows',
        os_version: '8.1'
-      },
-      'BS_iOS': {
-        base: 'BrowserStack',
-        device: 'iPhone 6',
-        os: 'ios',
-        os_version: '8.0'
      }
    }
  });
@@ -14,6 +14,13 @@ var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP

 module.exports = {

+  init: function() {
+    if (!process.env.TRAVIS) {
+      shell.exec('npm install');
+    }
+  },
+
+
  startKarma: function(config, singleRun, done){
    var browsers = grunt.option('browsers');
    var reporters = grunt.option('reporters');
@@ -185,16 +192,14 @@ module.exports = {
    var mapFileName = mapFile.match(/[^\/]+$/)[0];
    var errorFileName = file.replace(/\.js$/, '-errors.json');
    var versionNumber = grunt.config('NG_VERSION').full;
-    var compilationLevel = (file === 'build/angular-message-format.js') ?
-        'ADVANCED_OPTIMIZATIONS' : 'SIMPLE_OPTIMIZATIONS';
    shell.exec(
        'java ' +
            this.java32flags() + ' ' +
-            this.memoryRequirement() + ' ' +
+            '-Xmx2g ' +
            '-cp bower_components/closure-compiler/compiler.jar' + classPathSep +
            'bower_components/ng-closure-runner/ngcompiler.jar ' +
            'org.angularjs.closurerunner.NgClosureRunner ' +
-            '--compilation_level ' + compilationLevel + ' ' +
+            '--compilation_level SIMPLE_OPTIMIZATIONS ' +
            '--language_in ECMASCRIPT5_STRICT ' +
            '--minerr_pass ' +
            '--minerr_errors ' + errorFileName + ' ' +
@@ -217,10 +222,6 @@ module.exports = {
    }.bind(this));
  },

-  memoryRequirement: function() {
-    return (process.platform === 'win32') ? '' : '-Xmx2g';
-  },
-

  //returns the 32-bit mode force flags for java compiler if supported, this makes the build much faster
  java32flags: function(){
@@ -12,9 +12,9 @@ set -e
 # before_script:
 #   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash

-CONNECT_URL="https://saucelabs.com/downloads/sc-4.3.7-linux.tar.gz"
+CONNECT_URL="https://saucelabs.com/downloads/sc-4.3-linux.tar.gz"
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="sc-4.3.7-linux.tar.gz"
+CONNECT_DOWNLOAD="sc-4.3-linux.tar.gz"

 CONNECT_LOG="$LOGS_DIR/sauce-connect"
 CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
@@ -46,5 +46,5 @@ echo "Starting Sauce Connect in the background, logging into:"
 echo "  $CONNECT_LOG"
 echo "  $CONNECT_STDOUT"
 echo "  $CONNECT_STDERR"
-sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS \
+sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY $ARGS -v \
  --logfile $CONNECT_LOG 2> $CONNECT_STDERR 1> $CONNECT_STDOUT &
@@ -16,9 +16,9 @@ var currentPackage, previousVersions, cdnVersion, gitRepoInfo;
 var getPackage = function() {
  // Search up the folder hierarchy for the first package.json
  var packageFolder = path.resolve('.');
-  while (!fs.existsSync(path.join(packageFolder, 'package.json'))) {
+  while ( !fs.existsSync(path.join(packageFolder, 'package.json')) ) {
    var parent = path.dirname(packageFolder);
-    if (parent === packageFolder) { break; }
+    if ( parent === packageFolder) { break; }
    packageFolder = parent;
  }
  return JSON.parse(fs.readFileSync(path.join(packageFolder,'package.json'), 'UTF-8'));
@@ -48,11 +48,11 @@ var getGitRepoInfo = function() {
 * @return {String}         The codename if found, otherwise null/undefined
 */
 var getCodeName = function(tagName) {
-  var gitCatOutput = shell.exec('git cat-file -p ' + tagName, {silent:true}).output;
+  var gitCatOutput = shell.exec('git cat-file -p '+ tagName, {silent:true}).output;
  var tagMessage = gitCatOutput.match(/^.*codename.*$/mg)[0];
  var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
  if (!codeName) {
-    throw new Error("Could not extract release code name. The message of tag " + tagName +
+    throw new Error("Could not extract release code name. The message of tag "+tagName+
      " must match '*codename(some release name)*'");
  }
  return codeName;
@@ -65,7 +65,7 @@ var getCodeName = function(tagName) {
 */
 function getBuild() {
  var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
-  return 'sha.' + hash;
+  return 'sha.'+hash;
 }


@@ -76,14 +76,14 @@ function getBuild() {
 var getTaggedVersion = function() {
  var gitTagResult = shell.exec('git describe --exact-match', {silent:true});

-  if (gitTagResult.code === 0) {
+  if ( gitTagResult.code === 0 ) {
    var tag = gitTagResult.output.trim();
    var version = semver.parse(tag);

-    if (version && semver.satisfies(version, currentPackage.branchVersion)) {
+    if ( version && semver.satisfies(version, currentPackage.branchVersion)) {
      version.codeName = getCodeName(tag);
      version.full = version.version;
-      version.branch = 'v' + currentPackage.branchPattern.replace('*', 'x');
+      version.branch = 'v' + currentPackage.branchVersion.replace('*', 'x');
      return version;
    }
  }
@@ -102,7 +102,7 @@ var getPreviousVersions =  function() {
  var repo_url = currentPackage.repository.url;
  var tagResults = shell.exec('git ls-remote --tags ' + repo_url,
                              {silent: true});
-  if (tagResults.code === 0) {
+  if ( tagResults.code === 0 ) {
    return _(tagResults.output.match(/v[0-9].*[0-9]$/mg))
      .map(function(tag) {
        var version = semver.parse(tag);
@@ -110,16 +110,10 @@ var getPreviousVersions =  function() {
      })
      .filter()
      .map(function(version) {
-        // angular.js didn't follow semantic version until 1.20rc1
-        if ((version.major === 1 && version.minor === 0 && version.prerelease.length > 0) || (version.major === 1 && version.minor === 2 && version.prerelease[0] === 'rc1')) {
-          version.version = [version.major, version.minor, version.patch].join('.') + version.prerelease.join('');
-          version.raw = 'v' + version.version;
-        }
        version.docsUrl = 'http://code.angularjs.org/' + version.version + '/docs';
        // Versions before 1.0.2 had a different docs folder name
-        if (version.major < 1 || (version.major === 1 && version.minor === 0 && version.patch < 2)) {
+        if ( version.major < 1 || (version.major === 1 && version.minor === 0 && version.dot < 2 ) ) {
          version.docsUrl += '-' + version.version;
-          version.isOldDocsUrl = true;
        }
        return version;
      })
@@ -140,10 +134,10 @@ var getCdnVersion = function() {
      if (!cdnVersion) {
        // Note: need to use shell.exec and curl here
        // as version-infos returns its result synchronously...
-        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/' + version + '/angular.min.js ' +
+        var cdnResult = shell.exec('curl http://ajax.googleapis.com/ajax/libs/angularjs/'+version+'/angular.min.js '+
                  '--head --write-out "%{http_code}" -o /dev/null -silent',
                                    {silent: true});
-        if (cdnResult.code === 0) {
+        if ( cdnResult.code === 0 ) {
          var statusCode = cdnResult.output.trim();
          if (statusCode === '200') {
            cdnVersion = version;
@@ -165,9 +159,9 @@ var getSnapshotVersion = function() {
    })
    .last();

-  if (!version) {
+  if ( !version ) {
    // a snapshot version before the first tag on the branch
-    version = semver(currentPackage.branchPattern.replace('*','0-beta.1'));
+    version = semver(currentPackage.branchVersion.replace('*','0-beta.1'));
  }

  // We need to clone to ensure that we are not modifying another version
@@ -1,17 +1,10 @@
 {
  "name": "angularjs",
-  "license": "MIT",
-  "branchVersion": "^1.4.0-beta.0",
-  "branchPattern": "1.4.*",
+  "branchVersion": "1.3.*",
  "repository": {
    "type": "git",
    "url": "https://github.com/angular/angular.js.git"
  },
-  "engines": {
-    "node": "~0.10",
-    "npm": "~2.5"
-  },
-  "engineStrict": true,
  "devDependencies": {
    "angular-benchpress": "0.x.x",
    "benchmark": "1.x.x",
@@ -31,7 +24,7 @@
    "grunt-contrib-jshint": "~0.10.0",
    "grunt-ddescribe-iit": "~0.0.1",
    "grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
-    "grunt-jscs": "~1.2.0",
+    "grunt-jscs": "~0.7.1",
    "grunt-merge-conflict": "~0.0.1",
    "grunt-shell": "~1.1.1",
    "gulp": "~3.8.0",
@@ -45,7 +38,7 @@
    "jasmine-node": "~1.14.5",
    "jasmine-reporters": "~1.0.1",
    "jshint-stylish": "~1.0.0",
-    "karma": "0.12.32",
+    "karma": "vojtajina/karma#socketio_10",
    "karma-browserstack-launcher": "0.1.2",
    "karma-chrome-launcher": "0.1.5",
    "karma-firefox-launcher": "0.1.3",
@@ -59,7 +52,7 @@
    "marked": "~0.3.0",
    "node-html-encoder": "0.0.2",
    "promises-aplus-tests": "~2.1.0",
-    "protractor": "^2.1.0",
+    "protractor": "^1.6.0",
    "q": "~1.0.0",
    "q-io": "^1.10.9",
    "qq": "^0.3.5",
@@ -17,7 +17,7 @@ ARG_DEFS=(
 )

 function checkVersionNumber() {
-  BRANCH_PATTERN=$(readJsonProp "package.json" "branchPattern")
+  BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")
  if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then
    echo "version-number needs to match $BRANCH_PATTERN on this branch"
    usage
@@ -14,6 +14,21 @@ function init {
  TMP_DIR=$(resolveDir ../../tmp)
  BUILD_DIR=$(resolveDir ../../build)
  NEW_VERSION=$(cat $BUILD_DIR/version.txt)
+  REPOS=(
+    angular
+    angular-animate
+    angular-aria
+    angular-cookies
+    angular-i18n
+    angular-loader
+    angular-mocks
+    angular-route
+    angular-resource
+    angular-sanitize
+    angular-scenario
+    angular-touch
+    angular-messages
+  )
 }


@@ -48,21 +63,6 @@ function prepare {
  cp $BUILD_DIR/angular-csp.css $TMP_DIR/bower-angular


-  #
-  # Run local precommit script if there is one
-  #
-  for repo in "${REPOS[@]}"
-  do
-    if [ -f $TMP_DIR/bower-$repo/precommit.sh ]
-      then
-        echo "-- Running precommit.sh script for bower-$repo"
-        cd $TMP_DIR/bower-$repo
-        $TMP_DIR/bower-$repo/precommit.sh
-        cd $SCRIPT_DIR
-    fi
-  done
-
-
  #
  # update bower.json
  # tag each repo
@@ -114,5 +114,4 @@ function publish {
  done
 }

-source $(dirname $0)/repos.inc
 source $(dirname $0)/../utils.inc
@@ -1,19 +0,0 @@
-#!/bin/false
-# -*- mode: sh; -*- vim: set filetype=sh:
-
-REPOS=(
-  angular
-  angular-animate
-  angular-aria
-  angular-cookies
-  angular-i18n
-  angular-loader
-  angular-message-format
-  angular-messages
-  angular-mocks
-  angular-resource
-  angular-route
-  angular-sanitize
-  angular-scenario
-  angular-touch
-)
@@ -13,6 +13,21 @@ ARG_DEFS=(

 function init {
  TMP_DIR=$(resolveDir ../../tmp)
+  REPOS=(
+    angular
+    angular-animate
+    angular-aria
+    angular-cookies
+    angular-i18n
+    angular-loader
+    angular-messages
+    angular-mocks
+    angular-route
+    angular-resource
+    angular-sanitize
+    angular-scenario
+    angular-touch
+  )
 }

 function prepare {
@@ -38,5 +53,4 @@ function publish {
  done
 }

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