npm: upgrade to 1.4.3

2 files changed, 27 insertions, 18 deletions

diff --git a/deps/npm/man/man7/npm-disputes.7 b/deps/npm/man/man7/npm-disputes.7
index 136290baa2..51ec7797bc 100644
--- a/deps/npm/man/man7/npm-disputes.7
+++ b/deps/npm/man/man7/npm-disputes.7
@@ -12,7 +12,7 @@
 Get the author email with \fBnpm owner ls <pkgname>\fR
 .
 .IP "2" 4
-Email the author, CC \fIi@izs\.me\fR\|\.
+Email the author, CC \fIsupport@npmjs\.com\fR
 .
 .IP "3" 4
 After a few weeks, if there\'s no resolution, we\'ll sort it out\.
@@ -67,16 +67,17 @@ Joe\'s appropriate course of action in each case is the same\.
 owner (Bob)\.
 .
 .IP "2" 4
-Joe emails Bob, explaining the situation \fBas respectfully as possible\fR,
-and what he would like to do with the module name\.  He adds
-isaacs \fIi@izs\.me\fR to the CC list of the email\.  Mention in the email
-that Bob can run \fBnpm owner add joe foo\fR to add Joe as an owner of
-the \fBfoo\fR package\.
+Joe emails Bob, explaining the situation \fBas respectfully as
+possible\fR, and what he would like to do with the module name\.  He
+adds the npm support staff \fIsupport@npmjs\.com\fR to the CC list of
+the email\.  Mention in the email that Bob can run \fBnpm owner add
+joe foo\fR to add Joe as an owner of the \fBfoo\fR package\.
 .
 .IP "3" 4
 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 \fIi@izs\.me\fR 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 \fIsupport@npmjs\.com\fR and we\'ll sort it out\.  ("Reasonable" is
+usually at least 4 weeks, but extra time is allowed around common
+holidays\.)
 .
 .IP "" 0
 .
diff --git a/deps/npm/man/man7/npm-faq.7 b/deps/npm/man/man7/npm-faq.7
index dfd165d9a2..bc1ef22c3a 100644
--- a/deps/npm/man/man7/npm-faq.7
+++ b/deps/npm/man/man7/npm-faq.7
@@ -7,7 +7,7 @@
 \fBnpm-faq\fR \-\- Frequently Asked Questions
 .
 .SH "Where can I find these docs in HTML?"
-\fIhttps://npmjs\.org/doc/\fR, or run:
+\fIhttps://www\.npmjs\.org/doc/\fR, or run:
 .
 .IP "" 4
 .
@@ -84,7 +84,8 @@ That\'s what it\'s for\.  Install it globally, then link it into each
 program that uses it\.
 .
 .SH "Whatever, I really want the old style &#39;everything global&#39; style\."
-Write your own package manager, then\.  It\'s not that hard\.
+Write your own package manager\.  You could probably even wrap up \fBnpm\fR
+in a shell script if you really wanted to\.
 .
 .P
 npm will not help you do something that is known to be a bad idea\.
@@ -405,14 +406,18 @@ Go to \fIhttps://npmjs\.org/forgot\fR\|\.
 Either the registry is down, or node\'s DNS isn\'t able to reach out\.
 .
 .P
-To check if the registry is down, open up \fIhttp://registry\.npmjs\.org/\fR
-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 \fIhttps://registry\.npmjs\.org/\fR in a web browser\.  This will also tell
+you if you are just unable to access the internet for some reason\.
 .
 .P
-If the registry IS down, let me know by emailing \fIi@izs\.me\fR or posting
-an issue at \fIhttps://github\.com/npm/npm/issues\fR\|\.  We\'ll have
-someone kick it or something\.
+If the registry IS down, let us know by emailing \fIsupport@npmjs\.com\fR
+or posting an issue at \fIhttps://github\.com/npm/npm/issues\fR\|\.  If it\'s
+down for the world (and not just on your local network) then we\'re
+probably already being pinged about it\.
+.
+.P
+You can also often get a faster response by visiting the #npm channel
+on Freenode IRC\.
 .
 .SH "Why no namespaces?"
 Please see this discussion: \fIhttps://github\.com/npm/npm/issues/798\fR
@@ -425,10 +430,13 @@ If you want to namespace your own packages, you may: simply use the \fB\-\fR cha
 There is not sufficient need to impose namespace rules on everyone\.
 .
 .SH "Who does npm?"
-\fBnpm view npm author\fR
+npm was originally written by Isaac Z\. Schlueter, and many others have
+contributed to it, some of them quite substantially\.
 .
 .P
-\fBnpm view npm contributors\fR
+The npm open source project, The npm Registry, and the community
+website \fIhttps://www\.npmjs\.org\fR are maintained and operated by the
+good folks at npm, Inc\. \fIhttps://www\.npmjs\.com\fR
 .
 .SH "I have a question or request not addressed here\. Where should I put it?"
 Post an issue on the github project: