docs(Courses): fix syntax issue in developer guide

The courses section should use commas between links to differentiate the instances of each link

Closes #10448

.bowerrc

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

.editorconfig

@@ -0,0 +1,21 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[src/ngLocale/**]
+insert_final_newline = false
+
+[dropdown-toggle.js]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[htmlparser.js]
+insert_final_newline = false

.gitignore

@@ -9,10 +9,10 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
+*.iml
 .agignore
 libpeerconnection.log
 npm-debug.log

.jshintignore

@@ -0,0 +1,2 @@
+node_modules/**
+lib/htmlparser/**

.jshintrc

@@ -0,0 +1,5 @@
+{
+  "extends": ".jshintrc-base",
+  "node": true,
+  "globals": {}
+}

.jshintrc-base

@@ -0,0 +1,19 @@
+{
+  "bitwise": true,
+  "immed": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonew": true,
+  "trailing": true,
+  "maxlen": 200,
+  "boss": true,
+  "eqnull": true,
+  "expr": true,
+  "globalstrict": true,
+  "laxbreak": true,
+  "loopfunc": true,
+  "sub": true,
+  "undef": true,
+  "indent": 2
+}

.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
@@ -24,8 +23,8 @@ install:
   - npm config set spin false
   # Log HTTP requests
   - npm config set loglevel http
-  # Run npm install twice, because it is flaky.
-  - npm install || npm install
+  - time ./scripts/travis/npm-bundle-deps.sh
+  - time npm install
 
 before_script:
   - mkdir -p $LOGS_DIR

CONTRIBUTING.md

@@ -65,13 +65,13 @@ Help us to maximize the effort we can spend fixing issues and adding new
 features, by not reporting duplicate issues.  Providing the following information will increase the
 chances of your issue being dealt with quickly:
 
-* **Overview of the issue** - if an error is being thrown a non-minified stack trace helps
+* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
 * **Motivation for or Use Case** - explain why this is a bug for you
 * **Angular Version(s)** - is it a regression?
 * **Browsers and Operating System** - is this a problem with all browsers or only IE8?
-* **Reproduce the error** - provide a live example (using [Plunker][plunker] or
+* **Reproduce the Error** - provide a live example (using [Plunker][plunker] or
   [JSFiddle][jsfiddle]) or a unambiguous set of steps.
-* **Related issues** - has a similar issue been reported before?
+* **Related Issues** - has a similar issue been reported before?
 * **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
   causing the problem (line of code or commit)
 
@@ -119,7 +119,7 @@ Before you submit your pull request consider the following guidelines:
     ```
 
 * In GitHub, send a pull request to `angular:master`.
-* If we suggest changes then 
+* If we suggest changes then
   * Make the required updates.
   * Re-run the Angular test suite to ensure tests are still passing.
   * Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
@@ -172,7 +172,7 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
     * **Do not use namespaces**: Instead,  wrap the entire angular code base in an anonymous closure and
       export our API explicitly rather than implicitly.
     * Wrap all code at **100 characters**.
-    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypical
+    * Instead of complex inheritance hierarchies, we **prefer simple objects**. We use prototypal
       inheritance only when absolutely necessary.
     * We **love functions and closures** and, whenever possible, prefer them over objects.
     * To write concise code that can be better minified, we **use aliases internally** that map to the
@@ -237,7 +237,7 @@ reference GitHub issues that this commit **Closes**.
 
 A detailed explanation can be found in this [document][commit-message-format].
 
-## <a name="cla"></a> Signing the CLA 
+## <a name="cla"></a> Signing the CLA
 
 Please sign our Contributor License Agreement (CLA) before sending pull requests. For any code
 changes to be accepted, the CLA must be signed. It's a quick process, we promise!

Gruntfile.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
@@ -107,6 +109,9 @@ module.exports = function(grunt) {
       options: {
         jshintrc: true,
       },
+      node: {
+        files: { src: ['*.js', 'lib/**/*.js'] },
+      },
       tests: {
         files: { src: 'test/**/*.js' },
       },
@@ -252,7 +257,11 @@ module.exports = function(grunt) {
     compress: {
       build: {
         options: {archive: 'build/' + dist +'.zip', mode: 'zip'},
-        src: ['**'], cwd: 'build', expand: true, dot: true, dest: dist + '/'
+        src: ['**'],
+        cwd: 'build',
+        expand: true,
+        dot: true,
+        dest: dist + '/'
       }
     },
 

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.
@@ -44,11 +42,11 @@ This process based on the idea of minimizing user pain
     * Label `needs: breaking change` - if needed
     * Label `needs: public api` - if the issue requires introduction of a new public API
 1. Label `browser: *` - if the issue **only** affects a certain browser
-1. Label `frequency: *` – How often does this issue come up? How many developers does this affect?
+1. Label `frequency: *` – How often does this issue come up? How many developers does this affect? Chose just one of the following:
     * low - obscure issue affecting a handful of developers
     * moderate - impacts a common usage pattern
     * high - impacts most or all Angular apps
-1. Label `severity: *` - How bad is the issue?
+1. Label `severity: *` - How bad is the issue? Chose just one of the following:
     * security issue
     * regression
     * memory leak
@@ -59,11 +57,10 @@ 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 
+   * 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
-    
+
 
 1. Unassign yourself from the issue
 

angularFiles.js

@@ -1,4 +1,6 @@
-angularFiles = {
+'use strict';
+
+var angularFiles = {
   'angularSrc': [
     'src/minErr.js',
     'src/Angular.js',

bower.json

@@ -2,11 +2,7 @@
   "name": "AngularJS",
   "devDependencies": {
     "jquery": "1.10.2",
-    "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"
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip"
   }
 }

changelog.js

@@ -3,6 +3,8 @@
 // TODO(vojta): pre-commit hook for validating messages
 // TODO(vojta): report errors, currently Q silence everything which really sucks
 
+'use strict';
+
 var child = require('child_process');
 var fs = require('fs');
 var util = require('util');
@@ -110,7 +112,7 @@ var printSection = function(stream, title, section, printCommitLinks) {
         }
         stream.write(')\n');
       } else {
-        stream.write(util.format('%s %s', prefix, commit.subject));
+        stream.write(util.format('%s %s\n', prefix, commit.subject));
       }
     });
   });
@@ -164,7 +166,7 @@ var writeChangelog = function(stream, commits, version) {
         hash: commit.hash,
         closes: []
       });
-    };
+    }
   });
 
   stream.write(util.format(HEADER_TPL, version, version, currentDate()));
