docs(changelog): add release notes for 1.3.0-rc.3

Interpolates the form and form control attribute name, so that dynamic form controls (such as those
rendered in an ngRepeat) will always have their expected interpolated name.

The control will be present in its parent form controller with the interpolated property name, and
this name can change when the interpolated value changes.

Closes #4791
Closes #1404

.bowerrc

@@ -1,4 +0,0 @@
-{
-  "directory": "bower_components",
-  "json": "bower.json"
-}

.gitignore

@@ -1,4 +1,5 @@
 /build/
+/benchpress-build/
 .DS_Store
 gen_docs.disable
 test.disable
@@ -9,8 +10,7 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
 .agignore

.travis.yml

@@ -11,7 +11,6 @@ env:
     - JOB=unit
     - JOB=e2e TEST_TARGET=jqlite
     - JOB=e2e TEST_TARGET=jquery
-    - JOB=e2e TEST_TARGET=doce2e
   global:
     - SAUCE_USERNAME=angular-ci
     - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987

Gruntfile.js

@@ -10,6 +10,7 @@ module.exports = function(grunt) {
   require('load-grunt-tasks')(grunt);
 
   grunt.loadTasks('lib/grunt');
+  grunt.loadNpmTasks('angular-benchpress');
 
   var NG_VERSION = versionInfo.currentVersion;
   NG_VERSION.cdn = versionInfo.cdnVersion;
@@ -22,7 +23,12 @@ module.exports = function(grunt) {
   //config
   grunt.initConfig({
     NG_VERSION: NG_VERSION,
-
+    bp_build: {
+      options: {
+        buildPath: 'build/benchmarks',
+        benchmarksPath: 'benchmarks'
+      }
+    },
     parallel: {
       travis: {
         tasks: [
@@ -147,6 +153,9 @@ module.exports = function(grunt) {
       },
       ngTouch: {
         files: { src: 'src/ngTouch/**/*.js' },
+      },
+      ngAria: {
+        files: {src: 'src/ngAria/**/*.js'},
       }
     },
 
@@ -214,6 +223,10 @@ module.exports = function(grunt) {
         dest: 'build/angular-cookies.js',
         src: util.wrap(files['angularModules']['ngCookies'], 'module')
       },
+      aria: {
+        dest: 'build/angular-aria.js',
+        src: util.wrap(files['angularModules']['ngAria'], 'module')
+      },
       "promises-aplus-adapter": {
         dest:'tmp/promises-aplus-adapter++.js',
         src:['src/ng/q.js','lib/promises-aplus/promises-aplus-test-adapter.js']
@@ -230,7 +243,8 @@ module.exports = function(grunt) {
       touch: 'build/angular-touch.js',
       resource: 'build/angular-resource.js',
       route: 'build/angular-route.js',
-      sanitize: 'build/angular-sanitize.js'
+      sanitize: 'build/angular-sanitize.js',
+      aria: 'build/angular-aria.js'
     },
 
 

README.md

@@ -6,16 +6,17 @@ use good old HTML (or HAML, Jade and friends!) as your template language and let
 syntax to express your application’s components clearly and succinctly.  It automatically
 synchronizes data from your UI (view) with your JavaScript objects (model) through 2-way data
 binding. To help you structure your application better and make it easy to test, AngularJS teaches
-the browser how to do dependency injection and inversion of control. Oh yeah and it also helps with
-server-side communication, taming async callbacks with promises and deferreds; and makes client-side
-navigation and deeplinking with hashbang urls or HTML5 pushState a piece of cake. The best of all:
-it makes development fun!
+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. The best of all: it makes development fun!
 
 * Web site: http://angularjs.org
 * Tutorial: http://docs.angularjs.org/tutorial
 * API Docs: http://docs.angularjs.org/api
 * Developer Guide: http://docs.angularjs.org/guide
-* Contribution guidelines: http://docs.angularjs.org/misc/contribute
+* Contribution guidelines: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
 * Dashboard: http://dashboard.angularjs.org
 
 Building AngularJS
@@ -37,7 +38,7 @@ To execute end-to-end (e2e) tests, use:
     grunt test:e2e
 
 To learn more about the grunt tasks, run `grunt --help` and also read our
-[contribution guidelines](http://docs.angularjs.org/misc/contribute).
+[contribution guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)

TRIAGING.md

@@ -26,7 +26,6 @@ This process based on the idea of minimizing user pain
     * You can triage older issues as well
     * Triage to your heart's content
 1. Assign yourself: Pick an issue that is not assigned to anyone and assign it to you
-
 1. Understandable? - verify if the description of the request is clear.
     * If not, [close it][] according to the instructions below and go to the last step.
 1. Duplicate?
@@ -36,7 +35,6 @@ This process based on the idea of minimizing user pain
     * Label `Type: Bug`
     * Reproducible? - Steps to reproduce the bug are clear. If they are not, ask for a clarification. If there's no reply after a week, [close it][].
     * Reproducible on master? - <http://code.angularjs.org/snapshot/>
-
 1. Non bugs:
     * Label `Type: Feature`, `Type: Chore`, or `Type: Perf`
     * Belongs in core? – Often new features should be implemented as a third-party module rather than an addition to the core.
@@ -59,7 +57,6 @@ This process based on the idea of minimizing user pain
     * 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. 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
    * Current 1.x.y milestone (e.g. 1.3.0-beta-2) - regressions and urgent bugs only

angularFiles.js

@@ -34,6 +34,8 @@ var angularFiles = {
     'src/ng/sanitizeUri.js',
     'src/ng/sce.js',
     'src/ng/sniffer.js',
+    'src/ng/templateRequest.js',
+    'src/ng/testability.js',
     'src/ng/timeout.js',
     'src/ng/urlUtils.js',
     'src/ng/window.js',
@@ -106,6 +108,9 @@ var angularFiles = {
       'src/ngTouch/directive/ngClick.js',
       'src/ngTouch/directive/ngSwipe.js'
     ],
+    'ngAria': [
+      'src/ngAria/aria.js'
+    ]
   },
 
   'angularScenario': [
@@ -139,7 +144,8 @@ var angularFiles = {
     'test/ngRoute/**/*.js',
     'test/ngSanitize/**/*.js',
     'test/ngMock/*.js',
-    'test/ngTouch/**/*.js'
+    'test/ngTouch/**/*.js',
+    'test/ngAria/*.js'
   ],
 
   'karma': [
@@ -173,7 +179,8 @@ var angularFiles = {
     'test/ngRoute/**/*.js',
     'test/ngResource/*.js',
     'test/ngSanitize/**/*.js',
-    'test/ngTouch/**/*.js'
+    'test/ngTouch/**/*.js',
+    'test/ngAria/*.js'
   ],
 
   'karmaJquery': [
@@ -201,7 +208,8 @@ angularFiles['angularSrcModules'] = [].concat(
   angularFiles['angularModules']['ngRoute'],
   angularFiles['angularModules']['ngSanitize'],
   angularFiles['angularModules']['ngMock'],
-  angularFiles['angularModules']['ngTouch']
+  angularFiles['angularModules']['ngTouch'],
+  angularFiles['angularModules']['ngAria']
 );
 
 if (exports) {

benchmarks/README.md

@@ -0,0 +1,6 @@
+Instructions for using benchpress (how to create benchmarks, how to run, how to configure) can be
+found at: https://github.com/angular/benchpress/blob/master/README.md.
+
+In this project, there is a configured grunt task for building the benchmarks,
+`grunt bp_build`, which places the runnable benchmarks in "/build/benchmarks/".
+The existing `grunt webserver` task can be used to serve the built benchmarks at `localhost:8000/build/benchmarks/<benchmark-name>`

benchmarks/event-delegation-bp/app.js

@@ -0,0 +1,57 @@
+var app = angular.module('eventDelegationBenchmark', []);
+
+app.directive('noopDir', function() {
+  return {
+    compile: function($element, $attrs) {
+      return function($scope, $element) {
+        return 1;
+      }
+    }
+  };
+});
+
+app.directive('nativeClick', ['$parse', function($parse) {
+  return {
+    compile: function($element, $attrs) {
+      var expr = $parse($attrs.tstEvent);
+      return function($scope, $element) {
+        $element[0].addEventListener('click', function() {
+          console.log('clicked');
+        }, false);
+      }
+    }
+  };
+}]);
+
+app.directive('dlgtClick', function() {
+  return {
+    compile: function($element, $attrs) {
+      var evt = $attrs.dlgtClick;
+      // We don't setup the global event listeners as the costs are small and one time only...
+    }
+  };
+});
+
+app.controller('DataController', function($rootScope) {
+  this.ngRepeatCount = 1000;
+  this.rows = [];
+  var self = this;
+
+  benchmarkSteps.push({
+    name: '$apply',
+    fn: function() {
+      var oldRows = self.rows;
+      $rootScope.$apply(function() {
+        self.rows = [];
+      });
+      self.rows = oldRows;
+      if (self.rows.length !== self.ngRepeatCount) {
+        self.rows = [];
+        for (var i=0; i<self.ngRepeatCount; i++) {
+          self.rows.push('row'+i);
+        }
+      }
+      $rootScope.$apply();
+    }
+  });
+});

benchmarks/event-delegation-bp/bp.conf.js

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

benchmarks/event-delegation-bp/main.html

@@ -0,0 +1,139 @@
+<div ng-app="eventDelegationBenchmark">
+<div ng-controller="DataController as ctrl">
+<div class="container-fluid">
+
+<p>
+Impact of event delegation.
+</p>
+
+<p>
+<label>
+  Number of ngRepeats:
+  <input type="number" ng-model="ctrl.ngRepeatCount">
+</label>
+</p>
+
+<p>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngClick">ngClick</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngClickNoJqLite">ngClick without jqLite</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="ngShow">baseline: ng-show</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="textInterpolation">baseline: text interpolation</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="dlgtClick">delegate event directive (only compile)</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="noopDir">baseline: noop directive (compile and link)</label></div>
+<div class="radio"><label><input type=radio ng-model="benchmarkType" value="noop">baseline: no directive</label></div>
+</p>
+
+<p>
+How to read the results:
+<ul>
+  <li>The benchmark measures how long it takes to instantiate a given number of directives</li>
+  <li>ngClick is compared against ngShow and text interpolation as baseline. The results show
+      how expensive ngClick is compared to other very simple directives that touch the DOM.
+  </li>
+  <li>To measure the impact of jqLite.on vs element.addEventListener there is also a benchmark
+      that as a modified version of ngClick that uses element.addEventListener.
+  </li>
+  <li>The delegate event directive is compared against a noop directive with a compile and link function and the case with no directives.
+      The result shows how expensive it is to add a link function to a directive, as the delegate event directive has none.
+  </li>
+</ul>
+</p>
+
+<p>
+Results as of 7/31/2014:
+<ul>
+  <li>ngClick is very close to ngShow and text interpolation, especially when looking at a version of ngClick that does not use jqLite.on but element.addEventListener instead.</li>
+  <li>A delegate event directive that has no link function has the same speed as a directive with link function. I.e. ngClick is slower compared to the delegate event directive only because ngClick touches
+  the DOM for every element</li>
+  <li>A delegate event directive could be about 50% faster than ngClick. However, the overall performance
+      benefit depends on how many (and which) other directives are used on the same element
+      and what other things are part of the measures use case.
+      E.g. rows of a table with ngRepeat that use ngClick will probably also contain text interpolation.
+  </li>
+</ul>
+</p>
+
+Debug output:
+<ng-switch on="benchmarkType">
+  <div ng-switch-when="ngClick">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span ng-click="a()">1</span>
+        <span ng-click="a()">1</span>
+        <span ng-click="a()">1</span>
+        <span ng-click="a()">1</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="ngClickNoJqLite">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span native-click="a()">1</span>
+        <span native-click="a()">1</span>
+        <span native-click="a()">1</span>
+        <span native-click="a()">1</span>
+        <span native-click="a()">1</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="ngShow">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span ng-show="true">1</span>
+        <span ng-show="true">1</span>
+        <span ng-show="true">1</span>
+        <span ng-show="true">1</span>
+        <span ng-show="true">1</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="textInterpolation">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span>{{row}}</span>
+        <span>{{row}}</span>
+        <span>{{row}}</span>
+        <span>{{row}}</span>
+        <span>{{row}}</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="dlgtClick">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span dlgt-click="a()">1</span>
+        <span dlgt-click="a()">1</span>
+        <span dlgt-click="a()">1</span>
+        <span dlgt-click="a()">1</span>
+        <span dlgt-click="a()">1</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="noopDir">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span noop-dir>1</span>
+        <span noop-dir>1</span>
+        <span noop-dir>1</span>
+        <span noop-dir>1</span>
+        <span noop-dir>1</span>
+      </span>
+    </div>
+  </div>
+  <div ng-switch-when="noop">
+    <div>
+      <span ng-repeat="row in ctrl.rows">
+        <span>1</span>
+        <span>1</span>
+        <span>1</span>
+        <span>1</span>
+        <span>1</span>
+      </span>
+    </div>
+  </div>
+
+</ng-switch>
+
+</div>
+</div>
+</div>

benchmarks/largetable-bp/app.js

@@ -0,0 +1,183 @@
+var app = angular.module('largetableBenchmark', []);
+
+app.config(function($compileProvider) {
+  if ($compileProvider.debugInfoEnabled) {
+    $compileProvider.debugInfoEnabled(false);
+  }
+});
+
+app.filter('noop', function() {
+  return function(input) {
+    return input;
+  };
+});
+
+app.controller('DataController', function($scope, $rootScope) {
+  var totalRows = 1000;
+  var totalColumns = 20;
+
+  var data = $scope.data = [];
+  $scope.digestDuration = '?';
+  $scope.numberOfBindings = totalRows*totalColumns*2 + totalRows + 1;
+  $scope.numberOfWatches = '?';
+
+  function iGetter() { return this.i; }
+  function jGetter() { return this.j; }
+
+  for (var i=0; i<totalRows; i++) {
+    data[i] = [];
+    for (var j=0; j<totalColumns; j++) {
+      data[i][j] = {
+        i: i, j: j,
+        iFn: iGetter,
+        jFn: jGetter
+      };
+    }
+  }
+
+  var previousType;
+
+  benchmarkSteps.push({
+    name: 'destroy',
+    fn: function() {
+      $scope.$apply(function() {
+        previousType = $scope.benchmarkType;
+        $scope.benchmarkType = 'none';
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: 'create',
+    fn: function() {
+      $scope.$apply(function() {
+        $scope.benchmarkType = previousType;
+      });
+    }
+  });
+
+  benchmarkSteps.push({
+    name: '$apply',
+    fn: function() {
+      $rootScope.$apply();
+    }
+  });
+});
+
+var fn = function() { return 'x'};
+
+
+app.directive('baselineBindingTable', function() {
+  return {
+    restrict: 'E',
+    link: function ($scope, $element) {
+      var i, j, row, cell, comment;
+      var template = document.createElement('span');
+      template.setAttribute('ng-repeat', 'foo in foos');
+      template.classList.add('ng-scope');
+      template.appendChild(document.createElement('span'));
+      template.appendChild(document.createTextNode(':'));
+      template.appendChild(document.createElement('span'));
+      template.appendChild(document.createTextNode('|'));
+
+      for (i = 0; i < 1000; i++) {
+        row = document.createElement('div');
+        $element[0].appendChild(row);
+        for (j = 0; j < 20; j++) {
+          cell = template.cloneNode(true);
+          row.appendChild(cell);
+          cell.childNodes[0].textContent = i;
+          cell.childNodes[2].textContent = j;
+          cell.ng3992 = 'xxx';
+          comment = document.createComment('ngRepeat end: bar in foo');
+          row.appendChild(comment);
+        }
+
+        comment = document.createComment('ngRepeat end: foo in foos');
+        $element[0].appendChild(comment);
+      }
+    }
+  };
+});
+
+
+app.directive('baselineInterpolationTable', function() {
+  return {
+    restrict: 'E',
+    link: function ($scope, $element) {
+      var i, j, row, cell, comment;
+      var template = document.createElement('span');
+      template.setAttribute('ng-repeat', 'foo in foos');
+      template.classList.add('ng-scope');
+
+      for (i = 0; i < 1000; i++) {
+        row = document.createElement('div');
+        $element[0].appendChild(row);
+        for (j = 0; j < 20; j++) {
+          cell = template.cloneNode(true);
+          row.appendChild(cell);
+          cell.textContent = '' + i + ':' + j + '|';
+          cell.ng3992 = 'xxx';
+          comment = document.createComment('ngRepeat end: bar in foo');
+          row.appendChild(comment);
+        }
+
+        comment = document.createComment('ngRepeat end: foo in foos');
+        $element[0].appendChild(comment);
+      }
+    }
+  };
+});
+
+
+
+/*
+
+the fastest
+240/44
+
+app.directive('baselineTable', function() {
+  return function($scope, $element) {
+    var i, j, row, cell;
+
+    for (i = 0; i < 1000; i++) {
+      row = document.createElement('div');
+      for (j = 0; j < 20; j++) {
+        cell = document.createElement('span');
+        cell.textContent = '' + i + ':' + j;
+        row.appendChild(cell);
+      }
+      $element[0].appendChild(row);
+    }
+  };
+});
+
+ */
+
+/*
+with comments and expando
+232/90
+
+app.directive('baselineTable', function() {
+  return function($scope, $element) {
+    var i, j, row, cell, comment;
+
+    for (i = 0; i < 1000; i++) {
+      row = document.createElement('div');
+      $element[0].appendChild(row);
+      for (j = 0; j < 20; j++) {
+        cell = document.createElement('span');
+        row.appendChild(cell);
+        cell.textContent = '' + i + ':' + j;
+        cell.ng3992 = 'xxx';
+        comment = document.createComment('ngRepeat end: bar in foo');
+        row.appendChild(comment);
+      }
+
+      comment = document.createComment('ngRepeat end: foo in foos');
+      $element[0].appendChild(comment);
+    }
+  };
+});
+
+ */

benchmarks/largetable-bp/bp.conf.js

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

benchmarks/largetable-bp/jquery-noop.js

@@ -0,0 +1 @@
+//Override me with ?jquery=/bower_components/jquery/dist/jquery.js

benchmarks/largetable-bp/main.html

@@ -0,0 +1,65 @@
+<style>
+[ng-cloak] { display: none; }
+</style>
+<div ng-app="largetableBenchmark" ng-cloak>
+  <div ng-controller="DataController">
+    <div class="container-fluid">
+      <p>
+      Large table rendered with AngularJS
+      </p>
+
+      <div>none: <input type=radio ng-model="benchmarkType" value="none"></div>
+      <div>baseline binding: <input type=radio ng-model="benchmarkType" value="baselineBinding"></div>
+      <div>baseline interpolation: <input type=radio ng-model="benchmarkType" value="baselineInterpolation"></div>
+      <div>ngBind: <input type=radio ng-model="benchmarkType" value="ngBind"></div>
+      <div>interpolation: <input type=radio ng-model="benchmarkType" value="interpolation"></div>
+      <div>ngBind + fnInvocation: <input type=radio ng-model="benchmarkType" value="ngBindFn"></div>
+      <div>interpolation + fnInvocation: <input type=radio ng-model="benchmarkType" value="interpolationFn"></div>
+      <div>ngBind + filter: <input type=radio ng-model="benchmarkType" value="ngBindFilter"></div>
+      <div>interpolation + filter: <input type=radio ng-model="benchmarkType" value="interpolationFilter"></div>
+
+      <ng-switch on="benchmarkType">
+        <baseline-binding-table ng-switch-when="baselineBinding">
+        </baseline-binding-table>
+        <baseline-interpolation-table ng-switch-when="baselineInterpolation">
+        </baseline-interpolation-table>
+        <div ng-switch-when="ngBind">
+          <h2>baseline binding</h2>
+          <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>
+          </div>
+        </div>
+        <div ng-switch-when="interpolation">
+          <h2>baseline 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="ngBindFn">
+          <h2>bindings with functions</h2>
+          <div ng-repeat="row in data">
+            <span ng-repeat="column in row"><span ng-bind="column.iFn()"></span>:<span ng-bind="column.jFn()"></span>|</span>
+          </div>
+        </div>
+        <div ng-switch-when="interpolationFn">
+          <h2>interpolation with functions</h2>
+          <div ng-repeat="row in data">
+            <span ng-repeat="column in row">{{column.iFn()}}:{{column.jFn()}}|</span>
+          </div>
+        </div>
+        <div ng-switch-when="ngBindFilter">
+          <h2>bindings with filter</h2>
+          <div ng-repeat="row in data">
+            <span ng-repeat="column in row"><span ng-bind="column.i | noop"></span>:<span ng-bind="column.j | noop"></span>|</span>
+          </div>
+        </div>
+        <div ng-switch-when="interpolationFilter">
+          <h2>interpolation with filter</h2>
+          <div ng-repeat="row in data">
+            <span ng-repeat="column in row">{{column.i | noop}}:{{column.j | noop}}|</span>
+          </div>
+        </div>
+      </ng-switch>
+    </div>
+  </div>
+</div>

benchmarks/orderby-bp/app.js

@@ -0,0 +1,48 @@
+var app = angular.module('orderByBenchmark', []);
+
+app.controller('DataController', function($rootScope, $scope) {
+  this.ngRepeatCount = 5000;
+  this.rows = [];
+  var self = this;
+
+  $scope.benchmarkType = 'basic';
+
+  $scope.rawProperty = function(key) {
+    return function(item) {
+      return item[key];
+    };
+  };
+
+  // Returns a random integer between min (included) and max (excluded)
+  function getRandomInt(min, max) {
+    return Math.floor(Math.random() * (max - min)) + min;
+  }
+
+  benchmarkSteps.push({
+    name: 'setup',
+    description: 'Set rows to empty array and apply, then push new rows to be applied in next step',
+    fn: function() {
+      var oldRows = self.rows;
+      $rootScope.$apply(function() {
+        self.rows = [];
+      });
+      self.rows = oldRows;
+      if (self.rows.length !== self.ngRepeatCount) {
+        self.rows = [];
+        for (var i = 0; i < self.ngRepeatCount; i++) {
+          self.rows.push({
+            'name': getRandomInt(i, (i + 40)),
+            'index': i
+          });
+        }
+      }
+    }
+  })
+
+  benchmarkSteps.push({
+    name: '$apply',
+    fn: function() {
+      $rootScope.$apply();
+    }
+  });
+});

benchmarks/orderby-bp/bp.conf.js

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

benchmarks/orderby-bp/main.html

@@ -0,0 +1,82 @@
+<div class="container-fluid" ng-app="orderByBenchmark">
+  <div class="row" ng-controller="DataController as ctrl">
+    <div class="col-lg-8">
+      <p>Filters</p>
+
+      <p>
+        <label>Number of ngRepeats:</label>
+        <input type="number" ng-model="ctrl.ngRepeatCount">
+      </p>
+
+      <p>
+        <div class="radio">
+          <label>
+            <input type="radio" ng-model="benchmarkType" value="baseline">baseline
+          </label>
+        </div>
+        <pre><code>ng-repeat="row in ctrl.rows"</code></pre>
+        <br />
+        <div class="radio">
+          <label>
+            <input type="radio" ng-model="benchmarkType" value="orderBy">orderBy
+          </label>
+        </div>
+        <pre><code>ng-repeat="row in ctrl.rows | orderBy:'name'"</code></pre>
+        <br />
+        <div class="radio">
+          <label>
+            <input type="radio" ng-model="benchmarkType" value="orderByArray">orderBy array expression
+          </label>
+        </div>
+        <pre><code>ng-repeat="row in ctrl.rows | orderBy:['name', 'index']"</code></pre>
+        <br />
+        <div class="radio">
+          <label>
+            <input type="radio" ng-model="benchmarkType"
+            value="orderByFunction">orderBy function expression
+          </label>
+        </div>
+        <pre><code>ng-repeat="row in ctrl.rows | orderBy:rawProperty('name')"</code></pre>
+        <br />
+        <div class="radio">
+          <label>
+            <input type="radio" ng-model="benchmarkType"
+            value="orderByArrayFunction">orderBy array function expression
+          </label>
+        </div>
+        <pre><code>ng-repeat="row in ctrl.rows | orderBy:[rawProperty('name'), rawProperty('index')]"</code></pre>
+      </p>
+
+
+      Debug output:
+      <ng-switch on="benchmarkType">
+        <div ng-switch-when="baseline">
+          <span ng-repeat="row in ctrl.rows">
+            <span ng-bind="row.name"></span>,
+          </span>
+        </div>
+        <div ng-switch-when="orderBy">
+          <span ng-repeat="row in ctrl.rows | orderBy:'name'">
+            <span ng-bind="row.name"></span>,
+          </span>
+        </div>
+        <div ng-switch-when="orderByArray">
+          <span ng-repeat="row in ctrl.rows | orderBy:['name', 'index']">
+            <span ng-bind="row.name"></span>,
+          </span>
+        </div>
+        <div ng-switch-when="orderByFunction">
+          <span ng-repeat="row in ctrl.rows | orderBy:rawProperty('name')">
+            <span ng-bind="row.name"></span>,
+          </span>
+        </div>
+        <div ng-switch-when="orderByArrayFunction">
+          <span ng-repeat="row in ctrl.rows | orderBy:[rawProperty('name'), rawProperty('index')]">
+            <span ng-bind="row.name"></span>,
+          </span>
+        </div>
+      </ng-switch>
+
+    </div>
+  </div>
+</div>

benchmarks/parsed-expressions-bp/app.js

@@ -0,0 +1,86 @@
+var app = angular.module('parsedExpressionBenchmark', []);
+
+app.config(function($compileProvider) {
+  if ($compileProvider.debugInfoEnabled) {
+    $compileProvider.debugInfoEnabled(false);
+  }
+});
+
+app.filter('noop', function() {
+  return function(input) {
+    return input;
+  };
+});
+
+//Executes the specified expression as a watcher
+app.directive('bmPeWatch', function() {
+  return {
+    restrict: 'A',
+    compile: function($element, $attrs) {
+      $element.text( $attrs.bmPeWatch );
+      return function($scope, $element, $attrs) {
+        $scope.$watch($attrs.bmPeWatch, function(val) {
+          $element.text(val);
+
+        });
+      };
+    }
+  };
+});
+
+//Executes the specified expression as a watcher
+//Adds a simple wrapper method to allow use of $watch instead of $watchCollection
+app.directive('bmPeWatchLiteral', function($parse) {
+  function retZero() {
+    return 0;
+  }
+
+  return {
+    restrict: 'A',
+    compile: function($element, $attrs) {
+      $element.text( $attrs.bmPeWatchLiteral );
+      return function($scope, $element, $attrs) {
+        $scope.$watch( $parse($attrs.bmPeWatchLiteral, retZero) );
+      };
+    }
+  };
+});
+
+app.controller('DataController', function($scope, $rootScope) {
+  var totalRows = 10000;
+
+  var data = $scope.data = [];
+
+  var star = '*';
+
+  $scope.func = function() { return star;};
+
+  for (var i=0; i<totalRows; i++) {
+    data.push({
+      index: i,
+      odd:   i%2 === 0,
+      even:  i%2 === 1,
+      str0: "foo-" + Math.random()*Date.now(),
+      str1: "bar-" + Math.random()*Date.now(),
+      str2: "baz-" + Math.random()*Date.now(),
+      num0:  Math.random()*Date.now(),
+      num1:  Math.random()*Date.now(),
+      num2:  Math.random()*Date.now(),
+      date0: new Date(Math.random()*Date.now()),
+      date1: new Date(Math.random()*Date.now()),
+      date2: new Date(Math.random()*Date.now()),
+      func: function(){ return star; },
+      obj: data[i-1],
+      keys: data[i-1] && (data[i-1].keys || Object.keys(data[i-1]))
+    });
+  }
+
+  benchmarkSteps.push({
+    name: '$apply',
+    fn: function() {
+      for (var i=0; i<50; i++) {
+        $rootScope.$digest();
+      }
+    }
+  });
+});

benchmarks/parsed-expressions-bp/bp.conf.js

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

benchmarks/parsed-expressions-bp/main.html

@@ -0,0 +1,209 @@
+<div ng-app="parsedExpressionBenchmark" ng-cloak>
+  <div ng-controller="DataController">
+    <div class="container-fluid">
+      <p>
+        Tests the execution of $parse()ed expressions. Each test tries to isolate specific expression types. Expressions should (probably) not be constant so they get evaluated per digest.
+      </p>
+
+      <ul style="list-style:none">
+        <li>
+          <input type="radio" ng-model="expressionType" value="simplePath" id="simplePath">
+          <label for="simplePath">Simple Paths</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="complexPath" id="complexPath">
+          <label for="complexPath">Complex Paths</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="fieldAccess" id="fieldAccess">
+          <label for="fieldAccess">Field Accessors</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="fieldIndex" id="fieldIndex">
+          <label for="fieldIndex">Field Indexes</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="operators" id="operators">
+          <label for="operators">Binary/Unary operators</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="shortCircuitingOperators" id="shortCircuitingOperators">
+          <label for="shortCircuitingOperators">AND/OR short-circuiting operators</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="filters" id="filters">
+          <label for="filters">Filters</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="functionCalls" id="functionCalls">
+          <label for="functionCalls">Function calls</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="objectLiterals" id="objectLiterals">
+          <label for="objectLiterals">Object Literals</label>
+        </li>
+
+        <li>
+          <input type="radio" ng-model="expressionType" value="arrayLiterals" id="arrayLiterals">
+          <label for="arrayLiterals">Array Literals</label>
+        </li>
+      </ul>
+
+      <!--
+        NOTES:
+          - ensure each tested expression has at least one variable in it to avoid constant expressions
+      -->
+
+      <ul ng-switch="expressionType">
+        <li ng-switch-when="simplePath" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="rowIdx"></span>
+          <span bm-pe-watch="row.index"></span>
+          <span bm-pe-watch="row.num0"></span>
+          <span bm-pe-watch="row.num1"></span>
+          <span bm-pe-watch="row.num2"></span>
+          <span bm-pe-watch="row.str0"></span>
+          <span bm-pe-watch="row.str1"></span>
+          <span bm-pe-watch="row.str2"></span>
+          <span bm-pe-watch="row.date0"></span>
+          <span bm-pe-watch="row.obj"></span>
+          <span bm-pe-watch="row.keys"></span>
+        </li>
+
+        <li ng-switch-when="complexPath" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="row.index"></span>
+          <span bm-pe-watch="row.num0"></span>
+          <span bm-pe-watch="row.num1"></span>
+          <span bm-pe-watch="row.str0"></span>
+          <span bm-pe-watch="row.str1"></span>
+          <span bm-pe-watch="row.obj.index"></span>
+          <span bm-pe-watch="row.obj.index"></span>
+          <span bm-pe-watch="row.obj.index"></span>
+          <span bm-pe-watch="row.obj.obj.index"></span>
+          <span bm-pe-watch="row.obj.obj.index"></span>
+          <span bm-pe-watch="row.obj.obj.obj.index"></span>
+          <span bm-pe-watch="row.obj.obj.obj.index"></span>
+        </li>
+
+        <li ng-switch-when="fieldAccess" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="data[rowIdx].index"></span>
+          <span bm-pe-watch="data[rowIdx].num0"></span>
+          <span bm-pe-watch="data[rowIdx].num1"></span>
+          <span bm-pe-watch="data[rowIdx].str0"></span>
+          <span bm-pe-watch="data[rowIdx].str1"></span>
+          <span bm-pe-watch="data[rowIdx].obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.obj.obj.index"></span>
+          <span bm-pe-watch="data[rowIdx].obj.obj.obj.index"></span>
+        </li>
+
+        <li ng-switch-when="fieldIndex" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="data[rowIdx]"></span>
+          <span bm-pe-watch="row['str0']"></span>
+          <span bm-pe-watch="row['str1']"></span>
+          <span bm-pe-watch="data[row['index']]['index']"></span>
+          <span bm-pe-watch="data[rowIdx]['obj']"></span>
+          <span bm-pe-watch="data[rowIdx]['obj']['obj']"></span>
+          <span bm-pe-watch="row[row['keys'][0]]"></span>
+          <span bm-pe-watch="row[row['keys'][1]]"></span>
+          <span bm-pe-watch="row[row['keys'][2]]"></span>
+          <span bm-pe-watch="row[row['keys'][3]]"></span>
+          <span bm-pe-watch="row[row['keys'][4]]"></span>
+          <span bm-pe-watch="row[row['keys'][5]]"></span>
+
+        </li>
+
+        <li ng-switch-when="operators" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="+rowIdx"></span>
+          <span bm-pe-watch="-rowIdx"></span>
+          <span bm-pe-watch="rowIdx + 1"></span>
+          <span bm-pe-watch="rowIdx - 1"></span>
+          <span bm-pe-watch="rowIdx * 2"></span>
+          <span bm-pe-watch="rowIdx + -1"></span>
+          <span bm-pe-watch="rowIdx - -1"></span>
+          <span bm-pe-watch="-rowIdx * 2 + 1"></span>
+          <span bm-pe-watch="rowIdx % 2"></span>
+          <span bm-pe-watch="rowIdx % 2 === 1"></span>
+          <span bm-pe-watch="rowIdx % 2 === 0"></span>
+          <span bm-pe-watch="rowIdx / 1"></span>
+          <span bm-pe-watch="-rowIdx * 2 * rowIdx + rowIdx / rowIdx + 1"></span>
+        </li>
+
+        <li ng-switch-when="shortCircuitingOperators" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="rowIdx && row.odd"></span>
+          <span bm-pe-watch="row.odd && row.even"></span>
+          <span bm-pe-watch="row.odd && !row.even"></span>
+          <span bm-pe-watch="row.odd || row.even"></span>
+          <span bm-pe-watch="row.odd || row.even || row.index"></span>
+          <span bm-pe-watch="row.index === 1 || row.index === 2"></span>
+          <span bm-pe-watch="row.num0 < row.num1 && row.num1 < row.num2"></span>
+          <span bm-pe-watch="row.num0 < row.num1 || row.num1 < row.num2"></span>
+        </li>
+
+        <li ng-switch-when="filters" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="rowIdx | noop"></span>
+          <span bm-pe-watch="rowIdx | noop"></span>
+          <span bm-pe-watch="rowIdx | noop"></span>
+          <span bm-pe-watch="rowIdx | noop:1"></span>
+          <span bm-pe-watch="rowIdx | noop:rowIdx"></span>
+          <span bm-pe-watch="rowIdx | noop:1:2:3:4:5"></span>
+          <span bm-pe-watch="rowIdx | noop:rowIdx:rowIdx:rowIdx"></span>
+          <span bm-pe-watch="rowIdx | noop | noop"></span>
+          <span bm-pe-watch="rowIdx | noop:1 | noop"></span>
+          <span bm-pe-watch="rowIdx | noop | noop:null:undefined:0"></span>
+          <span bm-pe-watch="rowIdx | noop | noop | noop"></span>
+          <span bm-pe-watch="rowIdx | noop:1 | noop:2 | noop:3"></span>
+        </li>
+
+        <li ng-switch-when="functionCalls" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch="func()"></span>
+          <span bm-pe-watch="func(1)"></span>
+          <span bm-pe-watch="func(1, 2)"></span>
+          <span bm-pe-watch="func(1, 2, 3)"></span>
+          <span bm-pe-watch="row.func()"></span>
+          <span bm-pe-watch="row.func(1)"></span>
+          <span bm-pe-watch="row.func(1, 2)"></span>
+          <span bm-pe-watch="row.func(1, 2, 3)"></span>
+          <span bm-pe-watch="func(func())"></span>
+          <span bm-pe-watch="func(func(), func())"></span>
+          <span bm-pe-watch="row.func(row.func())"></span>
+          <span bm-pe-watch="row.func(row.func(), row.func())"></span>
+        </li>
+
+        <li ng-switch-when="objectLiterals" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch-literal="{foo: rowIdx}"></span>
+          <span bm-pe-watch-literal="{foo: row, bar: rowIdx}"></span>
+          <span bm-pe-watch-literal="{0: row, 1: rowIdx, 2: 3}"></span>
+          <span bm-pe-watch-literal="{str: 'foo', num: rowIdx, b: true}"></span>
+          <span bm-pe-watch-literal="{a: {b: {c: {d: {e: {f: rowIdx}}}}}}"></span>
+          <span bm-pe-watch-literal="{a: rowIdx, b: 1, c: 2, d: 3, e: 4, f: 5, g: rowIdx, h: 6, i: 7, j: 8, k: rowIdx}"></span>
+        </li>
+
+        <li ng-switch-when="arrayLiterals" ng-repeat="(rowIdx, row) in ::data">
+          <span bm-pe-watch-literal="[rowIdx]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2]"></span>
+          <span bm-pe-watch-literal="[rowIdx, 0, 1, 2, 3]"></span>
+          <span bm-pe-watch-literal="[[], [rowIdx], [], [], [3], [[[]]]]"></span>
+          <span bm-pe-watch-literal="[rowIdx, undefined, null, true, false]"></span>
+          <span bm-pe-watch-literal="[[][0], [0][0], [][rowIdx]]"></span>
+          <span bm-pe-watch-literal="[0, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, rowIdx]"></span>
+          <span bm-pe-watch-literal="[0, 1, 2, 3, rowIdx]"></span>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>

bower.json

@@ -2,11 +2,7 @@
   "name": "AngularJS",
   "devDependencies": {
     "jquery": "2.1.1",
-    "lunr.js": "0.4.3",
-    "open-sans-fontface": "1.0.4",
-    "google-code-prettify": "1.0.1",
-    "closure-compiler": "https://closure-compiler.googlecode.com/files/compiler-20130603.zip",
-    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip",
-    "bootstrap": "3.1.1"
+    "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }
 }

compare-master-to-stable.js

@@ -145,7 +145,7 @@ then(allInSeries(function (branch) {
         line = line.split(' ');
         var sha = line.shift();
         var msg = line.join(' ');
-        return sha + (msg.toLowerCase().indexOf('fix') === -1 ? '   ' : ' * ') + msg;
+        return sha + ((/fix\([^\)]+\):/i.test(msg))  ? ' * ' : '   ') + msg;
       });
       branch.log = log.map(function (line) {
         return line.substr(41);

docs/app/assets/css/docs.css

@@ -316,10 +316,10 @@ iframe.example {
 }
 
 .search-results-group.col-group-api { width:30%; }
-.search-results-group.col-group-guide { width:30%; }
-.search-results-group.col-group-tutorial { width:25%; }
+.search-results-group.col-group-guide,
+.search-results-group.col-group-tutorial { width:20%; }
 .search-results-group.col-group-misc,
-.search-results-group.col-group-error { float:right; clear:both; width:15% }
+.search-results-group.col-group-error { width:15%; float: right; }
 
 
 .search-results-group.col-group-api .search-result {
@@ -391,7 +391,6 @@ iframe.example {
   position:fixed;
   top:120px;
   bottom:0;
-  padding-bottom:120px;
   overflow:auto;
 }
 
@@ -412,6 +411,7 @@ iframe.example {
 
 .main-body-grid .side-navigation {
   position:relative;
+  padding-bottom:120px;
 }
 
 .main-body-grid .side-navigation.ng-hide {
@@ -635,12 +635,14 @@ ul.events > li {
     display:inline-block;
     padding:3px 0;
   }
-  .nav-index-group .nav-index-listing:not(.nav-index-section) + .nav-index-listing:not(.nav-index-section):after {
-      padding-right:5px;
-      content:",  ";
+  .nav-index-group .nav-index-listing:not(.nav-index-section):after {
+    padding-right:5px;
+    margin-left:-3px;
+    content:",  ";
   }
-  .nav-index-group .nav-index-listing:last-child {
+  .nav-index-group .nav-index-listing:last-child:after {
     content:"";
+    display:inline-block;
   }
   .nav-index-group .nav-index-section {
     display:block;

docs/app/assets/css/prettify-theme.css

@@ -6,6 +6,10 @@
   line-height: 1.5;
 }
 
+.lang-text * {
+  color: #333333!important;
+}
+
 .pln {
   color: #333333;
 }

docs/app/assets/js/search-worker.js

@@ -0,0 +1,44 @@
+"use strict";
+/* jshint browser: true */
+/* global importScripts, onmessage: true, postMessage, lunr */
+
+// Load up the lunr library
+importScripts('../components/lunr.js-0.4.2/lunr.min.js');
+
+// Create the lunr index - the docs should be an array of object, each object containing
+// the path and search terms for a page
+var index = lunr(function() {
+  this.ref('path');
+  this.field('titleWords', {boost: 50});
+  this.field('members', { boost: 40});
+  this.field('keywords', { boost : 20 });
+});
+
+// Retrieve the searchData which contains the information about each page to be indexed
+var searchData = {};
+var searchDataRequest = new XMLHttpRequest();
+searchDataRequest.onload = function() {
+
+  // Store the pages data to be used in mapping query results back to pages
+  searchData = JSON.parse(this.responseText);
+  // Add search terms from each page to the search index
+  searchData.forEach(function(page) {
+    index.add(page);
+  });
+  postMessage({ e: 'index-ready' });
+};
+searchDataRequest.open('GET', 'search-data.json');
+searchDataRequest.send();
+
+// The worker receives a message everytime the web app wants to query the index
+onmessage = function(oEvent) {
+  var q = oEvent.data.q;
+  var hits = index.search(q);
+  var results = [];
+  // Only return the array of paths to pages
+  hits.forEach(function(hit) {
+    results.push(hit.ref);
+  });
+  // The results of the query are sent back to the web app via a new message
+  postMessage({ e: 'query-ready', q: q, d: results });
+};

docs/app/e2e/.jshintrc

@@ -0,0 +1,42 @@
+{
+  "extends": "../../../.jshintrc-base",
+
+  "globals": {
+
+    /* jasmine / karma */
+    "it": false,
+    "iit": false,
+    "describe": false,
+    "ddescribe": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "expect": false,
+    "jasmine": false,
+    "spyOn": false,
+    "waits": false,
+    "waitsFor": false,
+    "runs": false,
+    "dump": false,
+
+    /* e2e */
+    "browser": false,
+    "element": false,
+    "by": false,
+
+    /* testabilityPatch / matchers */
+    "inject": false,
+    "module": false,
+    "dealoc": false,
+    "_jQuery": false,
+    "_jqLiteMode": false,
+    "sortedHtml": false,
+    "childrenTagsOf": false,
+    "assertHidden": false,
+    "assertVisible": false,
+    "provideLog": false,
+    "spyOnlyCallsWithArgs": false,
+    "createMockStyleSheet": false,
+    "browserTrigger": false,
+    "jqLiteCacheSize": false
+  }
+}

docs/app/e2e/api-docs/api-pages.scenario.js

@@ -0,0 +1,51 @@
+'use strict';
+
+describe("doc.angularjs.org", function() {
+
+  describe("API pages", function() {
+
+    it("should display links to code on GitHub", function() {
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.improve-docs')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/edit\/.+\/src\/ng\/http\.js/);
+
+      browser.get('index-debug.html#!/api/ng/service/$http');
+      expect(element(by.css('.view-source')).getAttribute('href')).toMatch(/https?:\/\/github\.com\/angular\/angular\.js\/tree\/.+\/src\/ng\/http\.js#L\d+/);
+    });
+
+    it('should change the page content when clicking a link to a service', function () {
+      browser.get('');
+
+      var ngBindLink = element(by.css('.definition-table td a[href="api/ng/directive/ngClick"]'));
+      ngBindLink.click();
+
+      var pageBody = element(by.css('h1'));
+      expect(pageBody.getText()).toEqual('ngClick');
+    });
+
+
+    it('should show the functioning input directive example', function () {
+      browser.get('index-debug.html#!/api/ng/directive/input');
+
+      // Ensure that the page is loaded before trying to switch frames.
+      browser.waitForAngular();
+
+      browser.switchTo().frame('example-input-directive');
+
+      var nameInput = element(by.model('user.name'));
+      nameInput.sendKeys('!!!');
+
+      var code = element.all(by.css('tt')).first();
+      expect(code.getText()).toContain('guest!!!');
+    });
+
+    it("should trim indentation from code blocks", function() {
+      browser.get('index-debug.html#!/api/ng/type/$rootScope.Scope');
+
+      var codeBlocks = element.all(by.css('pre > code.lang-js'));
+      codeBlocks.each(function(codeBlock) {
+        var firstSpan = codeBlock.all(by.css('span')).first();
+        expect(firstSpan.getText()).not.toMatch(/^\W+$/);
+      });
+    });
+  });
+});

docs/app/e2e/api-docs/provider-pages.scenario.js

@@ -0,0 +1,12 @@
+'use strict';
+
+describe("provider pages", function() {
+
+  it("should show the related service", function() {
+    browser.get('index-debug.html#!/api/ng/provider/$compileProvider');
+    var serviceLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(serviceLink.getText()).toEqual('- $compile');
+    expect(serviceLink.getAttribute('href')).toMatch(/api\/ng\/service\/\$compile/);
+  });
+
+});

docs/app/e2e/api-docs/service-pages.scenario.js

@@ -0,0 +1,22 @@
+'use strict';
+
+describe("service pages", function() {
+
+  it("should show the related provider if there is one", function() {
+    browser.get('index-debug.html#!/api/ng/service/$compile');
+    var providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).toEqual('- $compileProvider');
+    expect(providerLink.getAttribute('href')).toMatch(/api\/ng\/provider\/\$compileProvider/);
+
+    browser.get('index-debug.html#!/api/ng/service/$q');
+    providerLink = element.all(by.css('ol.api-profile-header-structure li a')).first();
+    expect(providerLink.getText()).not.toEqual('- $qProvider');
+    expect(providerLink.getAttribute('href')).not.toMatch(/api\/ng\/provider\/\$compileProvider/);
+  });
+
+  it("should show parameter defaults", function() {
+    browser.get('index-debug.html#!/api/ng/service/$timeout');
+    expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+  });
+
+});

docs/app/e2e/app.scenario.js

@@ -1,6 +1,29 @@
 'use strict';
 
+var webdriver = require('protractor/node_modules/selenium-webdriver');
+
 describe('docs.angularjs.org', function () {
+
+  beforeEach(function() {
+    // read and clear logs from previous tests
+    browser.manage().logs().get('browser');
+  });
+
+
+  afterEach(function() {
+    // verify that there were no console errors in the browser
+    browser.manage().logs().get('browser').then(function(browserLog) {
+      var filteredLog = browserLog.filter(function(logEntry) {
+        return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+      });
+      expect(filteredLog.length).toEqual(0);
+      if (filteredLog.length) {
+        console.log('browser console errors: ' + require('util').inspect(filteredLog));
+      }
+    });
+  });
+
+
   describe('App', function () {
     // it('should filter the module list when searching', function () {
     //   browser.get();
@@ -26,21 +49,6 @@ describe('docs.angularjs.org', function () {
     });
 
 
-    it('should show the functioning input directive example', function () {
-      browser.get('index-debug.html#!/api/ng/directive/input');
-
-      // Ensure that the page is loaded before trying to switch frames.
-      browser.waitForAngular();
-
-      browser.switchTo().frame('example-input-directive');
-
-      var nameInput = element(by.model('user.name'));
-      nameInput.sendKeys('!!!');
-
-      var code = element.all(by.css('tt')).first();
-      expect(code.getText()).toContain('guest!!!');
-    });
-
 
     it('should be resilient to trailing slashes', function() {
       browser.get('index-debug.html#!/api/ng/function/angular.noop/');
@@ -67,12 +75,15 @@ describe('docs.angularjs.org', function () {
       browser.get('index-debug.html#!error/ng/areq?p0=Missing&p1=not%20a%20function,%20got%20undefined');
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
+
+
   });
 
-  describe("templates", function() {
-    it("should show parameter defaults", function() {
-      browser.get('index-debug.html#!/api/ng/service/$timeout');
-      expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
-    });
-  });
 });
+
+describe('Error Handling', function() {
+  it("should display an error if the page does not exist", function() {
+    browser.get('index-debug.html#!/api/does/not/exist');
+    expect(element(by.css('h1')).getText()).toBe('Oops!');
+  });
+});

docs/app/src/app.js

@@ -6,6 +6,7 @@ angular.module('docsApp', [
   'DocsController',
   'versionsData',
   'pagesData',
+  'navData',
   'directives',
   'errors',
   'examples',

docs/app/src/docs.js

@@ -6,87 +6,39 @@ angular.module('DocsController', [])
   function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
               NG_PAGES, NG_NAVIGATION, NG_VERSION) {
 
-
   $scope.openPlunkr = openPlunkr;
 
   $scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;
 
-  $scope.fold = function(url) {
-    if(url) {
-      $scope.docs_fold = '/notes/' + url;
-      if(/\/build/.test($window.location.href)) {
-        $scope.docs_fold = '/build/docs' + $scope.docs_fold;
-      }
-      window.scrollTo(0,0);
-    }
-    else {
-      $scope.docs_fold = null;
-    }
-  };
-  var OFFLINE_COOKIE_NAME = 'ng-offline',
-      INDEX_PATH = /^(\/|\/index[^\.]*.html)$/;
-
-
-  /**********************************
-   Publish methods
-   ***********************************/
-
   $scope.navClass = function(navItem) {
     return {
-      active: navItem.href && this.currentPage.path,
+      active: navItem.href && this.currentPage && this.currentPage.path,
       'nav-index-section': navItem.type === 'section'
     };
   };
 
-  $scope.afterPartialLoaded = function() {
+
+
+  $scope.$on('$includeContentLoaded', function() {
     var pagePath = $scope.currentPage ? $scope.currentPage.path : $location.path();
     $window._gaq.push(['_trackPageview', pagePath]);
-  };
+  });
 
-  /** stores a cookie that is used by apache to decide which manifest ot send */
-  $scope.enableOffline = function() {
-    //The cookie will be good for one year!
-    var date = new Date();
-    date.setTime(date.getTime()+(365*24*60*60*1000));
-    var expires = "; expires="+date.toGMTString();
-    var value = angular.version.full;
-    document.cookie = OFFLINE_COOKIE_NAME + "="+value+expires+"; path=" + $location.path;
-
-    //force the page to reload so server can serve new manifest file
-    window.location.reload(true);
-  };
-
-
-
-  /**********************************
-   Watches
-   ***********************************/
+  $scope.$on('$includeContentError', function() {
+    $scope.partialPath = 'Error404.html';
+  });
 
 
   $scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
 
-    var currentPage = $scope.currentPage = NG_PAGES[path];
-    if ( !currentPage && path.charAt(0)==='/' ) {
-      // Strip off leading slash
-      path = path.substr(1);
-    }
+    path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
 
-    currentPage = $scope.currentPage = NG_PAGES[path];
-    if ( !currentPage && path.charAt(path.length-1) === '/' && path.length > 1 ) {
-      // Strip off trailing slash
-      path = path.substr(0, path.length-1);
-    }
-
-    currentPage = $scope.currentPage = NG_PAGES[path];
-    if ( !currentPage && /\/index$/.test(path) ) {
-      // Strip off index from the end
-      path = path.substr(0, path.length - 6);
-    }
+    $scope.partialPath = 'partials/' + path + '.html';
 
     currentPage = $scope.currentPage = NG_PAGES[path];
 
     if ( currentPage ) {
-      $scope.currentArea = currentPage && NG_NAVIGATION[currentPage.area];
+      $scope.currentArea = NG_NAVIGATION[currentPage.area];
       var pathParts = currentPage.path.split('/');
       var breadcrumb = $scope.breadcrumb = [];
       var breadcrumbPath = '';
@@ -107,24 +59,12 @@ angular.module('DocsController', [])
 
   $scope.versionNumber = angular.version.full;
   $scope.version = angular.version.full + "  " + angular.version.codeName;
-  $scope.subpage = false;
-  $scope.offlineEnabled = ($cookies[OFFLINE_COOKIE_NAME] == angular.version.full);
-  $scope.futurePartialTitle = null;
   $scope.loading = 0;
-  $scope.$cookies = $cookies;
 
-  $cookies.platformPreference = $cookies.platformPreference || 'gitUnix';
 
+  var INDEX_PATH = /^(\/|\/index[^\.]*.html)$/;
   if (!$location.path() || INDEX_PATH.test($location.path())) {
     $location.path('/api').replace();
   }
 
-  // bind escape to hash reset callback
-  angular.element(window).on('keydown', function(e) {
-    if (e.keyCode === 27) {
-      $scope.$apply(function() {
-        $scope.subpage = false;
-      });
-    }
-  });
 }]);

docs/app/src/navigationService.js

@@ -1,24 +0,0 @@
-angular.module('docsApp.navigationService', [])
-
-.factory('navigationService', function($window) {
-  var service = {
-    currentPage: null,
-    currentVersion: null,
-    changePage: function(newPage) {
-
-    },
-    changeVersion: function(newVersion) {
-
-      //TODO =========
-    //   var currentPagePath = '';
-
-    // // preserve URL path when switching between doc versions
-    // if (angular.isObject($rootScope.currentPage) && $rootScope.currentPage.section && $rootScope.currentPage.id) {
-    //   currentPagePath = '/' + $rootScope.currentPage.section + '/' + $rootScope.currentPage.id;
-    // }
-
-    // $window.location = version.url + currentPagePath;
-
-    }
-  };
-});

docs/app/src/search.js

@@ -10,22 +10,35 @@ angular.module('search', [])
   $scope.search = function(q) {
     var MIN_SEARCH_LENGTH = 2;
     if(q.length >= MIN_SEARCH_LENGTH) {
-      var results = docsSearch(q);
-      var totalAreas = 0;
-      for(var i in results) {
-        ++totalAreas;
-      }
-      if(totalAreas > 0) {
-        $scope.colClassName = 'cols-' + totalAreas;
-      }
-      $scope.hasResults = totalAreas > 0;
-      $scope.results = results;
+      docsSearch(q).then(function(hits) {
+        var results = {};
+        angular.forEach(hits, function(hit) {
+          var area = hit.area;
+
+          var limit = (area == 'api') ? 40 : 14;
+          results[area] = results[area] || [];
+          if(results[area].length < limit) {
+            results[area].push(hit);
+          }
+        });
+
+        var totalAreas = 0;
+        for(var i in results) {
+          ++totalAreas;
+        }
+        if(totalAreas > 0) {
+          $scope.colClassName = 'cols-' + totalAreas;
+        }
+        $scope.hasResults = totalAreas > 0;
+        $scope.results = results;
+      });
     }
     else {
       clearResults();
     }
     if(!$scope.$$phase) $scope.$apply();
   };
+
   $scope.submit = function() {
     var result;
     for(var i in $scope.results) {
@@ -39,76 +52,124 @@ angular.module('search', [])
       $scope.hideResults();
     }
   };
+
   $scope.hideResults = function() {
     clearResults();
     $scope.q = '';
   };
 }])
 
-.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch', function($scope, $location, docsSearch) {
-  $scope.results = docsSearch($location.path().split(/[\/\.:]/).pop());
+
+.controller('Error404SearchCtrl', ['$scope', '$location', 'docsSearch',
+        function($scope, $location, docsSearch) {
+  docsSearch($location.path().split(/[\/\.:]/).pop()).then(function(results) {
+    $scope.results = {};
+    angular.forEach(results, function(result) {
+      var area = $scope.results[result.area] || [];
+      area.push(result);
+      $scope.results[result.area] = area;
+    });
+  });
 }])
 
-.factory('lunrSearch', function() {
-  return function(properties) {
-    if (window.RUNNING_IN_NG_TEST_RUNNER) return null;
 
-    var engine = lunr(properties);
-    return {
-      store : function(values) {
-        engine.add(values);
-      },
-      search : function(q) {
-        return engine.search(q);
-      }
-    };
-  };
-})
+.provider('docsSearch', function() {
 
-.factory('docsSearch', ['$rootScope','lunrSearch', 'NG_PAGES',
-    function($rootScope, lunrSearch, NG_PAGES) {
-  if (window.RUNNING_IN_NG_TEST_RUNNER) {
-    return null;
-  }
+  // This version of the service builds the index in the current thread,
+  // which blocks rendering and other browser activities.
+  // It should only be used where the browser does not support WebWorkers
+  function localSearchFactory($http, $timeout, NG_PAGES) {
 
-  var index = lunrSearch(function() {
-    this.ref('id');
-    this.field('title', {boost: 50});
-    this.field('keywords', { boost : 20 });
-  });
+    console.log('Using Local Search Index');
 
-  angular.forEach(NG_PAGES, function(page, key) {
-    if(page.searchTerms) {
-      index.store({
-        id : key,
-        title : page.searchTerms.titleWords,
-        keywords : page.searchTerms.keywords
+    // Create the lunr index
+    var index = lunr(function() {
+      this.ref('path');
+      this.field('titleWords', {boost: 50});
+      this.field('members', { boost: 40});
+      this.field('keywords', { boost : 20 });
+    });
+
+    // Delay building the index by loading the data asynchronously
+    var indexReadyPromise = $http.get('js/search-data.json').then(function(response) {
+      var searchData = response.data;
+      // Delay building the index for 500ms to allow the page to render
+      return $timeout(function() {
+        // load the page data into the index
+        angular.forEach(searchData, function(page) {
+          index.add(page);
+        });
+      }, 500);
+    });
+
+    // The actual service is a function that takes a query string and
+    // returns a promise to the search results
+    // (In this case we just resolve the promise immediately as it is not
+    // inherently an async process)
+    return function(q) {
+      return indexReadyPromise.then(function() {
+        var hits = index.search(q);
+        var results = [];
+        angular.forEach(hits, function(hit) {
+          results.push(NG_PAGES[hit.ref]);
+        });
+        return results;
       });
     };
-  });
+  }
+  localSearchFactory.$inject = ['$http', '$timeout', 'NG_PAGES'];
 
-  return function(q) {
-    var results = {
-      api : [],
-      tutorial : [],
-      guide : [],
-      error : [],
-      misc : []
+  // This version of the service builds the index in a WebWorker,
+  // which does not block rendering and other browser activities.
+  // It should only be used where the browser does support WebWorkers
+  function webWorkerSearchFactory($q, $rootScope, NG_PAGES) {
+
+    console.log('Using WebWorker Search Index')
+
+    var searchIndex = $q.defer();
+    var results;
+
+    var worker = new Worker('js/search-worker.js');
+
+    // The worker will send us a message in two situations:
+    // - when the index has been built, ready to run a query
+    // - when it has completed a search query and the results are available
+    worker.onmessage = function(oEvent) {
+      $rootScope.$apply(function() {
+
+        switch(oEvent.data.e) {
+          case 'index-ready':
+            searchIndex.resolve();
+            break;
+          case 'query-ready':
+            var pages = oEvent.data.d.map(function(path) {
+              return NG_PAGES[path];
+            });
+            results.resolve(pages);
+            break;
+        }
+      });
     };
-    angular.forEach(index.search(q), function(result) {
-      var key = result.ref;
-      var item = NG_PAGES[key];
-      var area = item.area;
-      item.path = key;
 
-      var limit = area == 'api' ? 40 : 14;
-      if(results[area].length < limit) {
-        results[area].push(item);
-      }
-    });
-    return results;
+    // The actual service is a function that takes a query string and
+    // returns a promise to the search results
+    return function(q) {
+
+      // We only run the query once the index is ready
+      return searchIndex.promise.then(function() {
+
+        results = $q.defer();
+        worker.postMessage({ q: q });
+        return results.promise;
+      });
+    };
+  }
+  webWorkerSearchFactory.$inject = ['$q', '$rootScope', 'NG_PAGES'];
+
+  return {
+    $get: window.Worker ? webWorkerSearchFactory : localSearchFactory
   };
-}])
+})
 
 .directive('focused', function($timeout) {
   return function(scope, element, attrs) {

docs/app/test/docsSpec.js

@@ -19,7 +19,7 @@ describe("DocsController", function() {
     it("should update the Google Analytics with currentPage path if currentPage exists", inject(function($window) {
       $window._gaq = [];
       $scope.currentPage = { path: 'a/b/c' };
-      $scope.afterPartialLoaded();
+      $scope.$broadcast('$includeContentLoaded');
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'a/b/c']);
     }));
 
@@ -27,7 +27,7 @@ describe("DocsController", function() {
     it("should update the Google Analytics with $location.path if currentPage is missing", inject(function($window, $location) {
       $window._gaq = [];
       spyOn($location, 'path').andReturn('x/y/z');
-      $scope.afterPartialLoaded();
+      $scope.$broadcast('$includeContentLoaded');
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
     }));
   });

docs/bower.json

@@ -0,0 +1,10 @@
+{
+  "name": "AngularJS-docs-app",
+  "dependencies": {
+    "jquery": "2.1.1",
+    "lunr.js": "0.4.3",
+    "open-sans-fontface": "1.0.4",
+    "google-code-prettify": "1.0.1",
+    "bootstrap": "3.1.1"
+  }
+}

docs/config/index.js

@@ -1,43 +1,160 @@
-var _ = require('lodash');
+"use strict";
+
 var path = require('canonical-path');
 var packagePath = __dirname;
 
-var basePackage = require('dgeni-packages/ngdoc');
-var examplesPackage = require('dgeni-packages/examples');
+var Package = require('dgeni').Package;
 
-module.exports = function(config) {
+// Create and export a new Dgeni package called dgeni-example. This package depends upon
+// the jsdoc and nunjucks 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')
+])
 
-  config = basePackage(config);
-  config = examplesPackage(config);
 
-  config.append('processing.processors', [
-    require('./processors/git-data'),
-    require('./processors/error-docs'),
-    require('./processors/keywords'),
-    require('./processors/versions-data'),
-    require('./processors/pages-data'),
-    require('./processors/protractor-generate'),
-    require('./processors/index-page'),
-    require('./processors/debug-dump')
-  ]);
+.factory(require('./services/errorNamespaceMap'))
+.factory(require('./services/getMinerrInfo'))
+.factory(require('./services/getVersion'))
+.factory(require('./services/gitData'))
 
-  config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step')
-  ]);
+.factory(require('./services/deployments/debug'))
+.factory(require('./services/deployments/default'))
+.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/production'))
 
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
-  ]);
+.factory(require('./inline-tag-defs/type'))
 
-  config.append('processing.inlineTagDefinitions', [
-    require('./inline-tag-defs/type')
-  ]);
 
-  config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));
+.processor(require('./processors/error-docs'))
+.processor(require('./processors/index-page'))
+.processor(require('./processors/keywords'))
+.processor(require('./processors/pages-data'))
+.processor(require('./processors/versions-data'))
 
-  config.prepend('rendering.templateFolders', [
-    path.resolve(packagePath, 'templates')
-  ]);
 
-  return config;
-};
+.config(function(dgeni, log, readFilesProcessor, writeFilesProcessor) {
+
+  dgeni.stopOnValidationError = true;
+  dgeni.stopOnProcessingError = true;
+
+  log.level = 'info';
+
+  readFilesProcessor.basePath = path.resolve(__dirname,'../..');
+  readFilesProcessor.sourceFiles = [
+    { include: 'src/**/*.js', basePath: 'src' },
+    { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' }
+  ];
+
+  writeFilesProcessor.outputFolder = 'build/docs';
+
+})
+
+
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/tutorial-step'));
+  parseTagsProcessor.tagDefinitions.push(require('./tag-defs/sortOrder'));
+})
+
+
+.config(function(inlineTagProcessor, typeInlineTagDef) {
+  inlineTagProcessor.inlineTagDefinitions.push(typeInlineTagDef);
+})
+
+
+.config(function(templateFinder, renderDocsProcessor, gitData) {
+  templateFinder.templateFolders.unshift(path.resolve(packagePath, 'templates'));
+  renderDocsProcessor.extraData.git = gitData;
+})
+
+
+.config(function(computePathsProcessor, computeIdsProcessor) {
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['error'],
+    pathTemplate: 'error/${namespace}/${name}',
+    outputPathTemplate: 'partials/error/${namespace}/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['errorNamespace'],
+    pathTemplate: 'error/${name}',
+    outputPathTemplate: 'partials/error/${name}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['overview', 'tutorial'],
+    getPath: function(doc) {
+      var docPath = path.dirname(doc.fileInfo.relativePath);
+      if ( doc.fileInfo.baseName !== 'index' ) {
+        docPath = path.join(docPath, doc.fileInfo.baseName);
+      }
+      return docPath;
+    },
+    outputPathTemplate: 'partials/${path}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['e2e-test'],
+    getPath: function() {},
+    outputPathTemplate: 'ptore2e/${example.id}/${deployment.name}_test.js'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['indexPage'],
+    getPath: function() {},
+    outputPathTemplate: '${id}.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['module' ],
+    pathTemplate: '${area}/${name}',
+    outputPathTemplate: 'partials/${area}/${name}.html'
+  });
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['componentGroup' ],
+    pathTemplate: '${area}/${moduleName}/${groupType}',
+    outputPathTemplate: 'partials/${area}/${moduleName}/${groupType}.html'
+  });
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['overview', 'tutorial', 'e2e-test', 'indexPage'],
+    getId: function(doc) { return doc.fileInfo.baseName; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['error', 'errorNamespace'],
+    getId: function(doc) { return 'error:' + doc.name; },
+    getAliases: function(doc) { return [doc.id]; }
+  });
+})
+
+
+.config(function(
+  generateIndexPagesProcessor,
+  generateProtractorTestsProcessor,
+  generateExamplesProcessor,
+  debugDeployment, defaultDeployment,
+  jqueryDeployment, productionDeployment) {
+
+  generateIndexPagesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+
+  generateProtractorTestsProcessor.deployments = [
+    defaultDeployment,
+    jqueryDeployment
+  ];
+
+  generateExamplesProcessor.deployments = [
+    debugDeployment,
+    defaultDeployment,
+    jqueryDeployment,
+    productionDeployment
+  ];
+});

docs/config/inline-tag-defs/type.js

@@ -1,12 +1,17 @@
-var typeClassFilter = require('dgeni-packages/ngdoc/rendering/filters/type-class');
+"use strict";
+
 var encoder = new require('node-html-encoder').Encoder();
 
-module.exports = {
-  name: 'type',
-  description: 'Replace with markup that displays a nice type',
-  handlerFactory: function() {
-    return function(doc, tagName, tagDescription) {
-      return '<a href="" class="' + typeClassFilter.process(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
-    };
-  }
-};
+/**
+ * @dgService typeInlineTagDef
+ * @description
+ * Replace with markup that displays a nice type
+ */
+module.exports = function typeInlineTagDef(getTypeClass) {
+  return {
+    name: 'type',
+    handler: function(doc, tagName, tagDescription) {
+      return '<a href="" class="' + getTypeClass(tagDescription) + '">'+encoder.htmlEncode(tagDescription) + '</a>';
+    }
+  };
+};

docs/config/processors/debug-dump.js

@@ -1,33 +0,0 @@
-var fs = require('q-io/fs');
-var log = require('winston');
-var util = require("util");
-
-module.exports = {
-  name: 'debug-dump',
-  runBefore: ['write-files'],
-  description: 'This processor dumps docs that match a filter to a file',
-  process: function(docs, config) {
-
-    var filter, outputPath, depth;
-
-    filter = config.get('processing.debug-dump.filter');
-    outputPath = config.get('processing.debug-dump.outputPath');
-    depth = config.get('processing.debug-dump.depth', 2);
-
-
-    if ( filter && outputPath ) {
-      log.info('Dumping docs:', filter, outputPath);
-      var filteredDocs = filter(docs);
-      var dumpedDocs = util.inspect(filteredDocs, depth);
-      return writeFile(outputPath, dumpedDocs).then(function() {
-        return docs;
-      });
-    }
-  }
-};
-
-function writeFile(file, content) {
-  return fs.makeTree(fs.directory(file)).then(function() {
-    return fs.write(file, content, 'wb');
-  });
-}

docs/config/processors/error-docs.js

@@ -1,59 +1,52 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'error-docs',
-  description: 'Compute the various fields for docs in the Error area',
-  runAfter: ['tags-extracted', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  exports: {
-    errorNamespaces: ['factory', function() { return {}; }],
-    minerrInfo: ['factory', function(config) {
-      var minerrInfoPath = config.get('processing.errors.minerrInfoPath');
-      if ( !minerrInfoPath ) {
-        throw new Error('Error in configuration: Please provide a path to the minerr info file (errors.json) ' +
-          'in the `config.processing.errors.minerrInfoPath` property');
-      }
-      return require(minerrInfoPath);
-    }]
-  },
-  process: function(docs, partialNames, errorNamespaces, minerrInfo) {
+/**
+ * @dgProcessor errorDocsProcessor
+ * @description
+ * Process "error" docType docs and generate errorNamespace docs
+ */
+module.exports = function errorDocsProcessor(errorNamespaceMap, getMinerrInfo) {
+  return {
+    $runAfter: ['tags-extracted'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    // Create error namespace docs and attach error docs to each
-    _.forEach(docs, function(doc) {
-      if ( doc.docType === 'error' ) {
+      // Create error namespace docs and attach error docs to each
+      docs.forEach(function(doc) {
+        var parts, namespaceDoc;
 
-        // Parse out the error info from the id
-        parts = doc.name.split(':');
-        doc.namespace = parts[0];
-        doc.name = parts[1];
+        if ( doc.docType === 'error' ) {
 
+          // Parse out the error info from the id
+          parts = doc.name.split(':');
+          doc.namespace = parts[0];
+          doc.name = parts[1];
 
-        var namespaceDoc = errorNamespaces[doc.namespace];
-        if ( !namespaceDoc ) {
-          // First time we came across this namespace, so create a new one
-          namespaceDoc = errorNamespaces[doc.namespace] = {
-            area: doc.area,
-            name: doc.namespace,
-            errors: [],
-            path: path.dirname(doc.path),
-            outputPath: path.dirname(doc.outputPath) + '.html',
-            docType: 'errorNamespace'
-          };
+          // Get or create the relevant errorNamespace doc
+          namespaceDoc = errorNamespaceMap.get(doc.namespace);
+          if ( !namespaceDoc ) {
+            namespaceDoc = {
+              area: 'error',
+              name: doc.namespace,
+              errors: [],
+              docType: 'errorNamespace'
+            };
+            errorNamespaceMap.set(doc.namespace, namespaceDoc);
+          }
+
+          // Link this error doc to its namespace doc
+          namespaceDoc.errors.push(doc);
+          doc.namespaceDoc = namespaceDoc;
+          doc.formattedErrorMessage = getMinerrInfo().errors[doc.namespace][doc.name];
         }
+      });
 
-        // Add this error to the namespace
-        namespaceDoc.errors.push(doc);
-        doc.namespace = namespaceDoc;
-
-        doc.formattedErrorMessage = minerrInfo.errors[doc.namespace.name][doc.name];
-
-      }
-
-    });
-
-
-    return docs.concat(_.values(errorNamespaces));
-  }
-};
+      errorNamespaceMap.forEach(function(errorNamespace) {
+        docs.push(errorNamespace);
+      });
+    }
+  };
+};

docs/config/processors/git-data.js

@@ -1,20 +0,0 @@
-var gruntUtils = require('../../../lib/grunt/utils');
-var versionInfo = require('../../../lib/versions/version-info');
-
-module.exports = {
-  name: 'git-data',
-  runBefore: ['reading-files'],
-  description: 'This processor adds information from the local git repository to the extraData injectable',
-  exports: {
-    gitData: ['factory', function() {
-      return {
-        version: versionInfo.currentVersion,
-        versions: versionInfo.previousVersions,
-        info: versionInfo.gitRepoInfo
-      };
-    }]
-  },
-  process: function(extraData, gitData) {
-    extraData.git = gitData;
-  }
-};

docs/config/processors/index-page.js

@@ -1,40 +1,43 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'index-page',
-  runAfter: ['adding-extra-docs'],
-  runBefore: ['extra-docs-added'],
-  description: 'This processor creates docs that will be rendered as the index page for the app',
-  process: function(docs, config) {
+/**
+ * @dgProcessor generateIndexPagesProcessor
+ * @description
+ * This processor creates docs that will be rendered as the index page for the app
+ */
+module.exports = function generateIndexPagesProcessor() {
+  return {
+    deployments: [],
+    $validate: {
+      deployments: { presence: true }
+    },
+    $runAfter: ['adding-extra-docs'],
+    $runBefore: ['extra-docs-added'],
+    $process: function(docs) {
 
-    var deployment = config.deployment;
-    if ( !deployment || !deployment.environments ) {
-      throw new Error('No deployment environments found in the config.');
+      // Collect up all the areas in the docs
+      var areas = {};
+      docs.forEach(function(doc) {
+        if ( doc.area ) {
+          areas[doc.area] = doc.area;
+        }
+      });
+      areas = _.keys(areas);
+
+      this.deployments.forEach(function(deployment) {
+
+        var indexDoc = _.defaults({
+          docType: 'indexPage',
+          areas: areas
+        }, deployment);
+
+        indexDoc.id = 'index' + (deployment.name === 'default' ? '' : '-' + deployment.name);
+
+        docs.push(indexDoc);
+      });
     }
-
-    // Collect up all the areas in the docs
-    var areas = {};
-    _.forEach(docs, function(doc) {
-      if ( doc.area ) {
-        areas[doc.area] = doc.area;
-      }
-    });
-    areas = _.keys(areas);
-
-    _.forEach(deployment.environments, function(environment) {
-
-      var indexDoc = _.defaults({
-        docType: 'indexPage',
-        areas: areas
-      }, environment);
-
-      indexDoc.id = 'index' + (environment.name === 'default' ? '' : '-' + environment.name);
-      // Use .. to put it at the root of the build
-      indexDoc.outputPath = indexDoc.id + '.html';
-
-      docs.push(indexDoc);
-    });
-  }
-};
+  };
+};

docs/config/processors/keywords.js

@@ -1,50 +1,64 @@
+"use strict";
+
 var _ = require('lodash');
-var log = require('winston');
 var fs = require('fs');
 var path = require('canonical-path');
 
-module.exports = {
-  name: 'keywords',
-  runAfter: ['docs-processed'],
-  runBefore: ['adding-extra-docs'],
-  description: 'This processor extracts all the keywords from the document',
-  process: function(docs, config) {
+/**
+ * @dgProcessor generateKeywordsProcessor
+ * @description
+ * This processor extracts all the keywords from each document and creates
+ * a new document that will be rendered as a JavaScript file containing all
+ * this data.
+ */
+module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
+  return {
+    ignoreWordsFile: undefined,
+    areasToSearch: ['api', 'guide', 'misc', 'error', 'tutorial'],
+    propertiesToIgnore: [],
+    $validate: {
+      ignoreWordsFile: { },
+      areasToSearch: { presence: true },
+      propertiesToIgnore: {  }
+    },
+    $runAfter: ['memberDocsProcessor'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
 
-    // Keywords to ignore
-    var wordsToIgnore = [];
-    var propertiesToIgnore;
-    var areasToSearch;
+      // Keywords to ignore
+      var wordsToIgnore = [];
+      var propertiesToIgnore;
+      var areasToSearch;
 
-    // Keywords start with "ng:" or one of $, _ or a letter
-    var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
+      // Keywords start with "ng:" or one of $, _ or a letter
+      var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
 
-    // Load up the keywords to ignore, if specified in the config
-    if ( config.processing.search && config.processing.search.ignoreWordsFile ) {
+      // Load up the keywords to ignore, if specified in the config
+      if ( this.ignoreWordsFile ) {
 
-      var ignoreWordsPath = path.resolve(config.basePath, config.processing.search.ignoreWordsFile);
-      wordsToIgnore = fs.readFileSync(ignoreWordsPath, 'utf8').toString().split(/[,\s\n\r]+/gm);
+        var ignoreWordsPath = path.resolve(readFilesProcessor.basePath, this.ignoreWordsFile);
+        wordsToIgnore = fs.readFileSync(ignoreWordsPath, 'utf8').toString().split(/[,\s\n\r]+/gm);
 
-      log.debug('Loaded ignore words from "' + ignoreWordsPath + '"');
-      log.silly(wordsToIgnore);
+        log.debug('Loaded ignore words from "' + ignoreWordsPath + '"');
+        log.silly(wordsToIgnore);
 
-    }
-
-    areasToSearch = _.indexBy(config.get('processing.search.areasToSearch', ['api', 'guide', 'misc', 'error', 'tutorial']));
-
-    propertiesToIgnore = _.indexBy(config.get('processing.search.propertiesToIgnore', []));
-    log.debug('Properties to ignore', propertiesToIgnore);
-
-    var ignoreWordsMap = _.indexBy(wordsToIgnore);
-
-    // If the title contains a name starting with ng, e.g. "ngController", then add the module name
-    // without the ng to the title text, e.g. "controller".
-    function extractTitleWords(title) {
-      var match = /ng([A-Z]\w*)/.exec(title);
-      if ( match ) {
-        title = title + ' ' + match[1].toLowerCase();
       }
-      return title;
-    }
+
+      areasToSearch = _.indexBy(this.areasToSearch);
+      propertiesToIgnore = _.indexBy(this.propertiesToIgnore);
+      log.debug('Properties to ignore', propertiesToIgnore);
+
+      var ignoreWordsMap = _.indexBy(wordsToIgnore);
+
+      // If the title contains a name starting with ng, e.g. "ngController", then add the module name
+      // without the ng to the title text, e.g. "controller".
+      function extractTitleWords(title) {
+        var match = /ng([A-Z]\w*)/.exec(title);
+        if ( match ) {
+          title = title + ' ' + match[1].toLowerCase();
+        }
+        return title;
+      }
 
     function extractWords(text, words, keywordMap) {
 
@@ -52,37 +66,49 @@ module.exports = {
       _.forEach(tokens, function(token){
         var match = token.match(KEYWORD_REGEX);
         if (match){
-          key = match[1];
+          var key = match[1];
           if ( !keywordMap[key]) {
             keywordMap[key] = true;
             words.push(key);
           }
-        }
-      });
-    }
+          }
+        });
+      }
 
 
-    // We are only interested in docs that live in the right area
-    docs = _.filter(docs, function(doc) { return areasToSearch[doc.area]; });
+      // We are only interested in docs that live in the right area
+      docs = _.filter(docs, function(doc) { return areasToSearch[doc.area]; });
 
-    _.forEach(docs, function(doc) {
+      _.forEach(docs, function(doc) {
 
       var words = [];
       var keywordMap = _.clone(ignoreWordsMap);
+      var members = [];
+      var membersMap = {};
 
       // Search each top level property of the document for search terms
       _.forEach(doc, function(value, key) {
+
         if ( _.isString(value) && !propertiesToIgnore[key] ) {
           extractWords(value, words, keywordMap);
         }
+
+        if ( key === 'methods' || key === 'properties' || key === 'events' ) {
+          _.forEach(value, function(member) {
+            extractWords(member.name, members, membersMap);
+          });
+        }
       });
 
+
       doc.searchTerms = {
         titleWords: extractTitleWords(doc.name),
-        keywords: _.sortBy(words).join(' ')
+        keywords: _.sortBy(words).join(' '),
+        members: _.sortBy(members).join(' ')
       };
 
-    });
+      });
 
-  }
+    }
+  };
 };

docs/config/processors/pages-data.js

@@ -1,6 +1,7 @@
+"use strict";
+
 var _ = require('lodash');
 var path = require('canonical-path');
-var log = require('winston');
 
 var AREA_NAMES = {
   api: 'API',
@@ -33,182 +34,206 @@ function getNavGroup(pages, area, pageSorter, pageMapper) {
 }
 
 
-var navGroupMappers = {
-  api: function(areaPages, area) {
-    var navGroups = _(areaPages)
-      .filter('module') // We are not interested in docs that are not in a module
+/**
+ * @dgProcessor generatePagesDataProcessor
+ * @description
+ * This processor will create a new doc that will be rendered as a JavaScript file
+ * containing meta information about the pages and navigation
+ */
+module.exports = function generatePagesDataProcessor(log) {
 
-      .groupBy('module')
 
-      .map(function(modulePages, moduleName) {
-        log.debug('moduleName: ' + moduleName);
-        var navItems = [];
-        var modulePage;
+  var navGroupMappers = {
+    api: function(areaPages, area) {
+      var navGroups = _(areaPages)
+        .filter('module') // We are not interested in docs that are not in a module
 
-        _(modulePages)
+        .groupBy('module')
 
-          .groupBy('docType')
+        .map(function(modulePages, moduleName) {
+          log.debug('moduleName: ' + moduleName);
+          var navItems = [];
+          var modulePage;
 
-          .tap(function(docTypes) {
-            log.debug(_.keys(docTypes));
-            // Extract the module page from the collection
-            modulePage = docTypes.module[0];
-            delete docTypes.module;
-          })
+          _(modulePages)
 
-          .tap(function(docTypes) {
-            if ( docTypes.input ) {
-              docTypes.directive = docTypes.directive || [];
-              // Combine input docTypes into directive docTypes
-              docTypes.directive = docTypes.directive.concat(docTypes.input);
-              delete docTypes.input;
-            }
-          })
+            .groupBy('docType')
 
-          .forEach(function(sectionPages, sectionName) {
+            .tap(function(docTypes) {
+              log.debug(moduleName, _.keys(docTypes));
+              // Extract the module page from the collection
+              modulePage = docTypes.module[0];
+              delete docTypes.module;
+            })
 
-            sectionPages = _.sortBy(sectionPages, 'name');
+            .tap(function(docTypes) {
+              if ( docTypes.input ) {
+                docTypes.directive = docTypes.directive || [];
+                // Combine input docTypes into directive docTypes
+                docTypes.directive = docTypes.directive.concat(docTypes.input);
+                delete docTypes.input;
+              }
+            })
 
-            if ( sectionPages.length > 0 ) {
-              // Push a navItem for this section
-              navItems.push({
-                name: sectionName,
-                type: 'section',
-                href: path.dirname(sectionPages[0].path)
-              });
+            .forEach(function(sectionPages, sectionName) {
 
-              // Push the rest of the sectionPages for this section
-              _.forEach(sectionPages, function(sectionPage) {
+              sectionPages = _.sortBy(sectionPages, 'name');
 
+              if ( sectionPages.length > 0 ) {
+                // Push a navItem for this section
                 navItems.push({
-                  name: sectionPage.name,
-                  href: sectionPage.path,
-                  type: sectionPage.docType
+                  name: sectionName,
+                  type: 'section',
+                  href: path.dirname(sectionPages[0].path)
                 });
 
-              });
-            }
-          });
+                // Push the rest of the sectionPages for this section
+                _.forEach(sectionPages, function(sectionPage) {
+
+                  navItems.push({
+                    name: sectionPage.name,
+                    href: sectionPage.path,
+                    type: sectionPage.docType
+                  });
+
+                });
+              }
+            });
+          return {
+            name: moduleName,
+            href: modulePage.path,
+            type: 'group',
+            navItems: navItems
+          };
+        })
+        .value();
+      return navGroups;
+    },
+    tutorial: function(pages, area) {
+      return [getNavGroup(pages, area, 'step', function(page) {
         return {
-          name: moduleName,
-          href: modulePage.path,
-          type: 'group',
-          navItems: navItems
+          name: page.name,
+          step: page.step,
+          href: page.path,
+          type: 'tutorial'
         };
-      })
-      .value();
-    return navGroups;
-  },
-  tutorial: function(pages, area) {
-    return [getNavGroup(pages, area, 'step', function(page) {
-      return {
-        name: page.name,
-        step: page.step,
-        href: page.path,
-        type: 'tutorial'
-      };
-    })];
-  },
-  error: function(pages, area) {
-    return [getNavGroup(pages, area, 'path', function(page) {
-      return {
-        name: page.name,
-        href: page.path,
-        type: page.docType === 'errorNamespace' ? 'section' : 'error'
-      };
-    })];
-  },
-  pages: function(pages, area) {
-    return [getNavGroup(pages, area, 'path', function(page) {
-      return {
-        name: page.name,
-        href: page.path,
-        type: 'page'
-      };
-    })];
-  }
-};
-
-module.exports = {
-  name: 'pages-data',
-  description: 'This plugin will create a new doc that will be rendered as an angularjs module ' +
-               'which will contain meta information about the pages and navigation',
-  runAfter: ['adding-extra-docs', 'component-groups-generate', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, config) {
-
-    var outputFolder = config.rendering.outputFolder;
-
-    _(docs)
-    .filter(function(doc) { return doc.area === 'api'; })
-    .filter(function(doc) { return doc.docType === 'module'; })
-    .forEach(function(doc) { if ( !doc.path ) {
-      log.warn('Missing path property for ', doc.id);
-    }})
-    .map(function(doc) { return _.pick(doc, ['id', 'module', 'docType', 'area']); })
-    .tap(function(docs) {
-      log.debug(docs);
-    });
-
-
-    // We are only interested in docs that are in a area and not landing pages
-    var navPages = _.filter(docs, function(page) {
-      return page.area &&
-        page.docType != 'componentGroup';
-    });
-
-    // Generate an object collection of pages that is grouped by area e.g.
-    // - area "api"
-    //  - group "ng"
-    //    - section "directive"
-    //    - ngApp
-    //    - ngBind
-    //    - section "global"
-    //    - angular.element
-    //    - angular.bootstrap
-    //    - section "service"
-    //    - $compile
-    //  - group "ngRoute"
-    //    - section "directive"
-    //    - ngView
-    //    - section "service"
-    //    - $route
-    //
-    var areas = {};
-    _(navPages)
-      .groupBy('area')
-      .forEach(function(pages, areaId) {
-        var area = {
-          id: areaId,
-          name: AREA_NAMES[areaId]
+      })];
+    },
+    error: function(pages, area) {
+      return [getNavGroup(pages, area, 'path', function(page) {
+        return {
+          name: page.name,
+          href: page.path,
+          type: page.docType === 'errorNamespace' ? 'section' : 'error'
         };
-        areas[areaId] = area;
+      })];
+    },
+    pages: function(pages, area) {
+      return [getNavGroup(
+        pages,
+        area,
+        function(page) {
+          return page.sortOrder || page.path;
+        },
+        function(page) {
+          return {
+            name: page.name,
+            href: page.path,
+            type: 'page'
+          };
+        }
+      )];
+    }
+  };
 
-        var navGroupMapper = navGroupMappers[area.id] || navGroupMappers['pages'];
-        area.navGroups = navGroupMapper(pages, area);
+  return {
+    $runAfter: ['paths-computed', 'generateKeywordsProcessor'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
+
+      // We are only interested in docs that are in an area
+      var pages = _.filter(docs, function(doc) {
+        return doc.area;
       });
 
-    // Extract a list of basic page information for mapping paths to partials and for client side searching
-    var pages = _(docs)
-      .map(function(doc) {
-        var page = _.pick(doc, [
-          'docType', 'id', 'name', 'area', 'outputPath', 'path', 'searchTerms'
-        ]);
-        return page;
-      })
-      .indexBy('path')
-      .value();
+      // We are only interested in pages that are not landing pages
+      var navPages = _.filter(pages, function(page) {
+        return page.docType != 'componentGroup';
+      });
+
+      // Generate an object collection of pages that is grouped by area e.g.
+      // - area "api"
+      //  - group "ng"
+      //    - section "directive"
+      //    - ngApp
+      //    - ngBind
+      //    - section "global"
+      //    - angular.element
+      //    - angular.bootstrap
+      //    - section "service"
+      //    - $compile
+      //  - group "ngRoute"
+      //    - section "directive"
+      //    - ngView
+      //    - section "service"
+      //    - $route
+      //
+      var areas = {};
+      _(navPages)
+        .groupBy('area')
+        .forEach(function(pages, areaId) {
+          var area = {
+            id: areaId,
+            name: AREA_NAMES[areaId]
+          };
+          areas[areaId] = area;
+
+          var navGroupMapper = navGroupMappers[area.id] || navGroupMappers['pages'];
+          area.navGroups = navGroupMapper(pages, area);
+        });
+
+      docs.push({
+        docType: 'nav-data',
+        id: 'nav-data',
+        template: 'nav-data.template.js',
+        outputPath: 'js/nav-data.js',
+        areas: areas
+      });
 
 
-    var docData = {
-      docType: 'pages-data',
-      id: 'pages-data',
-      template: 'pages-data.template.js',
-      outputPath: 'js/pages-data.js',
 
-      areas: areas,
-      pages: pages
-    };
-    docs.push(docData);
-  }
+      var searchData = _(pages)
+        .filter(function(page) {
+            return page.searchTerms;
+        })
+        .map(function(page) {
+          return _.extend({ path: page.path }, page.searchTerms);
+        })
+        .value();
+
+      docs.push({
+        docType: 'json-doc',
+        id: 'search-data-json',
+        template: 'json-doc.template.json',
+        outputPath: 'js/search-data.json',
+        data: searchData
+      });
+
+      // Extract a list of basic page information for mapping paths to partials and for client side searching
+      var pageData = _(docs)
+        .map(function(doc) {
+          return _.pick(doc, ['name', 'area', 'path']);
+        })
+        .indexBy('path')
+        .value();
+
+      docs.push({
+        docType: 'pages-data',
+        id: 'pages-data',
+        template: 'pages-data.template.js',
+        outputPath: 'js/pages-data.js',
+        pages: pageData
+      });
+    }
+  };
 };

docs/config/processors/protractor-generate.js

@@ -1,49 +0,0 @@
-var _ = require('lodash');
-var path = require('canonical-path');
-
-module.exports = {
-  name: 'protractor-generate',
-  description: 'Generate a protractor test file from the e2e tests in the examples',
-  runAfter: ['adding-extra-docs'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, examples, config) {
-    var protractorFolder = config.get('rendering.protractor.outputFolder', 'ptore2e');
-
-    _.forEach(examples, function(example) {
-
-      _.forEach(example.files, function(file) {
-
-        // Check if it's a Protractor test.
-        if (file.type !== 'protractor') {
-          return;
-        }
-
-        // Create new files for the tests.
-        docs.push(createProtractorDoc(example, file, 'jquery'));
-        docs.push(createProtractorDoc(example, file, 'jqlite'));
-      });
-    });
-
-    function createProtractorDoc(example, file, env) {
-      var protractorDoc = {
-        docType: 'e2e-test',
-        id: 'protractorTest' + '-' + example.id,
-        template: 'protractorTests.template.js',
-        outputPath: path.join(protractorFolder, example.id, env + '_test.js'),
-        innerTest: file.fileContents,
-        pathPrefix: '.', // Hold for if we test with full jQuery
-        exampleId: example.id,
-        description: example.doc.id
-      };
-
-      if (env === 'jquery') {
-        protractorDoc.examplePath = example.outputFolder + '/index-jquery.html';
-      } else {
-        protractorDoc.examplePath = example.outputFolder + '/index.html';
-      }
-      return protractorDoc;
-    }
-
-
-  }
-};

docs/config/processors/versions-data.js

@@ -1,38 +1,34 @@
+"use strict";
+
 var _ = require('lodash');
 
-module.exports = {
-  name: 'versions-data',
-  description: 'This plugin will create a new doc that will be rendered as an angularjs module ' +
-               'which will contain meta information about the versions of angular',
-  runAfter: ['adding-extra-docs', 'pages-data'],
-  runBefore: ['extra-docs-added'],
-  process: function(docs, gitData) {
+/**
+ * @dgProcessor generateVersionDocProcessor
+ * @description
+ * This processor will create a new doc that will be rendered as a JavaScript file
+ * containing meta information about the current versions of AngularJS
+ */
+module.exports = function generateVersionDocProcessor(gitData) {
+  return {
+    $runAfter: ['generatePagesDataProcessor'],
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
 
-    var version = gitData.version;
-    var versions = gitData.versions;
+      var versionDoc = {
+        docType: 'versions-data',
+        id: 'versions-data',
+        template: 'versions-data.template.js',
+        outputPath: 'js/versions-data.js',
+        currentVersion: gitData.version
+      };
 
-    if ( !version ) {
-      throw new Error('Invalid configuration.  Please provide a valid `source.currentVersion` property');
+      versionDoc.versions = _(gitData.versions)
+        .filter(function(version) { return version.major > 0; })
+        .push(gitData.version)
+        .reverse()
+        .value();
+
+      docs.push(versionDoc);
     }
-    if ( !versions ) {
-      throw new Error('Invalid configuration.  Please provide a valid `source.previousVersions` property');
-    }
-
-    var versionDoc = {
-      docType: 'versions-data',
-      id: 'versions-data',
-      template: 'versions-data.template.js',
-      outputPath: 'js/versions-data.js',
-    };
-
-    versionDoc.currentVersion = version;
-
-    versionDoc.versions = _(versions)
-      .filter(function(version) { return version.major > 0; })
-      .push(version)
-      .reverse()
-      .value();
-
-    docs.push(versionDoc);
-  }
-};
+  };
+};

docs/config/services/deployments/debug.js

@@ -0,0 +1,40 @@
+"use strict";
+
+module.exports = function debugDeployment(getVersion) {
+  return {
+    name: 'debug',
+    examples: {
+      commonFiles: {
+        scripts: [ '../../../angular.js' ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      '../angular.js',
+      '../angular-resource.js',
+      '../angular-route.js',
+      '../angular-cookies.js',
+      '../angular-sanitize.js',
+      '../angular-touch.js',
+      '../angular-animate.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/nav-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/default.js

@@ -0,0 +1,40 @@
+"use strict";
+
+module.exports = function defaultDeployment(getVersion) {
+  return {
+    name: 'default',
+    examples: {
+      commonFiles: {
+        scripts: [ '../../../angular.min.js' ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      '../angular.min.js',
+      '../angular-resource.min.js',
+      '../angular-route.min.js',
+      '../angular-cookies.min.js',
+      '../angular-sanitize.min.js',
+      '../angular-touch.min.js',
+      '../angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/nav-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/jquery.js

@@ -0,0 +1,44 @@
+"use strict";
+
+module.exports = function jqueryDeployment(getVersion) {
+  return {
+    name: 'jquery',
+    examples: {
+      commonFiles: {
+        scripts: [
+          '../../components/jquery-' + getVersion('jquery') + '/jquery.js',
+          '../../../angular.js'
+        ]
+      },
+      dependencyPath: '../../../'
+    },
+    scripts: [
+      'components/jquery-' + getVersion('jquery') + '/jquery.js',
+      '../angular.min.js',
+      '../angular-resource.min.js',
+      '../angular-route.min.js',
+      '../angular-cookies.min.js',
+      '../angular-sanitize.min.js',
+      '../angular-touch.min.js',
+      '../angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/nav-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/deployments/production.js

@@ -0,0 +1,43 @@
+"use strict";
+
+var versionInfo = require('../../../../lib/versions/version-info');
+var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
+
+module.exports = function productionDeployment(getVersion) {
+  return {
+    name: 'production',
+    examples: {
+      commonFiles: {
+        scripts: [ cdnUrl + '/angular.min.js' ]
+      },
+      dependencyPath: cdnUrl + '/'
+    },
+    scripts: [
+      cdnUrl + '/angular.min.js',
+      cdnUrl + '/angular-resource.min.js',
+      cdnUrl + '/angular-route.min.js',
+      cdnUrl + '/angular-cookies.min.js',
+      cdnUrl + '/angular-sanitize.min.js',
+      cdnUrl + '/angular-touch.min.js',
+      cdnUrl + '/angular-animate.min.js',
+      'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js',
+      'js/angular-bootstrap/bootstrap.js',
+      'js/angular-bootstrap/bootstrap-prettify.js',
+      'js/angular-bootstrap/dropdown-toggle.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js',
+      'js/versions-data.js',
+      'js/pages-data.js',
+      'js/nav-data.js',
+      'js/docs.js'
+    ],
+    stylesheets: [
+      'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css',
+      'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css',
+      'css/prettify-theme.css',
+      'css/docs.css',
+      'css/animations.css'
+    ]
+  };
+};

docs/config/services/errorNamespaceMap.js

@@ -0,0 +1,10 @@
+"use strict";
+var StringMap = require('stringmap');
+
+/**
+ * @dgService errorNamespaceMap
+ * A map of error namespaces by name.
+ */
+module.exports = function errorNamespaceMap() {
+  return new StringMap();
+};

docs/config/services/getMinerrInfo.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var path = require('canonical-path');
+
+/**
+ * @dgService minErrInfo
+ * @description
+ * Load the error information that was generated during the AngularJS build.
+ */
+module.exports = function getMinerrInfo(readFilesProcessor) {
+  return function() {
+    var minerrInfoPath = path.resolve(readFilesProcessor.basePath, 'build/errors.json');
+    return require(minerrInfoPath);
+  };
+};

docs/config/services/getVersion.js

@@ -0,0 +1,17 @@
+"use strict";
+var path = require('canonical-path');
+
+/**
+ * dgService getVersion
+ * @description
+ * Find the current version of the bower component (or npm module)
+ */
+module.exports = function getVersion(readFilesProcessor) {
+  var basePath = readFilesProcessor.basePath;
+
+  return function(component, sourceFolder, packageFile) {
+    sourceFolder = path.resolve(basePath, sourceFolder || 'docs/bower_components');
+    packageFile = packageFile || 'bower.json';
+    return require(path.join(sourceFolder,component,packageFile)).version;
+  };
+};

docs/config/services/gitData.js

@@ -0,0 +1,17 @@
+"use strict";
+
+var gruntUtils = require('../../../lib/grunt/utils');
+var versionInfo = require('../../../lib/versions/version-info');
+
+/**
+ * @dgService gitData
+ * @description
+ * Information from the local git repository
+ */
+module.exports = function gitData() {
+  return {
+    version: versionInfo.currentVersion,
+    versions: versionInfo.previousVersions,
+    info: versionInfo.gitRepoInfo
+  };
+};

docs/config/tag-defs/sortOrder.js

@@ -0,0 +1,6 @@
+module.exports = {
+  name: 'sortOrder',
+  transforms: function(doc, tag, value) {
+    return parseInt(value, 10);
+  }
+};

docs/config/templates/indexPage.template.html

@@ -56,15 +56,6 @@
       }
     })();
 
-
-    // force page reload when new update is available
-    window.applicationCache && window.applicationCache.addEventListener('updateready', function(e) {
-      if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
-        window.applicationCache.swapCache();
-        window.location.reload();
-      }
-    }, false);
-
     // GA asynchronous tracker
     var _gaq = _gaq || [];
     _gaq.push(['_setAccount', 'UA-8594346-3']);
@@ -219,7 +210,7 @@
         </div>
         <div class="grid-right">
           <div id="loading" ng-show="loading">Loading...</div>
-          <div ng-hide="loading" ng-include="currentPage.outputPath || 'Error404.html'" onload="afterPartialLoaded()"  autoscroll></div>
+          <div ng-hide="loading" ng-include="partialPath" autoscroll></div>
         </div>
       </div>
     </section>

docs/config/templates/json-doc.template.json

@@ -0,0 +1 @@
+{$ doc.data | json $}

docs/config/templates/nav-data.template.js

@@ -0,0 +1,3 @@
+// Meta data used by the AngularJS docs app
+angular.module('navData', [])
+  .value('NG_NAVIGATION', {$ doc.areas | json $});

docs/config/templates/pages-data.template.js

@@ -1,4 +1,3 @@
 // Meta data used by the AngularJS docs app
 angular.module('pagesData', [])
-  .value('NG_PAGES', {$ doc.pages | json $})
-  .value('NG_NAVIGATION', {$ doc.areas | json $});
+  .value('NG_PAGES', {$ doc.pages | json $});

docs/config/templates/protractorTests.template.js

@@ -1,7 +0,0 @@
-describe("{$ doc.description $}", function() {
-  beforeEach(function() {
-    browser.get("{$ doc.pathPrefix $}/{$ doc.examplePath $}");
-  });
-
-{$ doc.innerTest $}
-});

docs/config/templates/runnableExample.template.html

@@ -2,15 +2,16 @@
    is HTML and wrap each line in a <p> - thus breaking the HTML #}
 
 <div>
-  <a ng-click="openPlunkr('{$ doc.example.outputFolder $}')" 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>
+
   <div class="runnable-example"
-      path="{$ doc.example.outputFolder $}"
+      path="{$ doc.example.deployments.default.path $}"
       {%- for attrName, attrValue in doc.example.attributes %}
       {$ attrName $}="{$ attrValue $}"{% endfor %}>
 
-   {% for fileName, file in doc.example.files %}
+  {% for fileName, file in doc.example.files %}
     <div class="runnable-example-file" {% for attrName, attrValue in file.attributes %}
       {$ attrName $}="{$ attrValue $}"{% endfor %}>
       {% code -%}
@@ -19,7 +20,7 @@
     </div>
   {% endfor %}
 
-    <iframe class="runnable-example-frame" src="{$ doc.example.outputFolder $}/index.html" name="{$ doc.example.id $}"></iframe>
+    <iframe class="runnable-example-frame" src="{$ doc.example.deployments.default.outputPath $}" name="{$ doc.example.id $}"></iframe>
   </div>
 </div>
 

docs/content/api/index.ngdoc

@@ -9,14 +9,14 @@ The documentation is organized into **{@link guide/module modules}** which conta
 These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
 
 <div class="alert alert-info">
-**Angular Namespaces `$` and `$$`**
+**Angular Prefixes `$` and `$$`**:
 
 To prevent accidental name collisions with your code,
 Angular prefixes names of public objects with `$` and names of private objects with `$$`.
 Please do not use the `$` or `$$` prefix in your code.
 </div>
 
-## Angular Namespace
+## Angular Modules
 
 
 ## {@link ng ng (core module)}

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

@@ -12,10 +12,10 @@ $controller(MyController);
 $controller(MyController, {scope: newScope});
 ```
 
-To fix the example above please provide a scope to the $controller call:
+To fix the example above please provide a scope (using the `$scope` property in the locals object) to the $controller call:
 
 ```
-$controller(MyController, {$scope, newScope});
+$controller(MyController, {$scope: newScope});
 ```
 
 Please consult the {@link ng.$controller $controller} service api docs to learn more.

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

@@ -0,0 +1,63 @@
+@ngdoc error
+@name $location:nobase
+@fullName $location in HTML5 mode requires a <base> tag to be present!
+@description
+
+If you configure {@link ng.$location `$location`} to use
+{@link api/ng.provider.$locationProvider `html5Mode`} (`history.pushState`), you need to specify the base URL for the application with a [`<base href="">`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base) tag or configure
+`$locationProvider` to not require a base tag by passing a definition object with
+`requireBase:false` to `$locationProvider.html5Mode()`:
+
+```javascript
+$locationProvider.html5Mode({
+  enabled: true,
+  requireBase: false
+});
+```
+
+Note that removing the requirement for a <base> tag will have adverse side effects when resolving
+relative paths with `$location` in IE9.
+
+The base URL is then used to resolve all relative URLs throughout the application regardless of the
+entry point into the app.
+
+If you are deploying your app into the root context (e.g. `https://myapp.com/`), set the base URL to `/`:
+
+```html
+<head>
+  <base href="/">
+  ...
+</head>
+```
+
+If you are deploying your app into a sub-context (e.g. `https://myapp.com/subapp/`), set the base URL to the
+URL of the subcontext:
+
+```html
+<head>
+  <base href="/subapp">
+  ...
+</head>
+```
+
+Before Angular 1.3 we didn't have this hard requirement and it was easy to write apps that worked
+when deployed in the root context but were broken when moved to a sub-context because in the
+sub-context all absolute urls would resolve to the root context of the app. To prevent this,
+use relative URLs throughout your app:
+
+```html
+<!-- wrong: -->
+<a href="/userProfile">User Profile</a>
+
+
+<!-- correct: -->
+<a href="userProfile">User Profile</a>
+
+```
+
+Additionally, if you want to support [browsers that don't have the `history.pushState`
+API](http://caniuse.com/#feat=history), the fallback mechanism provided by `$location`
+won't work well without specifying the base url of the application.
+
+In order to make it easier to migrate from hashbang mode to html5 mode, we require that the base
+URL is always specified when `$location`'s `html5mode` is enabled.

docs/content/error/$q/norslvr.ngdoc

@@ -0,0 +1,17 @@
+@ngdoc error
+@name $q:norslvr
+@fullName No resolver function passed to $Q
+@description
+
+Occurs when calling creating a promise using {@link $q} as a constructor, without providing the
+required `resolver` function.
+
+```
+//bad
+var promise = $q().then(doSomething);
+
+//good
+var promise = $q(function(resolve, reject) {
+  waitForSomethingAsync.then(resolve);
+}).then(doSomething);
+```

docs/content/error/$q/qcycle.ngdoc

@@ -0,0 +1,23 @@
+@ngdoc error
+@name $q:qcycle
+@fullName Cannot resolve a promise with itself
+@description
+
+Occurs when resolving a promise with itself as the value, including returning the promise in a
+function passed to `then`. The A+ 1.1 spec mandates that this behavior throw a TypeError.
+https://github.com/promises-aplus/promises-spec#the-promise-resolution-procedure
+
+```
+var promise = $q.defer().promise;
+
+//bad
+promise.then(function (val) {
+  //Cannot return self
+  return promise;
+});
+
+//good
+promise.then(function (val) {
+  return 'some other value';
+});
+```

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

@@ -10,7 +10,7 @@ Angular's {@link ng.$sce Strict Contextual Escaping (SCE)} mode
 contexts to result in a value that is trusted as safe for use in such a context.  (e.g. loading an
 Angular template from a URL requires that the URL is one considered safe for loading resources.)
 
-This helps prevent XSS and other security issues.  Read more at {@link
-api/ng.$sce Strict Contextual Escaping (SCE)}
+This helps prevent XSS and other security issues.  Read more at
+{@link ng.$sce Strict Contextual Escaping (SCE)}
 
 You may want to include the ngSanitize module to use the automatic sanitizing.

docs/content/error/ngRepeat/badident.ngdoc

@@ -0,0 +1,39 @@
+@ngdoc error
+@name ngRepeat:badident
+@fullName Invalid identifier expression
+@description
+
+Occurs when an invalid identifier is specified in an {@link ng.directive:ngRepeat ngRepeat} expression.
+
+The {@link ng.directive:ngRepeat ngRepeat} directive's `alias as` syntax is used to assign an alias for the processed collection in scope.
+
+If the expression is not a simple identifier (such that you could declare it with `var {name}`, or if the expression is a reserved name,
+this error is thrown.
+
+Reserved names include:
+
+  - `null`
+  - `this`
+  - `undefined`
+  - `$parent`
+  - `$even`
+  - `$odd`
+  - `$first`
+  - `$last`
+  - `$middle`
+
+Invalid expressions might look like this:
+
+```html
+<li ng-repeat="item in items | filter:searchString as this">{{item}}</li>
+<li ng-repeat="item in items | filter:searchString as some.objects["property"]">{{item}}</li>
+<li ng-repeat="item in items | filter:searchString as resultOfSomeMethod()">{{item}}</li>
+<li ng-repeat="item in items | filter:searchString as foo=6">{{item}}</li>
+```
+
+Valid expressions might look like this:
+
+```html
+<li ng-repeat="item in items | filter:searchString as collections">{{item}}</li>
+<li ng-repeat="item in items | filter:searchString as filteredCollection">{{item}}</li>
+```

docs/content/guide/$location.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Using $location
+@sortOrder 500
 @description
 
 # What does it do?
@@ -90,10 +91,11 @@ To configure the `$location` service, retrieve the
 {@link ng.$locationProvider $locationProvider} and set the parameters as follows:
 
 
-- **html5Mode(mode)**: {boolean}<br />
-  `true` - see HTML5 mode<br />
-  `false` - see Hashbang mode<br />
-  default: `false`
+- **html5Mode(mode)**: {boolean|Object}<br />
+  `true` or `enabled:true` - see HTML5 mode<br />
+  `false` or `enabled:false` - see Hashbang mode<br />
+  `requireBase:true` - see Relative links<br />
+  default: `enabled:false`
 
 - **hashPrefix(prefix)**: {string}<br />
   prefix used for Hashbang URLs (used in Hashbang mode or in legacy browser in Html5 mode)<br />
@@ -163,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](http://www.w3.org/TR/html5/history.html). 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.
 
@@ -210,6 +212,10 @@ facilitate the browser URL change and history management.
 ## Hashbang mode (default mode)
 
 In this mode, `$location` uses Hashbang URLs in all browsers.
+Angular also does not intercept and rewrite links in this mode. I.e. links work
+as expected and also perform full page reloads when other parts of the url
+than the hash fragment was changed.
+
 
 ### Example
 
@@ -240,7 +246,7 @@ it('should show example', inject(
 ## HTML5 mode
 
 In HTML5 mode, the `$location` service getters and setters interact with the browser URL address
-through the HTML5 history API, which allows for use of regular URL path and search segments,
+through the HTML5 history API. This allows for use of regular URL path and search segments,
 instead of their hashbang equivalents. If the HTML5 History API is not supported by a browser, the
 `$location` service will fall back to using the hashbang URLs automatically. This frees you from
 having to worry about whether the browser displaying your app supports the history API  or not; the
@@ -249,6 +255,10 @@ having to worry about whether the browser displaying your app supports the histo
 - Opening a regular URL in a legacy browser -> redirects to a hashbang URL
 - Opening hashbang URL in a modern browser -> rewrites to a regular URL
 
+Note that in this mode, Angular intercepts all links (subject to the "Html link rewriting" rules below)
+and updates the url in a way that never performs a full page reload.
+
+
 ### Example
 
 ```js
@@ -297,8 +307,8 @@ history API  or not; the `$location` service makes this transparent to you.
 
 ### Html link rewriting
 
-When you use HTML5 history API mode, you will need different links in different browsers, but all you
-have to do is specify regular URL links, such as: `<a href="/some?foo=bar">link</a>`
+When you use HTML5 history API mode, you will not need special hashbang links. All you have to do
+is specify regular URL links, such as: `<a href="/some?foo=bar">link</a>`
 
 When a user clicks on this link,
 
@@ -313,32 +323,28 @@ reload to the original link.
   Example: `<a href="/ext/link?a=b" target="_self">link</a>`
 - Absolute links that go to a different domain<br>
   Example: `<a href="http://angularjs.org/">link</a>`
-- Links starting with '/' that lead to a different base path when base is defined<br>
+- Links starting with '/' that lead to a different base path<br>
   Example: `<a href="/not-my-base/link">link</a>`
 
-When running Angular in the root of a domain, along side perhaps a normal application in the same
-directory, the "otherwise" route handler will try to handle all the URLs, including ones that map
-to static files.
 
-To prevent this, you can set your base href for the app to `<base href=".">` and then prefix links
-to URLs that should be handled with `.`. Now, links to locations, which are not to be routed by Angular,
-are not prefixed with `.` and will not be intercepted by the `otherwise` rule in your `$routeProvider`.
+### Relative links
 
+Be sure to check all relative links, images, scripts etc. Angular requires you to specify the url
+base in the head of your main html file (`<base href="/my-base">`) unless `html5Mode.requireBase` is
+set to `false` in the html5Mode definition object passed to `$locationProvider.html5Mode()`. With
+that, relative urls will always be resolved to this base url, event if the initial url of the
+document was different.
+
+There is one exception: Links that only contain a hash fragment (e.g. `<a href="#target">`)
+will only change `$location.hash()` and not modify the url otherwise. This is useful for scrolling
+to anchors on the same page without needing to know on which page the user currently is.
 
 ### Server side
 
 Using this mode requires URL rewriting on server side, basically you have to rewrite all your links
-to entry point of your application (e.g. index.html)
-
-### Relative links
-
-Be sure to check all relative links, images, scripts etc. You must either specify the url base in
-the head of your main html file (`<base href="/my-base">`) or you must use absolute urls
-(starting with `/`) everywhere because relative urls will be resolved to absolute urls using the
-initial absolute url of the document, which is often different from the root of the application.
-
-Running Angular apps with the History API enabled from document root is strongly encouraged as it
-takes care of all relative link issues.
+to entry point of your application (e.g. index.html). Requiring a `<base>` tag is also important for
+this case, as it allows Angular to differentiate between the part of the url that is the application
+base and the path that should be handeled by the application.
 
 ### Sending links among different browsers
 
@@ -469,12 +475,12 @@ In these examples we use `<base href="/base/index.html" />`
     it("should show fake browser info on load", function(){
       expect(addressBar.getAttribute('value')).toBe(url);
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/path');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('h');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/path');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('h');
 
     });
 
@@ -485,24 +491,24 @@ In these examples we use `<base href="/base/index.html" />`
 
       expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/first?a=b");
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/first');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/first');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('');
 
 
       navigation.get(1).click();
 
       expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/sec/ond?flag#hash");
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/sec/ond');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"flag":true}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('hash');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/sec/ond');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"flag":true}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('hash');
     });
 
   </file>
@@ -621,12 +627,12 @@ In these examples we use `<base href="/base/index.html" />`
     it("should show fake browser info on load", function(){
       expect(addressBar.getAttribute('value')).toBe(url);
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/path');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('h');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/path');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('h');
 
     });
 
@@ -637,24 +643,24 @@ In these examples we use `<base href="/base/index.html" />`
 
       expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/index.html#!/first?a=b");
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/first');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"a":"b"}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/first');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"a":"b"}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('');
 
 
       navigation.get(1).click();
 
       expect(addressBar.getAttribute('value')).toBe("http://www.example.com/base/index.html#!/sec/ond?flag#hash");
 
-      expect(element(by.binding('$location.protocol')).getText()).toBe('http');
-      expect(element(by.binding('$location.host')).getText()).toBe('www.example.com');
-      expect(element(by.binding('$location.port')).getText()).toBe('80');
-      expect(element(by.binding('$location.path')).getText()).toBe('/sec/ond');
-      expect(element(by.binding('$location.search')).getText()).toBe('{"flag":true}');
-      expect(element(by.binding('$location.hash')).getText()).toBe('hash');
+      expect(element(by.binding('$location.protocol()')).getText()).toBe('http');
+      expect(element(by.binding('$location.host()')).getText()).toBe('www.example.com');
+      expect(element(by.binding('$location.port()')).getText()).toBe('80');
+      expect(element(by.binding('$location.path()')).getText()).toBe('/sec/ond');
+      expect(element(by.binding('$location.search()')).getText()).toBe('{"flag":true}');
+      expect(element(by.binding('$location.hash()')).getText()).toBe('hash');
 
     });
   </file>

docs/content/guide/animations.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Animations
+@sortOrder 310
 @description
 
 

docs/content/guide/bootstrap.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Bootstrap
+@sortOrder 350
 @description
 
 # Bootstrap
@@ -86,7 +87,9 @@ Here is an example of manually initializing Angular:
 <!doctype html>
 <html>
 <body>
-  Hello {{greetMe}}!
+  <div ng-controller="MyController">
+    Hello {{greetMe}}!
+  </div>
   <script src="http://code.angularjs.org/snapshot/angular.js"></script>
 
   <script>

docs/content/guide/compiler.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  HTML Compiler
+@sortOrder 330
 @description
 
 <div class="alert alert-warning">

docs/content/guide/concepts.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Conceptual Overview
+@sortOrder 200
 @description
 
 # Conceptual Overview

docs/content/guide/controller.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Controllers
+@sortOrder 220
 @description
 
 # Understanding Controllers

docs/content/guide/css-styling.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Working With CSS
+@sortOrder 510
 @description
 
 

docs/content/guide/databinding.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Data Binding
+@sortOrder 210
 @description
 
 Data-binding in Angular apps is the automatic synchronization of data between the model and view

docs/content/guide/di.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Dependency Injection
+@sortOrder 250
 @description
 
 # Dependency Injection
@@ -109,7 +110,7 @@ asks the injector to create an instance of the controller and its dependencies.
 injector.instantiate(MyController);
 ```
 
-This is all done behinds the scenes. Notice that by having the `ng-controller` ask the injector to
+This is all done behind the scenes. Notice that by having the `ng-controller` ask the injector to
 instantiate the class, it can satisfy all of the dependencies of `MyController` without the
 controller ever knowing about the injector.
 
@@ -135,7 +136,7 @@ These can be used interchangeably as you see fit and are equivalent.
 
 ### Implicit Dependencies
 
-The simplest way to get hold of the dependencies, is to assume that the function parameter names
+The simplest way to get hold of the dependencies is to assume that the function parameter names
 are the names of the dependencies.
 
 ```js
@@ -144,7 +145,7 @@ function MyController($scope, greeter) {
 }
 ```
 
-Given a function the injector can infer the names of the service to inject by examining the
+Given a function the injector can infer the names of the services to inject by examining the
 function declaration and extracting the parameter names. In the above example `$scope`, and
 `greeter` are two services which need to be injected into the function.
 
@@ -154,7 +155,7 @@ rename the method parameter names. This makes this way of annotating only useful
 
 ### `$inject` Property Annotation
 
-To allow the minifiers to rename the function parameters and still be able to inject right services,
+To allow the minifiers to rename the function parameters and still be able to inject the right services,
 the function needs to be annotated with the `$inject` property. The `$inject` property is an array
 of service names to inject.
 
@@ -166,7 +167,7 @@ MyController['$inject'] = ['$scope', 'greeter'];
 ```
 
 In this scenario the ordering of the values in the `$inject` array must match the ordering of the
-arguments to inject. Using above code snippet as an example, `$scope` will be injected into
+arguments to inject. Using the above code snippet as an example, `$scope` will be injected into
 `renamed$scope` and `greeter` into `renamedGreeter`. Care must be taken that the `$inject`
 annotation is kept in sync with the actual arguments in the function declaration.
 
@@ -206,7 +207,7 @@ someModule.factory('greeter', ['$window', function(renamed$window) {
 }]);
 ```
 
-Here, instead of simply providing the factory function, we pass an array, whose elements consist of
+Here, instead of simply providing the factory function, we pass an array whose elements consist of
 a list of strings (the names of the dependencies) followed by the function itself.
 
 Keep in mind that all of the annotation styles are equivalent and can be used anywhere in Angular

docs/content/guide/directive.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Directives
+@sortOrder 300
 @description
 
 # Creating Custom Directives
@@ -84,7 +85,7 @@ Here are some equivalent examples of elements that match `ngBind`:
       <span x-ng-bind="name"></span> <br/>
     </div>
   </file>
-  <file name="protractorTest.js">
+  <file name="protractor.js" type="protractor">
     it('should show off bindings', function() {
       expect(element(by.css('div[ng-controller="Controller"] span[ng-bind]')).getText())
           .toBe('Max Karl Ernst Ludwig Planck (April 23, 1858 – October 4, 1947)');
@@ -159,9 +160,11 @@ restrictions, you cannot simply write `cx="{{cx}}"`.
 With `ng-attr-cx` you can work around this problem.
 
 If an attribute with a binding is prefixed with the `ngAttr` prefix (denormalized as `ng-attr-`)
-then during the binding will be applied to the corresponding unprefixed attribute. This allows
+then during the binding it will be applied to the corresponding unprefixed attribute. This allows
 you to bind to attributes that would otherwise be eagerly processed by browsers
-(e.g. an SVG element's `circle[cx]` attributes).
+(e.g. an SVG element's `circle[cx]` attributes). When using `ngAttr`, the `allOrNothing` flag of
+{@link ng.$interpolate $interpolate} is used, so if any expression in the interpolated string
+results in `undefined`, the attribute is removed and not added to the element.
 
 For example, we could fix the example above by instead writing:
 
@@ -279,12 +282,9 @@ using `templateUrl` instead:
   </file>
 </example>
 
-Great! But what if we wanted to have our directive match the tag name `<my-customer>` instead?
-If we simply put a `<my-customer>` element into the HTML, it doesn't work.
-
 <div class="alert alert-warning">
-**Note:** When you create a directive, it is restricted to attribute only by default. In order to
-create directives that are triggered by element or class name, you need to use the `restrict` option.
+**Note:** When you create a directive, it is restricted to attribute and elements only by default. In order to
+create directives that are triggered by class name, you need to use the `restrict` option.
 </div>
 
 The `restrict` option is typically set to:

docs/content/guide/e2e-testing.ngdoc

@@ -1,6 +1,6 @@
-@workInProgress
 @ngdoc overview
 @name  E2E Testing
+@sortOrder 420
 @description
 
 # E2E Testing
@@ -27,7 +27,7 @@ Protractor is a [Node.js](http://nodejs.org) program, and runs end to end tests
 written in JavaScript and run with node. Protractor uses [WebDriver](https://code.google.com/p/selenium/wiki/GettingStarted)
 to control browsers and simulate user actions.
 
-For more information on Protractor, view [getting started](https://github.com/angular/protractor/blob/master/docs/overview.md)
+For more information on Protractor, view [getting started](https://github.com/angular/protractor/blob/master/docs/getting-started.md)
 or the [api docs](https://github.com/angular/protractor/blob/master/docs/api.md).
 
 Protractor uses [Jasmine](http://jasmine.github.io/1.3/introduction.html) for its test syntax.

docs/content/guide/expression.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Expressions
+@sortOrder 270
 @description
 
 # Angular Expressions
@@ -38,7 +39,9 @@ the method from your view. If you want to `eval()` an Angular expression yoursel
 ## Example
 <example>
   <file name="index.html">
-    1+2={{1+2}}
+    <span>
+      1+2={{1+2}}
+    </span>
   </file>
 
   <file name="protractor.js" type="protractor">

docs/content/guide/filter.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Filters
+@sortOrder 280
 @description
 
 A filter formats the value of an expression for display to the user. They can be used in view templates,
@@ -86,12 +87,16 @@ This factory function should return a new filter function which takes the input
 as the first argument. Any filter arguments are passed in as additional arguments to the filter
 function.
 
+The filter function should be a [pure function](http://en.wikipedia.org/wiki/Pure_function), which
+means that it should be stateless and idempotent. Angular relies on these properties and executes
+the filter only when the inputs to the function change.
+
 The following sample filter reverses a text string. In addition, it conditionally makes the
 text upper-case.
 
-<example module="myReverseModule">
+<example module="myReverseFilterApp">
   <file name="index.html">
-    <div ng-controller="Controller">
+    <div ng-controller="MyController">
       <input ng-model="greeting" type="text"><br>
       No filter: {{greeting}}<br>
       Reverse: {{greeting|reverse}}<br>
@@ -100,7 +105,7 @@ text upper-case.
   </file>
 
   <file name="script.js">
-    angular.module('myReverseModule', [])
+    angular.module('myReverseFilterApp', [])
       .filter('reverse', function() {
         return function(input, uppercase) {
           input = input || '';
@@ -115,12 +120,53 @@ text upper-case.
           return out;
         };
       })
-      .controller('Controller', ['$scope', function($scope) {
+      .controller('MyController', ['$scope', function($scope) {
         $scope.greeting = 'hello';
       }]);
   </file>
 </example>
 
+
+## Stateful filters
+
+It is strongly discouraged to write filters that are stateful, because the execution of those can't
+be optimized by Angular, which often leads to performance issues. Many stateful filters can be
+converted into stateless filters just by exposing the hidden state as a model and turning it into an
+argument for the filter.
+
+If you however do need to write a stateful filter, you have to mark the filter as `$stateful`, which
+means that it will be executed one or more times during the each `$digest` cycle.
+
+<example module="myStatefulFilterApp">
+  <file name="index.html">
+    <div ng-controller="MyController">
+      Input: <input ng-model="greeting" type="text"><br>
+      Decoration: <input ng-model="decoration.symbol" type="text"><br>
+      No filter: {{greeting}}<br>
+      Decorated: {{greeting | decorate}}<br>
+    </div>
+  </file>
+
+  <file name="script.js">
+    angular.module('myStatefulFilterApp', [])
+      .filter('decorate', ['decoration', function(decoration) {
+
+        function decorateFilter(input) {
+          return decoration.symbol + input + decoration.symbol;
+        }
+        decorateFilter.$stateful = true;
+
+        return decorateFilter;
+      }])
+      .controller('MyController', ['$scope', 'decoration', function($scope, decoration) {
+        $scope.greeting = 'hello';
+        $scope.decoration = decoration;
+      }])
+      .value('decoration', {symbol: '*'});
+  </file>
+</example>
+
+
 ## Testing custom filters
 
 See the [phonecat tutorial](http://docs.angularjs.org/tutorial/step_09#test) for an example.

docs/content/guide/forms.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Forms
+@sortOrder 290
 @description
 
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
@@ -285,7 +286,7 @@ In the following example we create two directives.
   * The first one is `integer` and it validates whether the input is a valid integer.
     For example `1.23` is an invalid value, since it contains a fraction.
     Note that we unshift the array instead of pushing.
-    This is because we want to be first parser and consume the control string value, as we need to execute the validation function before a conversion to number occurs.
+    This is because we want it to be the first parser and consume the control string value, as we need to execute the validation function before a conversion to number occurs.
 
   * The second directive is a `smart-float`.
     It parses both `1.2` and `1,2` into a valid float number `1.2`.

docs/content/guide/i18n.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  i18n and l10n
+@sortOrder 520
 @description
 
 # i18n and l10n

docs/content/guide/ie.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Internet Explorer Compatibility
+@sortOrder 530
 @description
 
 # Internet Explorer Compatibility

docs/content/guide/index.ngdoc

@@ -70,7 +70,7 @@ In Angular applications, you move the job of filling page templates with data fr
 
 This is a short list of libraries with specific support and documentation for working with Angular.  You can find a full list of all known Angular external libraries at [ngmodules.org](http://ngmodules.org/).
 
-* **Internationalization:** [angular-translate](http://angular-translate.github.io), [angular-gettext](http://angular-gettext.rocketeer.be/)
+* **Internationalization:** [angular-translate](http://angular-translate.github.io), [angular-gettext](http://angular-gettext.rocketeer.be/), [angular-localization](http://doshprompt.github.io/angular-localization/)
 * **RESTful services:** [Restangular](https://github.com/mgonto/restangular)
 * **SQL and NoSQL backends:** [BreezeJS](http://www.breezejs.com/), [AngularFire](http://angularfire.com/)
 * **UI Widgets: **[KendoUI](http://kendo-labs.github.io/angular-kendo/#/), [UI Bootstrap](http://angular-ui.github.io/bootstrap/), [Wijmo](http://wijmo.com/tag/angularjs-2/), [ngTagsInput](https://github.com/mbenford/ngTagsInput)
@@ -81,6 +81,7 @@ This is a short list of libraries with specific support and documentation for wo
 
 ### General
 
+* **Docs Page:** {@link guide/production Running an AngularJS App in Production}
 * **Javascript minification: **[Background](http://thegreenpizza.github.io/2013/05/25/building-minification-safe-angular.js-applications/), [ng-annotate automation tool](https://github.com/olov/ng-annotate)
 * **Analytics and Logging:** [Angularyitcs (Google Analytics)](http://ngmodules.org/modules/angularytics), [Angulartics (Analytics)](https://github.com/luisfarzati/angulartics), [Logging Client-Side Errors](http://www.bennadel.com/blog/2542-Logging-Client-Side-Errors-With-AngularJS-And-Stacktrace-js.htm)
 * **SEO:** [By hand](http://www.yearofmoo.com/2012/11/angularjs-and-seo.html), [prerender.io](http://prerender.io/), [Brombone](http://www.brombone.com/), [SEO.js](http://getseojs.com/), [SEO4Ajax](http://www.seo4ajax.com/)

docs/content/guide/introduction.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Introduction
+@sortOrder 100
 @description
 
 

docs/content/guide/migration.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Migrating from Previous Versions
+@sortOrder 550
 @description
 
 Minor version releases in AngularJS introduce several breaking changes that may require changes to your
@@ -95,7 +96,7 @@ this limitation, use a regular expression object as the value for the expression
     //after
     $scope.exp = /abc/i;
 - **Scope:** due to [8c6a8171](https://github.com/angular/angular.js/commit/8c6a8171f9bdaa5cdabc0cc3f7d3ce10af7b434d),
-  Scope#$id is now of time number rather than string. Since the
+  Scope#$id is now of type number rather than string. Since the
 id is primarily being used for debugging purposes this change should not affect
 anyone.
 - **forEach:** due to [55991e33](https://github.com/angular/angular.js/commit/55991e33af6fece07ea347a059da061b76fc95f5),

docs/content/guide/module.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Modules
+@sortOrder 320
 @description
 
 # What is a Module?
@@ -26,10 +27,12 @@ should be bootstrapped. There are several advantages to this approach:
 
 I'm in a hurry. How do I get a Hello World module working?
 
-<example module='myApp'>
+<example ng-app-included="true">
   <file name="index.html">
-    <div>
-      {{ 'World' | greet }}
+    <div ng-app="myApp">
+      <div>
+        {{ 'World' | greet }}
+      </div>
     </div>
   </file>
 
@@ -48,7 +51,7 @@ I'm in a hurry. How do I get a Hello World module working?
 
   <file name="protractor.js" type="protractor">
     it('should add Hello to the name', function() {
-      expect(element(by.binding("{{ 'World' | greet }}")).getText()).toEqual('Hello, World!');
+      expect(element(by.binding("'World' | greet")).getText()).toEqual('Hello, World!');
     });
   </file>
 </example>
@@ -56,7 +59,7 @@ I'm in a hurry. How do I get a Hello World module working?
 Important things to notice:
 
   * The {@link angular.Module Module} API
-  * The reference to `myApp` module in `<html ng-app="myApp">`.
+  * The reference to `myApp` module in `<div ng-app="myApp">`.
     This is what bootstraps the app using your module.
   * The empty array in `angular.module('myApp', [])`.
     This array is the list of modules `myApp` depends on.
@@ -126,7 +129,7 @@ The above is a suggestion. Tailor it to your needs.
 
   <file name="protractor.js" type="protractor">
     it('should add Hello to the name', function() {
-      expect(element(by.binding("{{ greeting }}")).getText()).toEqual('Bonjour World!');
+      expect(element(by.binding("greeting")).getText()).toEqual('Bonjour World!');
     });
   </file>
 

docs/content/guide/production.ngdoc

@@ -0,0 +1,43 @@
+@ngdoc overview
+@name  Running in Production
+@sortOrder 540
+@description
+
+# Running an AngularJS App in Production
+
+There are a few things you might consider when running your AngularJS application in production.
+
+
+## Disabling Debug Data
+
+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-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`
+CSS class are attached to the corresponding element. These scope references can then be accessed via
+`element.scope()` and `element.isolateScope()`.
+
+Tools like [Protractor](github.com/angular/protractor) and
+[Batarang](https://github.com/angular/angularjs-batarang) need this information to run,
+but you can disable this in production for a significant performance boost with:
+
+```js
+myApp.config(['$compileProvider', function ($compileProvider) {
+  $compileProvider.debugInfoEnabled(false);
+}]);
+```
+
+If you wish to debug an application with this information then you should open up a debug
+console in the browser then call this method directly in this console:
+
+```js
+angular.reloadWithDebugInfo();
+```
+
+The page should reload and the debug information should now be available.
+
+For more see the docs pages on {@link ng.$compileProvider#debugInfoEnabled `$compileProvider`}
+and {@link ng/function/angular.reloadWithDebugInfo `angular.reloadWithDebugInfo`}.

docs/content/guide/providers.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Providers
+@sortOrder 340
 @description
 
 # Providers
@@ -97,9 +98,8 @@ created by this recipe.
 Note: All services in Angular are singletons. That means that the injector uses each recipe at most
 once to create the object. The injector then caches the reference for all future needs.
 
-Since Factory is more a powerful version of the Value recipe, you can construct the same service with it.
-Using our previous `clientId` Value recipe example, we can rewrite it as a Factory recipe like
-this:
+Since a Factory is a more powerful version of the Value recipe, the same service can be constructed with it.
+Using our previous `clientId` Value recipe example, we can rewrite it as a Factory recipe like this:
 
 ```javascript
 myApp.factory('clientId', function clientIdFactory() {
@@ -134,11 +134,11 @@ token.
 
 <div class="alert alert-success">
 **Best Practice:** name the factory functions as `<serviceId>Factory`
-(e.g. apiTokenFactory). While this naming convention is not required, it helps when navigating the code base
+(e.g., apiTokenFactory). While this naming convention is not required, it helps when navigating the codebase
 or looking at stack traces in the debugger.
 </div>
 
-Just like with Value recipe, Factory recipe can create a service of any type, whether it be a
+Just like with the Value recipe, the Factory recipe can create a service of any type, whether it be a
 primitive, object literal, function, or even an instance of a custom type.
 
 
@@ -153,7 +153,7 @@ function UnicornLauncher(apiToken) {
 
   this.launchedCount = 0;
   this.launch = function() {
-    // make a request to the remote api and include the apiToken
+    // Make a request to the remote API and include the apiToken
     ...
     this.launchedCount++;
   }
@@ -170,7 +170,7 @@ myApp.factory('unicornLauncher', ["apiToken", function(apiToken) {
 ```
 
 
-This is, however, exactly the use-case that Service recipe is the most suitable for.
+This is, however, exactly the use-case that the Service recipe is the most suitable for.
 
 The Service recipe produces a service just like the Value or Factory recipes, but it does so by
 *invoking a constructor with the `new` operator*. The constructor can take zero or more arguments,
@@ -189,7 +189,7 @@ myApp.service('unicornLauncher', ["apiToken", UnicornLauncher]);
 Much simpler!
 
 Note: Yes, we have called one of our service recipes 'Service'. We regret this and know that we'll
-be somehow punished for our mis-deed. It's like we named one of our offspring 'Child'. Boy,
+be somehow punished for our misdeed. It's like we named one of our offspring 'Child'. Boy,
 that would mess with the teachers.
 
 
@@ -199,8 +199,8 @@ As already mentioned in the intro, the Provider recipe is the core recipe type a
 all the other recipe types are just syntactic sugar on top of it. It is the most verbose recipe
 with the most abilities, but for most services it's overkill.
 
-Provider recipe is syntactically defined as a custom type that implements a `$get` method. This
-method is a factory function just like the one we use in Factory recipe. In fact, if you define
+The Provider recipe is syntactically defined as a custom type that implements a `$get` method. This
+method is a factory function just like the one we use in the Factory recipe. In fact, if you define
 a Factory recipe, an empty Provider type with the `$get` method set to your factory function is
 automatically created under the hood.
 
@@ -248,7 +248,7 @@ and wires (injects) all provider instances only.
 
 During application bootstrap, before Angular goes off creating all services, it configures and
 instantiates all providers. We call this the configuration phase of the application life-cycle.
-During this phase services aren't accessible because they haven't been created yet.
+During this phase, services aren't accessible because they haven't been created yet.
 
 Once the configuration phase is over, interaction with providers is disallowed and the process of
 creating services starts. We call this part of the application life-cycle the run phase.
@@ -259,9 +259,9 @@ creating services starts. We call this part of the application life-cycle the ru
 We've just learned how Angular splits the life-cycle into configuration phase and run phase and how
 you can provide configuration to your application via the config function. Since the config
 function runs in the configuration phase when no services are available, it doesn't have access
-even to simple value objects created via Value recipe.
+even to simple value objects created via the Value recipe.
 
-Since simple values, like url prefix, don't have dependencies or configuration, it is often handy
+Since simple values, like URL prefixes, don't have dependencies or configuration, it's often handy
 to make them available in both the configuration and run phases. This is what the Constant recipe
 is for.
 
@@ -317,7 +317,7 @@ Let's take a look at how we would create a very simple component via the directi
 on the `planetName` constant we've just defined and displays the planet name, in our case:
 "Planet Name: Greasy Giant".
 
-Since the directives are registered via Factory recipe, we can use the same syntax as with factories.
+Since the directives are registered via the Factory recipe, we can use the same syntax as with factories.
 
 ```javascript
 myApp.directive('myPlanet', ['planetName', function myPlanetDirectiveFactory(planetName) {
@@ -340,7 +340,7 @@ We can then use the component like this:
 </html>
 ```
 
-Using Factory recipes you can also define Angular's filters and animations, but the controllers
+Using Factory recipes, you can also define Angular's filters and animations, but the controllers
 are a bit special. You create a controller as a custom type that declares its dependencies as
 arguments for its constructor function. This constructor is then registered with a module. Let's
 take a look at the `DemoController`, created in one of the early examples:
@@ -351,7 +351,7 @@ myApp.controller('DemoController', ['clientId', function DemoController(clientId
 }]);
 ```
 
-The DemoController is instantiated via its constructor every time the app needs an instance of
+The DemoController is instantiated via its constructor, every time the app needs an instance of
 DemoController (in our simple app it's just once). So unlike services, controllers are not
 singletons. The constructor is called with all the requested services, in our case the `clientId`
 service.
@@ -365,12 +365,12 @@ To wrap it up, let's summarize the most important points:
 - There are five recipe types that define how to create objects: Value, Factory, Service, Provider
   and Constant.
 - Factory and Service are the most commonly used recipes. The only difference between them is that
-  Service recipe works better for objects of custom type, while Factory can produce JavaScript
+  the Service recipe works better for objects of a custom type, while the Factory can produce JavaScript
   primitives and functions.
 - The Provider recipe is the core recipe type and all the other ones are just syntactic sugar on it.
 - Provider is the most complex recipe type. You don't need it unless you are building a reusable
   piece of code that needs global configuration.
-- All special purpose objects except for Controller are defined via Factory recipes.
+- All special purpose objects except for the Controller are defined via Factory recipes.
 
 <table class="table table-bordered code-table">
 <thead>
@@ -409,7 +409,15 @@ To wrap it up, let's summarize the most important points:
   <td class="success">yes\*\*</td>
 </tr>
 <tr>
-  <td>can create functions/primitives</td>
+  <td>can create functions</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+  <td class="success">yes</td>
+</tr>
+<tr>
+  <td>can create primitives</td>
   <td class="success">yes</td>
   <td class="error">no</td>
   <td class="success">yes</td>

docs/content/guide/scope.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Scopes
+@sortOrder 240
 @description
 
 # What are Scopes?

docs/content/guide/services.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Services
+@sortOrder 230
 @description
 
 # Services

docs/content/guide/templates.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Templates
+@sortOrder 260
 @description
 
 In Angular, templates are written with HTML that contains Angular-specific elements and attributes.

docs/content/guide/unit-testing.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Unit Testing
+@sortOrder 410
 @description
 
 JavaScript is a dynamically typed language which comes with great power of expression, but it also
@@ -337,6 +338,16 @@ We inject the $compile service and $rootScope before each jasmine test. The $com
 to render the aGreatEye directive. After rendering the directive we ensure that the directive has
 replaced the content and "lidless, wreathed in flame, 2 times" is present.
 
+<div class="alert alert-info">
+**Underscore notation**:
+
+The use of the underscore notation (e.g.: `_$rootScope_`) is a convention wide spread in AngularJS
+community to keep the variable names clean in your tests. That's why the
+{@link $injector} strips out the leading and the trailing underscores when
+matching the parameters. The underscore rule applies ***only*** if the name starts **and** ends with
+exactly one underscore, otherwise no replacing happens.
+</div>
+
 ### Testing Transclusion Directives
 
 Directives that use transclusion are treated specially by the compiler.  Before their compile

docs/content/misc/contribute.ngdoc

@@ -62,13 +62,13 @@ minified AngularJS files:
 
 ```shell
 # Clone your Github repository:
-git clone git@github.com:<github username>/angular.js.git
+git clone "git@github.com:<github username>/angular.js.git"
 
 # Go to the AngularJS directory:
 cd angular.js
 
 # Add the main AngularJS repository as an upstream remote to your repository:
-git remote add upstream https://github.com/angular/angular.js.git
+git remote add upstream "https://github.com/angular/angular.js.git"
 
 # Install node.js dependencies:
 npm install
@@ -126,13 +126,13 @@ made available a local web server based on Node.js.
    ```
 
 2. To access the local server, enter the following URL into your web browser:
-   ```
+   ```text
    http://localhost:8000/
    ```
    By default, it serves the contents of the AngularJS project directory.
 
 3. To access the locally served docs, visit this URL:
-   ```
+   ```text
    http://localhost:8000/build/docs/
    ```
 
@@ -165,7 +165,7 @@ change. To execute tests in this mode run:
 2. To capture more browsers, open this URL in the desired browser (URL might be different if you have multiple instance
    of Karma running, read Karma's console output for the correct URL):
 
-   ```shell
+   ```text
    http://localhost:9876/
    ```
 

docs/content/misc/faq.ngdoc

@@ -205,7 +205,7 @@ If you want to apply a directive to each inner piece of the repeat, put it on a
 
 ### `$rootScope` exists, but it can be used for evil
 
-Scopes in Angular form a hierarchy, prototypically inheriting from a root scope at the top of the tree.
+Scopes in Angular form a hierarchy, prototypally inheriting from a root scope at the top of the tree.
 Usually this can be ignored, since most views have a controller, and therefore a scope, of their own.
 
 Occasionally there are pieces of data that you want to make global to the whole app.

docs/content/tutorial/index.ngdoc

@@ -44,8 +44,8 @@ really digging into it. If you're looking for a shorter introduction to AngularJ
 
 # Get Started
 
-The rest of this page explains how you can set up your machine to work with the code on your local
-machine.  If you just want to read the tutorial then you can just go straight to the first step:
+The rest of this page explains how you can set up your local machine for development.
+If you just want to read the tutorial then you can just go straight to the first step:
 [Step 0 - Bootstrapping](tutorial/step_00).
 
 # Working with the code

docs/content/tutorial/step_02.ngdoc

@@ -233,7 +233,7 @@ browser is limited, which results in your karma tests running extremely slow.
 
   Refresh your browser and verify that it says "Hello, World!".
 
-* Update the unit test for the controller in ./test/unit/controllersSpec.js to reflect the previous change. For example by adding:
+* Update the unit test for the controller in `./test/unit/controllersSpec.js` to reflect the previous change. For example by adding:
 
           expect(scope.name).toBe('World');
 
@@ -250,6 +250,8 @@ browser is limited, which results in your karma tests running extremely slow.
             <tr><th>row number</th></tr>
             <tr ng-repeat="i in [0, 1, 2, 3, 4, 5, 6, 7]"><td>{{i+1}}</td></tr>
           </table>
+  
+  Extra points: try and make an 8x8 table using an additional `ng-repeat`.
 
 * Make the unit test fail by changing `expect(scope.phones.length).toBe(3)` to instead use `toBe(4)`.