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

Conflicts:
	src/node_zlib.cc

deps/npm/AUTHORS

@@ -115,3 +115,44 @@ Vaz Allen <[email protected]>
 elisee <[email protected]>
 Evan You <[email protected]>
 Wil Moore III <[email protected]>
+Dylan Greene <[email protected]>
+zeke <[email protected]>
+Andrew Horton <[email protected]>
+Denis Gladkikh <[email protected]>
+Daniel Santiago <[email protected]>
+Alex Kocharin <[email protected]>
+Evan Lucas <[email protected]>
+Steve Mason <[email protected]>
+Quinn Slack <[email protected]>
+Sébastien Santoro <[email protected]>
+CamilleM <[email protected]>
+Tom Huang <[email protected]>
+Sergey Belov <[email protected]>
+Younghoon Park <[email protected]>
+Yazhong Liu <[email protected]>
+Mikola Lysenko <[email protected]>
+Rafael de Oleza <[email protected]>
+Yeonghoon Park <[email protected]>
+Franck Cuny <[email protected]>
+Alan Shaw <[email protected]>
+Alex Rodionov <[email protected]>
+Alexej Yaroshevich <[email protected]>
+Elan Shanker <[email protected]>
+François Frisch <[email protected]>
+Gabriel Falkenberg <[email protected]>
+Jason Diamond <[email protected]>
+Jess Martin <[email protected]>
+Jon Spencer <[email protected]>
+Matt Colyer <[email protected]>
+Matt McClure <[email protected]>
+Maximilian Antoni <[email protected]>
+Nicholas Kinsey <[email protected]>
+Paulo Cesar <[email protected]>
+Quim Calpe <[email protected]>
+Robert Gieseke <[email protected]>
+Spain Train <[email protected]>
+TJ Holowaychuk <[email protected]>
+Thom Blake <[email protected]>
+Trevor Burnham <[email protected]>
+bitspill <[email protected]>
+Neil Gentleman <[email protected]>

deps/npm/CONTRIBUTING.md

@@ -1,5 +1,9 @@
 ## Before you submit a new issue
 