@@ -172,7 +174,7 @@ var writeChangelog = function(stream, commits, version) {
   printSection(stream, 'Features', sections.feat);
   printSection(stream, 'Performance Improvements', sections.perf);
   printSection(stream, 'Breaking Changes', sections.breaks, false);
-}
+};
 
 
 var getPreviousTag = function() {
@@ -186,6 +188,7 @@ var getPreviousTag = function() {
 
 
 var generate = function(version, file) {
+
   getPreviousTag().then(function(tag) {
     console.log('Reading git log since', tag);
     readGitLog('^fix|^feat|^perf|BREAKING', tag).then(function(commits) {
@@ -199,6 +202,7 @@ var generate = function(version, file) {
 
 // publish for testing
 exports.parseRawCommit = parseRawCommit;
+exports.printSection = printSection;
 
 // hacky start if not run by jasmine :-D
 if (process.argv.join('').indexOf('jasmine-node') === -1) {

changelog.spec.js

@@ -1,3 +1,7 @@
+/* global describe: false, beforeEach: false, afterEach: false, it: false, expect: false */
+
+'use strict';
+
 describe('changelog.js', function() {
   var ch = require('./changelog');
 
@@ -13,7 +17,7 @@ describe('changelog.js', function() {
       expect(msg.hash).toBe('9b1aff905b638aa274a5fc8f88662df446d374bd');
       expect(msg.subject).toBe('broadcast $destroy event on scope destruction');
       expect(msg.body).toBe('perf testing shows that in chrome this change adds 5-15% overhead\n' +
-          'when destroying 10k nested scopes where each scope has a $destroy listener\n')
+          'when destroying 10k nested scopes where each scope has a $destroy listener\n');
       expect(msg.component).toBe('scope');
     });
 
@@ -40,4 +44,65 @@ describe('changelog.js', function() {
       expect(msg.breaking).toEqual(' first breaking change\nsomething else\nanother line with more info\n');
     });
   });
+
+  describe('printSection', function() {
+    var output;
+    var streamMock = {
+      write: function(str) {
+        output += str;
+      }
+    };
+
+    beforeEach(function() {
+      output = '';
+    });
+
+    it('should add a new line at the end of each breaking change list item ' +
+       'when there is 1 item per component', function() {
+      var title = 'test';
+      var printCommitLinks = false;
+
+      var section = {
+        module1: [{subject: 'breaking change 1'}],
+        module2: [{subject: 'breaking change 2'}]
+      };
+      var expectedOutput =
+          '\n' + '## test\n\n' +
+          '- **module1:** breaking change 1\n' +
+          '- **module2:** breaking change 2\n' +
+          '\n';
+
+      ch.printSection(streamMock, title, section, printCommitLinks);
+      expect(output).toBe(expectedOutput);
+    });
+
+    it('should add a new line at the end of each breaking change list item ' +
+       'when there are multiple items per component', function() {
+      var title = 'test';
+      var printCommitLinks = false;
+
+      var section = {
+        module1: [
+          {subject: 'breaking change 1.1'},
+          {subject: 'breaking change 1.2'}
+        ],
+        module2: [
+          {subject: 'breaking change 2.1'},
+          {subject: 'breaking change 2.2'}
+        ]
+      };
+      var expectedOutput =
+          '\n' + '## test\n\n' +
+          '- **module1:**\n' +
+          '  - breaking change 1.1\n' +
+          '  - breaking change 1.2\n' +
+          '- **module2:**\n' +
+          '  - breaking change 2.1\n' +
+          '  - breaking change 2.2\n' +
+          '\n';
+
+      ch.printSection(streamMock, title, section, printCommitLinks);
+      expect(output).toBe(expectedOutput);
+    });
+  });
 });

compare-master-to-stable.js

@@ -1,5 +1,7 @@
 #!/usr/local/bin/node
 
+'use strict';
+
 var util = require('util');
 var cp = require('child_process');
 
@@ -143,7 +145,7 @@ then(allInSeries(function (branch) {
         return sha + (msg.toLowerCase().indexOf('fix') === -1 ? '   ' : ' * ') + msg;
       });
       branch.log = log.map(function (line) {
-        return line.substr(41)
+        return line.substr(41);
       });
       return branch;
     });

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/css/prettify.css

@@ -40,7 +40,7 @@ pre.prettyprint.linenums {
 }
 ol.linenums {
   margin: 0 0 0 33px; /* IE indents via margin-left */
-} 
+}
 ol.linenums li {
   padding-left: 12px;
   font-size:12px;

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

@@ -1,284 +0,0 @@
-'use strict';
-
-var directive = {};
-var service = { value: {} };
-
-var DEPENDENCIES = {
-  'angular.js': 'http://code.angularjs.org/' + angular.version.full + '/angular.min.js',
-  'angular-resource.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-resource.min.js',
-  'angular-route.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-route.min.js',
-  'angular-animate.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-animate.min.js',
-  'angular-sanitize.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-sanitize.min.js',
-  'angular-cookies.js': 'http://code.angularjs.org/' + angular.version.full + '/angular-cookies.min.js'
-};
-
-
-function escape(text) {
-  return text.
-    replace(/\&/g, '&').
-    replace(/\</g, '&lt;').
-    replace(/\>/g, '&gt;').
-    replace(/"/g, '&quot;');
-}
-
-/**
- * http://stackoverflow.com/questions/451486/pre-tag-loses-line-breaks-when-setting-innerhtml-in-ie
- * http://stackoverflow.com/questions/195363/inserting-a-newline-into-a-pre-tag-ie-javascript
- */
-function setHtmlIe8SafeWay(element, html) {
-  var newElement = angular.element('<pre>' + html + '</pre>');
-
-  element.empty();
-  element.append(newElement.contents());
-  return element;
-}
-
-
-directive.jsFiddle = function(getEmbeddedTemplate, escape, script) {
-  return {
-    terminal: true,
-    link: function(scope, element, attr) {
-      var name = '',
-        stylesheet = '<link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css">\n',
-        fields = {
-          html: '',
-          css: '',
-          js: ''
-        };
-
-      angular.forEach(attr.jsFiddle.split(' '), function(file, index) {
-        var fileType = file.split('.')[1];
-
-        if (fileType == 'html') {
-          if (index == 0) {
-            fields[fileType] +=
-              '<div ng-app' + (attr.module ? '="' + attr.module + '"' : '') + '>\n' +
-                getEmbeddedTemplate(file, 2);
-          } else {
-            fields[fileType] += '\n\n\n  <!-- CACHE FILE: ' + file + ' -->\n' +
-              '  <script type="text/ng-template" id="' + file + '">\n' +
-              getEmbeddedTemplate(file, 4) +
-              '  </script>\n';
-          }
-        } else {
-          fields[fileType] += getEmbeddedTemplate(file) + '\n';
-        }
-      });
-
-      fields.html += '</div>\n';
-
-      setHtmlIe8SafeWay(element,
-        '<form class="jsfiddle" method="post" action="http://jsfiddle.net/api/post/library/pure/" target="_blank">' +
-          hiddenField('title', 'AngularJS Example: ' + name) +
-          hiddenField('css', '</style> <!-- Ugly Hack due to jsFiddle issue: http://goo.gl/BUfGZ --> \n' +
-            stylesheet +
-            script.angular +
-            (attr.resource ? script.resource : '') +
-            '<style>\n' +
-            fields.css) +
-          hiddenField('html', fields.html) +
-          hiddenField('js', fields.js) +
-          '<button class="btn btn-primary"><i class="icon-white icon-pencil"></i> Edit Me</button>' +
-          '</form>');
-
-      function hiddenField(name, value) {
-        return '<input type="hidden" name="' +  name + '" value="' + escape(value) + '">';
-      }
-    }
-  }
-};
-
-
-
-directive.ngSetText = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
-  return {
-    restrict: 'CA',
-    priority: 10,
-    compile: function(element, attr) {
-      setHtmlIe8SafeWay(element, escape(getEmbeddedTemplate(attr.ngSetText)));
-    }
-  }
-}]
-
-
-directive.ngHtmlWrap = ['reindentCode', 'templateMerge', function(reindentCode, templateMerge) {
-  return {
-    compile: function(element, attr) {
-      var properties = {
-            head: '',
-            module: '',
-            body: element.text()
-          },
-        html = "<!doctype html>\n<html ng-app{{module}}>\n  <head>\n{{head:4}}  </head>\n  <body>\n{{body:4}}  </body>\n</html>";
-
-      angular.forEach((attr.ngHtmlWrap || '').split(' '), function(dep) {
-        if (!dep) return;
-        dep = DEPENDENCIES[dep] || dep;
-
-        var ext = dep.split(/\./).pop();
-
-        if (ext == 'css') {
-          properties.head += '<link rel="stylesheet" href="' + dep + '" type="text/css">\n';
-        } else if(ext == 'js') {
-          properties.head += '<script src="' + dep + '"></script>\n';
-        } else {
-          properties.module = '="' + dep + '"';
-        }
-      });
-
-      setHtmlIe8SafeWay(element, escape(templateMerge(html, properties)));
-    }
-  }
-}];
-
-
-directive.ngSetHtml = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
-  return {
-    restrict: 'CA',
-    priority: 10,
-    compile: function(element, attr) {
-      setHtmlIe8SafeWay(element, getEmbeddedTemplate(attr.ngSetHtml));
-    }
-  }
-}];
-
-
-directive.ngEvalJavascript = ['getEmbeddedTemplate', function(getEmbeddedTemplate) {
-  return {
-    compile: function (element, attr) {
-      var fileNames = attr.ngEvalJavascript.split(' ');
-      angular.forEach(fileNames, function(fileName) {
-        var script = getEmbeddedTemplate(fileName);
-        try {
-          if (window.execScript) { // IE
-            window.execScript(script || '""'); // IE complains when evaling empty string
-          } else {
-            window.eval(script + '//@ sourceURL=' + fileName);
-          }
-        } catch (e) {
-          if (window.console) {
-            window.console.log(script, '\n', e);
-          } else {
-            window.alert(e);
-          }
-        }
-      });
-    }
-  };
-}];
-
-
-directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location', '$sniffer', '$animate',
-                function($templateCache,   $browser,  docsRootScope, $location,   $sniffer,   $animate) {
-  return {
-    terminal: true,
-    link: function(scope, element, attrs) {
-      var modules = ['ngAnimate'],
-          embedRootScope,
-          deregisterEmbedRootScope;
-
-      modules.push(['$provide', function($provide) {
-        $provide.value('$templateCache', $templateCache);
-        $provide.value('$anchorScroll', angular.noop);
-        $provide.value('$browser', $browser);
-        $provide.value('$sniffer', $sniffer);
-        $provide.value('$animate', $animate);
-        $provide.provider('$location', function() {
-          this.$get = ['$rootScope', function($rootScope) {
-            docsRootScope.$on('$locationChangeSuccess', function(event, oldUrl, newUrl) {
-              $rootScope.$broadcast('$locationChangeSuccess', oldUrl, newUrl);
-            });
-            return $location;
-          }];
-          this.html5Mode = angular.noop;
-        });
-
-        $provide.decorator('$rootScope', ['$delegate', function($delegate) {
-          embedRootScope = $delegate;
-
-          // Since we are teleporting the $animate service, which relies on the $$postDigestQueue
-          // we need the embedded scope to use the same $$postDigestQueue as the outer scope
-          embedRootScope.$$postDigestQueue = docsRootScope.$$postDigestQueue;
-
-          deregisterEmbedRootScope = docsRootScope.$watch(function embedRootScopeDigestWatch() {
-            embedRootScope.$digest();
-          });
-
-          return embedRootScope;
-        }]);
-      }]);
-      if (attrs.ngEmbedApp)  modules.push(attrs.ngEmbedApp);
-
-      element.on('click', function(event) {
-        if (event.target.attributes.getNamedItem('ng-click')) {
-          event.preventDefault();
-        }
-      });
-
-      element.bind('$destroy', function() {
-        deregisterEmbedRootScope();
-        embedRootScope.$destroy();
-      });
-
-      element.data('$injector', null);
-      angular.bootstrap(element, modules);
-    }
-  };
-}];
-
-service.reindentCode = function() {
-  return function (text, spaces) {
-    if (!text) return text;
-    var lines = text.split(/\r?\n/);
-    var prefix = '      '.substr(0, spaces || 0);
-    var i;
-
-    // remove any leading blank lines
-    while (lines.length && lines[0].match(/^\s*$/)) lines.shift();
-    // remove any trailing blank lines
-    while (lines.length && lines[lines.length - 1].match(/^\s*$/)) lines.pop();
-    var minIndent = 999;
-    for (i = 0; i < lines.length; i++) {
-      var line = lines[0];
-      var reindentCode = line.match(/^\s*/)[0];
-      if (reindentCode !== line && reindentCode.length < minIndent) {
-        minIndent = reindentCode.length;
-      }
-    }
-
-    for (i = 0; i < lines.length; i++) {
-      lines[i] = prefix + lines[i].substring(minIndent);
-    }
-    lines.push('');
-    return lines.join('\n');
-  }
-};
-
-service.templateMerge = ['reindentCode', function(indentCode) {
-  return function(template, properties) {
-    return template.replace(/\{\{(\w+)(?:\:(\d+))?\}\}/g, function(_, key, indent) {
-      var value = properties[key];
-
-      if (indent) {
-        value = indentCode(value, indent);
-      }
-
-      return value == undefined ? '' : value;
-    });
-  };
-}];
-
-service.getEmbeddedTemplate = ['reindentCode', function(reindentCode) {
-  return function (id) {
-    var element = document.getElementById(id);
-
-    if (!element) {
-      return null;
-    }
-
-    return reindentCode(angular.element(element).html(), 0);
-  }
-}];
-
-
-angular.module('bootstrapPrettify', []).directive(directive).factory(service);

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

@@ -11,7 +11,7 @@ directive.runnableExample = ['$templateCache', '$document', function($templateCa
          'ng-repeat="tab in tabs track by $index" ' +
          'href="" ' +
          'class="btn"' +
-         'ng-click="setTab($index)">' + 
+         'ng-click="setTab($index)">' +
     '    {{ tab }}' +
     '  </a>' +
     '</nav>';
@@ -103,7 +103,7 @@ directive.syntax = function() {
     restrict: 'A',
     link: function(scope, element, attrs) {
       function makeLink(type, text, link, icon) {
-        return '<a href="' + link + '" class="btn syntax-' + type + '" target="_blank" rel="nofollow">' + 
+        return '<a href="' + link + '" class="btn syntax-' + type + '" target="_blank" rel="nofollow">' +
                 '<span class="' + icon + '"></span> ' + text +
                '</a>';
       };
@@ -307,7 +307,7 @@ var popoverElement = function() {
       return this.titleElement.html(value);
     },
 
-    content : function(value) { 
+    content : function(value) {
       if(value && value.length > 0) {
         value = marked(value);
       }

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

@@ -26,21 +26,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(by.css('tt'));
-      expect(code.getText()).toContain('guest!!!');
-    });
-
 
     it('should be resilient to trailing slashes', function() {
       browser.get('index-debug.html#!/api/ng/function/angular.noop/');
@@ -67,5 +52,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('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',
@@ -13,11 +14,10 @@ angular.module('docsApp', [
   'tutorials',
   'versions',
   'bootstrap',
-  'bootstrapPrettify',
   'ui.bootstrap.dropdown'
 ])
 
 
-.config(function($locationProvider) {
+.config(['$locationProvider', function($locationProvider) {
   $locationProvider.html5Mode(true).hashPrefix('!');
-});
+}]);

docs/app/src/docs.js

@@ -6,31 +6,10 @@ 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,
@@ -38,55 +17,22 @@ angular.module('DocsController', [])
     };
   };
 
-  $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.$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);
-    }
-
-    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);
-    }
+    path = path.replace(/^\/?(.+?)(\/index)?\/?$/, '$1');
 
     currentPage = $scope.currentPage = NG_PAGES[path];
 
     if ( currentPage ) {
-      $scope.currentArea = currentPage && NG_NAVIGATION[currentPage.area];
+      $scope.partialPath = 'partials/' + path + '.html';
+      $scope.currentArea = NG_NAVIGATION[currentPage.area];
       var pathParts = currentPage.path.split('/');
       var breadcrumb = $scope.breadcrumb = [];
       var breadcrumbPath = '';
@@ -98,6 +44,7 @@ angular.module('DocsController', [])
     } else {
       $scope.currentArea = NG_NAVIGATION['api'];
       $scope.breadcrumb = [];
+      $scope.partialPath = 'Error404.html';
     }
   });
 
