docs(CHANGELOG.md): add upcoming breaking change

This reverts commit 9d9cdfb575.

This commit was causing breakages because of its assumption that transcluded
content would be handled predictably, i.e. with ngTransclude, whereas many
use cases involve manipulating transcluded content in linking functions.

.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,8 +9,7 @@ performance/temp*.html
 *.swp
 angular.js.tmproj
 /node_modules/
-/components/
-/bower_components/
+bower_components/
 angular.xcodeproj
 .idea
 .agignore

.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

@@ -24,8 +24,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

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

@@ -15,7 +15,7 @@ it makes development fun!
 * 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 +37,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

@@ -44,11 +44,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
@@ -61,9 +61,9 @@ This process based on the idea of minimizing user pain
 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');
@@ -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() {

changelog.spec.js

@@ -1,3 +1,7 @@
+/* global describe: 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');
     });
 

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

@@ -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.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/e2e/docsAppE2E.js

@@ -37,7 +37,7 @@ describe('docs.angularjs.org', function () {
       var nameInput = element(by.model('user.name'));
       nameInput.sendKeys('!!!');
 
-      var code = element(by.css('tt'));
+      var code = element.all(by.css('tt')).first();
       expect(code.getText()).toContain('guest!!!');
     });
 
@@ -68,4 +68,21 @@ describe('docs.angularjs.org', function () {
       expect(element(by.css('.minerr-errmsg')).getText()).toEqual("Argument 'Missing' is not a function, got undefined");
     });
   });
+
+  describe("templates", function() {
+    it("should show parameter defaults", function() {
+      browser.get('index-debug.html#!/api/ng/service/$timeout');
+      expect(element.all(by.css('.input-arguments p em')).first().getText()).toContain('(default: 0)');
+    });
+  });
+
+  describe("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+/);
+    });
+  });
 });

docs/app/src/app.js

@@ -20,4 +20,4 @@ angular.module('docsApp', [
 
 .config(function($locationProvider) {
   $locationProvider.html5Mode(true).hashPrefix('!');
-});
+});

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

@@ -21,4 +21,4 @@ angular.module('docsApp.navigationService', [])
 
     }
   };
-});
+});

docs/app/src/search.js

@@ -74,6 +74,7 @@ angular.module('search', [])
   var index = lunrSearch(function() {
     this.ref('id');
     this.field('title', {boost: 50});
+    this.field('members', { boost: 40});
     this.field('keywords', { boost : 20 });
   });
 
@@ -82,7 +83,8 @@ angular.module('search', [])
       index.store({
         id : key,
         title : page.searchTerms.titleWords,
-        keywords : page.searchTerms.keywords
+        keywords : page.searchTerms.keywords,
+        members : page.searchTerms.members
       });
     };
   });

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];
 
+  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.docs_versions = NG_VERSIONS;
+  $scope.getGroupName = function(v) {
+    return v.isLatest ? 'Latest' : (v.isStable ? 'Stable' : 'Unstable');
+  };
+
   $scope.jumpToDocsVersion = function(version) {
     var currentPagePath = $location.path();
 
     // 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

@@ -31,4 +31,4 @@ describe("DocsController", function() {
       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

@@ -9,7 +9,7 @@ module.exports = function(config) {
 
   config = basePackage(config);
   config = examplesPackage(config);
-  
+
   config.append('processing.processors', [
     require('./processors/git-data'),
     require('./processors/error-docs'),
@@ -22,7 +22,8 @@ module.exports = function(config) {
   ]);
 
   config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step')
+    require('./tag-defs/tutorial-step'),
+    require('./tag-defs/sortOrder')
   ]);
 
   config.append('processing.defaultTagTransforms', [

docs/config/processors/debug-dump.js

@@ -30,4 +30,4 @@ function writeFile(file, content) {
   return fs.makeTree(fs.directory(file)).then(function() {
     return fs.write(file, content, 'wb');
   });
-}
+}

docs/config/processors/error-docs.js

@@ -56,4 +56,4 @@ module.exports = {
 
     return docs.concat(_.values(errorNamespaces));
   }
-};
+};

docs/config/processors/git-data.js

@@ -17,4 +17,4 @@ module.exports = {
   process: function(extraData, gitData) {
     extraData.git = gitData;
   }
-};
+};

docs/config/processors/keywords.js

@@ -1,3 +1,4 @@
+"use strict";
 var _ = require('lodash');
 var log = require('winston');
 var fs = require('fs');
@@ -5,7 +6,7 @@ var path = require('canonical-path');
 
 module.exports = {
   name: 'keywords',
-  runAfter: ['docs-processed'],
+  runAfter: ['docs-processed', 'api-docs'],
   runBefore: ['adding-extra-docs'],
   description: 'This processor extracts all the keywords from the document',
   process: function(docs, config) {
@@ -52,7 +53,7 @@ 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);
@@ -69,20 +70,31 @@ module.exports = {
 
       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

@@ -119,13 +119,20 @@ var navGroupMappers = {
     })];
   },
   pages: function(pages, area) {
-    return [getNavGroup(pages, area, 'path', function(page) {
-      return {
-        name: page.name,
-        href: page.path,
-        type: 'page'
-      };
-    })];
+    return [getNavGroup(
+      pages,
+      area,
+      function(page) {
+        return page.sortOrder || page.path;
+      },
+      function(page) {
+        return {
+          name: page.name,
+          href: page.path,
+          type: 'page'
+        };
+      }
+    )];
   }
 };
 

docs/config/processors/protractor-generate.js

@@ -33,7 +33,8 @@ module.exports = {
         innerTest: file.fileContents,
         pathPrefix: '.', // Hold for if we test with full jQuery
         exampleId: example.id,
-        description: example.doc.id
+        description: example.doc.id,
+        'ng-app-included': example['ng-app-included']
       };
 
       if (env === 'jquery') {

docs/config/processors/versions-data.js

@@ -35,4 +35,4 @@ module.exports = {
 
     docs.push(versionDoc);
   }
-};
+};

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

@@ -175,7 +175,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">

docs/config/templates/protractorTests.template.js

@@ -1,7 +1,10 @@
 describe("{$ doc.description $}", function() {
+  var rootEl;
   beforeEach(function() {
+    rootEl = browser.rootEl;{% if doc['ng-app-included'] %}
+    browser.rootEl = '[ng-app]';{% endif %}
     browser.get("{$ doc.pathPrefix $}/{$ doc.examplePath $}");
   });
-
+  {% if doc['ng-app-included'] %}afterEach(function() { browser.rootEl = rootEl; });{% endif %}
 {$ doc.innerTest $}
-});
+});

docs/config/templates/runnableExample.template.html

@@ -24,4 +24,4 @@
 </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/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,33 @@ 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.
+  }]);
+```

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/guide/$location.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Using $location
+@sortOrder 500
 @description
 
 # What does it do?
@@ -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
@@ -90,7 +91,7 @@ Here is an example of manually initializing Angular:
 <!doctype html>
 <html>
 <body>
-  Hello {{'World'}}!
+  Hello {{greetMe}}!
   <script src="http://code.angularjs.org/snapshot/angular.js"></script>
 
   <script>

docs/content/guide/compiler.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  HTML Compiler
+@sortOrder 330
 @description
 
 <div class="alert alert-warning">
@@ -198,7 +199,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);
 ```

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}}
@@ -62,11 +63,8 @@ The first kind of new markup are the so called <a name="directive">"{@link direc
 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
@@ -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

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

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

docs/content/guide/i18n.ngdoc

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

docs/content/guide/ie.ngdoc

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

docs/content/guide/index.ngdoc

@@ -47,7 +47,7 @@ In Angular applications, you move the job of filling page templates with data fr
 
 ### Testing
 
-* **Unit testing:** [Using Karma (video)](http://www.youtube.com/watch?v=YG5DEzaQBIc), {@link guide/dev_guide.unit-testing Unit testing}, {@link guide/dev_guide.services.testing_services Testing services}, [Karma in Webstorm](http://blog.jetbrains.com/webstorm/2013/10/running-javascript-tests-with-karma-in-webstorm-7/)
+* **Unit testing:** [Using Karma (video)](http://www.youtube.com/watch?v=YG5DEzaQBIc), {@link guide/unit-testing Unit testing}, {@link guide/services#unit-testing Testing services}, [Karma in Webstorm](http://blog.jetbrains.com/webstorm/2013/10/running-javascript-tests-with-karma-in-webstorm-7/)
 * **Scenario testing:** [Protractor](https://github.com/angular/protractor)
 
 ## Specific Topics

docs/content/guide/introduction.ngdoc

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

docs/content/guide/migration.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name Migrating from 1.0 to 1.2
+@sortOrder 550
 @description
 
 # Migrating from 1.0 to 1.2
@@ -382,8 +383,6 @@ See [80739409](https://github.com/angular/angular.js/commit/807394095b991357225a
 
 ## ngBindHtmlUnsafe has been removed and replaced by ngBindHtml
 
-`ngBindHtml` which has been moved from `ngSanitize` module to the core `ng` module.
-
 `ngBindHtml` provides `ngBindHtmlUnsafe` like
 behavior (evaluate an expression and innerHTML the result into the DOM) when bound to the result
 of `$sce.trustAsHtml(string)`. When bound to a plain string, the string is sanitized via
@@ -391,6 +390,10 @@ of `$sce.trustAsHtml(string)`. When bound to a plain string, the string is sanit
 module is not loaded) and the bound expression evaluates to a value that is not trusted an
 exception is thrown.
 
+When using this directive you can either include `ngSanitize` in your module's dependencis (See the
+example at the {@link ngBindHtml} reference) or use the {@link $sce} service to set the value as
+trusted.
+
 See [dae69473](https://github.com/angular/angular.js/commit/dae694739b9581bea5dbc53522ec00d87b26ae55).
 
 

docs/content/guide/module.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Modules
+@sortOrder 320
 @description
 
 # What is a Module?
@@ -26,10 +27,12 @@ should be bootstrapped. There are several advantages to this approach:
 
 I'm in a hurry. How do I get a Hello World module working?
 
-<example module='myApp'>
+<example ng-app-included="true">
   <file name="index.html">
-    <div>
-      {{ 'World' | greet }}
+    <div ng-app="myApp">
+      <div>
+        {{ 'World' | greet }}
+      </div>
     </div>
   </file>
 
@@ -45,12 +48,18 @@ I'm in a hurry. How do I get a Hello World module working?
       };
     });
   </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should add Hello to the name', function() {
+      expect(element(by.binding("{{ 'World' | greet }}")).getText()).toEqual('Hello, World!');
+    });
+  </file>
 </example>
 
 Important things to notice:
 
   * The {@link angular.Module Module} API
-  * The reference to `myApp` module in `<html ng-app="myApp">`.
+  * The reference to `myApp` module in `<div ng-app="myApp">`.
     This is what bootstraps the app using your module.
   * The empty array in `angular.module('myApp', [])`.
     This array is the list of modules `myApp` depends on.
@@ -75,13 +84,14 @@ The above is a suggestion. Tailor it to your needs.
 <example module='xmpl'>
   <file name="index.html">
     <div ng-controller="XmplController">
-      {{ greeting }}!
+      {{ greeting }}
     </div>
   </file>
 
   <file name="script.js">
-    angular.module('xmpl.service', []).
-      value('greeter', {
+    angular.module('xmpl.service', [])
+
+      .value('greeter', {
         salutation: 'Hello',
         localize: function(localization) {
           this.salutation = localization.salutation;
@@ -89,8 +99,9 @@ The above is a suggestion. Tailor it to your needs.
         greet: function(name) {
           return this.salutation + ' ' + name + '!';
         }
-      }).
-      value('user', {
+      })
+
+      .value('user', {
         load: function(name) {
           this.name = name;
         }
@@ -100,21 +111,28 @@ The above is a suggestion. Tailor it to your needs.
 
     angular.module('xmpl.filter', []);
 
-    angular.module('xmpl', ['xmpl.service', 'xmpl.directive', 'xmpl.filter']).
-      run(function(greeter, user) {
+    angular.module('xmpl', ['xmpl.service', 'xmpl.directive', 'xmpl.filter'])
+
+      .run(function(greeter, user) {
         // This is effectively part of the main method initialization code
         greeter.localize({
           salutation: 'Bonjour'
         });
         user.load('World');
+      })
+
+      .controller('XmplController', function($scope, greeter, user){
+        $scope.greeting = greeter.greet(user.name);
       });
 
-
-    // A Controller for your app
-    var XmplController = function($scope, greeter, user) {
-      $scope.greeting = greeter.greet(user.name);
-    };
   </file>
+
+  <file name="protractor.js" type="protractor">
+    it('should add Hello to the name', function() {
+      expect(element(by.binding("{{ greeting }}")).getText()).toEqual('Bonjour World!');
+    });
+  </file>
+
 </example>
 
 

docs/content/guide/providers.ngdoc

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

docs/content/guide/scope.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Scopes
+@sortOrder 240
 @description
 
 # What are Scopes?
@@ -113,7 +114,7 @@ may have several child scopes.
 The application can have multiple scopes, because some {@link guide/directive directives} create
 new child scopes (refer to directive documentation to see which directives create new scopes).
 When new scopes are created, they are added as children of their parent scope. This creates a tree
-structure which parallels the DOM where they're attached
+structure which parallels the DOM where they're attached.
 
 When Angular evaluates `{{name}}`, it first looks at the scope associated with the given
 element for the `name` property. If no such property is found, it searches the parent scope

docs/content/guide/services.ngdoc

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

docs/content/guide/templates.ngdoc

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

docs/content/guide/unit-testing.ngdoc

@@ -1,5 +1,6 @@
 @ngdoc overview
 @name  Unit Testing
+@sortOrder 410
 @description
 
 JavaScript is a dynamically typed language which comes with great power of expression, but it also
@@ -337,6 +338,80 @@ We inject the $compile service and $rootScope before each jasmine test. The $com
 to render the aGreatEye directive. After rendering the directive we ensure that the directive has
 replaced the content and "lidless, wreathed in flame, 2 times" is present.
 
+### Testing Transclusion Directives
+
+Directives that use transclusion are treated specially by the compiler.  Before their compile
+function is called, the contents of the directive's element are removed from the element and
+provided via a transclusion function.  The directive's template is then appended to the directive's
+element, to which it can then insert the transcluded content into its template.
+
+
+Before compilation:
+```html
+<div translude-directive>
+  Some transcluded content
+</div>
+```
+
+After transclusion extraction:
+```html
+<div transclude-directive></div>
+```
+
+After compilation:
+```html
+<div transclude-directive>
+  Some Template
+  <span ng-transclude>Some transcluded content</span>
+</div>
+```
+
+If the directive is using 'element' transclusion, the compiler will actually remove the
+directive's entire element from the DOM and replace it with a comment node. The compiler then
+inserts the directive's template "after" this comment node, as a sibling.
+
+Before compilation
+```html
+<div element-transclude>
+  Some Content
+</div>
+```
+
+After transclusion extraction
+```html
+<!-- elementTransclude -->
+```
+
+After compilation:
+```html
+<!-- elementTransclude -->
+<div element-transclude>
+  Some Template
+  <span ng-transclude>Some transcluded content</span>
+</div>
+```
+
+It is important to be aware of this when writing tests for directives that use 'element'
+transclusion.  If you place the directive on the root element of the DOM fragment that you
+pass to {@link $compile}, then the DOM node returned from the linking function will be the
+comment node and you will lose the ability to access the template and transcluded content.
+
+```javascript
+var node = $compile('<div element-transclude></div>')($rootScope);
+expect(node[0].nodeType).toEqual(node.COMMENT_NODE);
+expect(node[1]).toBeUndefined();
+```
+
+To cope with this you simply ensure that your 'element' transclude directive is wrapped in an
+element, such as a `<div>`.
+
+```javascript
+var node = $compile('<div><div element-transclude></div></div>')($rootScope);
+var contents = node.contents();
+expect(contents[0].nodeType).toEqual(node.COMMENT_NODE);
+expect(contents[1].nodeType).toEqual(node.ELEMENT_NODE);
+```
+
 ### Testing Directives With External Templates
 
 If your directive uses `templateUrl`, consider using

docs/content/misc/contribute.ngdoc

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

docs/content/misc/downloading.ngdoc

@@ -83,4 +83,4 @@ after the core `angular.js` file:
 our docs, or even more importantly, view the docs offline.
 
 * __`i18n`__ - this directory contains locale specific `ngLocale` angular modules to override the defaults
-defined in the `ng` module.
+defined in the `ng` module.

docs/content/misc/faq.ngdoc

@@ -16,7 +16,7 @@ Because HTML has Angular brackets and "ng" sounds like "Angular".
 AngularJS fits the definition of a framework the best, even though it's much more lightweight than
 a typical framework and that's why many confuse it with a library.
 
-AngularJS is 100% JavaScript, 100% client side and compatible with both desktop and mobile browsers.
+AngularJS is 100% JavaScript, 100% client-side and compatible with both desktop and mobile browsers.
 So it's definitely not a plugin or some other native browser extension.
 
 
@@ -114,7 +114,7 @@ make our schwag will be happy to do a custom run for you, based on our existing
 they'll waive the setup costs, and you can order any quantity you need.
 
 **Stickers**
-For orders of 250 stickers or more within Canada or the United States, contact Tom Witting (or anyone in sales) via email at tom@stickergiant.com, and tell him you want to order some AngularJS
+For orders of 250 stickers or more within Canada or the United States, contact Tom Witting (or anyone in sales) via email at <tom@stickergiant.com>, and tell him you want to order some AngularJS
 stickers just like the ones in job #42711. You'll have to give them your own info for billing and shipping.
 
 As long as the design stays exactly the same, [StickerGiant](http://www.stickergiant.com) will give you a reorder discount.

docs/content/tutorial/index.ngdoc

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

docs/content/tutorial/step_00.ngdoc

@@ -31,7 +31,7 @@ npm install
 
 To see the app running in a browser, open a *separate* terminal/command line tab or window, then
 run `npm start` to start the web server. Now, open a browser window for the app and navigate to
-<a href="http://localhost:8000/app/index.html" target="_blank">`http://localhost:8000/app/index.html`</a>
+<a href="http://localhost:8000/app/" target="_blank">`http://localhost:8000/app/`</a>
 
 You can now see the page in your browser. It's not very exciting, but that's OK.
 

docs/content/tutorial/step_02.ngdoc

@@ -59,12 +59,17 @@ tag as the template.
 by the value of the expressions.
 
 We have added a new directive, called `ng-controller`, which attaches a `PhoneListCtrl`
-__controller__ to the DOM at this point:
+__controller__ to the <body> tag.  At this point:
 
 * The expressions in curly braces (`{{phone.name}}` and `{{phone.snippet}}` denote
 bindings, which are referring to our application model, which is set up in our `PhoneListCtrl`
 controller.
 
+<div class="alert alert-info">
+Note: We have specified an {@link angular.Module Angular Module} to load using `ng-app="phonecatApp"`,
+where `phonecatApp` is the name of our module.  This module will contain the `PhoneListCtrl`.
+</div>
+
 <img class="diagram" src="img/tutorial/tutorial_02.png">
 
 ## Model and Controller
@@ -205,6 +210,11 @@ To run the tests, and then watch the files for changes: `npm test`.
 * To rerun the tests, just change any of the source or test .js files. Karma will notice the change
   and will rerun the tests for you. Now isn't that sweet?
 
+<div class="alert alert-info">
+Make sure you don't minimize the browser that Karma opened. On some OS, memory assigned to a minimized
+browser is limited, which results in your karma tests running extremely slow.
+</div>
+
 # Experiments
 
 * Add another binding to `index.html`. For example:
@@ -240,6 +250,8 @@ To run the tests, and then watch the files for changes: `npm test`.
             <tr><th>row number</th></tr>
             <tr ng-repeat="i in [0, 1, 2, 3, 4, 5, 6, 7]"><td>{{i+1}}</td></tr>
           </table>
+  
+  Extra points: try and make an 8x8 table using an additional ng-repeat.
 
 * Make the unit test fail by changing `expect(scope.phones.length).toBe(3)` to instead use `toBe(4)`.
 
@@ -255,4 +267,4 @@ to the app.
 
 [jasmine]: http://jasmine.github.io/
 [jasmine-docs]: http://jasmine.github.io/1.3/introduction.html
-[karma]: http://karma-runner.github.io/
+[karma]: http://karma-runner.github.io/

docs/content/tutorial/step_03.ngdoc

@@ -128,7 +128,9 @@ will exit after the test run and will not automatically rerun the test suite on
 To rerun the test suite, execute `npm run protractor` again.
 
 <div class="alert alert-info">
-  Note: You must ensure you've installed the protractor and updated webdriver prior to running the
+  Note: You must ensure your application is being served via a web-server to test with protractor.
+  You can do this using `npm start`.
+  You also need to ensure you've installed the protractor and updated webdriver prior to running the
   `npm run protractor`. You can do this by issuing `npm install` and `npm run update-webdriver` into
   your terminal.
 </div>
@@ -143,16 +145,39 @@ Display the current value of the `query` model by adding a `{{query}}` binding i
 ### Display Query in Title
 Let's see how we can get the current value of the `query` model to appear in the HTML page title.
 
-* Add the following end-to-end test into the `describe` block within `test/e2e/scenarios.js`:
+* Add an end-to-end test into the `describe` block, `test/e2e/scenarios.js` should look like this:
 
   ```js
-    it('should display the current filter value in the title bar', function() {
+    describe('PhoneCat App', function() {
 
-      expect(browser.getTitle()).toMatch(/Google Phone Gallery:\s*$/);
-
-      element(by.model('query')).sendKeys('nexus');
-
-      expect(browser.getTitle()).toMatch(/Google Phone Gallery: nexus$/);
+      describe('Phone list view', function() {
+    
+        beforeEach(function() {
+          browser.get('app/index.html');
+        });
+    
+        var phoneList = element.all(by.repeater('phone in phones'));
+        var query = element(by.model('query'));
+    
+        it('should filter the phone list as user types into the search box', function() {
+          expect(phoneList.count()).toBe(3);
+    
+          query.sendKeys('nexus');
+          expect(phoneList.count()).toBe(1);
+    
+          query.clear();
+          query.sendKeys('motorola');
+          expect(phoneList.count()).toBe(2);
+        });
+    
+        it('should display the current filter value in the title bar', function() {
+          query.clear();
+          expect(browser.getTitle()).toMatch(/Google Phone Gallery:\s*$/);
+    
+          query.sendKeys('nexus');
+          expect(browser.getTitle()).toMatch(/Google Phone Gallery: nexus$/);
+        });
+      });
     });
   ```
 

docs/content/tutorial/step_05.ngdoc

@@ -166,7 +166,7 @@ Because we started using dependency injection and our controller has dependencie
 controller in our tests is a bit more complicated. We could use the `new` operator and provide the
 constructor with some kind of fake `$http` implementation. However, Angular provides a mock `$http`
 service that we can use in unit tests.  We configure "fake" responses to server requests by calling
-methods on a service called $httpBackend:
+methods on a service called `$httpBackend`:
 
 ```js
 describe('PhoneCat controllers', function() {

docs/content/tutorial/step_06.ngdoc

@@ -73,7 +73,7 @@ __`test/e2e/scenarios.js`__:
     it('should render phone specific links', function() {
       var query = element(by.model('query'));
       query.sendKeys('nexus');
-      element(by.css('.phones li a')).click();
+      element.all(by.css('.phones li a')).first().click();
       browser.getLocationAbsUrl().then(function(url) {
         expect(url.split('#')[1]).toBe('/phones/nexus-s');
       });

docs/content/tutorial/step_07.ngdoc

@@ -80,14 +80,14 @@ AngularJS, so it's important for you to understand a thing or two about how it w
 
 When the application bootstraps, Angular creates an injector that will be used to find and inject all
 of the services that are required by your app. The injector itself doesn't know anything about what
-`$http` or `$route` services do, in fact it doesn't even know about the existence of these services 
-unless it is configured with proper module definitions. 
+`$http` or `$route` services do, in fact it doesn't even know about the existence of these services
+unless it is configured with proper module definitions.
 
-The injector only carries out the following steps : 
+The injector only carries out the following steps :
 
  * load the module definition(s) that you specify in your app
  * register all Providers defined in these module definitions
- * when asked to do so, inject a specified function and any necessary dependencies (services) that 
+ * when asked to do so, inject a specified function and any necessary dependencies (services) that
    it lazily instantiates via their Providers.
 
 Providers are objects that provide (create) instances of services and expose configuration APIs
@@ -202,7 +202,7 @@ moved the controllers into their own module `phonecatControllers` (as shown belo
 
 We added `angular-route.js` to `index.html` and created a new `phonecatControllers` module in
 `controllers.js`. That's not all we need to do to be able to use their code, however. We also have
-to add the modules dependencies of our app. By listing these two modules as dependencies of
+to add the modules as dependencies of our app. By listing these two modules as dependencies of
 `phonecatApp`, we can use the directives and services they provide.
 
 

docs/content/tutorial/step_09.ngdoc

@@ -120,7 +120,7 @@ You should now see the following output in the Karma tab:
 
 # Experiments
 
-* Let's experiment with some of the {@link ng.$filterProvider built-in Angular filters} and add the
+* Let's experiment with some of the {@link api/ng/filter built-in Angular filters} and add the
 following bindings to `index.html`:
   * `{{ "lower cap string" | uppercase }}`
   * `{{ {foo: "bar", baz: 23} | json }}`

docs/content/tutorial/step_10.ngdoc

@@ -102,6 +102,50 @@ __`test/e2e/scenarios.js`:__
 You can now rerun `npm run protractor` to see the tests run.
 
 
+You also have to refactor one of your unit tests because of the addition of the `mainImageUrl`
+model property to the `PhoneDetailCtrl` controller. Below, we create the function `xyzPhoneData`
+which returns the appropriate json with the `images` attribute in order to get the test to pass.
+
+__`test/unit/controllersSpec.js`:__
+
+```js
+...
+  beforeEach(module('phonecatApp'));
+
+...
+
+ describe('PhoneDetailCtrl', function(){
+    var scope, $httpBackend, ctrl,
+        xyzPhoneData = function() {
+          return {
+            name: 'phone xyz',
+            images: ['image/url1.png', 'image/url2.png']
+          }
+        };
+
+
+    beforeEach(inject(function(_$httpBackend_, $rootScope, $routeParams, $controller) {
+      $httpBackend = _$httpBackend_;
+      $httpBackend.expectGET('phones/xyz.json').respond(xyzPhoneData());
+
+      $routeParams.phoneId = 'xyz';
+      scope = $rootScope.$new();
+      ctrl = $controller('PhoneDetailCtrl', {$scope: scope});
+    }));
+
+
+    it('should fetch phone detail', function() {
+      expect(scope.phone).toBeUndefined();
+      $httpBackend.flush();
+
+      expect(scope.phone).toEqual(xyzPhoneData());
+    });
+  });
+```
+
+Your unit tests should now be passing.
+
+
 # Experiments
 
 * Let's add a new controller method to `PhoneDetailCtrl`:

docs/docs.config.js

@@ -1,3 +1,5 @@
+"use strict";
+
 var path = require('canonical-path');
 var versionInfo = require('../lib/versions/version-info');
 var basePath = __dirname;
@@ -9,9 +11,10 @@ module.exports = function(config) {
   var cdnUrl = "//ajax.googleapis.com/ajax/libs/angularjs/" + versionInfo.cdnVersion;
 
   var getVersion = function(component, sourceFolder, packageFile) {
-    sourceFolder = sourceFolder || '../bower_components';
+    sourceFolder = sourceFolder || './bower_components';
     packageFile = packageFile || 'bower.json';
-    return require(path.join(sourceFolder,component,packageFile)).version;
+
+    return require(path.resolve(sourceFolder,component,packageFile)).version;
   };
 
 

docs/gulpfile.js

@@ -1,4 +1,7 @@
+"use strict";
+
 var gulp = require('gulp');
+var log = require('gulp-util').log;
 var concat = require('gulp-concat');
 var jshint = require('gulp-jshint');
 var bower = require('bower');
@@ -12,7 +15,7 @@ var path = require('canonical-path');
 // See clean and bower for async tasks, and see assets and doc-gen for dependent tasks below
 
 var outputFolder = '../build/docs';
-var bowerFolder = '../bower_components';
+var bowerFolder = 'bower_components';
 
 
 var copyComponent = function(component, pattern, sourceFolder, packageFile) {
@@ -26,7 +29,14 @@ var copyComponent = function(component, pattern, sourceFolder, packageFile) {
 };
 
 gulp.task('bower', function() {
-  return bower.commands.install();
+  var bowerTask = bower.commands.install();
+  bowerTask.on('log', function (result) {
+    log('bower:', result.id, result.data.endpoint.name);
+  });
+  bowerTask.on('error', function(error) {
+    log(error);
+  });
+  return bowerTask;
 });
 
 gulp.task('build-app', function() {
@@ -48,7 +58,7 @@ gulp.task('assets', ['bower'], function() {
 });
 
 
-gulp.task('doc-gen', function() {
+gulp.task('doc-gen', ['bower'], function() {
   var generateDocs = dgeni.generator('docs.config.js');
   return generateDocs()
     .catch(function(error) {

gdocs.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+'use strict';
+
 var http = require('http');
 var https = require('https');
 var fs = require('fs');
@@ -41,63 +43,63 @@ function help() {
   console.log('gdocs.js --login <username>');
   console.log('gdocs.js --fetch [<docs collection>]');
   process.exit(-1);
-};
+}
 
 
 function fetch(collection, url){
   console.log('fetching a list of docs in collection ' + collection + '...');
   request('GET', url, {
-        headers: {
-          'Gdata-Version': '3.0',
-          'Authorization': 'GoogleLogin auth=' + getAuthToken()
-        }
-      },
-      function(chunk){
-        var entries = chunk.split('<entry');
-        entries.shift();
-        entries.forEach(function(entry){
-          var title = entry.match(/<title>(.*?)<\/title>/)[1];
-          if (title.match(/\.ngdoc$/)) {
-            var exportUrl = entry.match(/<content type='text\/html' src='(.*?)'\/>/)[1];
-            download(collection, title, exportUrl);
-          };
-        });
+      headers: {
+        'Gdata-Version': '3.0',
+        'Authorization': 'GoogleLogin auth=' + getAuthToken()
       }
-    );
+    },
+    function(chunk){
+      var entries = chunk.split('<entry');
+      entries.shift();
+      entries.forEach(function(entry){
+        var title = entry.match(/<title>(.*?)<\/title>/)[1];
+        if (title.match(/\.ngdoc$/)) {
+          var exportUrl = entry.match(/<content type='text\/html' src='(.*?)'\/>/)[1];
+          download(collection, title, exportUrl);
+        }
+      });
+    }
+  );
 }
 
 function download(collection, name, url) {
   console.log('Downloading:', name, '...');
   request('GET', url + '&exportFormat=txt',
-      {
-        headers: {
-          'Gdata-Version': '3.0',
-          'Authorization': 'GoogleLogin auth=' + getAuthToken()
-        }
-      },
-      function(data){
-        data = data.replace('\ufeff', '');
-        data = data.replace(/\r\n/mg, '\n');
-
-        // strip out all text annotations
-        data = data.replace(/\[[a-zA-Z]{1,2}\]/mg, '');
-
-        // strip out all docos comments
-        data = data.replace(/^[^\s_]+:\n\S+[\S\s]*$/m, '');
-
-        // fix smart-quotes
-        data = data.replace(/[“”]/g, '"');
-        data = data.replace(/[‘’]/g, "'");
-
-
-        data = data + '\n';
-
-        //this should be a bug in Google Doc API, hence need to remove this once the bug is fixed
-        data = data.replace(/\n\n/g, '\n');
-
-        fs.writeFileSync('docs/content/' + collection + '/' + name, reflow(data, 100));
+    {
+      headers: {
+        'Gdata-Version': '3.0',
+        'Authorization': 'GoogleLogin auth=' + getAuthToken()
       }
-    );
+    },
+    function(data){
+      data = data.replace('\ufeff', '');
+      data = data.replace(/\r\n/mg, '\n');
+
+      // strip out all text annotations
+      data = data.replace(/\[[a-zA-Z]{1,2}\]/mg, '');
+
+      // strip out all docos comments
+      data = data.replace(/^[^\s_]+:\n\S+[\S\s]*$/m, '');
+
+      // fix smart-quotes
+      data = data.replace(/[“”]/g, '"');
+      data = data.replace(/[‘’]/g, "'");
+
+
+      data = data + '\n';
+
+      //this should be a bug in Google Doc API, hence need to remove this once the bug is fixed
+      data = data.replace(/\n\n/g, '\n');
+
+      fs.writeFileSync('docs/content/' + collection + '/' + name, reflow(data, 100));
+    }
+  );
 }
 
 /**
@@ -111,34 +113,34 @@ function download(collection, name, url) {
  */
 function login(username, password){
   request('POST', 'https://www.google.com/accounts/ClientLogin',
-      {
-        data: {
-          Email: username,
-          Passwd: password,
-          accountType: 'GOOGLE',
-          service: 'writely',
-          'Gdata-version': '3.0'
-        },
-        headers: {
-          'Content-type': 'application/x-www-form-urlencoded'
-        }
+    {
+      data: {
+        Email: username,
+        Passwd: password,
+        accountType: 'GOOGLE',
+        service: 'writely',
+        'Gdata-version': '3.0'
       },
-      function(chunk){
-        var token;
-        chunk.split('\n').forEach(function(line){
-          var parts = line.split('=');
-          if (parts[0] == 'Auth') {
-            token = parts[1];
-          }
-        });
-        if (token) {
-          fs.writeFileSync('tmp/gdocs.auth', token);
-          console.log("logged in, token saved in 'tmp/gdocs.auth'");
-        } else {
-          console.log('failed to log in');
-        }
+      headers: {
+        'Content-type': 'application/x-www-form-urlencoded'
       }
-    );
+    },
+    function(chunk){
+      var token;
+      chunk.split('\n').forEach(function(line){
+        var parts = line.split('=');
+        if (parts[0] == 'Auth') {
+          token = parts[1];
+        }
+      });
+      if (token) {
+        fs.writeFileSync('tmp/gdocs.auth', token);
+        console.log("logged in, token saved in 'tmp/gdocs.auth'");
+      } else {
+        console.log('failed to log in');
+      }
+    }
+  );
 }
 
 function getAuthToken() {
@@ -152,17 +154,18 @@ function getAuthToken() {
 }
 
 function request(method, url, options, response) {
-  var url = url.match(/http(s?):\/\/(.+?)(\/.*)/);
+  url = url.match(/http(s?):\/\/(.+?)(\/.*)/);
   var isHttps = url[1];
-  var request = (isHttps ? https : http).request({
+  var req = (isHttps ? https : http).request({
     host: url[2],
     port: (url[1] ? 443 : 80),
     path: url[3],
     method: method
   }, function(res){
+    var data;
     switch (res.statusCode) {
       case 200:
-        var data = [];
+        data = [];
         res.setEncoding('utf8');
         res.on('end', function () { response(data.join('')); });
         res.on('close', function () { response(data.join('')); });  // https
@@ -173,7 +176,7 @@ function request(method, url, options, response) {
         console.log('Eror: Login credentials expired! Please login.');
         break;
       default:
-        var data = [];
+        data = [];
         console.log('ERROR: ', res.statusCode);
         console.log('REQUEST URL: ', url[0]);
         console.log('REQUEST POST: ', options.data);
@@ -186,14 +189,14 @@ function request(method, url, options, response) {
     }
   });
   for(var header in options.headers) {
-    request.setHeader(header, options.headers[header]);
+    req.setHeader(header, options.headers[header]);
   }
   if (options.data)
-    request.write(encodeData(options.data));
-  request.on('end', function() {
+    req.write(encodeData(options.data));
+  req.on('end', function() {
     console.log('end');
   });
-  request.end();
+  req.end();
 }
 
 function encodeData(obj) {
@@ -215,7 +218,9 @@ function askPassword(callback) {
   stdin.on("data", function(c) {
     c = c + "";
     switch (c) {
-      case "\n": case "\r": case "\u0004":
+      case "\n":
+      case "\r":
+      case "\u0004":
         stdio.setRawMode(false);
         stdin.pause();
         callback(password);
@@ -227,7 +232,7 @@ function askPassword(callback) {
         password += c;
         break;
     }
-  })
+  });
 
 }