-* Check if there's a simple solution in the [Troubleshooting](https://github.com/npm/npm/wiki/Troubleshooting) wiki.
-* [Search for similar issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
-* Ensure your new issue conforms to the [Contributing Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).
+* Check if there's a simple solution in the
+  [Troubleshooting](https://github.com/npm/npm/wiki/Troubleshooting)
+  wiki.
+* [Search for similar
+  issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
+* Ensure your new issue conforms to the [Contributing
+  Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).

deps/npm/README.md

@@ -169,51 +169,54 @@ help config` to learn about all the options you can set there.
 
 ## More Docs
 
-Check out the [docs](https://npmjs.org/doc/),
-especially the [faq](https://npmjs.org/doc/faq.html).
+Check out the [docs](https://www.npmjs.org/doc/),
+especially the [faq](https://www.npmjs.org/doc/faq.html).
 
 You can use the `npm help` command to read any of them.
 
 If you're a developer, and you want to use npm to publish your program,
-you should [read this](https://npmjs.org/doc/developers.html)
+you should [read this](https://www.npmjs.org/doc/developers.html)
 
 ## Legal Stuff
 
-"npm" and "the npm registry" are owned by Isaac Z. Schlueter.
+"npm" and "The npm Registry" are owned by npm, Inc.
 All rights reserved.  See the included LICENSE file for more details.
 
-"Node.js" and "node" are trademarks owned by Joyent, Inc.  npm is not
-officially part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.
+"Node.js" and "node" are trademarks owned by Joyent, Inc.
 
-The packages in the npm registry are not part of npm itself, and are the
-sole property of their respective maintainers.  While every effort is
-made to ensure accountability, there is absolutely no guarantee,
-warrantee, or assertion made as to the quality, fitness for a specific
-purpose, or lack of malice in any given npm package.  Modules
-published on the npm registry are not affiliated with or endorsed by
-Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.
+Modules published on the npm registry are not officially endorsed by
+npm, Inc. or the Node.js project.
 
-If you have a complaint about a package in the npm registry, and cannot
-resolve it with the package owner, please express your concerns to
-Isaac Z. Schlueter at <[email protected]>.
+Data published to the npm registry is not part of npm itself, and is
+the sole property of the publisher.  While every effort is made to
+ensure accountability, there is absolutely no guarantee, warrantee, or
+assertion expressed or implied as to the quality, fitness for a
+specific purpose, or lack of malice in any given npm package.
 
-### In plain english
+If you have a complaint about a package in the public npm registry,
+and cannot [resolve it with the package
+owner](https://www.npmjs.org/doc/misc/npm-disputes.html), please email
+<[email protected]> and explain the situation.
 
-This is mine; not my employer's, not Node's, not Joyent's, not Ryan
-Dahl's.
+Any data published to The npm Registry (including user account
+information) may be removed or modified at the sole discretion of the
+npm server administrators.
+
+### In plainer english
+
+npm is the property of npm, Inc.
 
 If you publish something, it's yours, and you are solely accountable
-for it.  Not me, not Node, not Joyent, not Ryan Dahl.
+for it.
 
-If other people publish something, it's theirs.  Not mine, not Node's,
-not Joyent's, not Ryan Dahl's.
+If other people publish something, it's theirs.
 
-Yes, you can publish something evil.  It will be removed promptly if
-reported, and we'll lose respect for you.  But there is no vetting
-process for published modules.
+Users can publish Bad Stuff.  It will be removed promptly if reported.
+But there is no vetting process for published modules, and you use
+them at your own risk.  Please inspect the source.
 
-If this concerns you, inspect the source before using packages.
+If you publish Bad Stuff, we may delete it from the registry, or even
+ban your account in extreme cases.  So don't do that.
 
 ## BUGS
 

deps/npm/doc/misc/npm-disputes.md

@@ -4,7 +4,7 @@ npm-disputes(7) -- Handling Module Name Disputes
 ## SYNOPSIS
 
 1. Get the author email with `npm owner ls <pkgname>`
-2. Email the author, CC <[email protected]>.
+2. Email the author, CC <[email protected]>
 3. After a few weeks, if there's no resolution, we'll sort it out.
 
 Don't squat on package names.  Publish code or move out of the way.
@@ -42,15 +42,16 @@ Joe's appropriate course of action in each case is the same.
 
 1. `npm owner ls foo`.  This will tell Joe the email address of the
    owner (Bob).
-2. Joe emails Bob, explaining the situation **as respectfully as possible**,
-   and what he would like to do with the module name.  He adds
-   isaacs <[email protected]> to the CC list of the email.  Mention in the email
-   that Bob can run `npm owner add joe foo` to add Joe as an owner of
-   the `foo` package.
+2. Joe emails Bob, explaining the situation **as respectfully as
+   possible**, and what he would like to do with the module name.  He
+   adds the npm support staff <[email protected]> to the CC list of
+   the email.  Mention in the email that Bob can run `npm owner add
+   joe foo` to add Joe as an owner of the `foo` package.
 3. After a reasonable amount of time, if Bob has not responded, or if
-   Bob and Joe can't come to any sort of resolution, email isaacs
-   <[email protected]> and we'll sort it out.  ("Reasonable" is usually about 4
-   weeks, but extra time is allowed around common holidays.)
+   Bob and Joe can't come to any sort of resolution, email support
+   <[email protected]> and we'll sort it out.  ("Reasonable" is
+   usually at least 4 weeks, but extra time is allowed around common
+   holidays.)
 
 ## REASONING
 

deps/npm/doc/misc/npm-faq.md

@@ -3,7 +3,7 @@ npm-faq(7) -- Frequently Asked Questions
 
 ## Where can I find these docs in HTML?
 
-<https://npmjs.org/doc/>, or run:
+<https://www.npmjs.org/doc/>, or run:
 
     npm config set viewer browser
 
@@ -68,7 +68,8 @@ program that uses it.
 
 ## Whatever, I really want the old style 'everything global' style.
 
-Write your own package manager, then.  It's not that hard.
+Write your own package manager.  You could probably even wrap up `npm`
+in a shell script if you really wanted to.
 
 npm will not help you do something that is known to be a bad idea.
 
@@ -310,13 +311,17 @@ Go to <https://npmjs.org/forgot>.
 
 Either the registry is down, or node's DNS isn't able to reach out.
 
-To check if the registry is down, open up <http://registry.npmjs.org/>
-in a web browser.  This will also tell you if you are just unable to
-access the internet for some reason.
+To check if the registry is down, open up
+<https://registry.npmjs.org/> in a web browser.  This will also tell
+you if you are just unable to access the internet for some reason.
 
-If the registry IS down, let me know by emailing <[email protected]> or posting
-an issue at <https://github.com/npm/npm/issues>.  We'll have
-someone kick it or something.
+If the registry IS down, let us know by emailing <[email protected]>
+or posting an issue at <https://github.com/npm/npm/issues>.  If it's
+down for the world (and not just on your local network) then we're
+probably already being pinged about it.
+
+You can also often get a faster response by visiting the #npm channel
+on Freenode IRC.
 
 ## Why no namespaces?
 
@@ -330,9 +335,12 @@ There is not sufficient need to impose namespace rules on everyone.
 
 ## Who does npm?
 
-`npm view npm author`
+npm was originally written by Isaac Z. Schlueter, and many others have
+contributed to it, some of them quite substantially.
 
-`npm view npm contributors`
+The npm open source project, The npm Registry, and [the community
+website](https://www.npmjs.org) are maintained and operated by the
+good folks at [npm, Inc.](https://www.npmjs.com)
 
 ## I have a question or request not addressed here. Where should I put it?
 

deps/npm/html/doc/README.html

@@ -175,51 +175,54 @@ <h2 id="Using-npm-Programmatically">Using npm Programmatically</h2>
 
 <h2 id="More-Docs">More Docs</h2>
 
-<p>Check out the <a href="https://npmjs.org/doc/">docs</a>,
-especially the <a href="https://npmjs.org/doc/faq.html">faq</a>.</p>
+<p>Check out the <a href="https://www.npmjs.org/doc/">docs</a>,
+especially the <a href="https://www.npmjs.org/doc/faq.html">faq</a>.</p>
 
 <p>You can use the <code>npm help</code> command to read any of them.</p>
 
 <p>If you&#39;re a developer, and you want to use npm to publish your program,
-you should <a href="https://npmjs.org/doc/developers.html">read this</a></p>
+you should <a href="https://www.npmjs.org/doc/developers.html">read this</a></p>
 
 <h2 id="Legal-Stuff">Legal Stuff</h2>
 
-<p>&quot;npm&quot; and &quot;the npm registry&quot; are owned by Isaac Z. Schlueter.
+<p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
 All rights reserved.  See the included LICENSE file for more details.</p>
 
-<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.  npm is not
-officially part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.</p>
+<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
 
-<p>The packages in the npm registry are not part of npm itself, and are the
-sole property of their respective maintainers.  While every effort is
-made to ensure accountability, there is absolutely no guarantee,
-warrantee, or assertion made as to the quality, fitness for a specific
-purpose, or lack of malice in any given npm package.  Modules
-published on the npm registry are not affiliated with or endorsed by
-Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.</p>
+<p>Modules published on the npm registry are not officially endorsed by
+npm, Inc. or the Node.js project.</p>
 
-<p>If you have a complaint about a package in the npm registry, and cannot
-resolve it with the package owner, please express your concerns to
-Isaac Z. Schlueter at <a href="mailto:[email protected]">[email protected]</a>.</p>
+<p>Data published to the npm registry is not part of npm itself, and is
+the sole property of the publisher.  While every effort is made to
+ensure accountability, there is absolutely no guarantee, warrantee, or
+assertion expressed or implied as to the quality, fitness for a
+specific purpose, or lack of malice in any given npm package.</p>
 
-<h3 id="In-plain-english">In plain english</h3>
+<p>If you have a complaint about a package in the public npm registry,
+and cannot <a href="https://www.npmjs.org/doc/misc/npm-disputes.html">resolve it with the package
+owner</a>, please email
+<a href="mailto:[email protected]">[email protected]</a> and explain the situation.</p>
 
-<p>This is mine; not my employer&#39;s, not Node&#39;s, not Joyent&#39;s, not Ryan
-Dahl&#39;s.</p>
+<p>Any data published to The npm Registry (including user account
+information) may be removed or modified at the sole discretion of the
+npm server administrators.</p>
+
+<h3 id="In-plainer-english">In plainer english</h3>
+
+<p>npm is the property of npm, Inc.</p>
 
 <p>If you publish something, it&#39;s yours, and you are solely accountable
-for it.  Not me, not Node, not Joyent, not Ryan Dahl.</p>
+for it.</p>
 
-<p>If other people publish something, it&#39;s theirs.  Not mine, not Node&#39;s,
-not Joyent&#39;s, not Ryan Dahl&#39;s.</p>
+<p>If other people publish something, it&#39;s theirs.</p>
 
-<p>Yes, you can publish something evil.  It will be removed promptly if
-reported, and we&#39;ll lose respect for you.  But there is no vetting
-process for published modules.</p>
+<p>Users can publish Bad Stuff.  It will be removed promptly if reported.
+But there is no vetting process for published modules, and you use
+them at your own risk.  Please inspect the source.</p>
 
-<p>If this concerns you, inspect the source before using packages.</p>
+<p>If you publish Bad Stuff, we may delete it from the registry, or even
+ban your account in extreme cases.  So don&#39;t do that.</p>
 
 <h2 id="BUGS">BUGS</h2>
 
@@ -239,7 +242,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="cli/npm.html">npm(1)</a></li><li><a href="misc/npm-faq.html">npm-faq(7)</a></li><li><a href="cli/npm-help.html">npm-help(1)</a></li><li><a href="misc/npm-index.html">npm-index(7)</a></li></ul>
 </div>
-<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].0</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-bin.html

@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This function should not be used programmatically.  Instead, just refer
 to the <code>npm.bin</code> member.</p>
 </div>
-<p id="footer">npm-bin &mdash; [email protected].0</p>
+<p id="footer">npm-bin &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-bugs.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">npm-bugs &mdash; [email protected].0</p>
+<p id="footer">npm-bugs &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-commands.html

@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul>
 </div>
-<p id="footer">npm-commands &mdash; [email protected].0</p>
+<p id="footer">npm-commands &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-config.html

@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
 </div>
-<p id="footer">npm-config &mdash; [email protected].0</p>
+<p id="footer">npm-config &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-deprecate.html

@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
 <ul><li><a href="../api/npm-publish.html">npm-publish(3)</a></li><li><a href="../api/npm-unpublish.html">npm-unpublish(3)</a></li><li><a href="../misc/npm-registry.html">npm-registry(7)</a></li></ul>
 </div>
-<p id="footer">npm-deprecate &mdash; [email protected].0</p>
+<p id="footer">npm-deprecate &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-docs.html

@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>This command will launch a browser, so this command may not be the most
 friendly for programmatic use.</p>
 </div>
-<p id="footer">npm-docs &mdash; [email protected].0</p>
+<p id="footer">npm-docs &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-edit.html

@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 <p>Since this command opens an editor in a new process, be careful about where
 and how this is used.</p>
 </div>
-<p id="footer">npm-edit &mdash; [email protected].0</p>
+<p id="footer">npm-edit &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")

deps/npm/html/doc/api/npm-explore.html

@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>The first element in the &#39;args&#39; parameter must be a package name.  After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
 </div>
-<p id="footer">npm-explore &mdash; [email protected].0</p>
+<p id="footer">npm-explore &mdash; [email protected].3</p>
 <script>
 ;(function () {
 var wrapper = document.getElementById("wrapper")