@@ -107,24 +54,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/errors.js

@@ -59,4 +59,4 @@ angular.module('errors', ['ngSanitize'])
       element.html(errorLinkFilter(interpolate.apply(null, formatArgs), '_blank'));
     }
   };
-}]);
+}]);

docs/app/src/examples.js

@@ -2,7 +2,12 @@ angular.module('examples', [])
 
 .factory('formPostData', ['$document', function($document) {
   return function(url, fields) {
-    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="_blank"></form>');
+    /**
+     * Form previously posted to target="_blank", but pop-up blockers were causing this to not work.
+     * If a user chose to bypass pop-up blocker one time and click the link, they would arrive at
+     * a new default plnkr, not a plnkr with the desired template.
+     */
+    var form = angular.element('<form style="display: none;" method="post" action="' + url + '"></form>');
     angular.forEach(fields, function(value, name) {
       var input = angular.element('<input type="hidden" name="' +  name + '">');
       input.attr('value', value);
@@ -69,4 +74,4 @@ angular.module('examples', [])
         formPostData('http://plnkr.co/edit/?p=preview', postData);
       });
   };
-}]);
+}]);

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/src/tutorials.js

@@ -1,6 +1,6 @@
 angular.module('tutorials', [])
 
-.directive('docTutorialNav', function(templateMerge) {
+.directive('docTutorialNav', function() {
   var pages = [
     '',
     'step_00', 'step_01', 'step_02', 'step_03', 'step_04',
@@ -8,23 +8,22 @@ angular.module('tutorials', [])
     'step_10', 'step_11', 'step_12', 'the_end'
   ];
   return {
-    compile: function(element, attrs) {
-      var seq = 1 * attrs.docTutorialNav,
-          props = {
-            seq: seq,
-            prev: pages[seq],
-            next: pages[2 + seq],
-            diffLo: seq ? (seq - 1): '0~1',
-            diffHi: seq
-          };
+    scope: {},
+    template:
+      '<a ng-href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
+      '<a ng-href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
+      '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
+      '<a ng-href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>',
+    link: function(scope, element, attrs) {
+      var seq = 1 * attrs.docTutorialNav;
+      scope.seq = seq;
+      scope.prev = pages[seq];
+      scope.next = pages[2 + seq];
+      scope.diffLo = seq ? (seq - 1): '0~1';
+      scope.diffHi = seq;
 
       element.addClass('btn-group');
       element.addClass('tutorial-nav');
-      element.append(templateMerge(
-        '<a href="tutorial/{{prev}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-step-backward"></i> Previous</li></a>\n' +
-        '<a href="http://angular.github.io/angular-phonecat/step-{{seq}}/app"><li class="btn btn-primary"><i class="glyphicon glyphicon-play"></i> Live Demo</li></a>\n' +
-        '<a href="https://github.com/angular/angular-phonecat/compare/step-{{diffLo}}...step-{{diffHi}}"><li class="btn btn-primary"><i class="glyphicon glyphicon-search"></i> Code Diff</li></a>\n' +
-        '<a href="tutorial/{{next}}"><li class="btn btn-primary">Next <i class="glyphicon glyphicon-step-forward"></i></li></a>', props));
     }
   };
 })
@@ -47,4 +46,4 @@ angular.module('tutorials', [])
         '<a ng-href="https://github.com/angular/angular-phonecat/compare/step-{{step ? (step - 1): \'0~1\'}}...step-{{step}}">GitHub</a>\n' +
       '</p>'
   };
-});
+});

