docs(changelog): release notes for 1.3.0-beta.6 expedient-caffeination

Closes #7169

.bowerrc

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

.editorconfig

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

.jshintignore

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

.jshintrc

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

.jshintrc-base

@@ -1,19 +0,0 @@
-{
-  "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

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '0.10'
+  - 0.10
 
 branches:
   except:
@@ -18,15 +18,6 @@ env:
     - LOGS_DIR=/tmp/angular-build/logs
     - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready
 
-install:
-  # - npm config set registry http://23.251.144.68
-  # Disable the spinner, it looks bad on Travis
-  - npm config set spin false
-  # Log HTTP requests
-  - npm config set loglevel http
-  - time ./scripts/travis/npm-bundle-deps.sh
-  - time npm install
-
 before_script:
   - mkdir -p $LOGS_DIR
   - ./lib/sauce/sauce_connect_setup.sh

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!
@@ -252,7 +252,7 @@ You can find out more detailed information about contributing in the
 
 
 
-[Google Closure I18N library]: https://github.com/google/closure-library/tree/master/closure/goog/i18n
+[Google Closure I18N library]: https://code.google.com/p/closure-library/source/browse/closure/goog/i18n/
 [angular-dev]: https://groups.google.com/forum/?fromgroups#!forum/angular-dev
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md
 [commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
@@ -269,6 +269,6 @@ You can find out more detailed information about contributing in the
 [ngDocs]: https://github.com/angular/angular.js/wiki/Writing-AngularJS-Documentation
 [plunker]: http://plnkr.co/edit
 [stackoverflow]: http://stackoverflow.com/questions/tagged/angularjs
-[unit-testing]: https://docs.angularjs.org/guide/unit-testing
+[unit-testing]: http://docs.angularjs.org/guide/dev_guide.unit-testing
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/CONTRIBUTING.md?pixel)](https://github.com/igrigorik/ga-beacon)

Gruntfile.js

@@ -1,5 +1,3 @@
-'use strict';
-
 var files = require('./angularFiles').files;
 var util = require('./lib/grunt/utils.js');
 var versionInfo = require('./lib/versions/version-info');
@@ -109,12 +107,6 @@ module.exports = function(grunt) {
       options: {
         jshintrc: true,
       },
-      node: {
-        files: { src: ['*.js', 'lib/**/*.js'] },
-      },
-      tests: {
-        files: { src: 'test/**/*.js' },
-      },
       ng: {
         files: { src: files['angularSrc'] },
       },
@@ -228,11 +220,8 @@ module.exports = function(grunt) {
 
     "ddescribe-iit": {
       files: [
-        'src/**/*.js',
         'test/**/*.js',
-        '!test/ngScenario/DescribeSpec.js',
-        '!src/ng/directive/booleanAttrs.js', // legitimate xit here
-        '!src/ngScenario/**/*.js'
+        '!test/ngScenario/DescribeSpec.js'
       ]
     },
 
@@ -257,11 +246,7 @@ 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: [CONTRIBUTING.md](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)
+* Contribution guidelines: http://docs.angularjs.org/misc/contribute
 * 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](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md).
+[contribution guidelines](http://docs.angularjs.org/misc/contribute).
 
 
 [![Analytics](https://ga-beacon.appspot.com/UA-8594346-11/angular.js/README.md?pixel)](https://github.com/igrigorik/ga-beacon)

TRIAGING.md

@@ -34,7 +34,7 @@ This process based on the idea of minimizing user pain
     * Check if there are comments that link to a dupe. If so verify that this is indeed a dupe, [close it][], and go to the last step.
 1. Bugs:
     * Label `Type: Bug`
-    * Reproducible? - Steps to reproduce the bug are clear. If they are not, ask for a clarification. If there's no reply after a week, [close it][].
+    * Reproducible? - Steps to reproduce the bug are clear. If they are not,
     * Reproducible on master? - <http://code.angularjs.org/snapshot/>
 
 1. Non bugs:
@@ -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? Chose just one of the following:
+1. Label `frequency: *` – How often does this issue come up? How many developers does this affect?
     * 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? Chose just one of the following:
+1. Label `severity: *` - How bad is the issue?
     * 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,6 +1,4 @@
-'use strict';
-
-var angularFiles = {
+angularFiles = {
   'angularSrc': [
     'src/minErr.js',
     'src/Angular.js',

bower.json

@@ -2,7 +2,11 @@
   "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"
+    "ng-closure-runner": "https://raw.github.com/angular/ng-closure-runner/v0.2.3/assets/ng-closure-runner.zip",
+    "bootstrap": "3.1.1"
   }
 }

changelog.js

@@ -3,8 +3,6 @@
 // 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');
@@ -166,7 +164,7 @@ var writeChangelog = function(stream, commits, version) {
         hash: commit.hash,
         closes: []
       });
-    }
+    };
   });
 
   stream.write(util.format(HEADER_TPL, version, version, currentDate()));
@@ -174,7 +172,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,7 +1,3 @@
-/* global describe: false, it: false, expect: false */
-
-'use strict';
-
 describe('changelog.js', function() {
   var ch = require('./changelog');
 
@@ -17,7 +13,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,6 +1,4 @@
-#!/usr/local/bin/node
-
-'use strict';
+#!/usr/bin/env node
 
 var util = require('util');
 var cp = require('child_process');
@@ -123,9 +121,12 @@ then(function (tags) {
     value();
 }).
 then(function (tags) {
+  var master = tags.pop();
+  var stable = tags.pop();
+
   return [
-    { name: 'v1.0.x', tag: tags[0] },
-    { name: 'master', tag: tags[1] }
+    { name: stable.replace(/\d+$/, 'x'), tag: stable },
+    { name: 'master', tag: master}
   ];
 }).
 then(allInSeries(function (branch) {
@@ -145,7 +146,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;
     });

css/angular.css

@@ -9,14 +9,3 @@
 ng\:form {
   display: block;
 }
-
-.ng-animate-block-transitions {
-  transition:0s all!important;
-  -webkit-transition:0s all!important;
-}
-
-/* show the element during a show/hide animation when the
- * animation is ongoing, but the .ng-hide class is active */
-.ng-hide-add-active, .ng-hide-remove {
-  display: block!important;
-}

docs/app/assets/css/docs.css

@@ -184,6 +184,10 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 pre {
+  padding: 15px;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  display: block;
   white-space: pre-wrap;
   word-break: normal;
 }
@@ -211,10 +215,6 @@ code.highlighted {
   color:maroon;
 }
 
-ul + p {
-  margin-top: 10px;
-}
-
 .docs-version-jump {
   min-width:100%;
   max-width:100%;
@@ -257,9 +257,6 @@ ul + p {
   z-index: 99;
   cursor: pointer;
   font-size: 16px;
-  -moz-appearance: none;
-  text-indent: 0.01px;
-  text-overflow: '';
 }
 
 .picker:after {
@@ -579,15 +576,6 @@ ul.events > li {
   margin-bottom:40px;
 }
 
-@media only screen and (min-width: 769px) and (max-width: 991px) {
-  .main-body-grid {
-    margin-top: 160px;
-  }
-  .main-body-grid > .grid-left {
-    top: 160px;
-  }
-}
-
 @media only screen and (max-width : 768px) {
   .picker, .picker select {
     width:auto;
@@ -635,14 +623,12 @@ ul.events > li {
     display:inline-block;
     padding:3px 0;
   }
-  .nav-index-group .nav-index-listing:not(.nav-index-section):after {
-    padding-right:5px;
-    margin-left:-3px;
-    content:",  ";
+  .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:last-child:after {
+  .nav-index-group .nav-index-listing:last-child {
     content:"";
-    display:inline-block;
   }
   .nav-index-group .nav-index-section {
     display:block;

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

@@ -6,10 +6,6 @@
   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/src/app.js

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

docs/app/src/directives.js

@@ -21,7 +21,7 @@ angular.module('directives', [])
     restrict: 'E',
     terminal: true,
     compile: function(element) {
-      var linenums = element.hasClass('linenum');// || element.parent()[0].nodeName === 'PRE';
+      var linenums = element.hasClass('linenum') || element.parent()[0].nodeName === 'PRE';
       var match = /lang-(\S)+/.exec(element.className);
       var lang = match && match[1];
       var html = element.html();

docs/app/src/docs.js

@@ -1,16 +1,9 @@
 angular.module('DocsController', [])
 
-.controller('DocsController', [
-          '$scope', '$rootScope', '$location', '$window', '$cookies', 'openPlunkr',
-              'NG_PAGES', 'NG_NAVIGATION', 'NG_VERSION',
-  function($scope, $rootScope, $location, $window, $cookies, openPlunkr,
-              NG_PAGES, NG_NAVIGATION, NG_VERSION) {
-
-
-  $scope.openPlunkr = openPlunkr;
+.controller('DocsController', function($scope, $rootScope, $location, $window, $cookies, NG_PAGES, NG_NAVIGATION, NG_VERSION) {
 
   $scope.docsVersion = NG_VERSION.isSnapshot ? 'snapshot' : NG_VERSION.version;
-
+  
   $scope.fold = function(url) {
     if(url) {
       $scope.docs_fold = '/notes/' + url;
@@ -127,4 +120,4 @@ angular.module('DocsController', [])
       });
     }
   });
-}]);
+});

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

@@ -1,13 +1,67 @@
 angular.module('examples', [])
 
-.factory('formPostData', ['$document', function($document) {
+.directive('sourceEdit', function(getEmbeddedTemplate) {
+  return {
+    template: '<div class="btn-group pull-right">' +
+        '<a class="btn dropdown-toggle btn-primary" data-toggle="dropdown" href>' +
+        '  <i class="icon-pencil icon-white"></i> Edit<span class="caret"></span>' +
+        '</a>' +
+        '<ul class="dropdown-menu">' +
+        '  <li><a ng-click="plunkr($event)" href="">In Plunkr</a></li>' +
+        '  <li><a ng-click="fiddle($event)" href="">In JsFiddle</a></li>' +
+        '</ul>' +
+        '</div>',
+    scope: true,
+    controller: function($scope, $attrs, openJsFiddle, openPlunkr) {
+      var sources = {
+        module: $attrs.sourceEdit,
+        deps: read($attrs.sourceEditDeps),
+        html: read($attrs.sourceEditHtml),
+        css: read($attrs.sourceEditCss),
+        js: read($attrs.sourceEditJs),
+        json: read($attrs.sourceEditJson),
+        unit: read($attrs.sourceEditUnit),
+        scenario: read($attrs.sourceEditScenario)
+      };
+      $scope.fiddle = function(e) {
+        e.stopPropagation();
+        openJsFiddle(sources);
+      };
+      $scope.plunkr = function(e) {
+        e.stopPropagation();
+        openPlunkr(sources);
+      };
+    }
+  };
+
+  function read(text) {
+    var files = [];
+    angular.forEach(text ? text.split(' ') : [], function(refId) {
+      // refId is index.html-343, so we need to strip the unique ID when exporting the name
+      files.push({name: refId.replace(/-\d+$/, ''), content: getEmbeddedTemplate(refId)});
+    });
+    return files;
+  }
+})
+
+
+.factory('angularUrls', function($document) {
+  var urls = {};
+
+  angular.forEach($document.find('script'), function(script) {
+    var match = script.src.match(/^.*\/(angular[^\/]*\.js)$/);
+    if (match) {
+      urls[match[1].replace(/(\-\d.*)?(\.min)?\.js$/, '.js')] = match[0];
+    }
+  });
+
+  return urls;
+})
+
+
+.factory('formPostData', function($document) {
   return function(url, fields) {
-    /**
-     * 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>');
+    var form = angular.element('<form style="display: none;" method="post" action="' + url + '" target="_blank"></form>');
     angular.forEach(fields, function(value, name) {
       var input = angular.element('<input type="hidden" name="' +  name + '">');
       input.attr('value', value);
@@ -17,61 +71,196 @@ angular.module('examples', [])
     form[0].submit();
     form.remove();
   };
-}])
+})
 
 
-.factory('openPlunkr', ['formPostData', '$http', '$q', function(formPostData, $http, $q) {
-  return function(exampleFolder) {
+.factory('prepareDefaultAppModule', function() {
+  return function(content) {
+    var deps = [];
+    angular.forEach(content.deps, function(file) {
+      if(file.name == 'angular-animate.js') {
+        deps.push('ngAnimate');
+      }
+    });
 
-    var exampleName = 'AngularJS Example';
-
-    // Load the manifest for the example
-    $http.get(exampleFolder + '/manifest.json')
-      .then(function(response) {
-        return response.data;
-      })
-      .then(function(manifest) {
-        var filePromises = [];
-
-        // Build a pretty title for the Plunkr
-        var exampleNameParts = manifest.name.split('-');
-        exampleNameParts.unshift('AngularJS');
-        angular.forEach(exampleNameParts, function(part, index) {
-          exampleNameParts[index] = part.charAt(0).toUpperCase() + part.substr(1);
-        });
-        exampleName = exampleNameParts.join(' - ');
-
-        angular.forEach(manifest.files, function(filename) {
-          filePromises.push($http.get(exampleFolder + '/' + filename, { transformResponse: [] })
-            .then(function(response) {
-
-              // The manifests provide the production index file but Plunkr wants
-              // a straight index.html
-              if (filename === "index-production.html") {
-                filename = "index.html"
-              }
-
-              return {
-                name: filename,
-                content: response.data
-              };
-            }));
-        });
-        return $q.all(filePromises);
-      })
-      .then(function(files) {
-        var postData = {};
-
-        angular.forEach(files, function(file) {
-          postData['files[' + file.name + ']'] = file.content;
-        });
-
-        postData['tags[0]'] = "angularjs";
-        postData['tags[1]'] = "example";
-        postData.private = true;
-        postData.description = exampleName;
-
-        formPostData('http://plnkr.co/edit/?p=preview', postData);
-      });
+    var moduleName = 'App';
+    return {
+      module : moduleName,
+      script : "angular.module('" + moduleName + "', [" +
+          (deps.length ? "'" + deps.join("','") + "'" : "") + "]);\n\n"
+    };
   };
-}]);
+})
+
+.factory('prepareEditorAssetTags', function(angularUrls) {
+  return function(content, options) {
+    options = options || {};
+    var includeLocalFiles = options.includeLocalFiles;
+    var html = makeScriptTag(angularUrls['angular.js']);
+
+    var allFiles = [].concat(content.js, content.css, content.html, content.json);
+    angular.forEach(content.deps, function(file) {
+      if (file.name !== 'angular.js') {
+        var isLocal = false;
+        for(var i=0;i<allFiles.length;i++) {
+          if(allFiles[i].name == file.name) {
+            isLocal = true;
+            break;
+          }
+        }
+        if(!(isLocal && !includeLocalFiles)) {
+          var assetUrl = angularUrls[file.name] || file.name;
+          html += makeScriptTag(assetUrl);
+        }
+      }
+    });
+
+    if(includeLocalFiles) {
+      angular.forEach(content.css, function(file, index) {
+        html += makeCssLinkTag(file.name);
+      });
+    }
+
+    return html;
+
+
+    function makeScriptTag(src) {
+      return '<script type="text/javascript" src="' + src + '"></script>\n';
+    }
+
+    function makeCssLinkTag(src) {
+      return '<link rel="stylesheet" type="text/css" href="' + src + '" />\n';
+    }
+  };
+})
+
+
+.factory('openPlunkr', function(templateMerge, formPostData, prepareEditorAssetTags, prepareDefaultAppModule) {
+  return function(content) {
+    var hasRouting = false;
+    angular.forEach(content.deps, function(file) {
+      hasRouting = hasRouting || file.name == 'angular-route.js';
+    });
+    var indexHtmlContent = '<!doctype html>\n' +
+                           '<html ng-app="{{module}}">\n' +
+                           '  <head>\n' +
+                           '{{scriptDeps}}';
+
+    if(hasRouting) {
+        indexHtmlContent += '<script type="text/javascript">\n' +
+                            '//this is here to make plunkr work with AngularJS routing\n' +
+                            'angular.element(document.getElementsByTagName(\'head\')).append(' +
+                              'angular.element(\'<base href="\' + window.location.pathname + \'" />\')' +
+                            ');\n' +
+                            '</script>\n';
+    }
+
+    indexHtmlContent += '</head>\n' +
+                        '  <body>\n\n' +
+                        '{{indexContents}}\n\n' +
+                        '  </body>\n' +
+                        '</html>\n';
+
+    indexProp = {
+      module: content.module,
+      scriptDeps: prepareEditorAssetTags(content, { includeLocalFiles : true }),
+      indexContents: content.html[0].content
+    };
+
+    var allFiles = [].concat(content.js, content.css, content.html, content.json);
+
+    if(!content.module) {
+      var moduleData = prepareDefaultAppModule(content);
+      indexProp.module = moduleData.module;
+
+      var found = false;
+      angular.forEach(content.js, function(file) {
+        if(file.name == 'script.js') {
+          file.content = moduleData.script + file.content;
+          found = true;
+        }
+      });
+      if(!found) {
+        indexProp.scriptDeps += '<script type="text/javascript" src="script.js"></script>\n';
+        allFiles.push({
+          name : 'script.js',
+          content : moduleData.script
+        });
+      }
+    }
+
+    var postData = {};
+
+    angular.forEach(allFiles, function(file, index) {
+      if (file.content && file.name != 'index.html') {
+        postData['files[' + file.name + ']'] = file.content;
+      }
+    });
+
+    postData['files[index.html]'] = templateMerge(indexHtmlContent, indexProp);
+    postData['tags[]'] = "angularjs";
+
+    postData.private = true;
+    postData.description = 'AngularJS Example Plunkr';
+
+    formPostData('http://plnkr.co/edit/?p=preview', postData);
+  };
+})
+
+.factory('openJsFiddle', function(templateMerge, formPostData, prepareEditorAssetTags, prepareDefaultAppModule) {
+  var HTML = '<div ng-app=\"{{module}}\">\n{{html:2}}</div>',
+      CSS = '</style> <!-- Ugly Hack to make remote files preload in jsFiddle --> \n' +
+        '{{head:0}}<style>{{css}}',
+      SCRIPT = '{{script}}',
+      SCRIPT_CACHE = '\n\n<!-- {{name}} -->\n<script type="text/ng-template" id="{{name}}">\n{{content:2}}</script>',
+      BASE_HREF_TAG = '<!--  Ugly Hack to make AngularJS routing work inside of jsFiddle -->\n' +
+                      '<base href="/" />\n\n';
+
+  return function(content) {
+    var prop = {
+          module: content.module,
+          html: '',
+          css: '',
+          script: ''
+        };
+    if(!prop.module) {
+      var moduleData = prepareDefaultAppModule(content);
+      prop.script = moduleData.script;
+      prop.module = moduleData.module;
+    }
+
+    angular.forEach(content.html, function(file, index) {
+      if (index) {
+        prop.html += templateMerge(SCRIPT_CACHE, file);
+      } else {
+        prop.html += file.content;
+      }
+    });
+
+    prop.head = prepareEditorAssetTags(content, { includeLocalFiles : false });
+
+    angular.forEach(content.js, function(file, index) {
+      prop.script += file.content;
+    });
+
+    angular.forEach(content.css, function(file, index) {
+      prop.css += file.content;
+    });
+
+    var hasRouting = false;
+    angular.forEach(content.deps, function(file) {
+      hasRouting = hasRouting || file.name == 'angular-route.js';
+    });
+
+    var compiledHTML = templateMerge(HTML, prop);
+    if(hasRouting) {
+      compiledHTML = BASE_HREF_TAG + compiledHTML;
+    }
+    formPostData("http://jsfiddle.net/api/post/library/pure/", {
+      title: 'AngularJS Example',
+      html: compiledHTML,
+      js: templateMerge(SCRIPT, prop),
+      css: templateMerge(CSS, prop)
+    });
+  };
+});

docs/app/src/navigationService.js

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

docs/app/src/search.js

@@ -8,7 +8,7 @@ angular.module('search', [])
   }
 
   $scope.search = function(q) {
-    var MIN_SEARCH_LENGTH = 2;
+    var MIN_SEARCH_LENGTH = 3;
     if(q.length >= MIN_SEARCH_LENGTH) {
       var results = docsSearch(q);
       var totalAreas = 0;
@@ -35,7 +35,7 @@ angular.module('search', [])
       }
     }
     if(result) {
-      $location.path(result.path);
+      $location.path(result.url);
       $scope.hideResults();
     }
   };
@@ -74,7 +74,6 @@ 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 });
   });
 
@@ -83,8 +82,7 @@ angular.module('search', [])
       index.store({
         id : key,
         title : page.searchTerms.titleWords,
-        keywords : page.searchTerms.keywords,
-        members : page.searchTerms.members
+        keywords : page.searchTerms.keywords
       });
     };
   });

docs/app/src/versions.js

@@ -1,31 +1,15 @@
-"use strict";
-
 angular.module('versions', [])
 
 .controller('DocsVersionsCtrl', ['$scope', '$location', '$window', 'NG_VERSIONS', function($scope, $location, $window, 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.docs_version  = NG_VERSIONS[0];
 
   $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

@@ -3,7 +3,6 @@ describe("DocsController", function() {
 
   angular.module('fake', [])
     .value('$cookies', {})
-    .value('openPlunkr', function() {})
     .value('NG_PAGES', {})
     .value('NG_NAVIGATION', {})
     .value('NG_VERSION', {});
@@ -31,4 +30,4 @@ describe("DocsController", function() {
       expect($window._gaq.pop()).toEqual(['_trackPageview', 'x/y/z']);
     }));
   });
-});
+});

docs/bower.json

@@ -1,10 +0,0 @@
-{
-  "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,12 +22,7 @@ module.exports = function(config) {
   ]);
 
   config.append('processing.tagDefinitions', [
-    require('./tag-defs/tutorial-step'),
-    require('./tag-defs/sortOrder')
-  ]);
-
-  config.append('processing.defaultTagTransforms', [
-    require('dgeni-packages/jsdoc/tag-defs/transforms/trim-whitespace')
+    require('./tag-defs/tutorial-step')
   ]);
 
   config.append('processing.inlineTagDefinitions', [

docs/config/processors/debug-dump.js

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

docs/config/processors/error-docs.js

@@ -5,18 +5,16 @@ var path = require('canonical-path');
 module.exports = {
   name: 'error-docs',
   description: 'Compute the various fields for docs in the Error area',
-  runAfter: ['tags-extracted', 'compute-path'],
-  runBefore: ['extra-docs-added'],
-  exports: {
-    errorNamespaces: ['factory', function() { return {}; }],
-    minerrInfo: ['factory', function(config) {
-      var minerrInfoPath = config.get('processing.errors.minerrInfoPath');
-      if ( !minerrInfoPath ) {
-        throw new Error('Error in configuration: Please provide a path to the minerr info file (errors.json) ' +
-          'in the `config.processing.errors.minerrInfoPath` property');
-      }
-      return require(minerrInfoPath);
-    }]
+  runAfter: ['tags-extracted'],
+  init: function(config, injectables) {
+    injectables.value('errorNamespaces', {});
+
+    var minerrInfoPath = config.get('processing.errors.minerrInfoPath');
+    if ( !minerrInfoPath ) {
+      throw new Error('Error in configuration: Please provide a path to the minerr info file (errors.json) ' +
+        'in the `config.processing.errors.minerrInfoPath` property');
+    }
+    injectables.value('minerrInfo', require(minerrInfoPath));
   },
   process: function(docs, partialNames, errorNamespaces, minerrInfo) {
 
@@ -56,4 +54,4 @@ module.exports = {
 
     return docs.concat(_.values(errorNamespaces));
   }
-};
+};

docs/config/processors/git-data.js

@@ -3,18 +3,16 @@ var versionInfo = require('../../../lib/versions/version-info');
 
 module.exports = {
   name: 'git-data',
-  runBefore: ['reading-files'],
+  runBefore: ['loading-files'],
   description: 'This processor adds information from the local git repository to the extraData injectable',
-  exports: {
-    gitData: ['factory', function() {
-      return {
-        version: versionInfo.currentVersion,
-        versions: versionInfo.previousVersions,
-        info: versionInfo.gitRepoInfo
-      };
-    }]
+  init: function(config, injectables) {
+    injectables.value('gitData', {
+      version: versionInfo.currentVersion,
+      versions: versionInfo.previousVersions,
+      info: versionInfo.gitRepoInfo
+    });
   },
   process: function(extraData, gitData) {
     extraData.git = gitData;
   }
-};
+};

docs/config/processors/index-page.js

@@ -1,18 +1,20 @@
 var _ = require('lodash');
 var log = require('winston');
 var path = require('canonical-path');
+var deployment;
 
 module.exports = {
   name: 'index-page',
   runAfter: ['adding-extra-docs'],
   runBefore: ['extra-docs-added'],
   description: 'This processor creates docs that will be rendered as the index page for the app',
-  process: function(docs, config) {
-
-    var deployment = config.deployment;
+  init: function(config) {
+    deployment = config.deployment;
     if ( !deployment || !deployment.environments ) {
       throw new Error('No deployment environments found in the config.');
     }
+  },
+  process: function(docs) {
 
     // Collect up all the areas in the docs
     var areas = {};

docs/config/processors/keywords.js

@@ -1,23 +1,22 @@
-"use strict";
 var _ = require('lodash');
 var log = require('winston');
 var fs = require('fs');
 var path = require('canonical-path');
 
+// Keywords to ignore
+var wordsToIgnore = [];
+var propertiesToIgnore;
+var areasToSearch;
+
+// Keywords start with "ng:" or one of $, _ or a letter
+var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
+
 module.exports = {
   name: 'keywords',
-  runAfter: ['docs-processed', 'api-docs'],
+  runAfter: ['docs-processed'],
   runBefore: ['adding-extra-docs'],
   description: 'This processor extracts all the keywords from the document',
-  process: function(docs, config) {
-
-    // Keywords to ignore
-    var wordsToIgnore = [];
-    var propertiesToIgnore;
-    var areasToSearch;
-
-    // Keywords start with "ng:" or one of $, _ or a letter
-    var KEYWORD_REGEX = /^((ng:|[\$_a-z])[\w\-_]+)/;
+  init: function(config) {
 
     // Load up the keywords to ignore, if specified in the config
     if ( config.processing.search && config.processing.search.ignoreWordsFile ) {
@@ -35,6 +34,9 @@ module.exports = {
     propertiesToIgnore = _.indexBy(config.get('processing.search.propertiesToIgnore', []));
     log.debug('Properties to ignore', propertiesToIgnore);
 
+  },
+  process: function(docs) {
+
     var ignoreWordsMap = _.indexBy(wordsToIgnore);
 
     // If the title contains a name starting with ng, e.g. "ngController", then add the module name
@@ -53,7 +55,7 @@ module.exports = {
       _.forEach(tokens, function(token){
         var match = token.match(KEYWORD_REGEX);
         if (match){
-          var key = match[1];
+          key = match[1];
           if ( !keywordMap[key]) {
             keywordMap[key] = true;
             words.push(key);
@@ -70,31 +72,20 @@ 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(' '),
-        members: _.sortBy(members).join(' ')
+        keywords: _.sortBy(words).join(' ')
       };
 
     });
 
   }
-};
+};

docs/config/processors/pages-data.js

@@ -119,32 +119,28 @@ var navGroupMappers = {
     })];
   },
   pages: function(pages, area) {
-    return [getNavGroup(
-      pages,
-      area,
-      function(page) {
-        return page.sortOrder || page.path;
-      },
-      function(page) {
-        return {
-          name: page.name,
-          href: page.path,
-          type: 'page'
-        };
-      }
-    )];
+    return [getNavGroup(pages, area, 'path', function(page) {
+      return {
+        name: page.name,
+        href: page.path,
+        type: 'page'
+      };
+    })];
   }
 };
 
+var outputFolder;
+
 module.exports = {
   name: 'pages-data',
   description: 'This plugin will create a new doc that will be rendered as an angularjs module ' +
                'which will contain meta information about the pages and navigation',
-  runAfter: ['adding-extra-docs', 'component-groups-generate', 'compute-path'],
+  runAfter: ['adding-extra-docs', 'component-groups-generate'],
   runBefore: ['extra-docs-added'],
-  process: function(docs, config) {
-
-    var outputFolder = config.rendering.outputFolder;
+  init: function(config) {
+    outputFolder = config.rendering.outputFolder;
+  },
+  process: function(docs) {
 
     _(docs)
     .filter(function(doc) { return doc.area === 'api'; })
@@ -195,7 +191,7 @@ module.exports = {
         area.navGroups = navGroupMapper(pages, area);
       });
 
-    // Extract a list of basic page information for mapping paths to partials and for client side searching
+    // Extract a list of basic page information for mapping paths to paritals and for client side searching
     var pages = _(docs)
       .map(function(doc) {
         var page = _.pick(doc, [

docs/config/processors/protractor-generate.js

@@ -1,20 +1,45 @@
 var _ = require('lodash');
+var log = require('winston');
 var path = require('canonical-path');
+var trimIndentation = require('dgeni/lib/utils/trim-indentation');
+var code = require('dgeni/lib/utils/code');
+var protractorFolder;
+
+function createProtractorDoc(example, file, env) {
+  var protractorDoc = {
+    docType: 'e2e-test',
+    id: 'protractorTest' + '-' + example.id,
+    template: 'protractorTests.template.js',
+    outputPath: path.join(protractorFolder, example.id, env + '_test.js'),
+    innerTest: file.fileContents,
+    pathPrefix: '.', // Hold for if we test with full jQuery
+    exampleId: example.id,
+    description: example.doc.id
+  };
+
+  if (env === 'jquery') {
+    protractorDoc.examplePath = example.outputFolder + '/index-jquery.html'
+  } else {
+    protractorDoc.examplePath = example.outputFolder + '/index.html'
+  }
+  return protractorDoc;
+}
 
 module.exports = {
   name: 'protractor-generate',
   description: 'Generate a protractor test file from the e2e tests in the examples',
   runAfter: ['adding-extra-docs'],
   runBefore: ['extra-docs-added'],
-  process: function(docs, examples, config) {
-    var protractorFolder = config.get('rendering.protractor.outputFolder', 'ptore2e');
-
+  init: function(config, injectables) {
+    protractorFolder = config.get('rendering.protractor.outputFolder', 'ptore2e');
+  },
+  process: function(docs, examples) {
     _.forEach(examples, function(example) {
 
       _.forEach(example.files, function(file) {
 
         // Check if it's a Protractor test.
-        if (file.type !== 'protractor') {
+        if (!(file.type == 'protractor')) {
           return;
         }
 
@@ -23,28 +48,5 @@ module.exports = {
         docs.push(createProtractorDoc(example, file, 'jqlite'));
       });
     });
-
-    function createProtractorDoc(example, file, env) {
-      var protractorDoc = {
-        docType: 'e2e-test',
-        id: 'protractorTest' + '-' + example.id,
-        template: 'protractorTests.template.js',
-        outputPath: path.join(protractorFolder, example.id, env + '_test.js'),
-        innerTest: file.fileContents,
-        pathPrefix: '.', // Hold for if we test with full jQuery
-        exampleId: example.id,
-        description: example.doc.id,
-        'ng-app-included': example['ng-app-included']
-      };
-
-      if (env === 'jquery') {
-        protractorDoc.examplePath = example.outputFolder + '/index-jquery.html';
-      } else {
-        protractorDoc.examplePath = example.outputFolder + '/index.html';
-      }
-      return protractorDoc;
-    }
-
-
   }
 };

docs/config/processors/versions-data.js

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

docs/config/tag-defs/sortOrder.js

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

docs/config/tag-defs/tutorial-step.js

@@ -1,9 +1,9 @@
 module.exports = {
   name: 'step',
-  transforms: function(doc, tag, value) {
+  transformFn: function(doc, tag) {
     if ( doc.docType !== 'tutorial' ) {
       throw new Error('Invalid tag, step.  You should only use this tag on tutorial docs');
     }
-    return parseInt(value,10);
+    return parseInt(tag.description,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 getGroupName(v) for v in docs_versions"
+              <select ng-options="v as ('v' + v.version + (v.isSnapshot ? ' (snapshot)' : '')) group by (v.isStable?'Stable':'Unstable') 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,10 +1,7 @@
 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

@@ -2,7 +2,7 @@
    is HTML and wrap each line in a <p> - thus breaking the HTML #}
 
 <div>
-  <a ng-click="openPlunkr('{$ doc.example.outputFolder $}')" class="btn pull-right">
+  <a ng-href="http://plnkr.co/edit/ngdoc:{$ doc.example.id $}@{{docsVersion}}?p=preview" class="btn pull-right" target="_blank">
     <i class="glyphicon glyphicon-edit">&nbsp;</i>
     Edit in Plunker</a>
   <div class="runnable-example"
@@ -15,7 +15,7 @@
       {$ attrName $}="{$ attrValue $}"{% endfor %}>
       {% code -%}
       {$ file.fileContents $}
-      {%- endcode %}
+      {%- endcode %}  
     </div>
   {% endfor %}
 
@@ -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/api/index.ngdoc

@@ -6,7 +6,7 @@
 Welcome to the AngularJS API docs page. These pages contain the AngularJS reference materials for version <strong ng-bind="version"></strong>.
 
 The documentation is organized into **{@link guide/module modules}** which contain various components of an AngularJS application.
-These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates templates}, global APIs, and testing mocks.
+These components are {@link guide/directive directives}, {@link guide/services services}, {@link guide/filter filters}, {@link guide/providers providers}, {@link guide/templates types}, global APIs and testing mocks.
 
 <div class="alert alert-info">
 **Angular Namespaces `$` and `$$`**
@@ -212,7 +212,7 @@ Use ngTouch when developing for mobile browsers/devices.
       {@link ngTouch#service Services / Factories}
     </td>
     <td>
-      The {@link ngTouch.$swipe $swipe} service is used to register and manage mobile DOM events.
+      The {@link ngTouch.$swipe $swipe} service is used to register and manage mobile DOM events. 
     </td>
   </tr>
   <tr>
@@ -252,7 +252,7 @@ Use ngSanitize to securely parse and manipulate HTML data in your application.
 
 ## {@link ngMock ngMock}
 
-Use ngMock to inject and mock modules, factories, services and providers within your unit tests
+Use ngMock to inject and mock modules, factories, services and providers within your unit tests 
 
 <div class="alert alert-info">Include the **angular-mocks.js** file into your test runner for this to work.</div>
 

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

@@ -8,7 +8,7 @@ but the required directive controller is not present on the current DOM element
 
 To resolve this error ensure that there is no typo in the required controller name and that the required directive controller is present on the current element.
 
-If the required controller is expected to be on a ancestor element, make sure that you prefix the controller name in the `require` definition with `^`.
+If the required controller is expected to be on a ancestor element, make ensure that you prefix the controller name in the `require` definition with `^`.
 
 If the required controller is optionally requested, use `?` or `^?` to specify that.
 

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

@@ -16,7 +16,7 @@ myModule.directive('myDirective', function factory() {
   return {
     ...
     scope: {
-      localValue: '=bind'
+      'bind': '=localValue'
     }
     ...
   }

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

@@ -37,17 +37,3 @@ elements. For example:
 ```
 <b>Hello</b> World!
 ```
-
-Watch out for html comments at the beginning or end of templates, as these can cause this error as
-well.  Consider the following template:
-
-```
-<div class='container'>
-  <div class='wrapper>
-     ...
-  </div> <!-- wrapper -->
-</div> <!-- container -->
-```
-
-The `<!-- container -->` comment is interpreted as a second root element and causes the template to
-be invalid.

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/strictdi.ngdoc

@@ -0,0 +1,54 @@
+@ngdoc error
+@name $injector:strictdi
+@fullName Explicit annotation required
+@description
+
+This error occurs when attempting to invoke a function or provider which
+has not been explicitly annotated, while the application is running with
+strict-di mode enabled.
+
+For example:
+
+```
+angular.module("myApp", [])
+  // BadController cannot be invoked, because
+  // the dependencies to be injected are not
+  // explicitly listed.
+  .controller("BadController", function($scope, $http, $filter) {
+    // ...
+  });
+```
+
+To fix the error, explicitly annotate the function using either the inline
+bracket notation, or with the $inject property:
+
+```
+function GoodController1($scope, $http, $filter) {
+  // ...
+}
+GoodController1.$inject = ["$scope", "$http", "$filter"];
+
+angular.module("myApp", [])
+  // GoodController1 can be invoked because it
+  // had an $inject property, which is an array
+  // containing the dependency names to be
+  // injected.
+  .controller("GoodController1", GoodController1)
+
+  // GoodController2 can also be invoked, because
+  // the dependencies to inject are listed, in
+  // order, in the array, with the function to be
+  // invoked trailing on the end.
+  .controller("GoodController2", [
+    "$scope",
+    "$http",
+    "$filter",
+    function($scope, $http, $filter) {
+      // ...
+    }
+  ]);
+
+```
+
+For more information about strict-di mode, see {@link ng.directive:ngApp ngApp}
+and {@link api/angular.bootstrap angular.bootstrap}.

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

@@ -14,9 +14,8 @@ angular.module('myApp', [])
   }]);
 ```
 
-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.
+This code will fail with `$injector:unpr` if `myService` is not defined. Making
+sure each dependency is defined will fix the problem.
 
 ```
 angular.module('myApp', [])
@@ -24,34 +23,4 @@ angular.module('myApp', [])
   .controller('MyController', ['myService', function (myService) {
     // 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,34 +14,3 @@ 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

@@ -1,17 +0,0 @@
-@ngdoc error
-@name $parse:isecff
-@fullName Referencing 'call', 'apply' and 'bind' Disallowed
-@description
-
-Occurs when an expression attempts to invoke Function's 'call', 'apply' or 'bind'.
-
-Angular bans the invocation of 'call', 'apply' and 'bind' from within expressions
-since access is a known way to modify the behaviour of existing functions.
-
-To resolve this error, avoid using these methods in expressions.
-
-Example expression that would result in this error:
-
-```
-<div>{{user.sendInfo.call({}, true)}}</div>
-```

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

@@ -1,27 +1,18 @@
 @ngdoc error
 @name $parse:isecfld
-@fullName Referencing Disallowed Field in Expression
+@fullName Referencing 'constructor' Field in Expression
 @description
 
-Occurs when an expression attempts to access one of the following fields:
+Occurs when an expression attempts to access an objects constructor field.
 
-* __proto__
-* __defineGetter__
-* __defineSetter__
-* __lookupGetter__
-* __lookupSetter__
+AngularJS bans constructor access from within expressions since constructor
+access is a known way to execute arbitrary Javascript code.
 
-AngularJS bans access to these fields from within expressions since
-access is a known way to mess with native objects or
-to execute arbitrary Javascript code.
+To resolve this error, avoid constructor access.  As a last resort, alias
+the constructor and access it through the alias instead.
 
-To resolve this error, avoid using these fields in expressions. As a last resort,
-alias their value and access them through the alias instead.
-
-Example expressions that would result in this error:
+Example expression that would result in this error:
 
 ```
-<div>{{user.__proto__.hasOwnProperty = $emit}}</div>
-
-<div>{{user.__defineGetter__('name', noop)}}</div>
+<div>{{user.constructor.name}}</div>
 ```

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

@@ -1,11 +0,0 @@
-@ngdoc error
-@name $parse:isecobj
-@fullName Referencing Object Disallowed
-@description
-
-Occurs when an expression attempts to access the 'Object' object (Root object in JavaScript).
-
-Angular bans access to Object from within expressions since access is a known way to modify
-the behaviour of existing objects.
-
-To resolve this error, avoid Object access.

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/$rootScope/inprog.ngdoc

@@ -3,310 +3,72 @@
 @fullName Action Already In Progress
 @description
 
-At any point in time there can be only one `$digest` or `$apply` operation in progress. This is to
-prevent very hard to detect bugs from entering your application. The stack trace of this error
-allows you to trace the origin of the currently executing `$apply` or `$digest` call, which caused
-the error.
+At any point in time there can be only one `$digest` or $apply operation in progress.
+The stack trace of this error allows you to trace the origin of the currently executing $apply or $digest call.
 
-## Background
+`$digest` or `$apply` are processing operational states of the Scope - data-structure in Angular that provides context for models and enables model mutation observation.
 
-Angular uses a dirty-checking digest mechanism to monitor and update values of the scope during
-the processing of your application.  The digest works by checking all the values that are being
-watched against their previous value and running any watch handlers that have been defined for those
-values that have changed.
-
-This digest mechanism is triggered by calling `$digest` on a scope object.  Normally you do not need
-to trigger a digest manually, because every external action that can trigger changes in your
-application, such as mouse events, timeouts or server responses, wrap the Angular application code
-in a block of code that will run `$digest` when the code completes.
-
-You wrap Angular code in a block that will be followed by a `$digest` by calling `$apply` on a scope
-object.  So, in pseudo-code, the process looks like this:
-
-```
-element.on('mouseup', function() {
-  scope.$apply(function() {
-    $scope.doStuff();
-  });
-});
-```
-
-where `$apply()` looks something like:
-
-```
-$apply = function(fn) {
-  try {
-    fn();
-  } finally() {
-    $digest();
-  }
-}
-```
-
-## Digest Phases
-
-Angular keeps track of what phase of processing we are in, the relevant ones being `$apply` and
-`$digest`.  Trying to reenter a `$digest` or `$apply` while one of them is already in progress is
-typically a sign of programming error that needs to be fixed. So Angular will throw this error when
-that occurs.
-
-In most situations it should be well defined whether a piece of code will be run inside an `$apply`,
-in which case you should not be calling `$apply` or `$digest`, or it will be run outside, in which
-case you should wrap any code that will be interacting with Angular scope or services, in a call to
-`$apply`.
-
-As an example, all Controller code should expect to be run within Angular, so it should have no need
-to call `$apply` or `$digest`.  Conversely, code that is being trigger directly as a call back to
-some external event, from the DOM or 3rd party library, should expect that it is never called from
-within Angular, and so any Angular application code that it calls should first be wrapped in a call
-to $apply.
-
-## Common Causes
-
-Apart from simply incorrect calls to `$apply` or `$digest` there are some cases when you may get
-this error through no fault of your own.
-
-### Inconsistent API (Sync/Async)
+Trying to reenter a `$digest` or `$apply` while one of them is already in progress is typically a sign of programming error that needs to be fixed.
 
 This error is often seen when interacting with an API that is sometimes sync and sometimes async.
 
-For example, imagine a 3rd party library that has a method which will retrieve data for us. Since it
-may be making an asynchronous call to a server, it accepts a callback function, which will be called
-when the data arrives.
+For example:
 
 ```
-function MyController($scope, thirdPartyComponent) {
+function MyController() {
   thirdPartyComponent.getData(function(someData) {
-    $scope.$apply(function() {
-      $scope.someData = someData;
+    scope.$apply(function() {
+      scope.someData = someData;
     });
   });
 }
 ```
 
-We expect that our callback will be called asynchronously, and so from outside Angular. Therefore, we
-correctly wrap our application code that interacts with Angular in a call to `$apply`.
+The controller constructor is always instantiated from within an $apply cycle, so if the third-party component called our callback synchronously, we'd be trying to enter the $apply again.
 
-The problem comes if `getData()` decides to call the callback handler synchronously; perhaps it has
-the data already cached in memory and so it immediately calls the callback to return the data,
-synchronously.
+To resolve this type of issue, either fix the api to be always synchronous or asynchronous or wrap the call to the api with setTimeout call to make it always asynchronous.
 
-Since, the `MyController` constructor is always instantiated from within an `$apply` call, our
-handler is trying to enter a new `$apply` block from within one.
 
-This is not an ideal design choice on the part of the 3rd party library.
+Other situation that leads to this error is when you are trying to reuse a function to by using it as a callback for code that is called by various apis inside and outside of $apply.
 
-To resolve this type of issue, either fix the api to be always synchronous or asynchronous or force
-your callback handler to always run asynchronously by using the `$timeout` service.
+For example:
 
 ```
-function MyController($scope, thirdPartyComponent) {
-  thirdPartyComponent.getData(function(someData) {
-    $timeout(function() {
-      $scope.someData = someData;
-    }, 0);
-  });
-}
-```
-
-Here we have used `$timeout` to schedule the changes to the scope in a future call stack.
-By providing a timeout period of 0ms, this will occur as soon as possible and `$timeout` will ensure
-that the code will be called in a single `$apply` block.
-
-### Triggering Events Programmatically
-
-The other situation that often leads to this error is when you trigger code (such as a DOM event)
-programmatically (from within Angular), which is normally called by an external trigger.
-
-For example, consider a directive that will set focus on an input control when a value in the scope
-is true:
-
-```
-myApp.directive('setFocusIf', function() {
+myApp.directive('myDirective', function() {
   return {
-    link: function($scope, $element, $attr) {
-      $scope.$watch($attr.setFocusIf, function(value) {
-        if ( value ) { $element[0].focus(); }
-      });
-    }
-  };
-});
-```
+    link: function($scope, $element) {
+      function doSomeWork() {
+        $scope.$apply(function() {
+           // do work here, and update the model
+        };
+      }
 
-If we applied this directive to an input which also used the `ngFocus` directive to trigger some
-work when the element receives focus we will have a problem:
-
-```
-<input set-focus-if="hasFocus" ng-focus="msg='has focus'">
-<button ng-click="hasFocus = true">Focus</button>
-```
-
-In this setup, there are two ways to trigger ngFocus. First from a user interaction:
-
-* Click on the input control
-* The input control gets focus
-* The `ngFocus` directive is triggered, setting `$scope.msg='has focus'` from within a new call to
-`$apply()`
-
-Second programmatically:
-
-* Click the button
-* The `ngClick` directive sets the value of `$scope.hasFocus` to true inside a call to `$apply`
-* The `$digest` runs, which triggers the watch inside the `setFocusIf` directive
-* The watch's handle runs, which gives the focus to the input
-* The `ngFocus` directive is triggered, setting `$scope.msg='has focus'` from within a new call to
-`$apply()`
-
-In this second scenario, we are already inside a `$digest` when the ngFocus directive makes another
-call to `$apply()`, causing this error to be thrown.
-
-It is possible to workaround this problem by moving the call to set the focus outside of the digest,
-by using `$timeout(fn, 0, false)`, where the `false` value tells Angular not to wrap this `fn` in a
-`$apply` block:
-
-```
-myApp.directive('setFocusIf', function($timeout) {
-  return {
-    link: function($scope, $element, $attr) {
-      $scope.$watch($attr.setFocusIf, function(value) {
-        if ( value ) {
-          $timeout(function() {
-            // We must reevaluate the value in case it was changed by a subsequent
-            // watch handler in the digest.
-            if ( $scope.$eval($attr.setFocusIf) ) {
-              $element[0].focus();
-            }
-          }, 0, false);
-        }
-      });
+      $element.on('click', doSomeWork);
+      doSomeWork(); // << this will throw an exception because templates are compiled within $apply
     }
   }
 });
-```
-
-## Diagnosing This Error
-
-When you get this error it can be rather daunting to diagnose the cause of the issue.  The best
-course of action is to investigate the stack trace from the error.  You need to look for places
-where `$apply` or `$digest` have been called and find the context in which this occurred.
-
-There should be two calls:
-
-* The first call is the good `$apply`/`$digest` and would normally be triggered by some event near
-the top of the call stack.
-
-* The second call is the bad `$apply`/`$digest` and this is the one to investigate.
-
-Once you have identified this call you work your way up the stack to see what the problem is.
-
-* If the second call was made in your application code then you should look at why this code has been
-called from within a `$apply`/`$digest`.  It may be a simple oversight or maybe it fits with the
-sync/async scenario described earlier.
-
-* If the second call was made inside an Angular directive then it is likely that it matches the second
-programmatic event trigger scenario described earlier.  In this case you may need to look further up
-the tree to what triggered the event in the first place.
-
-### Example Problem
-
-Let's look at how to investigate this error using the `setFocusIf` example from above. This example
-defines a new `setFocusIf` directive that sets the focus on the element where it is defined when the
-value of its attribute becomes true.
-
-<example name="error-$rootScope-inprog" module="app">
-  <file name="index.html">
-    <button ng-click="focusInput = true">Focus</button>
-    <input ng-focus="count = count + 1" set-focus-if="focusInput" />
-  </file>
-  <file name="app.js">
-    angular.module('app', []).directive('setFocusIf', function() {
-      return function link($scope, $element, $attr) {
-        $scope.$watch($attr.setFocusIf, function(value) {
-          if ( value ) { $element[0].focus(); }
-        });
-      };
-    });
-  </file>
-</example>
-
-When you click on the button to cause the focus to occur we get our `$rootScope:inprog` error. The
-stacktrace looks like this:
 
 ```
-Error: [$rootScope:inprog]
-    at Error (native)
-    at angular.min.js:6:467
-    at n (angular.min.js:105:60)
-    at g.$get.g.$apply (angular.min.js:113:195)
-    at HTMLInputElement.<anonymous> (angular.min.js:198:401)
-    at angular.min.js:32:32
-    at Array.forEach (native)
-    at q (angular.min.js:7:295)
-    at HTMLInputElement.c (angular.min.js:32:14)
-    at Object.fn (app.js:12:38) angular.js:10111
-(anonymous function) angular.js:10111
-$get angular.js:7412
-$get.g.$apply angular.js:12738                   <--- $apply
-(anonymous function) angular.js:19833            <--- called here
-(anonymous function) angular.js:2890
-q angular.js:320
-c angular.js:2889
-(anonymous function) app.js:12
-$get.g.$digest angular.js:12469
-$get.g.$apply angular.js:12742                   <--- $apply
-(anonymous function) angular.js:19833            <--- called here
-(anonymous function) angular.js:2890
-q angular.js:320
+
+The fix for the example above looks like this:
 ```
+myApp.directive('myDirective', function() {
+  return {
+    link: function($scope, $element) {
+      function doSomeWork() {
+           // do work here, and update the model
+      }
 
-We can see (even though the Angular code is minified) that there were two calls to `$apply`, first
-on line `19833`, then on line `12738` of `angular.js`.
+      $element.on('click', function() {
+        $scope.$apply(doSomeWork); // <<< the $apply call was moved to the callsite that doesn't execute in $apply call already
+      });
 
-It is this second call that caused the error.  If we look at the angular.js code, we can see that
-this call is made by an Angular directive.
-
-```
-var ngEventDirectives = {};
-forEach(
-  'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
-  function(name) {
-    var directiveName = directiveNormalize('ng-' + name);
-    ngEventDirectives[directiveName] = ['$parse', function($parse) {
-      return {
-        compile: function($element, attr) {
-          var fn = $parse(attr[directiveName]);
-          return function(scope, element, attr) {
-            element.on(lowercase(name), function(event) {
-              scope.$apply(function() {
-                fn(scope, {$event:event});
-              });
-            });
-          };
-        }
-      };
-    }];
+      doSomeWork();
+    }
   }
-);
-```
-
-It is not possible to tell which from the stack trace, but we happen to know in this case that it is
-the `ngFocus` directive.
-
-Now look up the stack to see that our application code is only entered once in `app.js` at line `12`.
-This is where our problem is:
+});
 
-```
-10: link: function($scope, $element, $attr) {
-11:   $scope.$watch($attr.setFocusIf, function(value) {
-12:     if ( value ) { $element[0].focus(); }    <---- This is the source of the problem
-13:   });
-14: }
 ```
 
-We can now see that the second `$apply` was caused by us programmatically triggering a DOM event
-(i.e. focus) to occur. We must fix this by moving the code outside of the $apply block using
-`$timeout` as described above.
-
-## Further Reading
-To learn more about Angular processing model please check out the
-{@link guide/concepts concepts doc} as well as the {@link ng.$rootScope.Scope api} doc.
+To learn more about Angular processing model please check out the {@link guide/concepts concepts doc} as well as the {@link ng.$rootScope.Scope api} doc.

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

@@ -15,9 +15,9 @@ By default, only URLs that belong to the same origin are trusted. These are urls
 The {@link ng.directive:ngInclude ngInclude} directive and {@link guide/directive directives} that specify a `templateUrl` require a trusted resource URL.
 
 To load templates from other domains and/or protocols, either adjust the {@link
-ng.$sceDelegateProvider#resourceUrlWhitelist whitelist}/ {@link
-ng.$sceDelegateProvider#resourceUrlBlacklist blacklist} or wrap the URL with a call to {@link
-ng.$sce#trustAsResourceUrl $sce.trustAsResourceUrl}.
+api/ng.$sceDelegateProvider#resourceUrlWhitelist whitelist}/ {@link
+api/ng.$sceDelegateProvider#resourceUrlBlacklist blacklist} or wrap the URL with a call to {@link
+api/ng.$sce#trustAsResourceUrl $sce.trustAsResourceUrl}.
 
 **Note**: The browser's [Same Origin
 Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest) and

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

@@ -10,7 +10,6 @@ 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 ng.$sce Strict Contextual Escaping (SCE)}
+This helps prevent XSS and other security issues.  Read more at {@link
+api/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,6 +1,5 @@
 @ngdoc overview
 @name  Using $location
-@sortOrder 500
 @description
 
 # What does it do?
@@ -50,7 +49,7 @@ changes to $location are reflected into the browser address bar.
   <tr>
     <td class="head">integration with angular application life-cycle</td>
     <td>none</td>
-    <td>knows about all internal life-cycle phases, integrates with {@link ng.$rootScope.Scope#$watch $watch}, ...</td>
+    <td>knows about all internal life-cycle phases, integrates with $watch, ...</td>
   </tr>
 
   <tr>
@@ -61,7 +60,7 @@ changes to $location are reflected into the browser address bar.
 
   <tr>
     <td class="head">aware of docroot/context from which the application is loaded</td>
-    <td>no - window.location.pathname returns "/docroot/actual/path"</td>
+    <td>no - window.location.path returns "/docroot/actual/path"</td>
     <td>yes - $location.path() returns "/actual/path"</td>
   </tr>
 
@@ -238,6 +237,20 @@ it('should show example', inject(
 ));
 ```
 
+### Crawling your app
+
+To allow indexing of your AJAX application, you have to add special meta tag in the head section of
+your document:
+
+```html
+<meta name="fragment" content="!" />
+```
+
+This will cause crawler bot to request links with `_escaped_fragment_` param so that your server
+can recognize the crawler and serve a HTML snapshots. For more information about this technique,
+see [Making AJAX Applications
+Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
+
 ## HTML5 mode
 
 In HTML5 mode, the `$location` service getters and setters interact with the browser URL address
@@ -331,6 +344,20 @@ are not prefixed with `.` and will not be intercepted by the `otherwise` rule in
 Using this mode requires URL rewriting on server side, basically you have to rewrite all your links
 to entry point of your application (e.g. index.html)
 
+### Crawling your app
+
+If you want your AJAX application to be indexed by web crawlers, you will need to add the following
+meta tag to the HEAD section of your document:
+
+```html
+<meta name="fragment" content="!" />
+```
+
+This statement causes a crawler to request links with an empty `_escaped_fragment_` parameter so that
+your server can recognize the crawler and serve it HTML snapshots. For more information about this
+technique, see [Making AJAX
+Applications Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
+
 ### Relative links
 
 Be sure to check all relative links, images, scripts etc. You must either specify the url base in
@@ -359,309 +386,119 @@ 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 these examples we use `<base href="/base/index.html" />`
-
-#### Browser in HTML5 mode
-<example module="html5-mode" name="location-html5-mode">
+In this examples we use `<base href="/base/index.html" />`
+<example>
   <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 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>
   </file>
-  <file name="app.js">
-   angular.module('html5-mode', ['fake-browser', 'address-bar'])
 
-   .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;
+  <file name="script.js">
+    function FakeBrowser(initUrl, baseHref) {
+      this.onUrlChange = function(fn) {
+        this.urlChange = fn;
       };
 
-      $delegate.defer = function(fn, delay) {
-         setTimeout(function() { fn(); }, delay || 0);
-       };
+      this.url = function() {
+        return initUrl;
+      };
 
-      $delegate.baseHref = function() {
-         return baseHref;
-       };
+      this.defer = function(fn, delay) {
+        setTimeout(function() { fn(); }, delay || 0);
+      };
 
-       return $delegate;
-     });
-    });
-    </file>
+      this.baseHref = function() {
+        return baseHref;
+      };
 
-  <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;
+      this.notifyWhenOutstandingRequests = angular.noop;
+    }
 
-          input.on('keypress keyup keydown', function(event) {
-                  delay = (!delay ? $timeout(fireUrlChange, 250) : null);
-                  event.stopPropagation();
-                })
-               .val($browser.url());
+    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')
+    };
 
-          $browser.url = function(url) {
-            return url ? input.val(url) : input.val();
+    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());
+            }
           };
-
-          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) {
+        });
+      }]);
+      root.on('click', function(e) {
         e.stopPropagation();
       });
-    });
+    }
 
+    initEnv('html5');
+    initEnv('hashbang');
   </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
 
 ## Page reload navigation
@@ -673,12 +510,10 @@ use a lower level API, {@link ng.$window $window.location.href}.
 ## Using $location outside of the scope life-cycle
 
 `$location` knows about Angular's {@link ng.$rootScope.Scope scope} life-cycle. When a URL changes in
-the browser it updates the `$location` and calls `$apply` so that all
-{@link ng.$rootScope.Scope#$watch $watchers} /
-{@link ng.$compile.directive.Attributes#$observe $observers} are notified.
+the browser it updates the `$location` and calls `$apply` so that all $watchers / $observers are
+notified.
 When you change the `$location` inside the `$digest` phase everything is ok; `$location` will
-propagate this change into browser and will notify all the {@link ng.$rootScope.Scope#$watch $watchers} /
-{@link ng.$compile.directive.Attributes#$observe $observers}.
+propagate this change into browser and will notify all the $watchers / $observers.
 When you want to change the `$location` from outside Angular (for example, through a DOM Event or
 during testing) - you must call `$apply` to propagate the changes.
 
@@ -690,20 +525,6 @@ forward slash if it is missing.
 Note that the `!` prefix in the hashbang mode is not part of `$location.path()`; it is actually
 hashPrefix.
 
-## Crawling your app
-
-To allow indexing of your AJAX application, you have to add special meta tag in the head section of
-your document:
-
-```html
-<meta name="fragment" content="!" />
-```
-
-This will cause crawler bot to request links with `_escaped_fragment_` param so that your server
-can recognize the crawler and serve a HTML snapshots. For more information about this technique,
-see [Making AJAX Applications
-Crawlable](http://code.google.com/web/ajaxcrawling/docs/specification.html).
-
 
 # Testing with the $location service
 
@@ -811,26 +632,25 @@ then uses the information it obtains to compose hashbang URLs (such as
 
 The Angular's compiler currently does not support two-way binding for methods (see [issue](https://github.com/angular/angular.js/issues/404)).  If you should require two-way binding
 to the $location object (using {@link input[text] ngModel} directive on an input
-field), you will need to specify an extra model property (e.g. `locationPath`) with two {@link ng.$rootScope.Scope#$watch $watchers}
+field), you will need to specify an extra model property (e.g. `locationPath`) with two watchers
 which push $location updates in both directions. For example:
-<example module="locationExample">
+<example>
 <file name="index.html">
 <div ng-controller="LocationController">
   <input type="text" ng-model="locationPath" />
 </div>
 </file>
 <file name="script.js">
-angular.module('locationExample', [])
-  .controller('LocationController', ['$scope', '$location', function ($scope, $location) {
-    $scope.$watch('locationPath', function(path) {
-      $location.path(path);
-    });
-    $scope.$watch(function() {
-      return $location.path();
-    }, function(path) {
-      $scope.locationPath = path;
-    });
-  }]);
+function LocationController($scope, $location) {
+  $scope.$watch('locationPath', function(path) {
+    $location.path(path);
+  });
+  $scope.$watch(function() {
+    return $location.path();
+  }, function(path) {
+    $scope.locationPath = path;
+  });
+}
 </file>
 </example>
 

docs/content/guide/animations.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Animations
-@sortOrder 310
 @description
 
 
@@ -252,18 +251,15 @@ Although the CSS is a little different then what we saw before, the idea is the
 A handful of common AngularJS directives support and trigger animation hooks whenever any major event occurs during its life cycle.
 The table below explains in detail which animation events are triggered
 
- -| Directive                                                       | Supported Animations                                                     |
- -|-----------------------------------------------------------------|--------------------------------------------------------------------------|
- -| {@link ng.directive:ngRepeat#usage_animations ngRepeat}         | enter, leave and move                                                    |
- -| {@link ngRoute.directive:ngView#usage_animations ngView}        | enter and leave                                                          |
- -| {@link ng.directive:ngInclude#usage_animations ngInclude}       | enter and leave                                                          |
- -| {@link ng.directive:ngSwitch#usage_animations ngSwitch}         | enter and leave                                                          |
- -| {@link ng.directive:ngIf#usage_animations ngIf}                 | enter and leave                                                          |
- -| {@link ng.directive:ngClass#usage_animations ngClass}           | add and remove                                                           |
- -| {@link ng.directive:ngShow#usage_animations ngShow & ngHide}    | add and remove (the ng-hide class value)                                 |
- -| {@link ng.directive:form#usage_animations form}                 | add and remove (dirty, pristine, valid, invalid & all other validations) |
- -| {@link ng.directive:ngModel#usage_animations ngModel}           | add and remove (dirty, pristine, valid, invalid & all other validations) |
-
+| Directive                                                                           | Supported Animations                     |
+|-------------------------------------------------------------------------------------|------------------------------------------|
+| {@link ng.directive:ngRepeat#usage_animations ngRepeat}                               | enter, leave, and move                   |
+| {@link ngRoute.directive:ngView#usage_animations ngView}                              | enter and leave                          |
+| {@link ng.directive:ngInclude#usage_animations ngInclude}                             | enter and leave                          |
+| {@link ng.directive:ngSwitch#usage_animations ngSwitch}                               | enter and leave                          |
+| {@link ng.directive:ngIf#usage_animations ngIf}                                       | enter and leave                          |
+| {@link ng.directive:ngClass#usage_animations ngClass or {{class}}} | add and remove                           |
+| {@link ng.directive:ngShow#usage_animations ngShow & ngHide}                          | add and remove (the ng-hide class value) |
 
 For a full breakdown of the steps involved during each animation event, refer to the {@link ngAnimate.$animate API docs}.
 

docs/content/guide/bootstrap.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Bootstrap
-@sortOrder 350
 @description
 
 # Bootstrap
@@ -91,8 +90,8 @@ Here is an example of manually initializing Angular:
 <!doctype html>
 <html>
 <body>
-  Hello {{greetMe}}!
-  <script src="http://code.angularjs.org/snapshot/angular.js"></script>
+  Hello {{'World'}}!
+  <script src="http://code.angularjs.org/angular.js"></script>
 
   <script>
     angular.module('myApp', [])

docs/content/guide/compiler.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  HTML Compiler
-@sortOrder 330
 @description
 
 <div class="alert alert-warning">
@@ -199,7 +198,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);
 ```
@@ -227,7 +226,7 @@ moved to the compile function for performance reasons.
 To understand, let's look at a real-world example with `ngRepeat`:
 
 ```html
-Hello {{user.name}}, you have these actions:
+Hello {{user}}, you have these actions:
 <ul>
   <li ng-repeat="action in user.actions">
     {{action.description}}
@@ -237,7 +236,7 @@ Hello {{user.name}}, you have these actions:
 
 When the above example is compiled, the compiler visits every node and looks for directives.
 
-`{{user.name}}` matches the {@link ng.$interpolate interpolation directive}
+`{{user}}` matches the {@link ng.$interpolate interpolation directive}
 and `ng-repeat` matches the {@link ng.directive:ngRepeat `ngRepeat` directive}.
 
 But {@link ng.directive:ngRepeat ngRepeat} has a dilemma.

docs/content/guide/concepts.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Conceptual Overview
-@sortOrder 200
 @description
 
 # Conceptual Overview
@@ -12,7 +11,7 @@ For a more in-depth explanation, see the {@link tutorial/ tutorial}.
 |------------------|------------------------------------------|
 |{@link concepts#template Template}          | HTML with additional markup |
 |{@link concepts#directive Directives}        | extend HTML with custom attributes and elements |
-|{@link concepts#model Model}             | the data shown to the user in the view and with which the user interacts |
+|{@link concepts#model Model}             | the data that is shown to the user and with which the user interacts |
 |{@link concepts#scope Scope}             | context where the model is stored so that controllers, directives and expressions can access it |
 |{@link concepts#expression Expressions}       | access variables and functions from the scope |
 |{@link concepts#compiler Compiler}          | parses the template and instantiates directives and expressions |
@@ -20,9 +19,9 @@ For a more in-depth explanation, see the {@link tutorial/ tutorial}.
 |{@link concepts#view View}              | what the user sees (the DOM) |
 |{@link concepts#databinding Data Binding}      | sync data between the model and the view |
 |{@link concepts#controller Controller}        | the business logic behind views |
-|{@link concepts#di Dependency Injection} | Creates and wires objects and functions |
+|{@link concepts#di Dependency Injection} | Creates and wires objects / functions |
 |{@link concepts#injector Injector}          | dependency injection container |
-|{@link concepts#module Module}            | a container for the different parts of an app including controllers, services, filters, directives which configures the Injector |
+|{@link concepts#module Module}            | configures the Injector |
 |{@link concepts#service Service}           | reusable business logic independent of views |
 
 
@@ -38,10 +37,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">
+          Quantity: <input type="number" ng-model="qty" required >
         </div>
         <div>
-          Costs: <input type="number" ng-model="cost">
+          Costs: <input type="number" ng-model="cost" required >
         </div>
         <div>
           <b>Total:</b> {{qty * cost | currency}}
@@ -63,8 +62,11 @@ 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. The {@link ng.directive:ngModel `ng-model`} directive
-stores/updates the value of the input field into/from a variable.
+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.
 
 <div class="alert alert-info">
 **Custom directives to access the DOM**: In Angular, the only place where an application touches the DOM is
@@ -252,7 +254,7 @@ Let's refactor our example and move the currency conversion into a service in an
 
 What changed?
 We moved the `convertCurrency` function and the definition of the existing currencies
-into the new file `finance2.js`. But how does the controller
+into the new file `finance.js`. But how does the controller
 get a hold of the now separated function?
 
 This is where <a name="di">"{@link di Dependency Injection}"</a> comes into play.
@@ -321,7 +323,7 @@ The following example shows how this is done with Angular:
     angular.module('finance3', [])
       .factory('currencyConverter', ['$http', function($http) {
         var YAHOO_FINANCE_URL_PATTERN =
-              '//query.yahooapis.com/v1/public/yql?q=select * from '+
+              'http://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,6 +1,5 @@
 @ngdoc overview
 @name Controllers
-@sortOrder 220
 @description
 
 # Understanding Controllers
@@ -38,8 +37,27 @@ The properties contain the **view model** (the model that will be presented by t
 `$scope` properties will be available to the template at the point in the DOM where the Controller
 is registered.
 
-The following example demonstrates creating a `GreetingController`, which attaches a `greeting`
-property containing the string `'Hola!'` to the `$scope`:
+The following example shows a very simple constructor function for a Controller, `GreetingController`,
+which attaches a `greeting` property containing the string `'Hola!'` to the `$scope`:
+
+```js
+function GreetingController($scope) {
+  $scope.greeting = 'Hola!';
+}
+```
+
+Once the Controller has been attached to the DOM, the `greeting` property can be data-bound to the
+template:
+
+```js
+<div ng-controller="GreetingController">
+  {{ greeting }}
+</div>
+```
+
+**NOTE**: Although Angular allows you to create Controller functions in the global scope, this is
+not recommended.  In a real application you should use the `.controller` method of your
+{@link module Angular Module} for your application as follows:
 
 ```js
 var myApp = angular.module('myApp',[]);
@@ -49,24 +67,9 @@ myApp.controller('GreetingController', ['$scope', function($scope) {
 }]);
 ```
 
-We create an {@link module Angular Module}, `myApp`, for our application. Then we add the controller's
-constructor function to the module using the `.controller()` method. This keeps the controller's
-constructor function out of the global scope.
-
-<div class="alert alert-info">
 We have used an **inline injection annotation** to explicitly specify the dependency
 of the Controller on the `$scope` service provided by Angular. See the guide on
-{@link guide/di Dependency Injection} for more information.
-</div>
-
-We attach our controller to the DOM using the `ng-controller` directive. The `greeting` property can
-now be data-bound to the template:
-
-```js
-<div ng-controller="GreetingController">
-  {{ greeting }}
-</div>
-```
+[Dependency Injection](http://docs.angularjs.org/guide/di) for more information.
 
 
 # Adding Behavior to a Scope Object
@@ -240,7 +243,7 @@ more information about scope inheritance.
       }]);
       myApp.controller('GrandChildController', ['$scope', function($scope) {
         $scope.timeOfDay = 'evening';
-        $scope.name = 'Gingerbread Baby';
+        $scope.name = 'Gingerbreak Baby';
       }]);
   </file>
 </example>
@@ -270,8 +273,8 @@ involves injecting the {@link ng.$rootScope $rootScope} and {@link ng.$controlle
 
     myApp.controller('MyController', function($scope) {
       $scope.spices = [{"name":"pasilla", "spiciness":"mild"},
-                       {"name":"jalapeno", "spiciness":"hot hot hot!"},
-                       {"name":"habanero", "spiciness":"LAVA HOT!!"}];
+                       {"name":"jalapeno", "spiceiness":"hot hot hot!"},
+                       {"name":"habanero", "spiceness":"LAVA HOT!!"}];
       $scope.spice = "habanero";
     });
 ```
@@ -330,3 +333,6 @@ describe('state', function() {
     });
 });
 ```
+
+
+

docs/content/guide/css-styling.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Working With CSS
-@sortOrder 510
 @description
 
 
@@ -9,7 +8,7 @@ Angular sets these CSS classes. It is up to your application to provide useful s
 # CSS classes used by angular
 
 * `ng-scope`
-  - **Usage:** angular applies this class to any element for which a new {@link api/ng.$rootScope.Scope scope}
+  - **Usage:** angular applies this class to any element that where a new {@link ng.$rootScope.Scope scope}
     is defined. (see {@link guide/scope scope} guide for more information about scopes)
 
 * `ng-binding`

docs/content/guide/databinding.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Data Binding
-@sortOrder 210
 @description
 
 Data-binding in Angular apps is the automatic synchronization of data between the model and view
@@ -10,7 +9,7 @@ When the model changes, the view reflects the change, and vice versa.
 
 ## Data Binding in Classical Template Systems
 
-<img class="right" src="img/One_Way_Data_Binding.png"/><br />
+<img class="right" src="img/One_Way_Data_Binding.png"/>
 Most templating systems bind data in only one direction: they merge template and model components
 together into a view. After the merge occurs, changes to the model
 or related sections of the view are NOT automatically reflected in the view. Worse, any changes
@@ -19,7 +18,7 @@ to write code that constantly syncs the view with the model and the model with t
 
 ## Data Binding in Angular Templates
 
-<img class="right" src="img/Two_Way_Data_Binding.png"/><br />
+<img class="right" src="img/Two_Way_Data_Binding.png"/>
 Angular templates work differently. First the template (which is the uncompiled HTML along with
 any additional markup or directives) is compiled on the browser. The compilation step produces a
 live view. Any changes to the view are immediately reflected in the model, and any changes in

docs/content/guide/di.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Dependency Injection
-@sortOrder 250
 @description
 
 # Dependency Injection
@@ -110,7 +109,7 @@ asks the injector to create an instance of the controller and its dependencies.
 injector.instantiate(MyController);
 ```
 
-This is all done behind the scenes. Notice that by having the `ng-controller` ask the injector to
+This is all done behinds 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.
 
@@ -136,7 +135,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
@@ -145,7 +144,7 @@ function MyController($scope, greeter) {
 }
 ```
 
-Given a function the injector can infer the names of the services to inject by examining the
+Given a function the injector can infer the names of the service 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.
 
@@ -155,7 +154,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 the right services,
+To allow the minifers to rename the function parameters and still be able to inject right services,
 the function needs to be annotated with the `$inject` property. The `$inject` property is an array
 of service names to inject.
 
@@ -167,7 +166,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 the above code snippet as an example, `$scope` will be injected into
+arguments to inject. Using 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.
 
@@ -207,8 +206,8 @@ someModule.factory('greeter', ['$window', function(renamed$window) {
 }]);
 ```
 
-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.
+Here, instead of simply providing the factory function, we pass an array, whose elements consist of
+a list of strings (the names of the depenendencies) followed by the function itself.
 
 Keep in mind that all of the annotation styles are equivalent and can be used anywhere in Angular
 where injection is supported.
@@ -219,22 +218,15 @@ DI is pervasive throughout Angular. You can use it when defining components or w
 and `config` blocks for a module.
 
 - Components such as services, directives, filters and animations are defined by an injectable factory
-method or constructor function.  These components can be injected with "service" and "value"
+method or constructor function.  These components can be injected with "service" components as
+dependencies.
+
+- The `run` and `config` methods accept a function, which can also be injected with "service"
 components as dependencies.
 
-- The `run` method accepts a function, which can be injected with "service", "value" and "constant"
-components as dependencies. Note that you cannot inject "providers" into `run` blocks.
-
-- The `config` method accepts a function, which can be injected with "provider" and "constant"
-components as dependencies.  Note that you cannot inject "service" or "value" components into
-configuration
-
-- Controllers are defined by a constructor function, which can be injected with any of the "service"
-and "value" components as dependencies, but they can also be provided with special dependencies. See
-{@link di#controllers Controllers} below for a list of these special dependencies.
-
-See {@link module#module-loading-dependencies Modules} for more details about injecting dependencies
-into `run` and `config` blocks.
+- Controllers are defined by an constructor function, which can be injected with any of the "service"
+components as dependencies, but they can also be provided with special dependencies. See "DI in
+Controllers" below.
 
 
 ### Factory Methods
@@ -296,7 +288,7 @@ application. For example, there would be one instance for every `ng-controller`
 Moreover, additional dependencies are made available to Controllers:
 
 * {@link scope `$scope`}: Controllers are always associated with a point in the DOM and so are provided with
-  access to the {@link scope scope} at that point. Other components, such as services only have access to the
+  access to the {@link scope scope} at that point. Other components, such as servies only have access to the
   singleton {@link $rootScope} service.
 * {@link $route} resolves: If a controller is instantiated as part of a route, then any values that
-  are resolved as part of the route are made available for injection into the controller.
+  are resolved as part of the route are made available for injection into the controller.

docs/content/guide/directive.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Directives
-@sortOrder 300
 @description
 
 # Creating Custom Directives
@@ -283,7 +282,7 @@ using `templateUrl` instead:
 Great! But what if we wanted to have our directive match the tag name `<my-customer>` instead?
 If we simply put a `<my-customer>` element into the HTML, it doesn't work.
 
-<div class="alert alert-warning">
+<div class="alert alert-waring">
 **Note:** When you create a directive, it is restricted to attribute only by default. In order to
 create directives that are triggered by element or class name, you need to use the `restrict` option.
 </div>
@@ -353,7 +352,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">
@@ -476,6 +475,7 @@ 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() {
@@ -510,8 +510,8 @@ that you explicitly pass in.
 
 <div class="alert alert-warning">
 **Note:** Normally, a scope prototypically inherits from its parent. An isolated scope does not.
-See the {@link api/ng/service/$compile#directive-definition-object
-"Directive Definition Object - scope"} section for more information about isolate scopes.
+See the {@link guide/directive#isolating-the-scope-of-a-directive
+"Isolating the Scope of a Directive"} section for more information about isolate scopes.
 </div>
 
 <div class="alert alert-success">
@@ -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 `$timeout`s have completed before completing the test.
+end-to-end testing, where we want to ensure that all $timeouts 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">
@@ -901,39 +901,10 @@ So where does this `myTabs` controller come from? Directives can specify control
 the unsurprisingly named `controller` option. As you can see, the `myTabs` directive uses this
 option. Just like `ngController`, this option attaches a controller to the template of the directive.
 
-If it is necessary to reference the controller or any functions bound to the controller's scope in
-the template, you can use the option `controllerAs` to specify the name of the controller as an alias.
-The directive needs to define a scope for this configuration to be used. This is particularly useful
-in the case when the directive is used as a component.
-
 Looking back at `myPane`'s definition, notice the last argument in its `link` function: `tabsCtrl`.
 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
@@ -12,7 +12,7 @@ is now in maintenance mode.
 </div>
 
 As applications grow in size and complexity, it becomes unrealistic to rely on manual testing to
-verify the correctness of new features, catch bugs and notice regressions. End to end tests
+verify the correctness of new features, catch bugs and notice regressions. Unit tests
 are the first line of defense for catching bugs, but sometimes issues come up with integration
 between components which can't be captured in a unit test. End to end tests are made to find
 these problems.

docs/content/guide/expression.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Expressions
-@sortOrder 270
 @description
 
 # Angular Expressions
@@ -39,9 +38,7 @@ the method from your view. If you want to `eval()` an Angular expression yoursel
 ## Example
 <example>
   <file name="index.html">
-    <span>
-      1+2={{1+2}}
-    </span>
+    1+2={{1+2}}
   </file>
 
   <file name="protractor.js" type="protractor">
@@ -53,9 +50,9 @@ the method from your view. If you want to `eval()` an Angular expression yoursel
 
 You can try evaluating different expressions here:
 
-<example module="expressionExample">
+<example>
   <file name="index.html">
-    <div ng-controller="ExampleController" class="expressions">
+    <div ng-controller="Cntl2" class="expressions">
       Expression:
       <input type='text' ng-model="expr" size="80"/>
       <button ng-click="addExp(expr)">Evaluate</button>
@@ -69,24 +66,23 @@ You can try evaluating different expressions here:
   </file>
 
   <file name="script.js">
-    angular.module('expressionExample', [])
-      .controller('ExampleController', ['$scope', function($scope) {
-        var exprs = $scope.exprs = [];
-        $scope.expr = '3*10|currency';
-        $scope.addExp = function(expr) {
-          exprs.push(expr);
-        };
+    function Cntl2($scope) {
+      var exprs = $scope.exprs = [];
+      $scope.expr = '3*10|currency';
+      $scope.addExp = function(expr) {
+        exprs.push(expr);
+      };
 
-        $scope.removeExp = function(index) {
-          exprs.splice(index, 1);
-        };
-      }]);
+      $scope.removeExp = function(index) {
+        exprs.splice(index, 1);
+      };
+    }
   </file>
 
   <file name="protractor.js" type="protractor">
     it('should allow user expression testing', function() {
       element(by.css('.expressions button')).click();
-      var lis = element(by.css('.expressions ul')).all(by.repeater('expr in exprs'));
+      var lis = element(by.css('.expressions ul')).element.all(by.repeater('expr in exprs'));
       expect(lis.count()).toBe(1);
       expect(lis.get(0).getText()).toEqual('[ X ] 3*10|currency => $30.00');
     });
@@ -99,30 +95,27 @@ You can try evaluating different expressions here:
 Angular does not use JavaScript's `eval()` to evaluate expressions. Instead Angular's
 {@link ng.$parse $parse} service processes these expressions.
 
-Angular expressions do not have access to global variables like `window`, `document` or `location`.
-This restriction is intentional. It prevents accidental access to the global state – a common source of subtle bugs.
+Unlike JavaScript, where names default to global `window` properties, Angular expressions must use
+{@link ng.$window `$window`} explicitly to refer to the global `window` object. For example, if you
+want to call `alert()` in an expression you must use `$window.alert()`. This restriction is
+intentional. It prevents accidental access to the global state – a common source of subtle bugs.
 
-Instead use services like `$window` and `$location` in functions called from expressions. Such services
-provide mockable access to globals.
-
-<example module="expressionExample">
+<example>
   <file name="index.html">
-    <div class="example2" ng-controller="ExampleController">
+    <div class="example2" ng-controller="Cntl1">
       Name: <input ng-model="name" type="text"/>
       <button ng-click="greet()">Greet</button>
-      <button ng-click="window.alert('Should not see me')">Won't greet</button>
     </div>
   </file>
 
   <file name="script.js">
-    angular.module('expressionExample', [])
-      .controller('ExampleController', ['$window', '$scope', function($window, $scope) {
-        $scope.name = 'World';
+    function Cntl1($window, $scope){
+      $scope.name = 'World';
 
-        $scope.greet = function() {
-          $window.alert('Hello ' + $scope.name);
-        };
-      }]);
+      $scope.greet = function() {
+        $window.alert('Hello ' + $scope.name);
+      };
+    }
   </file>
 
   <file name="protractor.js" type="protractor">
@@ -159,10 +152,9 @@ Similarly, invoking a function `a.b.c()` on `undefined` or `null` simply returns
 
 ## No Control Flow Statements
 
-Apart from the ternary operator (`a ? b : c`), you cannot write a control flow statement in an
-expression. The reason behind this is core to the Angular philosophy that application logic should
-be in controllers, not the views. If you need a real conditional, loop, or to throw from a view
-expression, delegate to a JavaScript method instead.
+You cannot write a control flow statement in an expression. The reason behind this is core to the
+Angular philosophy that application logic should be in controllers, not the views. If you need a
+conditional, loop, or to throw from a view expression, delegate to a JavaScript method instead.
 
 ## `$event`
 

docs/content/guide/filter.ngdoc

@@ -1,12 +1,11 @@
 @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,
 controllers or services and it is easy to define your own filter.
 
-The underlying API is the {@link ng.$filterProvider `filterProvider`}.
+The underlying API is the {@link ng.$filterProvider filterProvider}.
 
 ## Using filters in view templates
 

docs/content/guide/forms.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Forms
-@sortOrder 290
 @description
 
 Controls (`input`, `select`, `textarea`) are ways for a user to enter data.
@@ -17,9 +16,9 @@ The key directive in understanding two-way data-binding is {@link ng.directive:n
 The `ngModel` directive provides the two-way data-binding by synchronizing the model to the view, as well as view to the model.
 In addition it provides an {@link ngModel.NgModelController API} for other directives to augment its behavior.
 
-<example module="formExample">
+<example>
   <file name="index.html">
-    <div ng-controller="ExampleController">
+    <div ng-controller="Controller">
       <form novalidate class="simple-form">
         Name: <input type="text" ng-model="user.name" /><br />
         E-mail: <input type="email" ng-model="user.email" /><br />
@@ -33,20 +32,19 @@ In addition it provides an {@link ngModel.NgModelController API} for other direc
     </div>
 
     <script>
-      angular.module('formExample', [])
-        .controller('ExampleController', ['$scope', function($scope) {
-          $scope.master = {};
+      function Controller($scope) {
+        $scope.master = {};
 
-          $scope.update = function(user) {
-            $scope.master = angular.copy(user);
-          };
+        $scope.update = function(user) {
+          $scope.master = angular.copy(user);
+        };
 
-          $scope.reset = function() {
-            $scope.user = angular.copy($scope.master);
-          };
+        $scope.reset = function() {
+          $scope.user = angular.copy($scope.master);
+        };
 
-          $scope.reset();
-        }]);
+        $scope.reset();
+      }
     </script>
   </file>
 </example>
@@ -69,9 +67,9 @@ The following example uses the CSS to display validity of each form control.
 In the example both `user.name` and `user.email` are required, but are rendered with red background only when they are dirty.
 This ensures that the user is not distracted with an error until after interacting with the control, and failing to satisfy its validity.
 
-<example module="formExample">
+<example>
   <file name="index.html">
-    <div ng-controller="ExampleController">
+    <div ng-controller="Controller">
       <form novalidate class="css-form">
         Name:
           <input type="text" ng-model="user.name" required /><br />
@@ -94,20 +92,19 @@ This ensures that the user is not distracted with an error until after interacti
     </style>
 
     <script>
-      angular.module('formExample', [])
-        .controller('ExampleController', ['$scope', function($scope) {
-          $scope.master = {};
+      function Controller($scope) {
+        $scope.master = {};
 
-          $scope.update = function(user) {
-            $scope.master = angular.copy(user);
-          };
+        $scope.update = function(user) {
+          $scope.master = angular.copy(user);
+        };
 
-          $scope.reset = function() {
-            $scope.user = angular.copy($scope.master);
-          };
+        $scope.reset = function() {
+          $scope.user = angular.copy($scope.master);
+        };
 
-          $scope.reset();
-        }]);
+        $scope.reset();
+      }
     </script>
   </file>
 </example>
@@ -133,9 +130,9 @@ This allows us to extend the above example with these features:
 - SAVE button is enabled only if form has some changes and is valid
 - custom error messages for `user.email` and `user.agree`
 
-<example module="formExample">
+<example>
   <file name="index.html">
-    <div ng-controller="ExampleController">
+    <div ng-controller="Controller">
       <form name="form" class="css-form" novalidate>
         Name:
           <input type="text" ng-model="user.name" name="uName" required /><br />
@@ -162,24 +159,99 @@ This allows us to extend the above example with these features:
   </file>
 
   <file name="script.js">
-    angular.module('formExample', [])
-      .controller('ExampleController', ['$scope', function($scope) {
-        $scope.master = {};
+    function Controller($scope) {
+      $scope.master = {};
 
-        $scope.update = function(user) {
-          $scope.master = angular.copy(user);
-        };
+      $scope.update = function(user) {
+        $scope.master = angular.copy(user);
+      };
 
-        $scope.reset = function() {
-          $scope.user = angular.copy($scope.master);
-        };
+      $scope.reset = function() {
+        $scope.user = angular.copy($scope.master);
+      };
 
-        $scope.isUnchanged = function(user) {
-          return angular.equals(user, $scope.master);
-        };
+      $scope.isUnchanged = function(user) {
+        return angular.equals(user, $scope.master);
+      };
 
-        $scope.reset();
-      }]);
+      $scope.reset();
+    }
+  </file>
+</example>
+
+
+
+# Custom triggers
+
+By default, any change to the content will trigger a model update and form validation. You can
+override this behavior using the {@link ng.directive:ngModelOptions ngModelOptions} directive to
+bind only to specified list of events. I.e. `ng-model-options="{ updateOn: 'blur' }"` will update
+and validate only after the control loses focus. You can set several events using a space delimited
+list. I.e. `ng-model-options="{ updateOn: 'mousedown blur' }"`
+
+If you want to keep the default behavior and just add new events that may trigger the model update
+and validation, add "default" as one of the specified events.
+
+I.e. `ng-model-options="{ updateOn: 'default blur' }"`
+
+The following example shows how to override immediate updates. Changes on the inputs within the form will update the model 
+only when the control loses focus (blur event).
+
+<example>
+  <file name="index.html">
+    <div ng-controller="ControllerUpdateOn">
+      <form>
+        Name:
+        <input type="text" ng-model="user.name" ng-model-options="{ updateOn: 'blur' }" /><br />
+        Other data:
+        <input type="text" ng-model="user.data" /><br />
+      </form>
+      <pre>username = "{{user.name}}"</pre>
+    </div>
+  </file>
+  <file name="script.js">
+    function ControllerUpdateOn($scope) {
+      $scope.user = {};
+    }
+  </file>
+</example>
+
+
+
+# Non-immediate (debounced) model updates
+
+You can delay the model update/validation by using the `debounce` key with the
+{@link ng.directive:ngModelOptions ngModelOptions} directive. This delay will also apply to
+parsers, validators and model flags like `$dirty` or `$pristine`.
+
+I.e. `ng-model-options="{ debounce: 500 }"` will wait for half a second since
+the last content change before triggering the model update and form validation.
+
+If custom triggers are used, custom debouncing timeouts can be set for each event using an object
+in `debounce`. This can be useful to force immediate updates on some specific circumstances
+(like blur events).
+
+I.e. `ng-model-options="{ updateOn: 'default blur', debounce: { default: 500, blur: 0 } }"`
+
+If those attributes are added to an element, they will be applied to all the child elements and controls that inherit from it unless they are
+overridden.
+
+This example shows how to debounce model changes. Model will be updated only 250 milliseconds after last change.
+
+<example>
+  <file name="index.html">
+    <div ng-controller="ControllerUpdateOn">
+      <form>
+        Name:
+        <input type="text" ng-model="user.name" ng-model-options="{ debounce: 250 }" /><br />
+      </form>
+      <pre>username = "{{user.name}}"</pre>
+    </div>
+  </file>
+  <file name="script.js">
+    function ControllerUpdateOn($scope) {
+      $scope.user = {};
+    }
   </file>
 </example>
 

docs/content/guide/i18n.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  i18n and l10n
-@sortOrder 520
 @description
 
 # i18n and l10n
@@ -115,7 +114,7 @@ You write the following binding using the currency filter:
 
 If your app is currently in the `en-US` locale, the browser will show `$1000.00`. If someone in the
 Japanese locale (`ja`) views your app, their browser will show a balance of `¥1000.00` instead.
-This is problematic because $1000 is not the same as ¥1000.
+This is problematinc because $1000 is not the same as ¥1000.
 
 In this case, you need to override the default currency symbol by providing the
 {@link ng.filter:currency} currency filter with a currency symbol as a parameter.

docs/content/guide/ie.ngdoc

@@ -1,6 +1,5 @@
 @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/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/)
+* **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/)
 * **Scenario testing:** [Protractor](https://github.com/angular/protractor)
 
 ## Specific Topics
@@ -73,16 +73,15 @@ This is a short list of libraries with specific support and documentation for wo
 * **Internationalization:** [angular-translate](http://angular-translate.github.io), [angular-gettext](http://angular-gettext.rocketeer.be/)
 * **RESTful services:** [Restangular](https://github.com/mgonto/restangular)
 * **SQL and NoSQL backends:** [BreezeJS](http://www.breezejs.com/), [AngularFire](http://angularfire.com/)
-* **UI Widgets: **[KendoUI](http://kendo-labs.github.io/angular-kendo/#/), [UI Bootstrap](http://angular-ui.github.io/bootstrap/), [Wijmo](http://wijmo.com/tag/angularjs-2/), [ngTagsInput](https://github.com/mbenford/ngTagsInput)
+* **UI Widgets: **[KendoUI](http://kendo-labs.github.io/angular-kendo/#/), [UI Bootstrap](http://angular-ui.github.io/bootstrap/), [Wijmo](http://wijmo.com/tag/angularjs-2/)
 * **Advanced Routing:** [UI-Router](https://github.com/angular-ui/ui-router)
-* **Maps:** [UI-Map (Google Maps)](https://github.com/angular-ui/ui-map)
 
 ## Deployment
 
 ### General
 
 * **Javascript minification: **[Background](http://thegreenpizza.github.io/2013/05/25/building-minification-safe-angular.js-applications/), [ngmin automation tool](http://www.thinkster.io/pick/XlWneEZCqY/angularjs-ngmin)
-* **Analytics and Logging:** [Angularyitcs (Google Analytics)](http://ngmodules.org/modules/angularytics), [Angulartics (Analytics)](https://github.com/luisfarzati/angulartics), [Logging Client-Side Errors](http://www.bennadel.com/blog/2542-Logging-Client-Side-Errors-With-AngularJS-And-Stacktrace-js.htm)
+* **Tracking:** [Angularyitcs (Google Analytics)](http://ngmodules.org/modules/angularytics), [Logging Client-Side Errors](http://www.bennadel.com/blog/2542-Logging-Client-Side-Errors-With-AngularJS-And-Stacktrace-js.htm)
 * **SEO:** [By hand](http://www.yearofmoo.com/2012/11/angularjs-and-seo.html), [prerender.io](http://prerender.io/), [Brombone](http://www.brombone.com/), [SEO.js](http://getseojs.com/), [SEO4Ajax](http://www.seo4ajax.com/)
 
 ### Server-Specific
@@ -113,7 +112,6 @@ This is a short list of libraries with specific support and documentation for wo
 * **Free online:**
   [thinkster.io](http://thinkster.io),
   [CodeAcademy](http://www.codecademy.com/courses/javascript-advanced-en-2hJ3J/0/1)
-  [CodeSchool](https://www.codeschool.com/courses/shaping-up-with-angular-js)
 * **Paid online:**
   [Pluralsite (3 courses)](http://www.pluralsight.com/training/Courses/Find?highlight=true&searchTerm=angularjs),
   [Tuts+](https://tutsplus.com/course/easier-js-apps-with-angular/),

docs/content/guide/introduction.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Introduction
-@sortOrder 100
 @description
 
 
@@ -23,7 +22,7 @@ The impedance mismatch between dynamic applications and static documents is ofte
     in charge and it calls into the library when it sees fit. E.g., `jQuery`.
   * **frameworks** - a particular implementation of a web application, where your code fills in
     the details. The framework is in charge and it calls into your code when it needs something
-    app specific. E.g., `durandal`, `ember`, etc.
+    app specific. E.g., `knockout`, `ember`, etc.
 
 
 Angular takes another approach. It attempts to minimize the impedance mismatch between document

docs/content/guide/migration.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name Migrating from 1.0 to 1.2
-@sortOrder 550
 @description
 
 # Migrating from 1.0 to 1.2
@@ -383,6 +382,8 @@ 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
@@ -390,10 +391,6 @@ 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,6 +1,5 @@
 @ngdoc overview
 @name  Modules
-@sortOrder 320
 @description
 
 # What is a Module?
@@ -27,12 +26,10 @@ 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 ng-app-included="true">
+<example module='myApp'>
   <file name="index.html">
-    <div ng-app="myApp">
-      <div>
-        {{ 'World' | greet }}
-      </div>
+    <div>
+      {{ 'World' | greet }}
     </div>
   </file>
 
@@ -48,18 +45,12 @@ 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 `<div ng-app="myApp">`.
+  * The reference to `myApp` module in `<html 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.
@@ -84,14 +75,13 @@ 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;
@@ -99,9 +89,8 @@ 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;
         }
@@ -111,28 +100,21 @@ 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);
       });
 
-  </file>
 
-  <file name="protractor.js" type="protractor">
-    it('should add Hello to the name', function() {
-      expect(element(by.binding("{{ greeting }}")).getText()).toEqual('Bonjour World!');
-    });
+    // A Controller for your app
+    var XmplController = function($scope, greeter, user) {
+      $scope.greeting = greeter.greet(user.name);
+    };
   </file>
-
 </example>
 
 

docs/content/guide/providers.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Providers
-@sortOrder 340
 @description
 
 # Providers
@@ -84,7 +83,7 @@ On to more complex examples!
 ## Factory Recipe
 
 The Value recipe is very simple to write, but lacks some important features we often need when
-creating services.  Let's now look at the Value recipe's more powerful sibling, the Factory. The
+creating services.  Let's now look at the Value recipe's more powerful sibling, the Factory.The
 Factory recipe adds the following abilities:
 
 * ability to use other services (have dependencies)
@@ -98,8 +97,9 @@ 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 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:
+Since Factory is more powerful version of 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:
 
 ```javascript
 myApp.factory('clientId', function clientIdFactory() {
@@ -111,8 +111,8 @@ But given that the token is just a string literal, sticking with the Value recip
 appropriate as it makes the code easier to follow.
 
 Let's say, however, that we would also like to create a service that computes a token used for
-authentication against a remote API. This token will be called `apiToken` and will be computed
-based on the `clientId` value and a secret stored in the browser's local storage:
+authentication against a remote API. This token will be called 'apiToken' and will be computed
+based on the `clientId` value and a secret stored in browser's local storage:
 
 ```javascript
 myApp.factory('apiToken', ['clientId', function apiTokenFactory(clientId) {
@@ -129,23 +129,21 @@ myApp.factory('apiToken', ['clientId', function apiTokenFactory(clientId) {
 ```
 
 In the code above, we see how the `apiToken` service is defined via the Factory recipe that depends
-on the `clientId` service. The factory service then uses NSA-proof encryption to produce an authentication
+on `clientId` service. The factory service then uses NSA-proof encryption to produce an authentication
 token.
 
-<div class="alert alert-success">
-**Best Practice:** name the factory functions as `<serviceId>Factory`
-(e.g., apiTokenFactory). While this naming convention is not required, it helps when navigating the codebase
+Note: It is a 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
 or looking at stack traces in the debugger.
-</div>
 
-Just like with the Value recipe, the Factory recipe can create a service of any type, whether it be a
+Just like with Value recipe, 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.
 
 
 ## Service Recipe
 
 JavaScript developers often use custom types to write object-oriented code. Let's explore how we
-could launch a unicorn into space via our `unicornLauncher` service which is an instance of a
+could launch a unicorn into space via our `unicornLauncher` service that is an instance of
 custom type:
 
 ```javascript
@@ -153,7 +151,7 @@ function UnicornLauncher(apiToken) {
 
   this.launchedCount = 0;
   this.launch = function() {
-    // Make a request to the remote API and include the apiToken
+    // make a request to the remote api and include the apiToken
     ...
     this.launchedCount++;
   }
@@ -170,7 +168,7 @@ myApp.factory('unicornLauncher', ["apiToken", function(apiToken) {
 ```
 
 
-This is, however, exactly the use-case that the Service recipe is the most suitable for.
+This is, however, exactly the use-case that Service recipe is the most suitable for.
 
 The Service recipe produces a service just like the Value or Factory recipes, but it does so by
 *invoking a constructor with the `new` operator*. The constructor can take zero or more arguments,
@@ -189,18 +187,19 @@ 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 misdeed. It's like we named one of our offspring 'Child'. Boy,
+be somehow punished for our mis-deed. It's like we named one of our offspring 'Children'. Boy,
 that would mess with the teachers.
 
 
 ## Provider Recipe
 
-As already mentioned in the intro, the Provider recipe is the core recipe type and
+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
 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.
 
-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
+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
 a Factory recipe, an empty Provider type with the `$get` method set to your factory function is
 automatically created under the hood.
 
@@ -248,7 +247,7 @@ and wires (injects) all provider instances only.
 
 During application bootstrap, before Angular goes off creating all services, it configures and
 instantiates all providers. We call this the configuration phase of the application life-cycle.
-During this phase, services aren't accessible because they haven't been created yet.
+During this phase services aren't accessible because they haven't been created yet.
 
 Once the configuration phase is over, interaction with providers is disallowed and the process of
 creating services starts. We call this part of the application life-cycle the run phase.
@@ -259,9 +258,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 the Value recipe.
+even to simple value objects created via Value recipe.
 
-Since simple values, like URL prefixes, don't have dependencies or configuration, it's often handy
+Since simple values, like url prefix, don't have dependencies or configuration, it is often handy
 to make them available in both the configuration and run phases. This is what the Constant recipe
 is for.
 
@@ -317,7 +316,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 the Factory recipe, we can use the same syntax as with factories.
+Since the directives are registered via Factory recipe, we can use the same syntax as with factories.
 
 ```javascript
 myApp.directive('myPlanet', ['planetName', function myPlanetDirectiveFactory(planetName) {
@@ -340,7 +339,7 @@ We can then use the component like this:
 </html>
 ```
 
-Using Factory recipes, you can also define Angular's filters and animations, but the controllers
+Using Factory recipes you can also define Angular's filters and animations, but the controllers
 are a bit special. You create a controller as a custom type that declares its dependencies as
 arguments for its constructor function. This constructor is then registered with a module. Let's
 take a look at the `DemoController`, created in one of the early examples:
@@ -351,7 +350,7 @@ myApp.controller('DemoController', ['clientId', function DemoController(clientId
 }]);
 ```
 
-The DemoController is instantiated via its constructor, every time the app needs an instance of
+The DemoController is instantiated via its constructor every time the app needs an instance of
 DemoController (in our simple app it's just once). So unlike services, controllers are not
 singletons. The constructor is called with all the requested services, in our case the `clientId`
 service.
@@ -365,12 +364,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
-  the Service recipe works better for objects of a custom type, while the Factory can produce JavaScript
+  Service recipe works better for objects of custom type, while 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 the Controller are defined via Factory recipes.
+- All special purpose objects except for Controller are defined via Factory recipes.
 
 <table class="table table-bordered code-table">
 <thead>

docs/content/guide/scope.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Scopes
-@sortOrder 240
 @description
 
 # What are Scopes?
@@ -43,16 +42,15 @@ arrangement isolates the controller from the directive as well as from DOM. This
 point since it makes the controllers view agnostic, which greatly improves the testing story of
 the applications.
 
-<example module="scopeExample">
+<example>
   <file name="script.js">
-    angular.module('scopeExample', [])
-      .controller('MyController', ['$scope', function($scope) {
-        $scope.username = 'World';
+    function MyController($scope) {
+      $scope.username = 'World';
 
-        $scope.sayHello = function() {
-          $scope.greeting = 'Hello ' + $scope.username + '!';
-        };
-      }]);
+      $scope.sayHello = function() {
+        $scope.greeting = 'Hello ' + $scope.username + '!';
+      };
+    }
   </file>
   <file name="index.html">
     <div ng-controller="MyController">
@@ -114,7 +112,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
@@ -124,13 +122,13 @@ inheritance, and child scopes prototypically inherit from their parents.
 This example illustrates scopes in application, and prototypical inheritance of properties. The example is followed by
 a diagram depicting the scope boundaries.
 
-<example module="scopeExample">
+<example>
   <file name="index.html">
   <div class="show-scope-demo">
-    <div ng-controller="GreetController">
+    <div ng-controller="GreetCtrl">
       Hello {{name}}!
     </div>
-    <div ng-controller="ListController">
+    <div ng-controller="ListCtrl">
       <ol>
         <li ng-repeat="name in names">{{name}} from {{department}}</li>
       </ol>
@@ -138,14 +136,14 @@ a diagram depicting the scope boundaries.
   </div>
   </file>
   <file name="script.js">
-    angular.module('scopeExample', [])
-      .controller('GreetController', ['$scope', '$rootScope', function($scope, $rootScope) {
-        $scope.name = 'World';
-        $rootScope.department = 'Angular';
-      }])
-      .controller('ListController', ['$scope', function($scope) {
-        $scope.names = ['Igor', 'Misko', 'Vojta'];
-      }]);
+    function GreetCtrl($scope, $rootScope) {
+      $scope.name = 'World';
+      $rootScope.department = 'Angular';
+    }
+
+    function ListCtrl($scope) {
+      $scope.names = ['Igor', 'Misko', 'Vojta'];
+    }
   </file>
   <file name="style.css">
     .show-scope-demo.ng-scope,
@@ -192,15 +190,14 @@ Scopes can propagate events in similar fashion to DOM events. The event can be {
 ng.$rootScope.Scope#$broadcast broadcasted} to the scope children or {@link
 ng.$rootScope.Scope#$emit emitted} to scope parents.
 
-<example module="eventExample">
+<example>
   <file name="script.js">
-    angular.module('eventExample', [])
-      .controller('EventController', ['$scope', function($scope) {
-        $scope.count = 0;
-        $scope.$on('MyEvent', function() {
-          $scope.count++;
-        });
-      }]);
+    function EventController($scope) {
+      $scope.count = 0;
+      $scope.$on('MyEvent', function() {
+        $scope.count++;
+      });
+    }
   </file>
   <file name="index.html">
     <div ng-controller="EventController">

docs/content/guide/services.ngdoc

@@ -1,6 +1,5 @@
 @ngdoc overview
 @name  Services
-@sortOrder 230
 @description
 
 # Services
@@ -131,14 +130,8 @@ injection of `$window`, `$scope`, and our `notify` service:
 </example>
 
 <div class="alert alert-danger">
-**Careful:** If you plan to [minify](http://en.wikipedia.org/wiki/Minification_(programming&#41;) your
-code, your variable names will get renamed unless you use one of the annotation techniques above.
-</div>
-
-<div class="alert alert-info">
-  If you use a tool like [ngmin](https://github.com/btford/ngmin#ngmin) in your workflow you can
-  use implicit dependency notation within your codebase and let **ngmin** automatically convert such
-  injectable functions to the array notation prior to minifying.
+**Careful:** If you plan to [minify](http://en.wikipedia.org/wiki/Minification_(programming) your code,
+your variable names will get renamed unless you use one of the annotation techniques above.
 </div>
 
 
@@ -300,5 +293,5 @@ it('should clear messages after alert', function() {
 
 ## Related API
 
-* {@link ./api/ng/service Angular Service API}
+* {@link ./ng Angular Service API}
 * {@link angular.injector Injector API}

docs/content/guide/templates.ngdoc

@@ -1,6 +1,5 @@
 @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,6 +1,5 @@
 @ngdoc overview
 @name  Unit Testing
-@sortOrder 410
 @description
 
 JavaScript is a dynamically typed language which comes with great power of expression, but it also
@@ -50,7 +49,7 @@ Out of the four options in the list above, only the last one is testable. Let's
 ### Using the `new` operator
 
 While there is nothing wrong with the `new` operator fundamentally, a problem arises when calling `new`
-on a constructor. This permanently binds the call site to the type. For example, let's say that we try to
+on a constructor. This permanently binds the call site to the type. For example, lets say that we try to
 instantiate an `XHR` that will retrieve data from the server.
 
 ```js
@@ -66,7 +65,7 @@ function MyClass() {
 
 A problem surfaces in tests when we would like to instantiate a `MockXHR` that would
 allow us to return fake data and simulate network failures. By calling `new XHR()` we are
-permanently bound to the actual XHR and there is no way to replace it. Yes, we could monkey
+permanently bound to the actual XHR and there is no  way to replace it. Yes, we could monkey
 patch, but that is a bad idea for many reasons which are outside the scope of this document.
 
 Here's an example of how the class above becomes hard to test when resorting to monkey patching:
@@ -97,7 +96,7 @@ function MyClass() {
 ```
 
 While no new dependency instance is created, it is fundamentally the same as `new` in
-that no  way exists to intercept the call to `global.xhr` for testing purposes, other then
+that no  way exists to intercept the call to `global.xhr` for testing purposes, other than
 through monkey patching. The basic issue for testing is that a global variable needs to be mutated in
 order to replace it with call to a mock method. For further explanation of why this is bad see: [Brittle Global
 State & Singletons](http://misko.hevery.com/code-reviewers-guide/flaw-brittle-global-state-singletons/)
@@ -134,7 +133,7 @@ function MyClass() {
 
 However, where does the serviceRegistry come from? If it is:
 * `new`-ed up, the test has no chance to reset the services for testing.
-* a global look-up then the service returned is global as well (but resetting is easier, since
+*  a global look-up then the service returned is global as well (but resetting is easier, since
 only one global variable exists to be reset).
 
 The class above is hard to test since we have to change the global state:
@@ -297,7 +296,7 @@ Now we can add a directive to our app.
 app.directive('aGreatEye', function () {
     return {
         restrict: 'E',
-        replace: true,
+        replace:  true,
         template: '<h1>lidless, wreathed in flame, {{1 + 1}} times</h1>'
     };
 });
@@ -338,80 +337,6 @@ 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