merge

docs/app/e2e/app.scenario.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var webdriver = require('protractor/node_modules/selenium-webdriver');
+var webdriver = require('selenium-webdriver');
 
 describe('docs.angularjs.org', function() {
 

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

@@ -0,0 +1,18 @@
+@ngdoc error
+@name $compile:badrestrict
+@fullName Invalid Directive Restrict
+@description
+
+This error occurs when the restrict property of a directive is not valid.
+
+The directive restrict property must be a string including one of more of the following characters:
+* E (element)
+* A (attribute)
+* C (class)
+* M (comment)
+
+For example:
+```javascript
+restrict: 'E'
+restrict: 'EAC'
+```

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

@@ -0,0 +1,27 @@
+@ngdoc error
+@name $compile:multilink
+@fullName Linking Element Multiple Times
+@description
+
+This error occurs when a single element is linked more then once.
+
+For example, if an element is compiled and linked twice without cloning:
+```
+  var linker = $compile(template);
+  linker($scope); //=> ok
+  linker($scope); //=> multilink error
+```
+
+Linking an element as a clone multiple times is ok:
+```
+  var linker = $compile(template);
+  linker($scope, function() { ... });     //=> ok
+  linker($scope, function() { ... });     //=> ok
+```
+
+However once an element has been linked it can not be re-linked as a clone:
+```
+  var linker = $compile(template);
+  linker($scope);                       //=> ok
+  linker($scope, function() { ... });   //=> multilink error
+```

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

@@ -16,7 +16,7 @@ For example, the following directives are valid:
 directive("okay", function() {
   return {
     bindToController: true,
-    controller: "myCtrl as $ctrl"
+    controller: "myCtrl as $ctrl",
     scope: {
       text: "@text"
     }

docs/content/guide/external-resources.ngdoc

@@ -140,7 +140,7 @@ You can find a larger list of Angular external libraries at [ngmodules.org](http
   [Pluralsite (3 courses)](http://www.pluralsight.com/training/Courses/Find?highlight=true&searchTerm=angularjs),
   [Tuts+](https://tutsplus.com/course/easier-js-apps-with-angular/),
   [lynda.com](http://www.lynda.com/AngularJS-tutorials/Up-Running-AngularJS/133318-2.html),
-  [WintellectNOW (4 lessons)](http://www.wintellectnow.com/Course/Detail/mastering-angularjs)
+  [WintellectNOW (4 lessons)](http://www.wintellectnow.com/Course/Detail/mastering-angularjs),
+  [Packt](https://www.packtpub.com/web-development/angularjs-maintaining-web-applications)
 * **Paid onsite:**
   [angularbootcamp.com](http://angularbootcamp.com/)
-

karma-shared.conf.js

@@ -170,8 +170,8 @@ module.exports = function(config, specificOptions) {
     '/someSanitizedUrl',
     '/{{testUrl}}'
   ];
-  var log4js = require('./node_modules/karma/node_modules/log4js');
-  var layouts = require('./node_modules/karma/node_modules/log4js/lib/layouts');
+  var log4js = require('log4js');
+  var layouts = require('log4js/lib/layouts');
   var originalConfigure = log4js.configure;
   log4js.configure = function(log4jsConfig) {
     var consoleAppender = log4jsConfig.appenders.shift();

lib/grunt/plugins.js

@@ -39,7 +39,7 @@ module.exports = function(grunt) {
 
 
   grunt.registerTask('docs', 'create angular docs', function() {
-    var gruntProc = shelljs.exec('"node_modules/.bin/gulp" --gulpfile docs/gulpfile.js');
+    var gruntProc = shelljs.exec('npm run gulp -- --gulpfile docs/gulpfile.js');
     if (gruntProc.code !== 0) {
       throw new Error('doc generation failed');
     }

lib/grunt/utils.js

@@ -3,7 +3,7 @@
 var fs = require('fs');
 var shell = require('shelljs');
 var grunt = require('grunt');
-var spawn = require('child_process').spawn;
+var spawn = require('cross-spawn');
 
 var CSP_CSS_HEADER = '/* Include this file in your html if you are using the CSP mode. */\n\n';
 
@@ -15,7 +15,7 @@ module.exports = {
     var reporters = grunt.option('reporters');
     var noColor = grunt.option('no-colors');
     var port = grunt.option('port');
-    var p = spawn('node', ['node_modules/karma/bin/karma', 'start', config,
+    var p = spawn('./node_modules/.bin/karma', ['start', config,
       singleRun ? '--single-run=true' : '',
       reporters ? '--reporters=' + reporters : '',
       browsers ? '--browsers=' + browsers : '',
@@ -38,7 +38,7 @@ module.exports = {
       done();
       return;
     }
-    var p = spawn('node', ['node_modules/protractor/bin/webdriver-manager', 'update']);
+    var p = spawn('./node_modules/.bin/webdriver-manager', ['update']);
     p.stdout.pipe(process.stdout);
     p.stderr.pipe(process.stderr);
     p.on('exit', function(code) {
@@ -54,7 +54,7 @@ module.exports = {
     var sauceBuild = grunt.option('capabilities.build');
     var browser = grunt.option('browser');
     var specs = grunt.option('specs');
-    var args = ['node_modules/protractor/bin/protractor', config];
+    var args = [config];
     if (sauceUser) args.push('--sauceUser=' + sauceUser);
     if (sauceKey) args.push('--sauceKey=' + sauceKey);
     if (tunnelIdentifier) args.push('--capabilities.tunnel-identifier=' + tunnelIdentifier);
@@ -65,7 +65,7 @@ module.exports = {
     }
 
 
-    var p = spawn('node', args);
+    var p = spawn('./node_modules/.bin/protractor', args);
     p.stdout.pipe(process.stdout);
     p.stderr.pipe(process.stderr);
     p.on('exit', function(code) {