This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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

Conflicts:
	src/node_zlib.cc
  • Loading branch information...
2 parents e5eadcf + 562b015 commit 466a9b5c78abef8f6c5261f33df83672d78b41b5 @tjfontaine tjfontaine committed Feb 18, 2014
Showing with 1,621 additions and 613 deletions.
  1. +41 −0 deps/npm/AUTHORS
  2. +7 −3 deps/npm/CONTRIBUTING.md
  3. +30 −27 deps/npm/README.md
  4. +10 −9 deps/npm/doc/misc/npm-disputes.md
  5. +18 −10 deps/npm/doc/misc/npm-faq.md
  6. +31 −28 deps/npm/html/doc/README.html
  7. +1 −1 deps/npm/html/doc/api/npm-bin.html
  8. +1 −1 deps/npm/html/doc/api/npm-bugs.html
  9. +1 −1 deps/npm/html/doc/api/npm-commands.html
  10. +1 −1 deps/npm/html/doc/api/npm-config.html
  11. +1 −1 deps/npm/html/doc/api/npm-deprecate.html
  12. +1 −1 deps/npm/html/doc/api/npm-docs.html
  13. +1 −1 deps/npm/html/doc/api/npm-edit.html
  14. +1 −1 deps/npm/html/doc/api/npm-explore.html
  15. +1 −1 deps/npm/html/doc/api/npm-help-search.html
  16. +1 −1 deps/npm/html/doc/api/npm-init.html
  17. +1 −1 deps/npm/html/doc/api/npm-install.html
  18. +1 −1 deps/npm/html/doc/api/npm-link.html
  19. +1 −1 deps/npm/html/doc/api/npm-load.html
  20. +1 −1 deps/npm/html/doc/api/npm-ls.html
  21. +1 −1 deps/npm/html/doc/api/npm-outdated.html
  22. +1 −1 deps/npm/html/doc/api/npm-owner.html
  23. +1 −1 deps/npm/html/doc/api/npm-pack.html
  24. +1 −1 deps/npm/html/doc/api/npm-prefix.html
  25. +1 −1 deps/npm/html/doc/api/npm-prune.html
  26. +1 −1 deps/npm/html/doc/api/npm-publish.html
  27. +1 −1 deps/npm/html/doc/api/npm-rebuild.html
  28. +1 −1 deps/npm/html/doc/api/npm-repo.html
  29. +1 −1 deps/npm/html/doc/api/npm-restart.html
  30. +1 −1 deps/npm/html/doc/api/npm-root.html
  31. +1 −1 deps/npm/html/doc/api/npm-run-script.html
  32. +1 −1 deps/npm/html/doc/api/npm-search.html
  33. +1 −1 deps/npm/html/doc/api/npm-shrinkwrap.html
  34. +1 −1 deps/npm/html/doc/api/npm-start.html
  35. +1 −1 deps/npm/html/doc/api/npm-stop.html
  36. +1 −1 deps/npm/html/doc/api/npm-submodule.html
  37. +1 −1 deps/npm/html/doc/api/npm-tag.html
  38. +1 −1 deps/npm/html/doc/api/npm-test.html
  39. +1 −1 deps/npm/html/doc/api/npm-uninstall.html
  40. +1 −1 deps/npm/html/doc/api/npm-unpublish.html
  41. +1 −1 deps/npm/html/doc/api/npm-update.html
  42. +1 −1 deps/npm/html/doc/api/npm-version.html
  43. +1 −1 deps/npm/html/doc/api/npm-view.html
  44. +1 −1 deps/npm/html/doc/api/npm-whoami.html
  45. +2 −2 deps/npm/html/doc/api/npm.html
  46. +1 −1 deps/npm/html/doc/cli/npm-adduser.html
  47. +1 −1 deps/npm/html/doc/cli/npm-bin.html
  48. +1 −1 deps/npm/html/doc/cli/npm-bugs.html
  49. +1 −1 deps/npm/html/doc/cli/npm-build.html
  50. +1 −1 deps/npm/html/doc/cli/npm-bundle.html
  51. +1 −1 deps/npm/html/doc/cli/npm-cache.html
  52. +1 −1 deps/npm/html/doc/cli/npm-completion.html
  53. +1 −1 deps/npm/html/doc/cli/npm-config.html
  54. +1 −1 deps/npm/html/doc/cli/npm-dedupe.html
  55. +1 −1 deps/npm/html/doc/cli/npm-deprecate.html
  56. +1 −1 deps/npm/html/doc/cli/npm-docs.html
  57. +1 −1 deps/npm/html/doc/cli/npm-edit.html
  58. +1 −1 deps/npm/html/doc/cli/npm-explore.html
  59. +1 −1 deps/npm/html/doc/cli/npm-help-search.html
  60. +1 −1 deps/npm/html/doc/cli/npm-help.html
  61. +1 −1 deps/npm/html/doc/cli/npm-init.html
  62. +1 −1 deps/npm/html/doc/cli/npm-install.html
  63. +1 −1 deps/npm/html/doc/cli/npm-link.html
  64. +2 −2 deps/npm/html/doc/cli/npm-ls.html
  65. +1 −1 deps/npm/html/doc/cli/npm-outdated.html
  66. +1 −1 deps/npm/html/doc/cli/npm-owner.html
  67. +1 −1 deps/npm/html/doc/cli/npm-pack.html
  68. +1 −1 deps/npm/html/doc/cli/npm-prefix.html
  69. +1 −1 deps/npm/html/doc/cli/npm-prune.html
  70. +1 −1 deps/npm/html/doc/cli/npm-publish.html
  71. +1 −1 deps/npm/html/doc/cli/npm-rebuild.html
  72. +1 −1 deps/npm/html/doc/cli/npm-repo.html
  73. +1 −1 deps/npm/html/doc/cli/npm-restart.html
  74. +1 −1 deps/npm/html/doc/cli/npm-rm.html
  75. +1 −1 deps/npm/html/doc/cli/npm-root.html
  76. +1 −1 deps/npm/html/doc/cli/npm-run-script.html
  77. +1 −1 deps/npm/html/doc/cli/npm-search.html
  78. +1 −1 deps/npm/html/doc/cli/npm-shrinkwrap.html
  79. +1 −1 deps/npm/html/doc/cli/npm-star.html
  80. +1 −1 deps/npm/html/doc/cli/npm-stars.html
  81. +1 −1 deps/npm/html/doc/cli/npm-start.html
  82. +1 −1 deps/npm/html/doc/cli/npm-stop.html
  83. +1 −1 deps/npm/html/doc/cli/npm-submodule.html
  84. +1 −1 deps/npm/html/doc/cli/npm-tag.html
  85. +1 −1 deps/npm/html/doc/cli/npm-test.html
  86. +1 −1 deps/npm/html/doc/cli/npm-uninstall.html
  87. +1 −1 deps/npm/html/doc/cli/npm-unpublish.html
  88. +1 −1 deps/npm/html/doc/cli/npm-update.html
  89. +1 −1 deps/npm/html/doc/cli/npm-version.html
  90. +1 −1 deps/npm/html/doc/cli/npm-view.html
  91. +1 −1 deps/npm/html/doc/cli/npm-whoami.html
  92. +2 −2 deps/npm/html/doc/cli/npm.html
  93. +1 −1 deps/npm/html/doc/files/npm-folders.html
  94. +1 −1 deps/npm/html/doc/files/npm-global.html
  95. +1 −1 deps/npm/html/doc/files/npm-json.html
  96. +1 −1 deps/npm/html/doc/files/npmrc.html
  97. +1 −1 deps/npm/html/doc/files/package.json.html
  98. +1 −1 deps/npm/html/doc/index.html
  99. +1 −1 deps/npm/html/doc/misc/npm-coding-style.html
  100. +1 −1 deps/npm/html/doc/misc/npm-config.html
  101. +1 −1 deps/npm/html/doc/misc/npm-developers.html
  102. +11 −10 deps/npm/html/doc/misc/npm-disputes.html
  103. +19 −11 deps/npm/html/doc/misc/npm-faq.html
  104. +1 −1 deps/npm/html/doc/misc/npm-index.html
  105. +1 −1 deps/npm/html/doc/misc/npm-registry.html
  106. +1 −1 deps/npm/html/doc/misc/npm-scripts.html
  107. +1 −1 deps/npm/html/doc/misc/removing-npm.html
  108. +1 −1 deps/npm/html/doc/misc/semver.html
  109. +64 −27 deps/npm/lib/cache.js
  110. +13 −9 deps/npm/lib/dedupe.js
  111. +2 −2 deps/npm/lib/install.js
  112. +5 −1 deps/npm/lib/link.js
  113. +2 −1 deps/npm/lib/ls.js
  114. +9 −1 deps/npm/lib/npm.js
  115. +80 −29 deps/npm/lib/outdated.js
  116. +2 −1 deps/npm/lib/prune.js
  117. +2 −1 deps/npm/lib/rebuild.js
  118. +17 −0 deps/npm/lib/shrinkwrap.js
  119. +1 −1 deps/npm/lib/unbuild.js
  120. +6 −2 deps/npm/lib/utils/completion/installed-deep.js
  121. +16 −0 deps/npm/lib/utils/gently-rm.js
  122. +1 −1 deps/npm/lib/utils/tar.js
  123. +1 −1 deps/npm/lib/view.js
  124. +31 −27 deps/npm/man/man1/npm-README.1
  125. +1 −1 deps/npm/man/man1/npm-ls.1
  126. +1 −1 deps/npm/man/man1/npm.1
  127. +1 −1 deps/npm/man/man3/npm.3
  128. +9 −8 deps/npm/man/man7/npm-disputes.7
  129. +18 −10 deps/npm/man/man7/npm-faq.7
  130. +1 −1 deps/npm/node_modules/glob/package.json
  131. +2 −0 deps/npm/node_modules/graceful-fs/graceful-fs.js
  132. +5 −5 deps/npm/node_modules/graceful-fs/package.json
  133. +21 −0 deps/npm/node_modules/graceful-fs/test/readdir-sort.js
  134. +4 −4 deps/npm/node_modules/nopt/README.md
  135. +4 −209 deps/npm/node_modules/nopt/lib/nopt.js
  136. +8 −4 deps/npm/node_modules/nopt/package.json
  137. +235 −0 deps/npm/node_modules/nopt/test/basic.js
  138. +2 −1 deps/npm/node_modules/npm-registry-client/lib/adduser.js
  139. +1 −1 deps/npm/node_modules/npm-registry-client/lib/deprecate.js
  140. +7 −1 deps/npm/node_modules/npm-registry-client/lib/get.js
  141. +4 −3 deps/npm/node_modules/npm-registry-client/lib/publish.js
  142. +1 −1 deps/npm/node_modules/npm-registry-client/lib/star.js
  143. +2 −1 deps/npm/node_modules/npm-registry-client/lib/unpublish.js
  144. +3 −7 deps/npm/node_modules/npm-registry-client/package.json
  145. +1 −1 deps/npm/node_modules/npm-registry-client/test/adduser-update.js
  146. +1 −1 deps/npm/node_modules/npm-registry-client/test/publish-again.js
  147. +11 −2 deps/npm/node_modules/read-installed/README.md
  148. +21 −5 deps/npm/node_modules/read-installed/package.json
  149. +13 −15 deps/npm/node_modules/read-installed/read-installed.js
  150. +20 −9 deps/npm/node_modules/read-installed/test/basic.js
  151. +22 −0 deps/npm/node_modules/read-installed/test/dev.js
  152. +10 −0 ...modules/read-installed/test/fixtures/peer-at-latest/node_modules/strong-task-emitter/package.json
  153. +21 −0 deps/npm/node_modules/read-installed/test/noargs.js
  154. +14 −0 deps/npm/node_modules/read-installed/test/peer-dep-at-latest.js
  155. +6 −6 deps/npm/package.json
  156. +10 −1 deps/npm/scripts/install.sh
  157. +2 −1 deps/npm/test/tap/dedupe.js
  158. +3 −1 deps/npm/test/tap/dedupe/package.json
  159. +43 −0 deps/npm/test/tap/git-cache-locking.js
  160. +43 −0 deps/npm/test/tap/install-at-locally.js
  161. +5 −0 deps/npm/test/tap/install-at-locally/package@1.2.3/package.json
  162. +47 −0 deps/npm/test/tap/npm-api-not-loaded-error.js
  163. +41 −0 deps/npm/test/tap/outdated-color.js
  164. +2 −1 deps/npm/test/tap/outdated-git.js
  165. +2 −1 deps/npm/test/tap/outdated-git/package.json
  166. +23 −1 deps/npm/test/tap/outdated.js
  167. +107 −0 deps/npm/test/tap/prune.js
  168. +13 −0 deps/npm/test/tap/prune/package.json
  169. +52 −0 deps/npm/test/tap/repo.js
  170. +66 −0 deps/npm/test/tap/shrinkwrap-dev-dependency.js
  171. +12 −0 deps/npm/test/tap/shrinkwrap-dev-dependency/desired-shrinkwrap-results.json
  172. +12 −0 deps/npm/test/tap/shrinkwrap-dev-dependency/package.json
  173. +58 −0 deps/npm/test/tap/shrinkwrap-shared-dev-dependency.js
  174. +12 −0 deps/npm/test/tap/shrinkwrap-shared-dev-dependency/desired-shrinkwrap-results.json
  175. +11 −0 deps/npm/test/tap/shrinkwrap-shared-dev-dependency/package.json
  176. +3 −2 lib/_debugger.js
  177. +14 −1 src/node_zlib.cc
  178. +10 −1 test/debugger/test-debugger-repl-restart.js
  179. +38 −0 test/simple/test-zlib-close-after-write.js