docs/app/src/versions.js

@@ -1,15 +1,31 @@
+"use strict";
+
 angular.module('versions', [])
 
 .controller('DocsVersionsCtrl', ['$scope', '$location', '$window', 'NG_VERSIONS', function($scope, $location, $window, NG_VERSIONS) {
-  $scope.docs_versions = NG_VERSIONS;
   $scope.docs_version  = NG_VERSIONS[0];
+  $scope.docs_versions = NG_VERSIONS;
+
+  for(var i=0, minor = NaN; i < NG_VERSIONS.length; i++) {
+    var version = NG_VERSIONS[i];
+    // NaN will give false here
+    if (minor <= version.minor) {
+      continue;
+    }
+    version.isLatest = true;
+    minor = version.minor;
+  }
+
+  $scope.getGroupName = function(v) {
+    return v.isLatest ? 'Latest' : ('v' + v.major + '.' + v.minor + '.x');
+  };
 
   $scope.jumpToDocsVersion = function(version) {
-    var currentPagePath = $location.path();
+    var currentPagePath = $location.path().replace(/\/$/, '');
 
     // TODO: We need to do some munging of the path for different versions of the API...
-    
+
 
     $window.location = version.docsUrl + currentPagePath;
   };
-}]);
+}]);

docs/app/test/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,8 +27,8 @@ 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,166 @@
-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 angularjs. This package depends upon
+// the ngdoc,nunjucks and examples packages defined in the dgeni-packages npm module.
+module.exports = new Package('angularjs', [
+  require('dgeni-packages/ngdoc'),
+  require('dgeni-packages/nunjucks'),
+  require('dgeni-packages/examples')
+])
 
-  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')
-  ]);
 
-  config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step')
-  ]);
+.factory(require('./services/errorNamespaceMap'))
+.factory(require('./services/getMinerrInfo'))
+.factory(require('./services/getVersion'))
+.factory(require('./services/gitData'))
 
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
-  ]);
+.factory(require('./services/deployments/debug'))
+.factory(require('./services/deployments/default'))
+.factory(require('./services/deployments/jquery'))
+.factory(require('./services/deployments/production'))
 
-  config.append('processing.inlineTagDefinitions', [
-    require('./inline-tag-defs/type')
-  ]);
+.factory(require('./inline-tag-defs/type'))
 
-  config.set('processing.search.ignoreWordsFile', path.resolve(packagePath, 'ignore.words'));
 
-  config.prepend('rendering.templateFolders', [
-    path.resolve(packagePath, 'templates')
-  ]);
+.processor(require('./processors/error-docs'))
+.processor(require('./processors/index-page'))
+.processor(require('./processors/keywords'))
+.processor(require('./processors/pages-data'))
+.processor(require('./processors/versions-data'))
 
-  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'],
+    pathTemplate: '.',
+    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(checkAnchorLinksProcessor) {
+  checkAnchorLinksProcessor.base = '/';
+  // We are only interested in docs that have an area (i.e. they are pages)
+  checkAnchorLinksProcessor.checkDoc = function(doc) { return doc.area; };
+})
+
+
+.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,39 @@
+"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/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,39 @@
+"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.min.js',
+      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      '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.min.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,43 @@
+"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.min.js',
+      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      '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.min.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,42 @@
+"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.min.js',
+      'js/angular-bootstrap/dropdown-toggle.min.js',
+      'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js',
+      'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js',
+      '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.min.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,16 @@
+"use strict";
+
+var versionInfo = require('../../../lib/versions/version-info');
+
+/**
+ * @dgService gitData
+ * @description
+ * Information from the local git repository
+ */
+module.exports = function gitData() {
+  return {
+    version: versionInfo.currentVersion,
+    versions: versionInfo.previousVersions,
+    info: versionInfo.gitRepoInfo
+  };
+};

docs/config/tag-defs/sortOrder.js

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

docs/config/templates/error.template.html

@@ -14,4 +14,4 @@
   {$ doc.description | marked $}
 </div>
 
-{% endblock %}
+{% endblock %}

docs/config/templates/errorNamespace.template.html

@@ -25,4 +25,4 @@
   </div>
 </div>
 
-{% endblock %}
+{% endblock %}

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']);
@@ -85,7 +76,7 @@
           <div class="row">
             <div class="col-md-9 header-branding">
               <a class="brand navbar-brand" href="http://angularjs.org">
-                <img class="logo" src="img/angularjs-for-header-only.svg">
+                <img width="117" height="30" class="logo" ng-src="img/angularjs-for-header-only.svg">
               </a>
               <ul class="nav navbar-nav">
                 <li class="divider-vertical"></li>
@@ -175,7 +166,7 @@
         <div class="container main-grid main-header-grid">
           <div class="grid-left">
             <div ng-controller="DocsVersionsCtrl" class="picker version-picker">
-              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by (v.isStable?'Stable':'Unstable') for v in docs_versions"
+              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by getGroupName(v) for v in docs_versions"
                       ng-model="docs_version"
                       ng-change="jumpToDocsVersion(docs_version)"
                       class="docs-version-jump">
