Merge remote-tracking branch 'upstream/v0.10'

Reverted 9520ade Conflicts: deps/cares/src/ares_parse_txt_reply.c deps/uv/.mailmap deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/include/uv.h deps/uv/src/unix/error.c deps/uv/src/unix/process.c deps/uv/src/version.c deps/uv/src/win/pipe.c deps/uv/src/win/signal.c deps/uv/src/win/util.c deps/uv/test/test-spawn.c deps/uv/vcbuild.bat deps/v8/src/platform-posix.cc deps/v8/tools/gyp/v8.gyp lib/util.js src/node.cc test/simple/test-util-format.js test/simple/test-util.js
19h · May 1, 2014 · b19b60a · b19b60a
2 parents d1fe685 + f76c393
commit b19b60a
Show file tree

Hide file tree

Showing 294 changed files with 1,854 additions and 589 deletions.
diff --git a/Makefile b/Makefile
@@ -167,7 +167,7 @@ website_files = \
 	out/doc/sh_main.js    \
 	out/doc/sh_javascript.min.js
 
-doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ node
+doc: $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/ out/doc/changelog.html node
 
 $(apidoc_dirs):
 	mkdir -p $@

diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+script: "npm run-script tap"
+node_js:
+  - "0.11"
+  - "0.10"
diff --git a/deps/npm/Makefile b/deps/npm/Makefile
@@ -169,7 +169,6 @@ publish: link doc
 	git push origin &&\
 	git push origin --tags &&\
 	npm publish &&\
-	npm tag npm@$(shell npm -v) $(shell npm -v | awk -F. '{print $$1 "." $$2}') &&\
 	make doc-publish &&\
 	make zip-publish
 

diff --git a/deps/npm/README.md b/deps/npm/README.md
@@ -1,6 +1,6 @@
 npm(1) -- node package manager
 ==============================
-
+[![Build Status](https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm)
 ## SYNOPSIS
 
 This is just enough info to get you up and running.
@@ -38,6 +38,10 @@ paths, etc.) then read on.
 There's a pretty robust install script at
 <https://www.npmjs.org/install.sh>.  You can download that and run it.
 
+Here's an example using curl:
+
+    curl -L https://npmjs.org/install.sh | sh
+
 ### Slightly Fancier
 
 You can set any npm configuration params with that script:

diff --git a/deps/npm/doc/api/npm.md b/deps/npm/doc/api/npm.md
@@ -4,7 +4,7 @@ npm(3) -- node package manager
 ## SYNOPSIS
 
     var npm = require("npm")
-    npm.load([configObject], function (er, npm) {
+    npm.load([configObject, ]function (er, npm) {
       // use the npm object, now that it's loaded.
 
       npm.config.set(key, val)

diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md
@@ -24,7 +24,7 @@ A `package` is:
 * a) a folder containing a program described by a package.json file
 * b) a gzipped tarball containing (a)
 * c) a url that resolves to (b)
-* d) a `<name>@<version>` that is published on the registry with (c)
+* d) a `<name>@<version>` that is published on the registry (see `npm-registry(7)`) with (c)
 * e) a `<name>@<tag>` that points to (d)
 * f) a `<name>` that has a "latest" tag satisfying (e)
 * g) a `<git remote url>` that resolves to (b)
@@ -254,7 +254,6 @@ affects a real use-case, it will be investigated.
 * npm-config(7)
 * npmrc(5)
 * npm-registry(7)
-* npm-folders(5)
 * npm-tag(1)
 * npm-rm(1)
 * npm-shrinkwrap(1)
diff --git a/deps/npm/doc/cli/npm-run-script.md b/deps/npm/doc/cli/npm-run-script.md
@@ -3,11 +3,13 @@ npm-run-script(1) -- Run arbitrary package scripts
 
 ## SYNOPSIS
 
-    npm run-script <script> <name>
+    npm run-script [<pkg>] <command>
 
 ## DESCRIPTION
 
-This runs an arbitrary command from a package's "scripts" object.
+This runs an arbitrary command from a package's `"scripts"` object.
+If no package name is provided, it will search for a `package.json`
+in the current folder and use its `"scripts"` object.
 
 It is used by the test, start, restart, and stop commands, but can be
 called directly, as well.