View
@@ -115,3 +115,44 @@ Vaz Allen <vaz@tryptid.com>
elisee <elisee@sparklin.org>
Evan You <yyx990803@gmail.com>
Wil Moore III <wil.moore@wilmoore.com>
+Dylan Greene <dylang@gmail.com>
+zeke <zeke@sikelianos.com>
+Andrew Horton <andrew.j.horton@gmail.com>
+Denis Gladkikh <outcoldman@gmail.com>
+Daniel Santiago <daniel.santiago@highlevelwebs.com>
+Alex Kocharin <alex@kocharin.ru>
+Evan Lucas <evanlucas@me.com>
+Steve Mason <stevem@brandwatch.com>
+Quinn Slack <qslack@qslack.com>
+Sébastien Santoro <dereckson@espace-win.org>
+CamilleM <camille.moulin@alterway.fr>
+Tom Huang <hzlhu.dargon@gmail.com>
+Sergey Belov <peimei@ya.ru>
+Younghoon Park <sola92@gmail.com>
+Yazhong Liu <yorkiefixer@gmail.com>
+Mikola Lysenko <mikolalysenko@gmail.com>
+Rafael de Oleza <rafa@spotify.com>
+Yeonghoon Park <sola92@gmail.com>
+Franck Cuny <franck.cuny@gmail.com>
+Alan Shaw <alan@freestyle-developments.co.uk>
+Alex Rodionov <p0deje@gmail.com>
+Alexej Yaroshevich <alex@qfox.ru>
+Elan Shanker <elan.shanker@gmail.com>
+François Frisch <francoisfrisch@gmail.com>
+Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
+Jason Diamond <jason@diamond.name>
+Jess Martin <jessmartin@gmail.com>
+Jon Spencer <jon@jonspencer.ca>
+Matt Colyer <matt@colyer.name>
+Matt McClure <matt.mcclure@mapmyfitness.com>
+Maximilian Antoni <maximilian.antoni@juliusbaer.com>
+Nicholas Kinsey <pyro@feisty.io>
+Paulo Cesar <pauloc062@gmail.com>
+Quim Calpe <quim@kalpe.com>
+Robert Gieseke <robert.gieseke@gmail.com>
+Spain Train <michael.spainhower@opower.com>
+TJ Holowaychuk <tj@vision-media.ca>
+Thom Blake <tblake@brightroll.com>
+Trevor Burnham <tburnham@hubspot.com>
+bitspill <bitspill+github@bitspill.net>
+Neil Gentleman <ngentleman@gmail.com>
View
@@ -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).
View
@@ -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 <i@izs.me>.
+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
+<support@npmjs.com> 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
@@ -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 <i@izs.me>.
+2. Email the author, CC <support@npmjs.com>
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 <i@izs.me> 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 <support@npmjs.com> 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
- <i@izs.me> 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
+ <support@npmjs.com> and we'll sort it out. ("Reasonable" is
+ usually at least 4 weeks, but extra time is allowed around common
+ holidays.)
## REASONING
@@ -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 <i@izs.me> 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 <support@npmjs.com>
+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?
@@ -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:i@izs.me">i@izs.me</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:support@npmjs.com">support@npmjs.com</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; npm@1.4.0</p>
+<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-bin &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-bugs &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-commands &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-config &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-deprecate &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-docs &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-edit &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
@@ -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; npm@1.4.0</p>
+<p id="footer">npm-explore &mdash; npm@1.4.3</p>
<script>
;(function () {
var wrapper = document.getElementById("wrapper")
Oops, something went wrong.

0 comments on commit 466a9b5

Please sign in to comment.