@@ -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,9 +20,9 @@
     </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>
 
 {# Be aware that we need these extra new lines here or marked will not realise that the <div>
-   above is HTML and wrap each line in a <p> - thus breaking the HTML #}
+   above is HTML and wrap each line in a <p> - thus breaking the HTML #}

docs/config/templates/tutorial.template.html

@@ -1 +1 @@
-{% include 'overview.template.html' %}
+{% include 'overview.template.html' %}

docs/content/api/index.ngdoc

@@ -148,7 +148,7 @@ or JavaScript callbacks.
       {@link ngAnimate CSS-based animations}
     </td>
     <td>
-      Follow ngAnimate’s CSS naming structure to reference CSS transitions / keyframe animations in AngularJS. Once defined the animation can be triggered by referencing the CSS class within the HTML template code.
+      Follow ngAnimate’s CSS naming structure to reference CSS transitions / keyframe animations in AngularJS. Once defined, the animation can be triggered by referencing the CSS class within the HTML template code.
     </td>
   </tr>
   <tr>
@@ -156,7 +156,7 @@ or JavaScript callbacks.
       {@link ngAnimate JS-based animations}
     </td>
     <td>
-      Use {@link angular.Module#animation module.animation()} to register a JavaScript animation. Once registered the animation can be triggered by referencing the CSS class within the HTML template code.
+      Use {@link angular.Module#animation module.animation()} to register a JavaScript animation. Once registered, the animation can be triggered by referencing the CSS class within the HTML template code.
     </td>
   </tr>
 </table>

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/$injector/cdep.ngdoc

@@ -23,4 +23,4 @@ When an instance of `MyCtrl` is created, the service `myService` will be created
 by the `$injector`. `myService` depends on itself, which causes the `$injector`
 to detect a circular dependency and throw the error.
 
-For more information, see the {@link guide/di Dependency Injection Guide}.
+For more information, see the {@link guide/di Dependency Injection Guide}.

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

@@ -23,4 +23,4 @@ To avoid the error, always use string literals for dependency injection annotati
 tokens.
 
 For an explanation of what injection annotations are and how to use them, refer
-to the {@link guide/di Dependency Injection Guide}.
+to the {@link guide/di Dependency Injection Guide}.

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

@@ -23,4 +23,4 @@ angular.module("myApp", [])
 ```
 
 For more information, refer to the {@link auto.$provide#provider
-$provide.provider} api doc.
+$provide.provider} api doc.

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

@@ -14,7 +14,7 @@ angular.module('myApp', [])
   }]);
 ```
 
-The above code will fail with `$injector:unpr` if `myService` is not defined. 
+The above code will fail with `$injector:unpr` if `myService` is not defined.
 
 Making sure each dependency is defined will fix the problem, as noted below.
 
@@ -25,3 +25,47 @@ angular.module('myApp', [])
     // Do something with myService
   }]);
 ```
+
+An unknown provider error can also be caused by accidentally redefining a
+module using the `angular.module` API, as shown in the following example.
+
+```
+angular.module('myModule', [])
+  .service('myCoolService', function () { /* ... */ });
+
+angular.module('myModule', [])
+  // myModule has already been created! This is not what you want!
+  .directive('myDirective', ['myCoolService', function (myCoolService) {
+    // This directive definition throws unknown provider, because myCoolService
+    // has been destroyed.
+  }]);
+```
+
+To fix this problem, make sure you only define each module with the
+`angular.module(name, [requires])` syntax once across your entire project.
+Retrieve it for subsequent use with `angular.module(name)`. The fixed example
+is shown below.
+
+```
+angular.module('myModule', [])
+  .service('myCoolService', function () { /* ... */ });
+
+angular.module('myModule')
+  .directive('myDirective', ['myCoolService', function (myCoolService) {
+    // This directive definition does not throw unknown provider.
+  }]);
+```
+
+
+Attempting to inject one controller into another will also throw an `Unknown provider` error:
+
+```
+angular.module('myModule', [])
+  .controller('MyFirstController', function() { /* ... */ });
+  .controller('MySecondController', ['MyFirstController', function(MyFirstController) {
+    // This controller throws an unknown provider error because
+    // MyFirstController cannot be injected.
+  }]);
+```
+
+Use the `$controller` service if you want to instantiate controllers yourself.

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

@@ -9,4 +9,4 @@ it hard to reason about whether some combination of concatenated values are
 unsafe to use and could easily lead to XSS.
 
 For more information about how AngularJS helps keep your app secure, refer to
-the {@link ng.$sce $sce} API doc.
+the {@link ng.$sce $sce} API doc.

docs/content/error/$parse/isecdom.ngdoc

@@ -14,3 +14,34 @@ perform this check - it's up to the developer to not expose such sensitive and p
 directly on the scope chain.
 
 To resolve this error, avoid access to DOM nodes.
+
+
+# Event Handlers and Return Values
+
+The `$parse:isecdom` error also occurs when an event handler invokes a function that returns a DOM
+node.
+
+```html
+  <button ng-click="iWillReturnDOM()">click me</button>
+```
+
+```js
+  $scope.iWillReturnDOM = function() {
+    return someDomNode;
+  }
+```
+
+To fix this issue, avoid returning DOM nodes from event handlers.
+
+*Note: This error often means that you are accessing DOM from your controllers, which is usually
+a sign of poor coding style that violates separation of concerns.*
+
+
+# Implicit Returns in CoffeeScript
+
+This error can occur more frequently when using CoffeeScript, which has a feature called implicit
+returns. This language feature returns the last dereferenced object in the function when the
+function has no explicit return statement.
+
+The solution in this scenario is to add an explicit return statement. For example `return false` to
+the function.

docs/content/error/$parse/isecff.ngdoc

@@ -14,4 +14,4 @@ Example expression that would result in this error:
 
 ```
 <div>{{user.sendInfo.call({}, true)}}</div>
-```
+```

docs/content/error/$parse/isecfld.ngdoc

@@ -24,4 +24,4 @@ Example expressions that would result in this error:
 <div>{{user.__proto__.hasOwnProperty = $emit}}</div>
 
 <div>{{user.__defineGetter__('name', noop)}}</div>
-```
+```

docs/content/error/$resource/badname.ngdoc

@@ -5,4 +5,4 @@
 
 Occurs when you try to use the name `hasOwnProperty` as a name of a parameter.
 Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object
-and allowing such a name would break lookups on this object.
+and allowing such a name would break lookups on this object.

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/ng/areq.ngdoc

@@ -5,4 +5,4 @@
 
 AngularJS often asserts that certain values will be present and truthy using a
 helper function. If the assertion fails, this error is thrown. To fix this problem,
-make sure that the value the assertion expects is defined and truthy.
+make sure that the value the assertion expects is defined and truthy.

docs/content/error/ng/badname.ngdoc

@@ -5,4 +5,4 @@
 
 Occurs when you try to use the name `hasOwnProperty` in a context where it is not allow.
 Generally, a name cannot be `hasOwnProperty` because it is used, internally, on a object
-and allowing such a name would break lookups on this object.
+and allowing such a name would break lookups on this object.

docs/content/error/ng/btstrpd.ngdoc

@@ -49,4 +49,4 @@ You can also get this error if you accidentally load AngularJS itself more than
     <script src="angular.js"></script>
   </body>
 </html>
-```
+```

docs/content/error/ng/cpi.ngdoc

@@ -7,4 +7,4 @@ This error occurs when attempting to copy an object to itself. Calling {@link
 api/angular.copy angular.copy} with a `destination` object deletes
 all of the elements or properties on `destination` before copying to it. Copying
 an object to itself is not supported. Make sure to check your calls to
-`angular.copy` and avoid copying objects or arrays to themselves.
+`angular.copy` and avoid copying objects or arrays to themselves.

docs/content/error/ng/cpws.ngdoc

