npm: upgrade to 1.1.70

8 files changed, 25 insertions, 9 deletions

diff --git a/deps/npm/man/man1/deprecate.1 b/deps/npm/man/man1/deprecate.1
index 74ea57760d..bbefd7f3f0 100644
--- a/deps/npm/man/man1/deprecate.1
+++ b/deps/npm/man/man1/deprecate.1
@@ -33,6 +33,9 @@ npm deprecate my\-thing@"< 0\.2\.3" "critical bug fixed in v0\.2\.3"
 .P
 Note that you must be the package owner to deprecate something\.  See the \fBowner\fR and \fBadduser\fR help topics\.
 .
+.P
+To un\-deprecate a package, specify an empty string (\fB""\fR) for the \fBmessage\fR argument\.
+.
 .SH "SEE ALSO"
 .
 .IP "\(bu" 4
diff --git a/deps/npm/man/man1/disputes.1 b/deps/npm/man/man1/disputes.1
index 63420b84b6..042b2ef537 100644
--- a/deps/npm/man/man1/disputes.1
+++ b/deps/npm/man/man1/disputes.1
@@ -19,6 +19,9 @@ After a few weeks, if there\'s no resolution, we\'ll sort it out\.
 .
 .IP "" 0
 .
+.P
+Don\'t squat on package names\.  Publish code or move out of the way\.
+.
 .SH "DESCRIPTION"
 There sometimes arise cases where a user publishes a module, and then
 later, some other user wants to use that name\.  Here are some common
@@ -64,7 +67,7 @@ Joe\'s appropriate course of action in each case is the same\.
 owner (Bob)\.
 .
 .IP "2" 4
-Joe emails Bob, explaining the situation \fBas respecfully as possible\fR,
+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
@@ -107,6 +110,13 @@ license statement)
 .IP "3" 4
 Illegal content\.
 .
+.IP "4" 4
+"Squatting" on a package name that you \fIplan\fR to use, but aren\'t
+actually using\.  Sorry, I don\'t care how great the name is, or how
+perfect a fit it is for the thing that someday might happen\.  If
+someone wants to use it today, and you\'re just taking up space with
+an empty tarball, you\'re going to be evicted\.
+.
 .IP "" 0
 .
 .P
diff --git a/deps/npm/man/man1/ls.1 b/deps/npm/man/man1/ls.1
index 13c18a9dbf..ddeaac7b6d 100644
--- a/deps/npm/man/man1/ls.1
+++ b/deps/npm/man/man1/ls.1
@@ -29,7 +29,7 @@ For example, running \fBnpm ls promzard\fR in npm\'s source tree will show:
 .IP "" 4
 .
 .nf
-npm@1.1.69 /path/to/npm
+npm@1.1.70 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index eefdaf057b..4b50686b4b 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -14,7 +14,7 @@ npm <command> [args]
 .fi
 .
 .SH "VERSION"
-1.1.69
+1.1.70
 .
 .SH "DESCRIPTION"
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man1/registry.1 b/deps/npm/man/man1/registry.1
index 308bf8dc33..a4a096c158 100644
--- a/deps/npm/man/man1/registry.1
+++ b/deps/npm/man/man1/registry.1
@@ -90,10 +90,7 @@ then it\'ll fail, so please make sure that you understand the spec, and
 ask for help on the \fInpm\-@googlegroups\.com\fR mailing list\.
 .
 .SH "Is there a website or something to see package docs and such?"
-No, but such a thing is planned, and a tiny bit developed\.
-.
-.P
-Stay tuned!
+Yes, head over to \fIhttps://npmjs\.org/\fR
 .
 .SH "SEE ALSO"
 .
diff --git a/deps/npm/man/man1/view.1 b/deps/npm/man/man1/view.1
index a30b6ab4f4..2b4a2f4bde 100644
--- a/deps/npm/man/man1/view.1
+++ b/deps/npm/man/man1/view.1
@@ -148,7 +148,10 @@ npm view yui3@\'>0\.5\.4\' dependencies\.jsdom
 .SH "OUTPUT"
 If only a single string field for a single version is output, then it
 will not be colorized or quoted, so as to enable piping the output to
-another command\.
+another command\. If the field is an object, it will be output as a JavaScript object literal\.
+.
+.P
+If the \-\-json flag is given, the outputted fields will be JSON\.
 .
 .P
 If the version range matches multiple versions, than each printed value
diff --git a/deps/npm/man/man3/deprecate.3 b/deps/npm/man/man3/deprecate.3
index 4a42fe913c..3f83bf2804 100644
--- a/deps/npm/man/man3/deprecate.3
+++ b/deps/npm/man/man3/deprecate.3
@@ -39,6 +39,9 @@ install the package\.
 .P
 Note that you must be the package owner to deprecate something\.  See the \fBowner\fR and \fBadduser\fR help topics\.
 .
+.P
+To un\-deprecate a package, specify an empty string (\fB""\fR) for the \fBmessage\fR argument\.
+.
 .SH "SEE ALSO"
 .
 .IP "\(bu" 4
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index 1cb69a87d9..532d133cb1 100644
--- a/deps/npm/man/man3/npm.3
+++ b/deps/npm/man/man3/npm.3
@@ -21,7 +21,7 @@ npm\.load(configObject, function (er, npm) {
 .fi
 .
 .SH "VERSION"
-1.1.69
+1.1.70
 .
 .SH "DESCRIPTION"
 This is the API documentation for npm\.