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

Conflicts:
	node.gyp

1 files changed, 6 insertions, 5 deletions

diff --git a/deps/npm/html/doc/cli/npm-docs.html b/deps/npm/html/doc/cli/npm-docs.html
index ed60c8724..bc4a76e93 100644
--- a/deps/npm/html/doc/cli/npm-docs.html
+++ b/deps/npm/html/doc/cli/npm-docs.html
@@ -10,17 +10,18 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<pre><code>npm docs &lt;pkgname&gt;
+<pre><code>npm docs [&lt;pkgname&gt; [&lt;pkgname&gt; ...]]
 npm docs (with no args in a package dir)
-npm home &lt;pkgname&gt;
+npm home [&lt;pkgname&gt; [&lt;pkgname&gt; ...]]
 npm home (with no args in a package dir)</code></pre>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>This command tries to guess at the likely location of a package&#39;s
 documentation URL, and then tries to open it using the <code>--browser</code>
-config param. If no package name is provided, it will search for
-a <code>package.json</code> in the current folder and use the <code>name</code> property.</p>
+config param. You can pass multiple package names at once. If no
+package name is provided, it will search for a <code>package.json</code> in
+the current folder and use the <code>name</code> property.</p>
 
 <h2 id="CONFIGURATION">CONFIGURATION</h2>
 
@@ -40,7 +41,7 @@ a <code>package.json</code> in the current folder and use the <code>name</code>
 
 <ul><li><a href="../cli/npm-view.html">npm-view(1)</a></li><li><a href="../cli/npm-publish.html">npm-publish(1)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li><li><a href="../cli/npm-config.html">npm-config(1)</a></li><li><a href="../misc/npm-config.html">npm-config(7)</a></li><li><a href="../files/npmrc.html">npmrc(5)</a></li><li><a href="../files/package.json.html">package.json(5)</a></li></ul>
 </div>
-<p id="footer">npm-docs &mdash; npm@1.3.23</p>
+<p id="footer">npm-docs &mdash; npm@1.3.24</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")