@@ -7,4 +7,4 @@ Copying Window or Scope instances is not supported because of cyclical and self
 references. Avoid copying windows and scopes, as well as any other cyclical or
 self-referential structures. Note that trying to deep copy an object containing
 cyclical references that is neither a window nor a scope will cause infinite
-recursion and a stack overflow.
+recursion and a stack overflow.

docs/content/error/ngRepeat/dupes.ngdoc

@@ -15,7 +15,7 @@ For example the issue can be triggered by this *invalid* code:
 
 To resolve this error either ensure that the items in the collection have unique identity or use the `track by` syntax to specify how to track the association between models and DOM.
 
-To resolve the example above can be resolved by using `track by $index`, which will cause the items to be keyed by their position in the array instead of their value:
+The example above can be resolved by using `track by $index`, which will cause the items to be keyed by their position in the array instead of their value:
 
 ```
 <div ng-repeat="value in [4, 4] track by $index"></div>

docs/content/guide/$location.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Using $location
+@sortOrder 500
 @description
 
 # What does it do?
@@ -163,7 +164,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 +211,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 +245,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 +254,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 +306,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,17 +322,9 @@ 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`.
-
 
 ### Server side
 
@@ -358,118 +359,308 @@ Note that when you type hashbang url into first browser (or vice versa) it doesn
 redirect to regular / hashbang url, as this conversion happens only during parsing the initial URL
 = on page reload.
 
-In this examples we use `<base href="/base/index.html" />`
-<example>
+In these examples we use `<base href="/base/index.html" />`
+
+#### Browser in HTML5 mode
+<example module="html5-mode" name="location-html5-mode">
   <file name="index.html">
-    <div id="html5-mode" ng-controller="Html5Cntl">
-      <h3>Browser with History API</h3>
-      <div ng-address-bar browser="html5"></div><br><br>
-      $location.protocol() = {{$location.protocol()}}<br>
-      $location.host() = {{$location.host()}}<br>
-      $location.port() = {{$location.port()}}<br>
-      $location.path() = {{$location.path()}}<br>
-      $location.search() = {{$location.search()}}<br>
-      $location.hash() = {{$location.hash()}}<br>
-      <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
-      <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
-      <a href="/other-base/another?search">external</a>
-    </div>
-
-    <div id="hashbang-mode" ng-controller="HashbangCntl">
-      <h3>Browser without History API</h3>
-      <div ng-address-bar browser="hashbang"></div><br><br>
-      $location.protocol() = {{$location.protocol()}}<br>
-      $location.host() = {{$location.host()}}<br>
-      $location.port() = {{$location.port()}}<br>
-      $location.path() = {{$location.path()}}<br>
-      $location.search() = {{$location.search()}}<br>
-      $location.hash() = {{$location.hash()}}<br>
-      <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
-      <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
-      <a href="/other-base/another?search">external</a>
+    <div ng-controller="LocationController">
+      <div ng-address-bar></div><br><br>
+      <div>
+        $location.protocol() = <span ng-bind="$location.protocol()"></span> <br>
+        $location.host() = <span ng-bind="$location.host()"></span> <br>
+        $location.port() = <span ng-bind="$location.port()"></span> <br>
+        $location.path() = <span ng-bind="$location.path()"></span> <br>
+        $location.search() = <span ng-bind="$location.search()"></span> <br>
+        $location.hash() = <span ng-bind="$location.hash()"></span> <br>
+      </div>
+      <div id="navigation">
+        <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
+        <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
+        <a href="/other-base/another?search">external</a>
+      </div>
     </div>
   </file>
+  <file name="app.js">
+   angular.module('html5-mode', ['fake-browser', 'address-bar'])
 
-  <file name="script.js">
-    function FakeBrowser(initUrl, baseHref) {
-      this.onUrlChange = function(fn) {
-        this.urlChange = fn;
+   .constant('initUrl', 'http://www.example.com/base/path?a=b#h')
+   .constant('baseHref', '/base/index.html')
+   .value('$sniffer', { history: true })
+
+   .controller("LocationController", function($scope, $location) {
+     $scope.$location = {};
+     angular.forEach("protocol host port path search hash".split(" "), function(method){
+      $scope.$location[method] = function(){
+        var result = $location[method].call($location);
+        return angular.isObject(result) ? angular.toJson(result) : result;
+      };
+     });
+   })
+
+   .config(function($locationProvider) {
+     $locationProvider.html5Mode(true).hashPrefix('!');
+   })
+
+   .run(function($rootElement) {
+     $rootElement.on('click', function(e) { e.stopPropagation(); });
+   });
+  </file>
+
+  <file name="fakeBrowser.js">
+    angular.module('fake-browser', [])
+
+    .config(function($provide) {
+     $provide.decorator('$browser', function($delegate, baseHref, initUrl) {
+
+      $delegate.onUrlChange = function(fn) {
+         this.urlChange = fn;
+       };
+
+      $delegate.url = function() {
+         return initUrl;
       };
 
-      this.url = function() {
-        return initUrl;
-      };
+      $delegate.defer = function(fn, delay) {
+         setTimeout(function() { fn(); }, delay || 0);
+       };
 
-      this.defer = function(fn, delay) {
-        setTimeout(function() { fn(); }, delay || 0);
-      };
+      $delegate.baseHref = function() {
+         return baseHref;
+       };
 
-      this.baseHref = function() {
-        return baseHref;
-      };
+       return $delegate;
+     });
+    });
+    </file>
 
-      this.notifyWhenOutstandingRequests = angular.noop;
-    }
+  <file name="addressBar.js">
+   angular.module('address-bar', [])
+   .directive('ngAddressBar', function($browser, $timeout) {
+      return {
+        template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
+        link: function(scope, element, attrs){
+          var input = element.children("input"), delay;
 
-    var browsers = {
-      html5: new FakeBrowser('http://www.example.com/base/path?a=b#h', '/base/index.html'),
-      hashbang: new FakeBrowser('http://www.example.com/base/index.html#!/path?a=b#h', '/base/index.html')
-    };
+          input.on('keypress keyup keydown', function(event) {
+                  delay = (!delay ? $timeout(fireUrlChange, 250) : null);
+                  event.stopPropagation();
+                })
+               .val($browser.url());
 
-    function Html5Cntl($scope, $location) {
-      $scope.$location = $location;
-    }
-
-    function HashbangCntl($scope, $location) {
-      $scope.$location = $location;
-    }
-
-    function initEnv(name) {
-      var root = angular.element(document.getElementById(name + '-mode'));
-      // We must kill a link to the injector for this element otherwise angular will
-      // complain that it has been bootstrapped already.
-      root.data('$injector', null);
-      angular.bootstrap(root, [function($compileProvider, $locationProvider, $provide){
-        $locationProvider.html5Mode(true).hashPrefix('!');
-
-        $provide.value('$browser', browsers[name]);
-        $provide.value('$sniffer', {history: name == 'html5'});
-
-        $compileProvider.directive('ngAddressBar', function() {
-          return function(scope, elm, attrs) {
-            var browser = browsers[attrs.browser],
-                input = angular.element('<input type="text" style="width: 400px">').val(browser.url()),
-                delay;
-
-            input.on('keypress keyup keydown', function() {
-              if (!delay) {
-                delay = setTimeout(fireUrlChange, 250);
-              }
-            });
-
-            browser.url = function(url) {
-              return input.val(url);
-            };
-
-            elm.append('Address: ').append(input);
-
-            function fireUrlChange() {
-              delay = null;
-              browser.urlChange(input.val());
-            }
+          $browser.url = function(url) {
+            return url ? input.val(url) : input.val();
           };
-        });
-      }]);
-      root.on('click', function(e) {
-        e.stopPropagation();
-      });
-    }
 
-    initEnv('html5');
-    initEnv('hashbang');
+          function fireUrlChange() {
+            delay = null;
+            $browser.urlChange(input.val());
+          }
+        }
+      };
+    });
   </file>
+
+  <file name="protractor.js" type="protractor">
+
+    var addressBar = element(by.css("#addressBar")),
+        url = 'http://www.example.com/base/path?a=b#h';
+
+
+    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');
+
+    });
+
+    it("should change $location accordingly", function(){
+      var navigation = element.all(by.css("#navigation a"));
+
+      navigation.get(0).click();
+
+      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('');
+
+
+      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');
+    });
+
+  </file>
+
 </example>
 
