npm: upgrade to 1.1.70

5 files changed, 18 insertions, 7 deletions

diff --git a/deps/npm/doc/api/deprecate.md b/deps/npm/doc/api/deprecate.md
index ac94fd7a9f..0608d3864a 100644
--- a/deps/npm/doc/api/deprecate.md
+++ b/deps/npm/doc/api/deprecate.md
@@ -25,6 +25,8 @@ The 'args' parameter must have exactly two elements:
 Note that you must be the package owner to deprecate something.  See the
 `owner` and `adduser` help topics.
 
+To un-deprecate a package, specify an empty string (`""`) for the `message` argument.
+
 ## SEE ALSO
 
 * npm-publish(3)
diff --git a/deps/npm/doc/cli/deprecate.md b/deps/npm/doc/cli/deprecate.md
index 925337f21a..c45245f095 100644
--- a/deps/npm/doc/cli/deprecate.md
+++ b/deps/npm/doc/cli/deprecate.md
@@ -18,6 +18,8 @@ something like this:
 Note that you must be the package owner to deprecate something.  See the
 `owner` and `adduser` help topics.
 
+To un-deprecate a package, specify an empty string (`""`) for the `message` argument.
+
 ## SEE ALSO
 
 * npm-publish(1)
diff --git a/deps/npm/doc/cli/disputes.md b/deps/npm/doc/cli/disputes.md
index 96ad9ef1f8..751e804f8f 100644
--- a/deps/npm/doc/cli/disputes.md
+++ b/deps/npm/doc/cli/disputes.md
@@ -4,8 +4,10 @@ npm-disputes(1) -- Handling Module Name Disputes
 ## SYNOPSIS
 
 1. Get the author email with `npm owner ls <pkgname>`
-1. Email the author, CC <i@izs.me>.
-2. After a few weeks, if there's no resolution, we'll sort it out.
+2. Email the author, CC <i@izs.me>.
+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.
 
 ## DESCRIPTION
 
@@ -40,7 +42,7 @@ 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 respecfully as possible**,
+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
@@ -75,6 +77,11 @@ but not limited to:
    MIT-licensed program, and then removing or changing the copyright and
    license statement)
 3. Illegal content.
+4. "Squatting" on a package name that you *plan* 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.
 
 If you see bad behavior like this, please report it right away.
 
diff --git a/deps/npm/doc/cli/registry.md b/deps/npm/doc/cli/registry.md
index 44ddd94e05..9173defeff 100644
--- a/deps/npm/doc/cli/registry.md
+++ b/deps/npm/doc/cli/registry.md
@@ -82,9 +82,7 @@ ask for help on the <npm-@googlegroups.com> mailing list.
 
 ## Is there a website or something to see package docs and such?
 
-No, but such a thing is planned, and a tiny bit developed.
-
-Stay tuned!
+Yes, head over to <https://npmjs.org/>
 
 ## SEE ALSO
 
diff --git a/deps/npm/doc/cli/view.md b/deps/npm/doc/cli/view.md
index 5ec9dc0aca..07836a5ef0 100644
--- a/deps/npm/doc/cli/view.md
+++ b/deps/npm/doc/cli/view.md
@@ -69,7 +69,9 @@ was required by each matching version of yui3:
 
 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.
+
+If the --json flag is given, the outputted fields will be JSON.
 
 If the version range matches multiple versions, than each printed value
 will be prefixed with the version it applies to.