Skip to content

Commit 466a9b5

Browse files
tjfontainetjfontaine
committed
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: src/node_zlib.cc
2 parents e5eadcf + 562b015 commit 466a9b5

File tree

179 files changed

+1621
-613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1621
-613
lines changed

‎deps/npm/AUTHORS‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,44 @@ Vaz Allen <vaz@tryptid.com>
115115
elisee <elisee@sparklin.org>
116116
Evan You <yyx990803@gmail.com>
117117
Wil Moore III <wil.moore@wilmoore.com>
118+
Dylan Greene <dylang@gmail.com>
119+
zeke <zeke@sikelianos.com>
120+
Andrew Horton <andrew.j.horton@gmail.com>
121+
Denis Gladkikh <outcoldman@gmail.com>
122+
Daniel Santiago <daniel.santiago@highlevelwebs.com>
123+
Alex Kocharin <alex@kocharin.ru>
124+
Evan Lucas <evanlucas@me.com>
125+
Steve Mason <stevem@brandwatch.com>
126+
Quinn Slack <qslack@qslack.com>
127+
Sébastien Santoro <dereckson@espace-win.org>
128+
CamilleM <camille.moulin@alterway.fr>
129+
Tom Huang <hzlhu.dargon@gmail.com>
130+
Sergey Belov <peimei@ya.ru>
131+
Younghoon Park <sola92@gmail.com>
132+
Yazhong Liu <yorkiefixer@gmail.com>
133+
Mikola Lysenko <mikolalysenko@gmail.com>
134+
Rafael de Oleza <rafa@spotify.com>
135+
Yeonghoon Park <sola92@gmail.com>
136+
Franck Cuny <franck.cuny@gmail.com>
137+
Alan Shaw <alan@freestyle-developments.co.uk>
138+
Alex Rodionov <p0deje@gmail.com>
139+
Alexej Yaroshevich <alex@qfox.ru>
140+
Elan Shanker <elan.shanker@gmail.com>
141+
François Frisch <francoisfrisch@gmail.com>
142+
Gabriel Falkenberg <gabriel.falkenberg@gmail.com>
143+
Jason Diamond <jason@diamond.name>
144+
Jess Martin <jessmartin@gmail.com>
145+
Jon Spencer <jon@jonspencer.ca>
146+
Matt Colyer <matt@colyer.name>
147+
Matt McClure <matt.mcclure@mapmyfitness.com>
148+
Maximilian Antoni <maximilian.antoni@juliusbaer.com>
149+
Nicholas Kinsey <pyro@feisty.io>
150+
Paulo Cesar <pauloc062@gmail.com>
151+
Quim Calpe <quim@kalpe.com>
152+
Robert Gieseke <robert.gieseke@gmail.com>
153+
Spain Train <michael.spainhower@opower.com>
154+
TJ Holowaychuk <tj@vision-media.ca>
155+
Thom Blake <tblake@brightroll.com>
156+
Trevor Burnham <tburnham@hubspot.com>
157+
bitspill <bitspill+github@bitspill.net>
158+
Neil Gentleman <ngentleman@gmail.com>

‎deps/npm/CONTRIBUTING.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Before you submit a new issue
22

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