+####Browser in HTML5 Fallback mode (Hashbang mode)
+<example module="hashbang-mode" name="location-hashbang-mode">
+  <file name="index.html">
+    <div ng-controller="LocationController">
+      <div ng-address-bar></div><br><br>
+      <div>
+        $location.protocol() = <span ng-bind="$location.protocol()"></span> <br>
+        $location.host() = <span ng-bind="$location.host()"></span> <br>
+        $location.port() = <span ng-bind="$location.port()"></span> <br>
+        $location.path() = <span ng-bind="$location.path()"></span> <br>
+        $location.search() = <span ng-bind="$location.search()"></span> <br>
+        $location.hash() = <span ng-bind="$location.hash()"></span> <br>
+      </div>
+      <div id="navigation">
+        <a href="http://www.example.com/base/first?a=b">/base/first?a=b</a> |
+        <a href="http://www.example.com/base/sec/ond?flag#hash">sec/ond?flag#hash</a> |
+        <a href="/other-base/another?search">external</a>
+      </div>
+    </div>
+  </file>
+  <file name="app.js">
+    angular.module('hashbang-mode', ['fake-browser', 'address-bar'])
+
+    .constant('initUrl', 'http://www.example.com/base/index.html#!/path?a=b#h')
+    .constant('baseHref', '/base/index.html')
+    .value('$sniffer', { history: false })
+
+    .config(function($locationProvider) {
+      $locationProvider.html5Mode(true).hashPrefix('!');
+    })
+
+    .controller("LocationController", function($scope, $location) {
+      $scope.$location = {};
+      angular.forEach("protocol host port path search hash".split(" "), function(method){
+        $scope.$location[method] = function(){
+          var result = $location[method].call($location);
+          return angular.isObject(result) ? angular.toJson(result) : result;
+        };
+      });
+    })
+
+    .run(function($rootElement) {
+      $rootElement.on('click', function(e) {
+        e.stopPropagation();
+      });
+    });
+
+  </file>
+
+  <file name="fakeBrowser.js">
+    angular.module('fake-browser', [])
+
+    .config(function($provide) {
+     $provide.decorator('$browser', function($delegate, baseHref, initUrl) {
+
+      $delegate.onUrlChange = function(fn) {
+         this.urlChange = fn;
+       };
+
+      $delegate.url = function() {
+         return initUrl;
+      };
+
+      $delegate.defer = function(fn, delay) {
+         setTimeout(function() { fn(); }, delay || 0);
+       };
+
+      $delegate.baseHref = function() {
+         return baseHref;
+       };
+
+       return $delegate;
+     });
+    });
+  </file>
+
+
+  <file name="addressBar.js">
+   angular.module('address-bar', [])
+   .directive('ngAddressBar', function($browser, $timeout) {
+      return {
+        template: 'Address: <input id="addressBar" type="text" style="width: 400px" >',
+        link: function(scope, element, attrs){
+          var input = element.children("input"), delay;
+
+          input.on('keypress keyup keydown', function(event) {
+                  delay = (!delay ? $timeout(fireUrlChange, 250) : null);
+                  event.stopPropagation();
+                })
+               .val($browser.url());
+
+          $browser.url = function(url) {
+            return url ? input.val(url) : input.val();
+          };
+
+          function fireUrlChange() {
+            delay = null;
+            $browser.urlChange(input.val());
+          }
+        }
+      };
+    });
+  </file>
+
+  <file name="protractor.js" type="protractor">
+
+    var addressBar = element(by.css("#addressBar")),
+         url = 'http://www.example.com/base/index.html#!/path?a=b#h';
+
+    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');
+
+    });
+
+    it("should change $location accordingly", function(){
+      var navigation = element.all(by.css("#navigation a"));
+
+      navigation.get(0).click();
+
+      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('');
+
+
+      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');
+
+    });
+  </file>
+
+</example>
 
 # Caveats
 

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
@@ -19,7 +20,7 @@ initialization.
 <html xmlns:ng="http://angularjs.org" ng-app>
   <body>
     ...
-    <script src="angular.js">
+    <script src="angular.js"></script>
   </body>
 </html>
 ```
@@ -90,7 +91,9 @@ Here is an example of manually initializing Angular:
 <!doctype html>
 <html>
 <body>
-  Hello {{'World'}}!
+  <div ng-controller="MyController">
+    Hello {{greetMe}}!
+  </div>
   <script src="http://code.angularjs.org/snapshot/angular.js"></script>
 
   <script>

docs/content/guide/compiler.ngdoc

@@ -1,7 +1,10 @@
 @ngdoc overview
 @name  HTML Compiler
+@sortOrder 330
 @description
 
+# HTML Compiler
+
 <div class="alert alert-warning">
 **Note:** this guide is targeted towards developers who are already familiar with AngularJS basics.
 
@@ -11,7 +14,7 @@ If you want a deeper look into Angular's compilation process, you're in the righ
 </div>
 
 
-# Overview
+## Overview
 
 Angular's {@link ng.$compile HTML compiler} allows the developer to teach the
 browser new HTML syntax. The compiler allows you to attach behavior to any HTML element or attribute
@@ -84,7 +87,9 @@ Here is a directive which makes any element draggable. Notice the `draggable` at
            position: 'relative',
            border: '1px solid red',
            backgroundColor: 'lightgrey',
-           cursor: 'pointer'
+           cursor: 'pointer',
+           display: 'block',
+           width: '65px'
           });
           element.on('mousedown', function(event) {
             // Prevent default dragging of selected content
@@ -198,7 +203,7 @@ This should help give you an idea of what Angular does internally.
 
   // Step 3: link the compiled template with the scope.
   var element = linkFn(scope);
-  
+
   // Step 4: Append to DOM (optional)
   parent.appendChild(element);
 ```
@@ -327,7 +332,7 @@ The first issue we have to solve is that the dialog box template expects `title`
 But we would like the template's scope property `title` to be the result of interpolating the
 `<dialog>` element's `title` attribute (i.e. `"Hello {{username}}"`). Furthermore, the buttons expect
 the `onOk` and `onCancel` functions to be present in the scope. This limits the usefulness of the