diff --git a/deps/npm/doc/files/package.json.md b/deps/npm/doc/files/package.json.md
@@ -311,6 +311,7 @@ See semver(7) for more details about specifying version ranges.
 * `<version`
 * `<=version`
 * `~version` "Approximately equivalent to version"  See semver(7)
+* `^version` "Compatible with version"  See semver(7)
 * `1.2.x` 1.2.0, 1.2.1, etc., but not 1.3.0
 * `http://...` See 'URLs as Dependencies' below
 * `*` Matches any version
@@ -404,6 +405,40 @@ can consume the functionality without requiring them to compile it
 themselves.  In dev mode (ie, locally running `npm install`), it'll
 run this script as well, so that you can test it easily.
 
+## peerDependencies
+
+In some cases, you want to express the compatibility of your package with an
+host tool or library, while not necessarily doing a `require` of this host.
+This is usually refered to as a *plugin*. Notably, your module may be exposing
+a specific interface, expected and specified by the host documentation.
+
+For example:
+
+    {
+      "name": "tea-latte",
+      "version": "1.3.5"
+      "peerDependencies": {
+        "tea": "2.x"
+      }
+    }
+
+This ensures your package `tea-latte` can be installed *along* with the second
+major version of the host package `tea` only. The host package is automatically
+installed if needed. `npm install tea-latte` could possibly yield the following
+dependency graph:
+
+    ├── tea-latte@1.3.5
+    └── tea@2.2.0
+
+Trying to install another plugin with a conflicting requirement will cause an
+error. For this reason, make sure your plugin requirement is as broad as
+possible, and not to lock it down to specific patch versions.
+
+Assuming the host complies with [semver](http://semver.org/), only changes in
+the host package's major version will break your plugin. Thus, if you've worked
+with every 1.x version of the host package, use `"^1.0"` or `"1.x"` to express
+this. If you depend on features introduced in 1.5.2, use `">= 1.5.2 < 2"`.
+
 ## bundledDependencies
 
 Array of package names that will be bundled when publishing the package.

diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md
@@ -648,6 +648,19 @@ devDependencies hash.
 
 Only works if there is already a package.json file present.
 
+### save-prefix
+
+* Default: '^'
+* Type: String
+
+Configure how versions of packages installed to a package.json file via 
+`--save` or `--save-dev` get prefixed.
+
+For example if a package has version `1.2.3`, by default it's version is
+set to `^1.2.3` which allows minor upgrades for that package, but after  
+`npm config set save-prefix='~'` it would be set to `~1.2.3` which only allows
+patch upgrades.
+
 ### searchopts
 
 * Default: ""

diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md
@@ -77,7 +77,7 @@ npm will not help you do something that is known to be a bad idea.
 
 Mikeal Rogers answered this question very well:
 
-<http://www.mikealrogers.com/posts/nodemodules-in-git.html>
+<http://www.futurealoof.com/posts/nodemodules-in-git.html>
 
 tl;dr
 

diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
@@ -3,14 +3,16 @@
   <title>README</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/README.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
     <div id="wrapper">
 
 <h1><a href="cli/npm.html">npm</a></h1> <p>node package manager</p>
 
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
+<p><a href="https://img.shields.io/travis/npm/npm/master.svg)](https://travis-ci.org/npm/npm">![Build Status</a>
+## SYNOPSIS</p>
 
 <p>This is just enough info to get you up and running.</p>
 
@@ -47,6 +49,10 @@ <h2 id="Fancy-Install-Unix">Fancy Install (Unix)</h2>
 <p>There&#39;s a pretty robust install script at
 <a href="https://www.npmjs.org/install.sh">https://www.npmjs.org/install.sh</a>.  You can download that and run it.</p>
 
+<p>Here&#39;s an example using curl:</p>
+
+<pre><code>curl -L https://npmjs.org/install.sh | sh</code></pre>
+
 <h3 id="Slightly-Fancier">Slightly Fancier</h3>
 
 <p>You can set any npm configuration params with that script:</p>
@@ -254,5 +260,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.6</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-bin.html b/deps/npm/html/doc/api/npm-bin.html
@@ -3,6 +3,7 @@
   <title>npm-bin</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-bin.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -31,5 +32,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bin &mdash; npm@1.4.6</p>
+<p id="footer">npm-bin &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-bugs.html b/deps/npm/html/doc/api/npm-bugs.html
@@ -3,6 +3,7 @@
   <title>npm-bugs</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-bugs.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -37,5 +38,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-bugs &mdash; npm@1.4.6</p>
+<p id="footer">npm-bugs &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-commands.html b/deps/npm/html/doc/api/npm-commands.html
@@ -3,6 +3,7 @@
   <title>npm-commands</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-commands.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -40,5 +41,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-commands &mdash; npm@1.4.6</p>
+<p id="footer">npm-commands &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-config.html b/deps/npm/html/doc/api/npm-config.html
@@ -3,6 +3,7 @@
   <title>npm-config</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-config.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -45,5 +46,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-config &mdash; npm@1.4.6</p>
+<p id="footer">npm-config &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-deprecate.html b/deps/npm/html/doc/api/npm-deprecate.html
@@ -3,6 +3,7 @@
   <title>npm-deprecate</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-deprecate.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -44,5 +45,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-deprecate &mdash; npm@1.4.6</p>
+<p id="footer">npm-deprecate &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-docs.html b/deps/npm/html/doc/api/npm-docs.html
@@ -3,6 +3,7 @@
   <title>npm-docs</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-docs.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -37,5 +38,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-docs &mdash; npm@1.4.6</p>
+<p id="footer">npm-docs &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-edit.html b/deps/npm/html/doc/api/npm-edit.html
@@ -3,6 +3,7 @@
   <title>npm-edit</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-edit.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -42,5 +43,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-edit &mdash; npm@1.4.6</p>
+<p id="footer">npm-edit &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-explore.html b/deps/npm/html/doc/api/npm-explore.html
@@ -3,6 +3,7 @@
   <title>npm-explore</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-explore.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -36,5 +37,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-explore &mdash; npm@1.4.6</p>
+<p id="footer">npm-explore &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-help-search.html b/deps/npm/html/doc/api/npm-help-search.html
@@ -3,6 +3,7 @@
   <title>npm-help-search</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-help-search.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -44,5 +45,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-help-search &mdash; npm@1.4.6</p>
+<p id="footer">npm-help-search &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-init.html b/deps/npm/html/doc/api/npm-init.html
@@ -3,6 +3,7 @@
   <title>npm-init</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-init.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -47,5 +48,5 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-init &mdash; npm@1.4.6</p>
+<p id="footer">npm-init &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-install.html b/deps/npm/html/doc/api/npm-install.html
@@ -3,6 +3,7 @@
   <title>npm-install</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-install.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -37,5 +38,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-install &mdash; npm@1.4.6</p>
+<p id="footer">npm-install &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-link.html b/deps/npm/html/doc/api/npm-link.html
@@ -3,6 +3,7 @@
   <title>npm-link</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-link.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -51,5 +52,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-link &mdash; npm@1.4.6</p>
+<p id="footer">npm-link &mdash; npm@1.4.8</p>
 
diff --git a/deps/npm/html/doc/api/npm-load.html b/deps/npm/html/doc/api/npm-load.html
@@ -3,6 +3,7 @@
   <title>npm-load</title>
   <meta http-equiv="content-type" value="text/html;utf-8">
   <link rel="stylesheet" type="text/css" href="../../static/style.css">
+  <link rel="canonical" href="https://www.npmjs.org/doc/api/npm-load.html">
   <script async=true src="../../static/toc.js"></script>
 
   <body>
@@ -44,5 +45,5 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-load &mdash; npm@1.4.6</p>
+<p id="footer">npm-load &mdash; npm@1.4.8</p>
-Original file line number
+Diff line change
@@ Expand Up @@
     Mikeal Rogers answered this question very well:
-    <http://www.mikealrogers.com/posts/nodemodules-in-git.html>
+    <http://www.futurealoof.com/posts/nodemodules-in-git.html>
     tl;dr
@@ Expand Down @@