Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.8

* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  Add noindex to vnext-staging
  Add note for 1.8 release. (#4632)
  fix create-cluster-kubeadm docs
  Update aws.md
  add newline above kube-apiserver
  Update scheduling-gpus.md
  Fix spacing with shell commands
  Documenting another (potential) callout issue (#4604)
  Update reference docs with most recent version of brodocs (#4600)
  Update kubernetes-api.md
  fix spelling mistake
  fix typos in fedration docs
  fix kubelet garbage collected typo
  fix typo in network-policies.md
  fix typo
  Add /_includes/glossary directory for snippets (#4628)
  Fixed typo in getting started guide using minikube
  Update to include Python library (#4624)
  Rename OWNERS assignees: to approvers:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,8 @@
-> NOTE: Please check the “Allow edits from maintainers” box (see image below) to  
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+> For 1.8 Features: set Milestone to `1.8` and Base Branch to `release-1.8`
+> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+>
+> NOTE: Please check the “Allow edits from maintainers” box (see image below) to
 > [allow reviewers to fix problems](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/) on your patch and speed up the review process.
 >
 > Please delete this note before submitting the pull request.

OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - smarterclayton
 - janetkuo
 - pwittrock

_includes/glossary/README.md

@@ -0,0 +1,3 @@
+# Instructions for Glossary snippets
+
+Markdown snippets of glossary terms to be reused throughout the documentation should be placed in this directory.

cn/docs/concepts/overview/what-is-kubernetes.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - k8s-merge-robot
 
 title: 认识 Kubernetes?

cn/docs/getting-started-guides/centos/centos_manual_config.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - thockin
 title: CentOS
 ---

cn/docs/getting-started-guides/coreos/bare_metal_offline.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - thockin
 title: Offline
@@ -705,4 +705,4 @@ IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs
 -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ----------------------------
 Bare-metal (Offline) | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/coreos/bare_metal_offline)              |          | Community ([@jeffbean](https://github.com/jeffbean))
 
-有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。
+有关所有解决方案的支持级别信息，请参阅[解决方案列表](/docs/getting-started-guides/#table-of-solutions)。

cn/docs/whatisk8s.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - k8s-merge-robot
 
 title: 认识 Kubernetes?

docs/admin/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - mikedanese
 

docs/admin/accessing-the-api.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bgrant0607
 - erictune
 - lavalamp

docs/admin/admission-controllers.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bprashanth
 - davidopp
 - derekwaynecarr

docs/admin/authentication.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - ericchiang

docs/admin/authorization/abac.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k
@@ -152,4 +152,4 @@ file:
 The apiserver will need to be restarted to pickup the new policy lines.
 
 {% endcapture %}
-{% include templates/concept.md %}
+{% include templates/concept.md %}

docs/admin/authorization/index.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k

docs/admin/authorization/node.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - timstclair
 - deads2k
 - liggitt

docs/admin/authorization/rbac.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - deads2k
 - liggitt

docs/admin/authorization/webhook.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - erictune
 - lavalamp
 - deads2k

docs/admin/bootstrap-tokens.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - jbeda
 title: Authenticating with Bootstrap Tokens
 ---

docs/admin/cluster-large.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - davidopp
 - lavalamp
 title: Building Large Clusters

docs/admin/extensible-admission-controllers.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - smarterclayton
 - lavalamp
 - whitlockjc

docs/admin/federation/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - madhusudancs
 - mml
 - nikhiljindal

docs/admin/federation/index.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - madhusudancs
 - mml
 - nikhiljindal

docs/admin/high-availability/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - davidopp
 - lavalamp
 

docs/admin/kubeadm.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - mikedanese
 - luxas
 - errordeveloper

docs/admin/kubelet-authentication-authorization.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - liggitt
 title: Kubelet authentication/authorization
 ---

docs/admin/kubelet-tls-bootstrapping.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - ericchiang
 - mikedanese
 - jcbsmpsn

docs/admin/limitrange/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - janetkuo
 

docs/admin/multiple-schedulers/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - davidopp
 - madhusudancs
 

docs/admin/multiple-zones.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - jlowdermilk
 - justinsb
 - quinton-hoole
@@ -74,7 +74,7 @@ located in a single zone.  Users that want a highly available control
 plane should follow the [high availability](/docs/admin/high-availability) instructions.
 
 
-## Walkthough
+## Walkthrough
 
 We're now going to walk through setting up and using a multi-zone
 cluster on both GCE & AWS.  To do so, you bring up a full cluster

docs/admin/namespaces/OWNERS

@@ -1,4 +1,4 @@
-assignees:
+approvers:
 - derekwaynecarr
 - janetkuo
 

docs/admin/node-conformance.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - Random-Liu
 title: Validate Node Setup
 ---

docs/admin/ovs-networking.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - thockin
 title: Kubernetes OpenVSwitch GRE/VxLAN networking
 ---

docs/admin/resourcequota/OWNERS

@@ -1,3 +1,3 @@
-assignees:
+approvers:
 - derekwaynecarr
 

docs/admin/salt.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - davidopp
 title: Configuring Kubernetes with Salt
 ---

docs/admin/service-accounts-admin.md

@@ -1,5 +1,5 @@
 ---
-assignees:
+approvers:
 - bprashanth
 - davidopp
 - lavalamp

docs/api-reference/v1.7/brodoc.js

@@ -153,7 +153,7 @@ function generateNestedNav(parent, nest) {
 
 function generateNavJson(data) {
     var navJson = JSON.stringify(data);
-    navScript = `(function(){navData = ${navJson}})();`;
+    navScript = `(function(){navData = ${navJson};})();`;
     fs.writeFile('./navData.js', navScript, function(err) {
         if (err) {
             return console.log(err);

docs/api-reference/v1.7/node_modules/ejs/Jakefile

@@ -59,8 +59,7 @@ publishTask('ejs', ['build'], function () {
     'package.json',
     'ejs.js',
     'ejs.min.js',
-    'lib/**',
+    'lib/**'
-    'test/**'
   ]);
 });
 

docs/api-reference/v1.7/node_modules/ejs/README.md

@@ -4,6 +4,7 @@ Embedded JavaScript templates
 
 [![Build Status](https://img.shields.io/travis/mde/ejs/master.svg?style=flat)](https://travis-ci.org/mde/ejs)
 [![Developing Dependencies](https://img.shields.io/david/dev/mde/ejs.svg?style=flat)](https://david-dm.org/mde/ejs?type=dev)
+[![Known Vulnerabilities](https://snyk.io/test/npm/ejs/badge.svg?style=flat-square)](https://snyk.io/test/npm/ejs)
 
 ## Installation
 

docs/api-reference/v1.7/node_modules/ejs/ejs.js

@@ -122,16 +122,36 @@ exports.resolveInclude = function(name, filename, isDir) {
  * @param  {Options} options compilation options
  * @return {String}
  */
-function getIncludePath(path, options){
+function getIncludePath(path, options) {
   var includePath;
+  var filePath;
+  var views = options.views;
+
+  // Abs path
   if (path.charAt(0) == '/') {
     includePath = exports.resolveInclude(path.replace(/^\/*/,''), options.root || '/', true);
   }
+  // Relative paths
   else {
-    if (!options.filename) {
+    // Look relative to a passed filename first
-      throw new Error('`include` use relative path requires the \'filename\' option.');
+    if (options.filename) {
+      filePath = exports.resolveInclude(path, options.filename);
+      if (fs.existsSync(filePath)) {
+        includePath = filePath;
+      }
+    }
+    // Then look in any views directories
+    if (!includePath) {
+      if (Array.isArray(views) && views.some(function (v) {
+        filePath = exports.resolveInclude(path, v, true);
+        return fs.existsSync(filePath);
+      })) {
+        includePath = filePath;
+      }
+    }
+    if (!includePath) {
+      throw new Error('Could not find include include file.');
     }
-    includePath = exports.resolveInclude(path, options.filename);
   }
   return includePath;
 }
@@ -391,8 +411,13 @@ exports.renderFile = function () {
     // in the data, copy them to options
     if (arguments.length === 3) {
       // Express 4
-      if (data.settings && data.settings['view options']) {
+      if (data.settings) {
-        utils.shallowCopyFromList(opts, data.settings['view options'], _OPTS_EXPRESS);
+        if (data.settings['view options']) {
+          utils.shallowCopyFromList(opts, data.settings['view options'], _OPTS_EXPRESS);
+        }
+        if (data.settings.views) {
+          opts.views = data.settings.views;
+        }
       }
       // Express 3 and lower
       else {
@@ -443,6 +468,7 @@ function Template(text, opts) {
   options.rmWhitespace = opts.rmWhitespace;
   options.root = opts.root;
   options.localsName = opts.localsName || exports.localsName || _DEFAULT_LOCALS_NAME;
+  options.views = opts.views;
 
   if (options.strict) {
     options._with = false;
@@ -506,10 +532,6 @@ Template.prototype = {
       src = this.source;
     }
 
-    if (opts.debug) {
-      console.log(src);
-    }
-
     if (opts.client) {
       src = 'escapeFn = escapeFn || ' + escapeFn.toString() + ';' + '\n' + src;
       if (opts.compileDebug) {
@@ -520,6 +542,9 @@ Template.prototype = {
     if (opts.strict) {
       src = '"use strict";\n' + src;
     }
+    if (opts.debug) {
+      console.log(src);
+    }
 
     try {
       fn = new Function(opts.localsName + ', escapeFn, include, rethrow', src);
@@ -612,7 +637,7 @@ Template.prototype = {
                   + '      try {' + '\n'
                   + includeObj.source
                   + '      } catch (e) {' + '\n'
-                  + '        rethrow(e, __lines, __filename, __line);' + '\n'
+                  + '        rethrow(e, __lines, __filename, __line, escapeFn);' + '\n'
                   + '      }' + '\n'
                   + '    ; }).call(this)' + '\n';
             }else{
@@ -658,43 +683,43 @@ Template.prototype = {
     return arr;
   },
 
+  _addOutput: function (line) {
+    if (this.truncate) {
+      // Only replace single leading linebreak in the line after
+      // -%> tag -- this is the single, trailing linebreak
+      // after the tag that the truncation mode replaces
+      // Handle Win / Unix / old Mac linebreaks -- do the \r\n
+      // combo first in the regex-or
+      line = line.replace(/^(?:\r\n|\r|\n)/, '');
+      this.truncate = false;
+    }
+    else if (this.opts.rmWhitespace) {
+      // rmWhitespace has already removed trailing spaces, just need
+      // to remove linebreaks
+      line = line.replace(/^\n/, '');
+    }
+    if (!line) {
+      return line;
+    }
+
+    // Preserve literal slashes
+    line = line.replace(/\\/g, '\\\\');
+
+    // Convert linebreaks
+    line = line.replace(/\n/g, '\\n');
+    line = line.replace(/\r/g, '\\r');
+
+    // Escape double-quotes
+    // - this will be the delimiter during execution
+    line = line.replace(/"/g, '\\"');
+    this.source += '    ; __append("' + line + '")' + '\n';
+  },
+
   scanLine: function (line) {
     var self = this;
     var d = this.opts.delimiter;
     var newLineCount = 0;
 
-    function _addOutput() {
-      if (self.truncate) {
-        // Only replace single leading linebreak in the line after
-        // -%> tag -- this is the single, trailing linebreak
-        // after the tag that the truncation mode replaces
-        // Handle Win / Unix / old Mac linebreaks -- do the \r\n
-        // combo first in the regex-or
-        line = line.replace(/^(?:\r\n|\r|\n)/, '');
-        self.truncate = false;
-      }
-      else if (self.opts.rmWhitespace) {
-        // rmWhitespace has already removed trailing spaces, just need
-        // to remove linebreaks
-        line = line.replace(/^\n/, '');
-      }
-      if (!line) {
-        return;
-      }
-
-      // Preserve literal slashes
-      line = line.replace(/\\/g, '\\\\');
-
-      // Convert linebreaks
-      line = line.replace(/\n/g, '\\n');
-      line = line.replace(/\r/g, '\\r');
-
-      // Escape double-quotes
-      // - this will be the delimiter during execution
-      line = line.replace(/"/g, '\\"');
-      self.source += '    ; __append("' + line + '")' + '\n';
-    }
-
     newLineCount = (line.split('\n').length - 1);
 
     switch (line) {
@@ -723,7 +748,7 @@ Template.prototype = {
     case '-' + d + '>':
     case '_' + d + '>':
       if (this.mode == Template.modes.LITERAL) {
-        _addOutput();
+        this._addOutput(line);
       }
 
       this.mode = null;
@@ -759,13 +784,13 @@ Template.prototype = {
           break;
             // Literal <%% mode, append as raw output
         case Template.modes.LITERAL:
-          _addOutput();
+          this._addOutput(line);
           break;
         }
       }
         // In string mode, just add the output
       else {
-        _addOutput();
+        this._addOutput(line);
       }
     }
 
@@ -1428,7 +1453,7 @@ module.exports={
     "engine",
     "ejs"
   ],
-  "version": "2.5.5",
+  "version": "2.5.6",
   "author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
   "contributors": [
     "Timothy Gu <timothygu99@gmail.com> (https://timothygu.github.io)"
@@ -1457,7 +1482,7 @@ module.exports={
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "mocha",
+    "test": "jake test",
     "lint": "eslint \"**/*.js\" Jakefile",
     "coverage": "istanbul cover node_modules/mocha/bin/_mocha",
     "doc": "jake doc",

docs/api-reference/v1.7/node_modules/ejs/lib/ejs.js

@@ -121,16 +121,36 @@ exports.resolveInclude = function(name, filename, isDir) {
  * @param  {Options} options compilation options
  * @return {String}
  */
-function getIncludePath(path, options){
+function getIncludePath(path, options) {
   var includePath;
+  var filePath;
+  var views = options.views;
+
+  // Abs path
   if (path.charAt(0) == '/') {
     includePath = exports.resolveInclude(path.replace(/^\/*/,''), options.root || '/', true);
   }
+  // Relative paths
   else {
-    if (!options.filename) {
+    // Look relative to a passed filename first
-      throw new Error('`include` use relative path requires the \'filename\' option.');
+    if (options.filename) {
+      filePath = exports.resolveInclude(path, options.filename);
+      if (fs.existsSync(filePath)) {
+        includePath = filePath;
+      }
+    }
+    // Then look in any views directories
+    if (!includePath) {
+      if (Array.isArray(views) && views.some(function (v) {
+        filePath = exports.resolveInclude(path, v, true);
+        return fs.existsSync(filePath);
+      })) {
+        includePath = filePath;
+      }
+    }
+    if (!includePath) {
+      throw new Error('Could not find include include file.');
     }
-    includePath = exports.resolveInclude(path, options.filename);
   }
   return includePath;
 }
@@ -390,8 +410,13 @@ exports.renderFile = function () {
     // in the data, copy them to options
     if (arguments.length === 3) {
       // Express 4
-      if (data.settings && data.settings['view options']) {
+      if (data.settings) {
-        utils.shallowCopyFromList(opts, data.settings['view options'], _OPTS_EXPRESS);
+        if (data.settings['view options']) {
+          utils.shallowCopyFromList(opts, data.settings['view options'], _OPTS_EXPRESS);
+        }
+        if (data.settings.views) {
+          opts.views = data.settings.views;
+        }
       }
       // Express 3 and lower
       else {
@@ -442,6 +467,7 @@ function Template(text, opts) {
   options.rmWhitespace = opts.rmWhitespace;
   options.root = opts.root;
   options.localsName = opts.localsName || exports.localsName || _DEFAULT_LOCALS_NAME;
+  options.views = opts.views;
 
   if (options.strict) {
     options._with = false;
@@ -505,10 +531,6 @@ Template.prototype = {
       src = this.source;
     }
 
-    if (opts.debug) {
-      console.log(src);
-    }
-
     if (opts.client) {
       src = 'escapeFn = escapeFn || ' + escapeFn.toString() + ';' + '\n' + src;
       if (opts.compileDebug) {
@@ -519,6 +541,9 @@ Template.prototype = {
     if (opts.strict) {
       src = '"use strict";\n' + src;
     }
+    if (opts.debug) {
+      console.log(src);
+    }
 
     try {
       fn = new Function(opts.localsName + ', escapeFn, include, rethrow', src);
@@ -611,7 +636,7 @@ Template.prototype = {
                   + '      try {' + '\n'
                   + includeObj.source
                   + '      } catch (e) {' + '\n'
-                  + '        rethrow(e, __lines, __filename, __line);' + '\n'
+                  + '        rethrow(e, __lines, __filename, __line, escapeFn);' + '\n'
                   + '      }' + '\n'
                   + '    ; }).call(this)' + '\n';
             }else{
@@ -657,43 +682,43 @@ Template.prototype = {
     return arr;
   },
 
+  _addOutput: function (line) {
+    if (this.truncate) {
+      // Only replace single leading linebreak in the line after
+      // -%> tag -- this is the single, trailing linebreak
+      // after the tag that the truncation mode replaces
+      // Handle Win / Unix / old Mac linebreaks -- do the \r\n
+      // combo first in the regex-or
+      line = line.replace(/^(?:\r\n|\r|\n)/, '');
+      this.truncate = false;
+    }
+    else if (this.opts.rmWhitespace) {
+      // rmWhitespace has already removed trailing spaces, just need
+      // to remove linebreaks
+      line = line.replace(/^\n/, '');
+    }
+    if (!line) {
+      return line;
+    }
+
+    // Preserve literal slashes
+    line = line.replace(/\\/g, '\\\\');
+
+    // Convert linebreaks
+    line = line.replace(/\n/g, '\\n');
+    line = line.replace(/\r/g, '\\r');
+
+    // Escape double-quotes
+    // - this will be the delimiter during execution
+    line = line.replace(/"/g, '\\"');
+    this.source += '    ; __append("' + line + '")' + '\n';
+  },
+
   scanLine: function (line) {
     var self = this;
     var d = this.opts.delimiter;
     var newLineCount = 0;
 
-    function _addOutput() {
-      if (self.truncate) {
-        // Only replace single leading linebreak in the line after
-        // -%> tag -- this is the single, trailing linebreak
-        // after the tag that the truncation mode replaces
-        // Handle Win / Unix / old Mac linebreaks -- do the \r\n
-        // combo first in the regex-or
-        line = line.replace(/^(?:\r\n|\r|\n)/, '');
-        self.truncate = false;
-      }
-      else if (self.opts.rmWhitespace) {
-        // rmWhitespace has already removed trailing spaces, just need
-        // to remove linebreaks
-        line = line.replace(/^\n/, '');
-      }
-      if (!line) {
-        return;
-      }
-
-      // Preserve literal slashes
-      line = line.replace(/\\/g, '\\\\');
-
-      // Convert linebreaks
-      line = line.replace(/\n/g, '\\n');
-      line = line.replace(/\r/g, '\\r');
-
-      // Escape double-quotes
-      // - this will be the delimiter during execution
-      line = line.replace(/"/g, '\\"');
-      self.source += '    ; __append("' + line + '")' + '\n';
-    }
-
     newLineCount = (line.split('\n').length - 1);
 
     switch (line) {
@@ -722,7 +747,7 @@ Template.prototype = {
     case '-' + d + '>':
     case '_' + d + '>':
       if (this.mode == Template.modes.LITERAL) {
-        _addOutput();
+        this._addOutput(line);
       }
 
       this.mode = null;
@@ -758,13 +783,13 @@ Template.prototype = {
           break;
             // Literal <%% mode, append as raw output
         case Template.modes.LITERAL:
-          _addOutput();
+          this._addOutput(line);
           break;
         }
       }
         // In string mode, just add the output
       else {
-        _addOutput();
+        this._addOutput(line);
       }
     }
 

docs/api-reference/v1.7/node_modules/ejs/package.json

@@ -14,13 +14,13 @@
     ]
   ],
   "_from": "ejs@>=2.5.2 <3.0.0",
-  "_id": "ejs@2.5.6",
+  "_id": "ejs@2.5.7",
   "_inCache": true,
   "_location": "/ejs",
   "_nodeVersion": "6.9.1",
   "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
+    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/ejs-2.5.6.tgz_1487277787176_0.4875628533773124"
+    "tmp": "tmp/ejs-2.5.7.tgz_1501385411193_0.3807816591579467"
   },
   "_npmUser": {
     "name": "mde",
@@ -40,8 +40,8 @@
   "_requiredBy": [
     "#DEV:/"
   ],
-  "_resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz",
+  "_resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz",
-  "_shasum": "479636bfa3fe3b1debd52087f0acb204b4f19c88",
+  "_shasum": "cc872c168880ae3c7189762fd5ffc00896c9518a",
   "_shrinkwrap": null,
   "_spec": "ejs@^2.5.2",
   "_where": "/brodocs",
@@ -75,8 +75,8 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "479636bfa3fe3b1debd52087f0acb204b4f19c88",
+    "shasum": "cc872c168880ae3c7189762fd5ffc00896c9518a",
-    "tarball": "https://registry.npmjs.org/ejs/-/ejs-2.5.6.tgz"
+    "tarball": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz"
   },
   "engines": {
     "node": ">=0.10.0"
@@ -107,7 +107,7 @@
     "devdoc": "jake doc[dev]",
     "doc": "jake doc",
     "lint": "eslint \"**/*.js\" Jakefile",
-    "test": "mocha"
+    "test": "jake test"
   },
-  "version": "2.5.6"
+  "version": "2.5.7"
 }

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/backslash.ejs

@@ -1 +0,0 @@
-\foo

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/backslash.html

@@ -1 +0,0 @@
-\foo

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/comments.ejs

@@ -1,7 +0,0 @@
-<li><a href="foo"><% // double-slash comment %>foo</li>
-<li><a href="bar"><% /* C-style comment */ %>bar</li>
-<li><a href="baz"><% // double-slash comment with newline
-    %>baz</li>
-<li><a href="qux"><% var x = 'qux'; // double-slash comment @ end of line %><%= x %></li>
-<li><a href="fee"><%# ERB style comment %>fee</li>
-<li><a href="bah"><%= 'not a ' + '//' + ' comment' %></a></li>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/comments.html

@@ -1,6 +0,0 @@
-<li><a href="foo">foo</li>
-<li><a href="bar">bar</li>
-<li><a href="baz">baz</li>
-<li><a href="qux">qux</li>
-<li><a href="fee">fee</li>
-<li><a href="bah">not a // comment</a></li>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/consecutive-tags.ejs

@@ -1 +0,0 @@
-<% var a = 'foo' %><% var b = 'bar' %><%= a %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/consecutive-tags.html

@@ -1 +0,0 @@
-foo

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/double-quote.ejs

@@ -1 +0,0 @@
-<p><%= "lo" + 'ki' %>'s "wheelchair"</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/double-quote.html

@@ -1 +0,0 @@
-<p>loki's "wheelchair"</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/error.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <% if (users) { %>
-    <p>Has users</p>
-  <% } %>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/error.out

@@ -1,8 +0,0 @@
-ReferenceError: error.ejs:2
-    1| <ul>
- >> 2|   <% if (users) { %>
-    3|     <p>Has users</p>
-    4|   <% } %>
-    5| </ul>
-
-users is not defined

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/fail.ejs

@@ -1 +0,0 @@
-<% function foo() return 'foo'; %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/hello-world.ejs

@@ -1 +0,0 @@
-<p>Hello world!</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include-abspath.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <@ pets.forEach(function(pet){ @>
-    <@- include(path.join(dir, 'pet'), {pet: pet}); @>
-  <@ }); @>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include-root.ejs

@@ -1 +0,0 @@
-<@- include('/include'); @>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include-simple.ejs

@@ -1,3 +0,0 @@
-<ul>
-  <%- include('hello-world'); %>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include-simple.html

@@ -1,4 +0,0 @@
-<ul>
-  <p>Hello world!</p>
-
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include.css.ejs

@@ -1 +0,0 @@
-<style><%- include('style.css', {value: 'bar'}); %></style>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include.css.html

@@ -1,4 +0,0 @@
-<style>body {
-  foo: 'bar';
-}
-</style>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <@ pets.forEach(function(pet){ @>
-    <@- include('pet', {pet: pet}); @>
-  <@ }); @>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include.html

@@ -1,12 +0,0 @@
-<ul>
-  
-    <li>geddy</li>
-
-  
-    <li>neil</li>
-
-  
-    <li>alex</li>
-
-  
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_cache.ejs

@@ -1 +0,0 @@
-<%- include('../tmp/include') %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_cache.html

@@ -1 +0,0 @@
-<p>Old</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor.css.ejs

@@ -1 +0,0 @@
-<style><% var value = 'bar' %><% include style.css %></style>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor.css.html

@@ -1,4 +0,0 @@
-<style>body {
-  foo: 'bar';
-}
-</style>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <@ pets.forEach(function(pet){ @>
-    <@ include pet @>
-  <@ }) @>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor.html

@@ -1,12 +0,0 @@
-<ul>
-  
-    <li>geddy</li>
-
-  
-    <li>neil</li>
-
-  
-    <li>alex</li>
-
-  
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor_cache.ejs

@@ -1 +0,0 @@
-<%- include ../tmp/include_preprocessor %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor_cache.html

@@ -1 +0,0 @@
-<p>Old</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor_line_slurp.ejs

@@ -1 +0,0 @@
-<% include include_preprocessor_line_slurp_child %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor_line_slurp.html

@@ -1,5 +0,0 @@
-<div>
-12
-3
-45
-</div>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/include_preprocessor_line_slurp_child.ejs

@@ -1,5 +0,0 @@
-<div>
-1   <%_ if (true) { _%> 2
-        3
-4   <%_ } _%> 5
-</div>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/includes/bom.ejs

@@ -1 +0,0 @@
-<p>This is a file with BOM.</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/includes/menu-item.ejs

@@ -1 +0,0 @@
-<li><% include menu/item %></li>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/includes/menu/item.ejs

@@ -1 +0,0 @@
-<a href="/<%= url %>"><%= title %></a>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/literal.ejs

@@ -1,3 +0,0 @@
-<pre>There should be a space followed by a less-than sign and then two more
-spaces in the next line:
- <   .</pre>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/literal.html

@@ -1,3 +0,0 @@
-<pre>There should be a space followed by a less-than sign and then two more
-spaces in the next line:
- <  .</pre>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/menu.ejs

@@ -1,15 +0,0 @@
-<%- include('includes/menu-item', {
-  url: '/foo'
-, title: 'Foo'
-}); -%>
-
-<%- include('includes/menu-item', {
-  url: '/bar'
-, title: 'Bar'
-}); -%>
-
-<%- include('includes/menu-item', {
-  url: '/baz'
-, title: 'Baz'
-}); -%>
-

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/menu.html

@@ -1,9 +0,0 @@
-<li><a href="//foo">Foo</a>
-</li>
-
-<li><a href="//bar">Bar</a>
-</li>
-
-<li><a href="//baz">Baz</a>
-</li>
-

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/menu_preprocessor.ejs

@@ -1,11 +0,0 @@
-<% var url = '/foo' -%>
-<% var title = 'Foo' -%>
-<% include includes/menu-item -%>
-
-<% var url = '/bar' -%>
-<% var title = 'Bar' -%>
-<% include includes/menu-item -%>
-
-<% var url = '/baz' -%>
-<% var title = 'Baz' -%>
-<% include includes/menu-item -%>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/menu_preprocessor.html

@@ -1,8 +0,0 @@
-<li><a href="//foo">Foo</a>
-</li>
-
-<li><a href="//bar">Bar</a>
-</li>
-
-<li><a href="//baz">Baz</a>
-</li>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/menu_var.ejs

@@ -1,15 +0,0 @@
-<%- include(varPath, {
-  url: '/foo'
-, title: 'Foo'
-}); -%>
-
-<%- include(varPath, {
-  url: '/bar'
-, title: 'Bar'
-}); -%>
-
-<%- include(varPath, {
-  url: '/baz'
-, title: 'Baz'
-}); -%>
-

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/messed.ejs

@@ -1 +0,0 @@
-<ul><%users.forEach(function(user){%><li><%=user.name%></li><%})%></ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/messed.html

@@ -1 +0,0 @@
-<ul><li>geddy</li><li>neil</li><li>alex</li></ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/newlines.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <% users.forEach(function(user){ %>
-    <li><%= user.name %></li>
-  <% }) %>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/newlines.html

@@ -1,9 +0,0 @@
-<ul>
-  
-    <li>geddy</li>
-  
-    <li>neil</li>
-  
-    <li>alex</li>
-  
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/newlines.mixed.ejs

@@ -1,6 +0,0 @@
-<ul>
-  <% var unused1 = 'blah' -%>
-  <% var unused2 = 'bleh'  %>
-  <% var unused3 = 'bloh' -%>
-  <% var unused4 = 'bluh'  %>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/newlines.mixed.html

@@ -1,4 +0,0 @@
-<ul>
-    
-    
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/no.newlines.ejs

@@ -1,5 +0,0 @@
-<ul>
-  <% users.forEach(function(user){ -%>
-  <li><%= user.name %></li>
-  <% }) -%>
-</ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/no.newlines.error.ejs

@@ -1,5 +0,0 @@
-AAA
-<% var data = "test"; -%>
-BBB
-<%= qdata %>
-CCC

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/no.newlines.html

@@ -1,5 +0,0 @@
-<ul>
-    <li>geddy</li>
-    <li>neil</li>
-    <li>alex</li>
-  </ul>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/no.semicolons.ejs

@@ -1,8 +0,0 @@
-This document does not use semicolons in scriptlets.
-<%
-  var a = 'b'
-  var b = 'c'
-  var c
-  c = b
-%>
-The value of c is: <%= c %>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/no.semicolons.html

@@ -1,3 +0,0 @@
-This document does not use semicolons in scriptlets.
-
-The value of c is: c

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/para.ejs

@@ -1 +0,0 @@
-<p>hey</p>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/pet.ejs

@@ -1 +0,0 @@
-<li><@= pet.name @></li>

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/rmWhitespace.ejs

@@ -1,14 +0,0 @@
-   <tag1>  
-<tag2>  
-A very long piece of text very long piece of text very long piece of
-text very long piece <% var f = 'f' %>of text very long piece of
-tex
t very long piece of<% %>text very long 
-adsffadsfadsfad<%= f %>   
-   
-piece of text.
-<% var a = 'a' %>  
-Text again.
-<% var b = 'b' %>
-<% var c = 'c'
-var d = 'd' %>
-Another text. <%= c %>  

docs/api-reference/v1.7/node_modules/ejs/test/fixtures/rmWhitespace.html

@@ -1,8 +0,0 @@
-<tag1>
-<tag2>
-A very long piece of text very long piece of text very long piece of
-text very long piece of text very long piece of
-text very long piece oftext very long
-adsffadsfadsfadfpiece of text.
-Text again.
-Another text. c