-widget. To solve the mapping issue we use the `locals` to create local variables which the template
+widget. To solve the mapping issue we use the `scope` to create local variables which the template
 expects as follows:
 
 ```js

docs/content/guide/concepts.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Conceptual Overview
+@sortOrder 200
 @description
 
 # Conceptual Overview
@@ -37,10 +38,10 @@ Let's start with input fields for quantity and cost whose values are multiplied
       <div ng-app ng-init="qty=1;cost=2">
         <b>Invoice:</b>
         <div>
-          Quantity: <input type="number" ng-model="qty" required >
+          Quantity: <input type="number" ng-model="qty">
         </div>
         <div>
-          Costs: <input type="number" ng-model="cost" required >
+          Costs: <input type="number" ng-model="cost">
         </div>
         <div>
           <b>Total:</b> {{qty * cost | currency}}
@@ -55,22 +56,19 @@ Try out the Live Preview above, and then let's walk through the example and desc
 
 This looks like normal HTML, with some new markup. In Angular, a file like this is called a
 <a name="template">"{@link templates template}"</a>. When Angular starts your application, it parses and
-processes this new markup from the template using the so called <a name="compiler">"{@link compiler compiler}"</a>.
+processes this new markup from the template using the so-called <a name="compiler">"{@link compiler compiler}"</a>.
 The loaded, transformed and rendered DOM is then called the <a name="view">"view"</a>.
 
-The first kind of new markup are the so called <a name="directive">"{@link directive directives}"</a>.
+The first kind of new markup are the so-called <a name="directive">"{@link directive directives}"</a>.
 They apply special behavior to attributes or elements in the HTML. In the example above we use the
 {@link ng.directive:ngApp `ng-app`} attribute, which is linked to a directive that automatically
 initializes our application. Angular also defines a directive for the {@link ng.directive:input `input`}
-element that adds extra behavior to the element. E.g. it is able to automatically validate that the entered
-text is non empty by evaluating the `required` attribute.
-The {@link ng.directive:ngModel `ng-model`} directive stores/updates
-the value of the input field into/from a variable and shows the validation state of the input field by
-adding css classes. In the example we use these css classes to mark an empty input field with a red border.
+element that adds extra behavior to the element. The {@link ng.directive:ngModel `ng-model`} directive
+stores/updates the value of the input field into/from a variable.
 
 <div class="alert alert-info">
-**Custom directives to access the DOM**: In Angular, the only place where an application touches the DOM is
- within directives. This is good as artifacts that access the DOM are hard to test.
+**Custom directives to access the DOM**: In Angular, the only place where an application should access the DOM is
+ within directives. This is important because artifacts that access the DOM are hard to test.
  If you need to access the DOM directly you should write a custom directive for this. The
  {@link directive directives guide} explains how to do this.
 </div>
@@ -91,7 +89,7 @@ A filter formats the value of an expression for display to the user.
 In the example above, the filter {@link ng.filter:currency `currency`} formats a number
 into an output that looks like money.
 
-The important thing in the example is that angular provides _live_ bindings:
+The important thing in the example is that Angular provides _live_ bindings:
 Whenever the input values change, the value of the expressions are automatically
 recalculated and the DOM is updated with their values.
 The concept behind this is <a name="databinding">"{@link databinding two-way data binding}"</a>.
@@ -152,13 +150,13 @@ different currencies and also pay the invoice.
 
 What changed?
 
-First, there is a new JavaScript file that contains a so called <a name="controller">"{@link controller controller}"</a>.
+First, there is a new JavaScript file that contains a so-called <a name="controller">"{@link controller controller}"</a>.
 More exactly, the file contains a constructor function that creates the actual controller instance.
 The purpose of controllers is to expose variables and functionality to expressions and directives.
 
 Besides the new file that contains the controller code we also added a
 {@link ng.directive:ngController `ng-controller`} directive to the HTML.
-This directive tells angular that the new `InvoiceController` is responsible for the element with the directive
+This directive tells Angular that the new `InvoiceController` is responsible for the element with the directive
 and all of the element's children.
 The syntax `InvoiceController as invoice` tells Angular to instantiate the controller
 and save it in the variable `invoice` in the current scope.
@@ -265,7 +263,7 @@ services, ...) is created and wired using dependency injection. Within Angular,
 the DI container is called the <a name="injector">"{@link di injector}"</a>.
 
 To use DI, there needs to be a place where all the things that should work together are registered.
-In Angular, this is the purpose of the so called <a name="module">"{@link module modules}"</a>.
+In Angular, this is the purpose of the so-called <a name="module">"{@link module modules}"</a>.
 When Angular starts, it will use the configuration of the module with the name defined by the `ng-app` directive,
 including the configuration of all modules that this module depends on.
 
@@ -323,7 +321,7 @@ The following example shows how this is done with Angular:
     angular.module('finance3', [])
       .factory('currencyConverter', ['$http', function($http) {
         var YAHOO_FINANCE_URL_PATTERN =
-              'http://query.yahooapis.com/v1/public/yql?q=select * from '+
+              '//query.yahooapis.com/v1/public/yql?q=select * from '+
               'yahoo.finance.xchange where pair in ("PAIRS")&format=json&'+
               'env=store://datatables.org/alltableswithkeys&callback=JSON_CALLBACK';
         var currencies = ['USD', 'EUR', 'CNY'];

docs/content/guide/controller.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Controllers
+@sortOrder 220
 @description
 
 # Understanding Controllers
@@ -325,7 +326,7 @@ describe('state', function() {
         expect(childScope.timeOfDay).toBe('morning');
         expect(childScope.name).toBe('Mattie');
         expect(grandChildScope.timeOfDay).toBe('evening');
-        expect(grandChildScope.name).toBe('Gingerbreak Baby');
+        expect(grandChildScope.name).toBe('Gingerbread Baby');
     });
 });
 ```

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
@@ -159,7 +160,7 @@ 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).
 
@@ -352,7 +353,7 @@ element as a customer component.
 Our `myCustomer` directive above is great, but it has a fatal flaw. We can only use it once within a
 given scope.
 
-In its current implementation, we'd need to create a different controller each time In order to
+In its current implementation, we'd need to create a different controller each time in order to
 re-use such a directive:
 
 <example module="docsScopeProblemExample">
@@ -475,7 +476,6 @@ within our directive's template:
     angular.module('docsIsolationExample', [])
       .controller('Controller', ['$scope', function($scope) {
         $scope.naomi = { name: 'Naomi', address: '1600 Amphitheatre' };
-
         $scope.vojta = { name: 'Vojta', address: '3456 Somewhere Else' };
       }])
       .directive('myCustomer', function() {
@@ -537,7 +537,7 @@ where:
 In our `link` function, we want to update the displayed time once a second, or whenever a user
 changes the time formatting string that our directive binds to. We will use the `$interval` service
 to call a handler on a regular basis. This is easier than using `$timeout` but also works better with
-end-to-end testing, where we want to ensure that all $timeouts have completed before completing the test.
+end-to-end testing, where we want to ensure that all `$timeout`s have completed before completing the test.
 We also want to remove the `$interval` if the directive is deleted so we don't introduce a memory leak.
 
 <example module="docsTimeDirective">
@@ -910,6 +910,30 @@ Looking back at `myPane`'s definition, notice the last argument in its `link` fu
 When a directive requires a controller, it receives that controller as the fourth argument of its
 `link` function. Taking advantage of this, `myPane` can call the `addPane` function of `myTabs`.
 
+If multiple controllers are required, the `require` option of the directive can take an array argument.
+The corresponding parameter being sent to the `link` function will also be an array.
+
+```js
+angular.module('docsTabsExample', [])
+  .directive('myPane', function() {
+    return {
+      require: ['^myTabs', '^ngModel'],
+      restrict: 'E',
+      transclude: true,
+      scope: {
+        title: '@'
+      },
+      link: function(scope, element, attrs, controllers) {
+        var tabsCtrl = controllers[0],
+            modelCtrl = controllers[1];
+
+        tabsCtrl.addPane(scope);
+      },
+      templateUrl: 'my-pane.html'
+    };
+  });
+```
+
 Savvy readers may be wondering what the difference is between `link` and `controller`.
 The basic difference is that `controller` can expose an API, and `link` functions can interact with
 controllers using `require`.

docs/content/guide/e2e-testing.ngdoc

@@ -1,6 +1,6 @@
-@workInProgress
 @ngdoc overview
 @name  E2E Testing
+@sortOrder 420
 @description
 
 # E2E Testing
@@ -27,8 +27,8 @@ 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/getting-started.md)
-or the [api docs](https://github.com/angular/protractor/blob/master/docs/api.md).
+For more information on Protractor, view [getting started](http://angular.github.io/protractor/#/getting-started)
+or the [api docs](http://angular.github.io/protractor/#/api).
 
 Protractor uses [Jasmine](http://jasmine.github.io/1.3/introduction.html) for its test syntax.
 As in unit testing, a test file is comprised of one or

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,

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.
@@ -134,7 +135,7 @@ This allows us to extend the above example with these features:
 
 <example module="formExample">
   <file name="index.html">
-    <div ng-controller="Controller">
+    <div ng-controller="ExampleController">
       <form name="form" class="css-form" novalidate>
         Name:
           <input type="text" ng-model="user.name" name="uName" required /><br />
@@ -205,7 +206,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