‎deps/npm/README.md‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -169,51 +169,54 @@ help config` to learn about all the options you can set there.
169169

170170
## More Docs
171171

172-
Check out the [docs](https://npmjs.org/doc/),
173-
especially the [faq](https://npmjs.org/doc/faq.html).
172+
Check out the [docs](https://www.npmjs.org/doc/),
173+
especially the [faq](https://www.npmjs.org/doc/faq.html).
174174

175175
You can use the `npm help` command to read any of them.
176176

177177
If you're a developer, and you want to use npm to publish your program,
178-
you should [read this](https://npmjs.org/doc/developers.html)
178+
you should [read this](https://www.npmjs.org/doc/developers.html)
179179

180180
## Legal Stuff
181181

182-
"npm" and "the npm registry" are owned by Isaac Z. Schlueter.
182+
"npm" and "The npm Registry" are owned by npm, Inc.
183183
All rights reserved. See the included LICENSE file for more details.
184184

185-
"Node.js" and "node" are trademarks owned by Joyent, Inc. npm is not
186-
officially part of the Node.js project, and is neither owned by nor
187-
officially affiliated with Joyent, Inc.
185+
"Node.js" and "node" are trademarks owned by Joyent, Inc.
188186

189-
The packages in the npm registry are not part of npm itself, and are the
190-
sole property of their respective maintainers. While every effort is
191-
made to ensure accountability, there is absolutely no guarantee,
192-
warrantee, or assertion made as to the quality, fitness for a specific
193-
purpose, or lack of malice in any given npm package. Modules
194-
published on the npm registry are not affiliated with or endorsed by
195-
Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.
187+
Modules published on the npm registry are not officially endorsed by
188+
npm, Inc. or the Node.js project.
196189

197-
If you have a complaint about a package in the npm registry, and cannot
198-
resolve it with the package owner, please express your concerns to
199-
Isaac Z. Schlueter at <i@izs.me>.
190+
Data published to the npm registry is not part of npm itself, and is
191+
the sole property of the publisher. While every effort is made to
192+
ensure accountability, there is absolutely no guarantee, warrantee, or
193+
assertion expressed or implied as to the quality, fitness for a
194+
specific purpose, or lack of malice in any given npm package.
200195

201-
### In plain english
196+
If you have a complaint about a package in the public npm registry,
197+
and cannot [resolve it with the package
198+
owner](https://www.npmjs.org/doc/misc/npm-disputes.html), please email
199+
<support@npmjs.com> and explain the situation.
202200

203-
This is mine; not my employer's, not Node's, not Joyent's, not Ryan
204-
Dahl's.
201+
Any data published to The npm Registry (including user account
202+
information) may be removed or modified at the sole discretion of the
203+
npm server administrators.
204+
205+
### In plainer english
206+
207+
npm is the property of npm, Inc.
205208

206209
If you publish something, it's yours, and you are solely accountable
207-
for it. Not me, not Node, not Joyent, not Ryan Dahl.
210+
for it.
208211

209-
If other people publish something, it's theirs. Not mine, not Node's,
210-
not Joyent's, not Ryan Dahl's.
212+
If other people publish something, it's theirs.
211213

212-
Yes, you can publish something evil. It will be removed promptly if
213-
reported, and we'll lose respect for you. But there is no vetting
214-
process for published modules.
214+
Users can publish Bad Stuff. It will be removed promptly if reported.
215+
But there is no vetting process for published modules, and you use
216+
them at your own risk. Please inspect the source.
215217

216-
If this concerns you, inspect the source before using packages.
218+
If you publish Bad Stuff, we may delete it from the registry, or even
219+
ban your account in extreme cases. So don't do that.
217220

218221
## BUGS
219222

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ npm-disputes(7) -- Handling Module Name Disputes
44
## SYNOPSIS
55

66
1. Get the author email with `npm owner ls <pkgname>`
7-
2. Email the author, CC <i@izs.me>.
7+
2. Email the author, CC <support@npmjs.com>
88
3. After a few weeks, if there's no resolution, we'll sort it out.
99

1010
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.
4242

4343
1. `npm owner ls foo`. This will tell Joe the email address of the
4444
owner (Bob).
45-
2. Joe emails Bob, explaining the situation **as respectfully as possible**,
46-
and what he would like to do with the module name. He adds
47-
isaacs <i@izs.me> to the CC list of the email. Mention in the email
48-
that Bob can run `npm owner add joe foo` to add Joe as an owner of
49-
the `foo` package.
45+
2. Joe emails Bob, explaining the situation **as respectfully as
46+
possible**, and what he would like to do with the module name. He
47+
adds the npm support staff <support@npmjs.com> to the CC list of
48+
the email. Mention in the email that Bob can run `npm owner add
49+
joe foo` to add Joe as an owner of the `foo` package.
5050
3. After a reasonable amount of time, if Bob has not responded, or if
51-
Bob and Joe can't come to any sort of resolution, email isaacs
52-
<i@izs.me> and we'll sort it out. ("Reasonable" is usually about 4
53-
weeks, but extra time is allowed around common holidays.)
51+
Bob and Joe can't come to any sort of resolution, email support
52+
<support@npmjs.com> and we'll sort it out. ("Reasonable" is
53+
usually at least 4 weeks, but extra time is allowed around common
54+
holidays.)
5455

5556
## REASONING
5657

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

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ npm-faq(7) -- Frequently Asked Questions
33

44
## Where can I find these docs in HTML?
55

6-
<https://npmjs.org/doc/>, or run:
6+
<https://www.npmjs.org/doc/>, or run:
77

88
npm config set viewer browser
99

@@ -68,7 +68,8 @@ program that uses it.
6868

6969
## Whatever, I really want the old style 'everything global' style.
7070

71-
Write your own package manager, then. It's not that hard.
71+
Write your own package manager. You could probably even wrap up `npm`
72+
in a shell script if you really wanted to.
7273

7374
npm will not help you do something that is known to be a bad idea.
7475

@@ -310,13 +311,17 @@ Go to <https://npmjs.org/forgot>.
310311

311312
Either the registry is down, or node's DNS isn't able to reach out.
312313

313-
To check if the registry is down, open up <http://registry.npmjs.org/>
314-
in a web browser. This will also tell you if you are just unable to
315-
access the internet for some reason.
314+
To check if the registry is down, open up
315+
<https://registry.npmjs.org/> in a web browser. This will also tell
316+
you if you are just unable to access the internet for some reason.
316317

317-
If the registry IS down, let me know by emailing <i@izs.me> or posting
318-
an issue at <https://github.com/npm/npm/issues>. We'll have
319-
someone kick it or something.
318+
If the registry IS down, let us know by emailing <support@npmjs.com>
319+
or posting an issue at <https://github.com/npm/npm/issues>. If it's
320+
down for the world (and not just on your local network) then we're
321+
probably already being pinged about it.
322+
323+
You can also often get a faster response by visiting the #npm channel
324+
on Freenode IRC.
320325

321326
## Why no namespaces?
322327

@@ -330,9 +335,12 @@ There is not sufficient need to impose namespace rules on everyone.
330335

331336
## Who does npm?
332337

333-
`npm view npm author`
338+
npm was originally written by Isaac Z. Schlueter, and many others have
339+
contributed to it, some of them quite substantially.
334340

335-
`npm view npm contributors`
341+
The npm open source project, The npm Registry, and [the community
342+
website](https://www.npmjs.org) are maintained and operated by the
343+
good folks at [npm, Inc.](https://www.npmjs.com)
336344

337345
## I have a question or request not addressed here. Where should I put it?
338346

‎deps/npm/html/doc/README.html‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -175,51 +175,54 @@ <h2 id="Using-npm-Programmatically">Using npm Programmatically</h2>
175175

176176
<h2 id="More-Docs">More Docs</h2>
177177

178-
<p>Check out the <a href="https://npmjs.org/doc/">docs</a>,
179-
especially the <a href="https://npmjs.org/doc/faq.html">faq</a>.</p>
178+
<p>Check out the <a href="https://www.npmjs.org/doc/">docs</a>,
179+
especially the <a href="https://www.npmjs.org/doc/faq.html">faq</a>.</p>
180180

181181
<p>You can use the <code>npm help</code> command to read any of them.</p>
182182

183183
<p>If you&#39;re a developer, and you want to use npm to publish your program,
184-
you should <a href="https://npmjs.org/doc/developers.html">read this</a></p>
184+
you should <a href="https://www.npmjs.org/doc/developers.html">read this</a></p>
185185

186186
<h2 id="Legal-Stuff">Legal Stuff</h2>
187187

188-
<p>&quot;npm&quot; and &quot;the npm registry&quot; are owned by Isaac Z. Schlueter.
188+
<p>&quot;npm&quot; and &quot;The npm Registry&quot; are owned by npm, Inc.
189189
All rights reserved. See the included LICENSE file for more details.</p>
190190

191-
<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc. npm is not
192-
officially part of the Node.js project, and is neither owned by nor
193-
officially affiliated with Joyent, Inc.</p>
191+
<p>&quot;Node.js&quot; and &quot;node&quot; are trademarks owned by Joyent, Inc.</p>
194192

195-
<p>The packages in the npm registry are not part of npm itself, and are the
196-
sole property of their respective maintainers. While every effort is
197-
made to ensure accountability, there is absolutely no guarantee,
198-
warrantee, or assertion made as to the quality, fitness for a specific
199-
purpose, or lack of malice in any given npm package. Modules
200-
published on the npm registry are not affiliated with or endorsed by
201-
Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.</p>
193+
<p>Modules published on the npm registry are not officially endorsed by
194+
npm, Inc. or the Node.js project.</p>
202195

203-
<p>If you have a complaint about a package in the npm registry, and cannot
204-
resolve it with the package owner, please express your concerns to
205-
Isaac Z. Schlueter at <a href="mailto:i@izs.me">i@izs.me</a>.</p>
196+
<p>Data published to the npm registry is not part of npm itself, and is
197+
the sole property of the publisher. While every effort is made to
198+
ensure accountability, there is absolutely no guarantee, warrantee, or
199+
assertion expressed or implied as to the quality, fitness for a
200+
specific purpose, or lack of malice in any given npm package.</p>
206201

207-
<h3 id="In-plain-english">In plain english</h3>
202+
<p>If you have a complaint about a package in the public npm registry,
203+
and cannot <a href="https://www.npmjs.org/doc/misc/npm-disputes.html">resolve it with the package
204+
owner</a>, please email
205+
<a href="mailto:support@npmjs.com">support@npmjs.com</a> and explain the situation.</p>
208206

209-
<p>This is mine; not my employer&#39;s, not Node&#39;s, not Joyent&#39;s, not Ryan
210-
Dahl&#39;s.</p>
207+
<p>Any data published to The npm Registry (including user account
208+
information) may be removed or modified at the sole discretion of the
209+
npm server administrators.</p>
210+
211+
<h3 id="In-plainer-english">In plainer english</h3>
212+
213+
<p>npm is the property of npm, Inc.</p>
211214

212215
<p>If you publish something, it&#39;s yours, and you are solely accountable
213-
for it. Not me, not Node, not Joyent, not Ryan Dahl.</p>
216+
for it.</p>
214217

215-
<p>If other people publish something, it&#39;s theirs. Not mine, not Node&#39;s,
216-
not Joyent&#39;s, not Ryan Dahl&#39;s.</p>
218+
<p>If other people publish something, it&#39;s theirs.</p>
217219

218-
<p>Yes, you can publish something evil. It will be removed promptly if
219-
reported, and we&#39;ll lose respect for you. But there is no vetting
220-
process for published modules.</p>
220+
<p>Users can publish Bad Stuff. It will be removed promptly if reported.
221+
But there is no vetting process for published modules, and you use
222+
them at your own risk. Please inspect the source.</p>
221223

222-
<p>If this concerns you, inspect the source before using packages.</p>
224+
<p>If you publish Bad Stuff, we may delete it from the registry, or even
225+
ban your account in extreme cases. So don&#39;t do that.</p>
223226

224227
<h2 id="BUGS">BUGS</h2>
225228

@@ -239,7 +242,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
239242

240243
<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>
241244
</div>
242-
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.0</p>
245+
<p id="footer"><a href="../doc/README.html">README</a> &mdash; npm@1.4.3</p>
243246
<script>
244247
;(function () {
245248
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>This function should not be used programmatically. Instead, just refer
2020
to the <code>npm.bin</code> member.</p>
2121
</div>
22-
<p id="footer">npm-bin &mdash; npm@1.4.0</p>
22+
<p id="footer">npm-bin &mdash; npm@1.4.3</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">npm-bugs &mdash; npm@1.4.0</p>
28+
<p id="footer">npm-bugs &mdash; npm@1.4.3</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2828

2929
<ul><li><a href="../misc/npm-index.html">npm-index(7)</a></li></ul>
3030
</div>
31-
<p id="footer">npm-commands &mdash; npm@1.4.0</p>
31+
<p id="footer">npm-commands &mdash; npm@1.4.3</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3333

3434
<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
3535
</div>
36-
<p id="footer">npm-config &mdash; npm@1.4.0</p>
36+
<p id="footer">npm-config &mdash; npm@1.4.3</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)