deps: upgrade npm to 3.3.6

PR-URL: https://github.com/nodejs/node/pull/3310
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

83 files changed, 282 insertions, 361 deletions

diff --git a/deps/npm/man/man1/npm-bin.1 b/deps/npm/man/man1/npm-bin.1
index 4f28530086..12e182d9a1 100644
--- a/deps/npm/man/man1/npm-bin.1
+++ b/deps/npm/man/man1/npm-bin.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm bin
+npm bin [\-\-global]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-bugs.1 b/deps/npm/man/man1/npm-bugs.1
index 513355ae97..9f4626a411 100644
--- a/deps/npm/man/man1/npm-bugs.1
+++ b/deps/npm/man/man1/npm-bugs.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm bugs <pkgname>
-npm bugs (with no args in a package dir)
+npm bugs [<pkgname>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-build.1 b/deps/npm/man/man1/npm-build.1
index 8e20ab1770..7528f1a21c 100644
--- a/deps/npm/man/man1/npm-build.1
+++ b/deps/npm/man/man1/npm-build.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm build <package\-folder>
+npm build [<package\-folder>]
 .fi
 .RE
 .RS 0
diff --git a/deps/npm/man/man1/npm-completion.1 b/deps/npm/man/man1/npm-completion.1
index ce7235fbd7..0f3b1abf2e 100644
--- a/deps/npm/man/man1/npm-completion.1
+++ b/deps/npm/man/man1/npm-completion.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-\|\. <(npm completion)
+source <(npm completion)
 .fi
 .RE
 .SH DESCRIPTION
@@ -15,7 +15,14 @@ Enables tab\-completion in all npm commands\.
 The synopsis above
 loads the completions into your current shell\.  Adding it to
 your ~/\.bashrc or ~/\.zshrc will make the completions available
-everywhere\.
+everywhere:
+.P
+.RS 2
+.nf
+npm completion >> ~/\.bashrc
+npm completion >> ~/\.zshrc
+.fi
+.RE
 .P
 You may of course also pipe the output of npm completion to a file
 such as \fB/usr/local/etc/bash_completion\.d/npm\fP if you have a system
diff --git a/deps/npm/man/man1/npm-config.1 b/deps/npm/man/man1/npm-config.1
index 47a5bd197e..4ff3ac37ea 100644
--- a/deps/npm/man/man1/npm-config.1
+++ b/deps/npm/man/man1/npm-config.1
@@ -10,7 +10,6 @@ npm config get <key>
 npm config delete <key>
 npm config list
 npm config edit
-npm c [set|get|delete|list]
 npm get <key>
 npm set <key> <value> [\-\-global]
 .fi
diff --git a/deps/npm/man/man1/npm-dedupe.1 b/deps/npm/man/man1/npm-dedupe.1
index 9d73fcb177..0c965e957a 100644
--- a/deps/npm/man/man1/npm-dedupe.1
+++ b/deps/npm/man/man1/npm-dedupe.1
@@ -42,25 +42,20 @@ Because of the hierarchical nature of node's module lookup, b and d
 will both get their dependency met by the single c package at the root
 level of the tree\.
 .P
+The deduplication algorithm walks the tree, moving each dependency as far
+up in the tree as possible, even if duplicates are not found\. This will
+result in both a flat and deduplicated tree\.
+.P
 If a suitable version exists at the target location in the tree
 already, then it will be left untouched, but the other duplicates will
 be deleted\.
 .P
-If no suitable version can be found, then a warning is printed, and
-nothing is done\.
-.P
-If any arguments are supplied, then they are filters, and only the
-named packages will be touched\.
-.P
-Note that this operation transforms the dependency tree, and may
-result in packages getting updated versions, perhaps from the npm
-registry\.
+Arguments are ignored\. Dedupe always acts on the entire tree\.
 .P
-This feature is experimental, and may change in future versions\.
+Modules
 .P
-The \fB\-\-tag\fP argument will apply to all of the affected dependencies\. If a
-tag with the given name exists, the tagged version is preferred over newer
-versions\.
+Note that this operation transforms the dependency tree, but will never
+result in new modules being installed\.
 .SH SEE ALSO
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-deprecate.1 b/deps/npm/man/man1/npm-deprecate.1
index 1c41959dac..df8c342953 100644
--- a/deps/npm/man/man1/npm-deprecate.1
+++ b/deps/npm/man/man1/npm-deprecate.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm deprecate <name>[@<version>] <message>
+npm deprecate <pkg>[@<version>] <message>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-docs.1 b/deps/npm/man/man1/npm-docs.1
index 328ad817fd..74b258d737 100644
--- a/deps/npm/man/man1/npm-docs.1
+++ b/deps/npm/man/man1/npm-docs.1
@@ -6,9 +6,9 @@
 .RS 2
 .nf
 npm docs [<pkgname> [<pkgname> \.\.\.]]
-npm docs (with no args in a package dir)
+npm docs \.
 npm home [<pkgname> [<pkgname> \.\.\.]]
-npm home (with no args in a package dir)
+npm home \.
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-edit.1 b/deps/npm/man/man1/npm-edit.1
index c3cba10dcc..8cb4ea635e 100644
--- a/deps/npm/man/man1/npm-edit.1
+++ b/deps/npm/man/man1/npm-edit.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm edit <name>[@<version>]
+npm edit <pkg>[@<version>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-explore.1 b/deps/npm/man/man1/npm-explore.1
index b588f8d2f2..4b14717481 100644
--- a/deps/npm/man/man1/npm-explore.1
+++ b/deps/npm/man/man1/npm-explore.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm explore <name> [ \-\- <cmd>]
+npm explore <pkg> [ \-\- <cmd>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-help-search.1 b/deps/npm/man/man1/npm-help-search.1
index 1fa13cc301..8d6f8e42e6 100644
--- a/deps/npm/man/man1/npm-help-search.1
+++ b/deps/npm/man/man1/npm-help-search.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm help\-search some search terms
+npm help\-search <text>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-help.1 b/deps/npm/man/man1/npm-help.1
index 5083a5866f..2f6d09c665 100644
--- a/deps/npm/man/man1/npm-help.1
+++ b/deps/npm/man/man1/npm-help.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm help <topic>
-npm help some search terms
+npm help <term> [<terms\.\.>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-init.1 b/deps/npm/man/man1/npm-init.1
index 56da738cb8..5fabda5543 100644
--- a/deps/npm/man/man1/npm-init.1
+++ b/deps/npm/man/man1/npm-init.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm init [\-f|\-\-force|\-y|\-\-yes]
+npm init [\-\-force|\-f|\-\-yes|\-y]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-install.1 b/deps/npm/man/man1/npm-install.1
index c135dfb4a3..8e78558ba4 100644
--- a/deps/npm/man/man1/npm-install.1
+++ b/deps/npm/man/man1/npm-install.1
@@ -5,15 +5,17 @@
 .P
 .RS 2
 .nf
-npm install (with no args in a package dir)
+npm install (with no args, in package dir)
+npm install [<@scope>/]<name>
+npm install [<@scope>/]<name>@<tag>
+npm install [<@scope>/]<name>@<version>
+npm install [<@scope>/]<name>@<version range>
 npm install <tarball file>
 npm install <tarball url>
 npm install <folder>
-npm install [@<scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact]
-npm install [@<scope>/]<name>@<tag>
-npm install [@<scope>/]<name>@<version>
-npm install [@<scope>/]<name>@<version range>
-npm i (with any of the previous argument usage)
+
+alias: npm i
+common options: [\-\-save|\-\-save\-dev|\-\-save\-optional] [\-\-save\-exact] [\-\-dry\-run]
 .fi
 .RE
 .SH DESCRIPTION
@@ -37,7 +39,7 @@ e) a \fB<name>@<tag>\fP that points to (d)
 .IP \(bu 2
 f) a \fB<name>\fP that has a "latest" tag satisfying (e)
 .IP \(bu 2
-g) a \fB<git remote url>\fP that resolves to (b)
+g) a \fB<git remote url>\fP that resolves to (a)
 
 .RE
 .P
@@ -83,7 +85,7 @@ after packing it up into a tarball (b)\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fP:
+\fBnpm install [<@scope>/]<name> [\-\-save|\-\-save\-dev|\-\-save\-optional]\fP:
   Do a \fB<name>@<tag>\fP install, where \fB<tag>\fP is the "tag" config\. (See
   npm help 7 \fBnpm\-config\fP\|\.)
   In most cases, this will install the latest version
@@ -110,6 +112,8 @@ package\.json, there is an additional, optional flag:
 \fB\-\-save\-exact\fP: Saved dependencies will be configured with an
 exact version rather than using npm's default semver range
 operator\.
+Further, if you have an \fBnpm\-shrinkwrap\.json\fP then it will be updated as
+well\.
 \fB<scope>\fP is optional\. The package will be downloaded from the registry
 associated with the specified scope\. If no registry is associated with
 the given scope the default registry is assumed\. See npm help 7 \fBnpm\-scope\fP\|\.
@@ -142,7 +146,7 @@ fetch the package by name if it is not valid\.
 .RE
 .RS 0
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<tag>\fP:
+\fBnpm install [<@scope>/]<name>@<tag>\fP:
   Install the version of the package that is referenced by the specified tag\.
   If the tag does not exist in the registry data for that package, then this
   will fail\.
@@ -155,7 +159,7 @@ fetch the package by name if it is not valid\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<version>\fP:
+\fBnpm install [<@scope>/]<name>@<version>\fP:
   Install the specified version of the package\.  This will fail if the
   version has not been published to the registry\.
   Example:
@@ -167,7 +171,7 @@ fetch the package by name if it is not valid\.
 .fi
 .RE
 .IP \(bu 2
-\fBnpm install [@<scope>/]<name>@<version range>\fP:
+\fBnpm install [<@scope>/]<name>@<version range>\fP:
   Install a version of the package matching the specified version range\.  This
   will follow the same rules for resolving dependencies described in npm help 5 \fBpackage\.json\fP\|\.
   Note that most version ranges must be put in quotes so that your shell will
@@ -182,12 +186,12 @@ fetch the package by name if it is not valid\.
 .RE
 .IP \(bu 2
 \fBnpm install <git remote url>\fP:
-  Install a package by cloning a git remote url\.  The format of the git
-  url is:
+  Installs the package from the hosted git provider, cloning it with
+  \fBgit\fP\|\. First it tries via the https (git with github) and if that fails, via ssh\.
 .P
 .RS 2
 .nf
-    <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:/]<path>[#<commit\-ish>]
+    <protocol>://[<user>[:<password>]@]<hostname>[:<port>][:][/]<path>[#<commit\-ish>]
 .fi
 .RE
   \fB<protocol>\fP is one of \fBgit\fP, \fBgit+ssh\fP, \fBgit+http\fP, or
@@ -289,6 +293,9 @@ The \fB\-\-tag\fP argument will apply to all of the specified install targets\.
 tag with the given name exists, the tagged version is preferred over newer
 versions\.
 .P
+The \fB\-\-dry\-run\fP argument will report in the usual way what the install would
+have done without actually installing anything\.
+.P
 The \fB\-\-force\fP argument will force npm to fetch remote resources even if a
 local copy exists on disk\.
 .P
@@ -316,6 +323,9 @@ shrinkwrap file and use the package\.json instead\.
 The \fB\-\-nodedir=/path/to/node/source\fP argument will allow npm to find the
 node source code so that npm can compile native modules\.
 .P
+The \fB\-\-only={prod[uction]|dev[elopment]}\fP argument will cause either only
+\fBdevDependencies\fP or only non\-\fBdevDependencies\fP to be installed\.
+.P
 See npm help 7 \fBnpm\-config\fP\|\.  Many of the configuration params have some
 effect on installation, since that's most of what npm does\.
 .SH ALGORITHM
@@ -324,15 +334,16 @@ To install a package, npm uses the following algorithm:
 .P
 .RS 2
 .nf
-install(where, what, family, ancestors)
-fetch what, unpack to <where>/node_modules/<what>
-for each dep in what\.dependencies
-  resolve dep to precise version
-for each dep@version in what\.dependencies
-    not in <where>/node_modules/<what>/node_modules/*
-    and not in <family>
-  add precise version deps to <family>
-  install(<where>/node_modules/<what>, dep, family)
+load the existing node_modules tree from disk
+clone the tree
+fetch the package\.json and assorted metadata and add it to the clone
+walk the clone and add any missing dependencies
+  dependencies will be added as close to the top as is possible
+  without breaking any other modules
+compare the original tree with the cloned tree and make a list of
+actions to take to convert one to the other
+execute all of the actions, deepest first
+  kinds of actions are install, update, remove and move
 .fi
 .RE
 .P
@@ -343,13 +354,29 @@ this algorithm produces:
 .nf
 A
 +\-\- B
-`\-\- C
-    `\-\- D
++\-\- C
++\-\- D
 .fi
 .RE
 .P
 That is, the dependency from B to C is satisfied by the fact that A
-already caused C to be installed at a higher level\.
+already caused C to be installed at a higher level\. D is still installed
+at the top level because nothing conflicts with it\.
+.P
+For \fBA{B,C}, B{C,D@1}, C{D@2}\fP, this algorithm produces:
+.P
+.RS 2
+.nf
+A
++\-\- B
++\-\- C
+   `\-\- D@2
++\-\- D@1
+.fi
+.RE
+.P
+Because B's D@1 will be installed in the top leve, C now has to install D@2
+privately for itself\.
 .P
 See npm help 5 folders for a more detailed description of the specific
 folder structures that npm creates\.
diff --git a/deps/npm/man/man1/npm-link.1 b/deps/npm/man/man1/npm-link.1
index 7fee404349..78c3b75a8e 100644
--- a/deps/npm/man/man1/npm-link.1
+++ b/deps/npm/man/man1/npm-link.1
@@ -5,9 +5,10 @@
 .P
 .RS 2
 .nf
-npm link (in package folder)
-npm link [@<scope>/]<pkgname>
-npm ln (with any of the previous argument usage)
+npm link (in package dir)
+npm link [<@scope>/]<pkg>[@<version>]
+
+alias: npm ln
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-logout.1 b/deps/npm/man/man1/npm-logout.1
index d7ea3cd978..d7a840c5dd 100644
--- a/deps/npm/man/man1/npm-logout.1
+++ b/deps/npm/man/man1/npm-logout.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm logout [\-\-registry=url] [\-\-scope=@orgname]
+npm logout [\-\-registry=<url>] [\-\-scope=<@scope>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
index a65a3fa890..d246286fd5 100644
--- a/deps/npm/man/man1/npm-ls.1
+++ b/deps/npm/man/man1/npm-ls.1
@@ -5,10 +5,9 @@
 .P
 .RS 2
 .nf
-npm list [[@<scope>/]<pkg> \.\.\.]
-npm ls [[@<scope>/]<pkg> \.\.\.]
-npm la [[@<scope>/]<pkg> \.\.\.]
-npm ll [[@<scope>/]<pkg> \.\.\.]
+npm ls [[<@scope>/]<pkg> \.\.\.]
+
+aliases: list, la, ll
 .fi
 .RE
 .SH DESCRIPTION
@@ -23,7 +22,7 @@ For example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@2.14.7 /path/to/npm
+npm@3.3.6 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi
@@ -35,6 +34,9 @@ If a project specifies git urls for dependencies these are shown
 in parentheses after the name@version to make it easier for users to
 recognize potential forks of a project\.
 .P
+The tree shown is the logical dependency tree, based on package
+dependencies, not the physical layout of your node_modules folder\.
+.P
 When run as \fBll\fP or \fBla\fP, it shows extended information by default\.
 .SH CONFIGURATION
 .SS json
@@ -106,6 +108,16 @@ Default: false
 .RE
 .P
 Display only the dependency tree for packages in \fBdevDependencies\fP\|\.
+.SS only
+.RS 0
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development", is an alias to \fBdev\fP\|\.
+.P
+When "prod" or "production", is an alias to \fBproduction\fP\|\.`
 .SH SEE ALSO
 .RS 0
 .IP \(bu 2
diff --git a/deps/npm/man/man1/npm-outdated.1 b/deps/npm/man/man1/npm-outdated.1
index 7f96b4e48c..493e7a9f21 100644
--- a/deps/npm/man/man1/npm-outdated.1
+++ b/deps/npm/man/man1/npm-outdated.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm outdated [<name> [<name> \.\.\.]]
+npm outdated [[<@scope>/]<pkg> \.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-owner.1 b/deps/npm/man/man1/npm-owner.1
index 28d2cc125f..009121d4eb 100644
--- a/deps/npm/man/man1/npm-owner.1
+++ b/deps/npm/man/man1/npm-owner.1
@@ -5,9 +5,9 @@
 .P
 .RS 2
 .nf
-npm owner ls <package name>
-npm owner add <user> <package name>
-npm owner rm <user> <package name>
+npm owner add <user> [<@scope>/]<pkg>
+npm owner rm <user> [<@scope>/]<pkg>
+npm owner ls [<@scope>/]<pkg>
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-pack.1 b/deps/npm/man/man1/npm-pack.1
index 295d918bfe..0ece00cf1f 100644
--- a/deps/npm/man/man1/npm-pack.1
+++ b/deps/npm/man/man1/npm-pack.1
@@ -5,16 +5,16 @@
 .P
 .RS 2
 .nf
-npm pack [<pkg> [<pkg> \.\.\.]]
+npm pack [[<@scope>/]<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
 .P
 For anything that's installable (that is, a package folder, tarball,
-tarball url, name@tag, name@version, or name), this command will fetch
-it to the cache, and then copy the tarball to the current working
-directory as \fB<name>\-<version>\.tgz\fP, and then write the filenames out to
-stdout\.
+tarball url, name@tag, name@version, name, or scoped name), this
+command will fetch it to the cache, and then copy the tarball to the
+current working directory as \fB<name>\-<version>\.tgz\fP, and then write
+the filenames out to stdout\.
 .P
 If the same package is specified multiple times, then the file will be
 overwritten the second time\.
diff --git a/deps/npm/man/man1/npm-prune.1 b/deps/npm/man/man1/npm-prune.1
index bb9908f515..051acaab50 100644
--- a/deps/npm/man/man1/npm-prune.1
+++ b/deps/npm/man/man1/npm-prune.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm prune [<name> [<name \.\.\.]]
-npm prune [<name> [<name \.\.\.]] [\-\-production]
+npm prune [[<@scope>/]<pkg>\.\.\.] [\-\-production]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-publish.1 b/deps/npm/man/man1/npm-publish.1
index 20d1f36f6c..4421c8f45d 100644
--- a/deps/npm/man/man1/npm-publish.1
+++ b/deps/npm/man/man1/npm-publish.1
@@ -5,8 +5,10 @@
 .P
 .RS 2
 .nf
-npm publish <tarball> [\-\-tag <tag>] [\-\-access <public|restricted>]
-npm publish <folder> [\-\-tag <tag>] [\-\-access <public|restricted>]
+npm publish [<tarball>|<folder>] [\-\-tag <tag>] [\-\-access <public|restricted>]
+
+Publishes '\.' if no argument supplied
+Sets tag 'latest' if no \-\-tag specified
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-rebuild.1 b/deps/npm/man/man1/npm-rebuild.1
index b10caeef0d..03d16889aa 100644
--- a/deps/npm/man/man1/npm-rebuild.1
+++ b/deps/npm/man/man1/npm-rebuild.1
@@ -5,15 +5,10 @@
 .P
 .RS 2
 .nf
-npm rebuild [<name> [<name> \.\.\.]]
-npm rb [<name> [<name> \.\.\.]]
-.fi
-.RE
-.RS 0
-.IP \(bu 2
-\fB<name>\fP:
-The package to rebuild
+npm rebuild [[<@scope>/<name>]\.\.\.]
 
+alias: npm rb
+.fi
 .RE
 .SH DESCRIPTION
 .P
diff --git a/deps/npm/man/man1/npm-repo.1 b/deps/npm/man/man1/npm-repo.1
index 14f228c955..fe4418e7e5 100644
--- a/deps/npm/man/man1/npm-repo.1
+++ b/deps/npm/man/man1/npm-repo.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm repo <pkgname>
-npm repo (with no args in a package dir)
+npm repo [<pkg>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-rm.1 b/deps/npm/man/man1/npm-rm.1
deleted file mode 100644
index 9c2506635a..0000000000
--- a/deps/npm/man/man1/npm-rm.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH "NPM\-RM" "1" "October 2015" "" ""
-.SH "NAME"
-\fBnpm-rm\fR \- Remove a package
-.SH SYNOPSIS
-.P
-.RS 2
-.nf
-npm rm <name>
-npm r <name>
-npm uninstall <name>
-npm un <name>
-.fi
-.RE
-.SH DESCRIPTION
-.P
-This uninstalls a package, completely removing everything npm installed
-on its behalf\.
-.SH SEE ALSO
-.RS 0
-.IP \(bu 2
-npm help prune
-.IP \(bu 2
-npm help install
-.IP \(bu 2
-npm help 5 folders
-.IP \(bu 2
-npm help config
-.IP \(bu 2
-npm help 7 config
-.IP \(bu 2
-npm help 5 npmrc
-
-.RE
-
diff --git a/deps/npm/man/man1/npm-root.1 b/deps/npm/man/man1/npm-root.1
index 20e4a2f687..6c42d89965 100644
--- a/deps/npm/man/man1/npm-root.1
+++ b/deps/npm/man/man1/npm-root.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm root
+npm root [\-g]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-run-script.1 b/deps/npm/man/man1/npm-run-script.1
index e4da37dc2a..08a675a311 100644
--- a/deps/npm/man/man1/npm-run-script.1
+++ b/deps/npm/man/man1/npm-run-script.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm run\-script [command] [\-\- <args>]
-npm run [command] [\-\- <args>]
+npm run\-script <command> [\-\- <args>\.\.\.]
+
+alias: npm run
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-search.1 b/deps/npm/man/man1/npm-search.1
index ea2a9c8243..c3d1a6d0c9 100644
--- a/deps/npm/man/man1/npm-search.1
+++ b/deps/npm/man/man1/npm-search.1
@@ -6,8 +6,8 @@
 .RS 2
 .nf
 npm search [\-\-long] [search terms \.\.\.]
-npm s [search terms \.\.\.]
-npm se [search terms \.\.\.]
+
+aliases: s, se
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-shrinkwrap.1 b/deps/npm/man/man1/npm-shrinkwrap.1
index 1a8abd7829..a3d7940478 100644
--- a/deps/npm/man/man1/npm-shrinkwrap.1
+++ b/deps/npm/man/man1/npm-shrinkwrap.1
@@ -111,13 +111,17 @@ This generates \fBnpm\-shrinkwrap\.json\fP, which will look something like this:
 .nf
 {
   "name": "A",
-  "version": "0\.1\.0",
+  "version": "1\.1\.0",
   "dependencies": {
     "B": {
-      "version": "0\.0\.1",
+      "version": "1\.0\.1",
+      "from": "B@^1\.0\.0",
+      "resolved": "https://registry\.npmjs\.org/B/\-/B\-1\.0\.1\.tgz",
       "dependencies": {
         "C": {
-          "version": "0\.0\.1"
+          "version": "1\.0\.1",
+          "from": "org/C#v1\.0\.1",
+          "resolved": "git://github\.com/org/C\.git#5c380ae319fc4efe9e7f2d9c78b0faa588fd99b4"
         }
       }
     }
@@ -126,15 +130,18 @@ This generates \fBnpm\-shrinkwrap\.json\fP, which will look something like this:
 .fi
 .RE
 .P
-The shrinkwrap command has locked down the dependencies based on
-what's currently installed in node_modules\.  When \fBnpm install\fP
-installs a package with an \fBnpm\-shrinkwrap\.json\fP in the package
-root, the shrinkwrap file (rather than \fBpackage\.json\fP files) completely
-drives the installation of that package and all of its dependencies
-(recursively)\.  So now the author publishes A@0\.1\.0, and subsequent
-installs of this package will use B@0\.0\.1 and C@0\.0\.1, regardless the
-dependencies and versions listed in A's, B's, and C's \fBpackage\.json\fP
-files\.
+The shrinkwrap command has locked down the dependencies based on what's
+currently installed in \fBnode_modules\fP\|\.  The installation behavior is changed to:
+.RS 0
+.IP 1. 3
+The module tree described by the shrinkwrap is reproduced\. This means
+reproducing the structure described in the file, using the specific files
+referenced in "resolved" if available, falling back to normal package
+resolution using "version" if one isn't\.
+.IP 2. 3
+The tree is walked and any missing dependencies are installed in the usual fasion\.
+
+.RE
 .SS Using shrinkwrapped packages
 .P
 Using a shrinkwrapped package is no different than using any other
@@ -161,17 +168,16 @@ To add or update a dependency in a shrinkwrapped package:
 Run \fBnpm install\fP in the package root to install the current
 versions of all dependencies\.
 .IP 2. 3
-Add or update dependencies\. \fBnpm install\fP each new or updated
-package individually and then update \fBpackage\.json\fP\|\.  Note that they
-must be explicitly named in order to be installed: running \fBnpm
-install\fP with no arguments will merely reproduce the existing
+Add or update dependencies\. \fBnpm install \-\-save\fP each new or updated
+package individually to update the \fBpackage\.json\fP and the shrinkwrap\.
+Note that they must be explicitly named in order to be installed: running
+\fBnpm install\fP with no arguments will merely reproduce the existing
 shrinkwrap\.
 .IP 3. 3
 Validate that the package works as expected with the new
 dependencies\.
 .IP 4. 3
-Run \fBnpm shrinkwrap\fP, commit the new \fBnpm\-shrinkwrap\.json\fP, and
-publish your package\.
+Commit the new \fBnpm\-shrinkwrap\.json\fP, and publish your package\.
 
 .RE
 .P
diff --git a/deps/npm/man/man1/npm-star.1 b/deps/npm/man/man1/npm-star.1
index 7bcb1db69f..fabbfba56e 100644
--- a/deps/npm/man/man1/npm-star.1
+++ b/deps/npm/man/man1/npm-star.1
@@ -5,8 +5,8 @@
 .P
 .RS 2
 .nf
-npm star <pkgname> [<pkg>, \.\.\.]
-npm unstar <pkgname> [<pkg>, \.\.\.]
+npm star [<pkg>\.\.\.]
+npm unstar [<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-stars.1 b/deps/npm/man/man1/npm-stars.1
index 2d8c3b2c7d..f8c7b21410 100644
--- a/deps/npm/man/man1/npm-stars.1
+++ b/deps/npm/man/man1/npm-stars.1
@@ -5,8 +5,7 @@
 .P
 .RS 2
 .nf
-npm stars
-npm stars [username]
+npm stars [<user>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-tag.1 b/deps/npm/man/man1/npm-tag.1
index affc443d53..4d63d7168d 100644
--- a/deps/npm/man/man1/npm-tag.1
+++ b/deps/npm/man/man1/npm-tag.1
@@ -5,7 +5,8 @@
 .P
 .RS 2
 .nf
-npm tag <name>@<version> [<tag>]
+[DEPRECATED] npm tag <name>@<version> [<tag>]
+See `dist\-tag`
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-uninstall.1 b/deps/npm/man/man1/npm-uninstall.1
index fedb41b730..d254c8142d 100644
--- a/deps/npm/man/man1/npm-uninstall.1
+++ b/deps/npm/man/man1/npm-uninstall.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm uninstall [@<scope>/]<package> [\-\-save|\-\-save\-dev|\-\-save\-optional]
-npm rm (with any of the previous argument usage)
+npm uninstall [<@scope>/]<pkg>[@<version>]\.\.\. [\-\-save|\-\-save\-dev|\-\-save\-optional]
+
+aliases: remove, rm, r, un, unlink
 .fi
 .RE
 .SH DESCRIPTION
@@ -37,6 +38,9 @@ the package version in your main package\.json:
 
 .RE
 .P
+Further, if you have an \fBnpm\-shrinkwrap\.json\fP then it will be updated as
+well\.
+.P
 Scope is optional and follows the usual rules for npm help 7 \fBnpm\-scope\fP\|\.
 .P
 Examples:
diff --git a/deps/npm/man/man1/npm-unpublish.1 b/deps/npm/man/man1/npm-unpublish.1
index f3c46aac93..9d3236baa2 100644
--- a/deps/npm/man/man1/npm-unpublish.1
+++ b/deps/npm/man/man1/npm-unpublish.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm unpublish [@<scope>/]<name>[@<version>]
+npm unpublish [<@scope>/]<pkg>[@<version>]
 .fi
 .RE
 .SH WARNING
diff --git a/deps/npm/man/man1/npm-update.1 b/deps/npm/man/man1/npm-update.1
index 4e247b5008..ec9d93a9e9 100644
--- a/deps/npm/man/man1/npm-update.1
+++ b/deps/npm/man/man1/npm-update.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm update [\-g] [<name> [<name> \.\.\.]]
+npm update [\-g] [<pkg>\.\.\.]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-version.1 b/deps/npm/man/man1/npm-version.1
index 5c04c279f9..b7f9bca0cd 100644
--- a/deps/npm/man/man1/npm-version.1
+++ b/deps/npm/man/man1/npm-version.1
@@ -6,6 +6,10 @@
 .RS 2
 .nf
 npm version [<newversion> | major | minor | patch | premajor | preminor | prepatch | prerelease]
+
+\|'npm \-v' or 'npm \-\-version' to print npm version
+\|'npm view <pkg> version' to view a package's published version
+\|'npm ls' to inspect current package/dependency versions
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-view.1 b/deps/npm/man/man1/npm-view.1
index ba3fe90030..55f1f6ae15 100644
--- a/deps/npm/man/man1/npm-view.1
+++ b/deps/npm/man/man1/npm-view.1
@@ -5,8 +5,9 @@
 .P
 .RS 2
 .nf
-npm view [@<scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
-npm v [@<scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
+npm view [<@scope>/]<name>[@<version>] [<field>[\.<subfield>]\.\.\.]
+
+aliases: info, show, v
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm-whoami.1 b/deps/npm/man/man1/npm-whoami.1
index b52b509ebb..1bb605e285 100644
--- a/deps/npm/man/man1/npm-whoami.1
+++ b/deps/npm/man/man1/npm-whoami.1
@@ -5,7 +5,7 @@
 .P
 .RS 2
 .nf
-npm whoami
+npm whoami [\-\-registry <registry>]
 .fi
 .RE
 .SH DESCRIPTION
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 3837768230..38dab77422 100644
--- a/deps/npm/man/man1/npm.1
+++ b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SH VERSION
 .P
-2.14.7
+3.3.6
 .SH DESCRIPTION
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man3/npm-bin.3 b/deps/npm/man/man3/npm-bin.3
index 31c2c4326d..bfb93455d8 100644
--- a/deps/npm/man/man3/npm-bin.3
+++ b/deps/npm/man/man3/npm-bin.3
@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "3" "October 2015" "" ""
+.TH "NPM\-BIN" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-bugs.3 b/deps/npm/man/man3/npm-bugs.3
index 860af2e576..2740034a58 100644
--- a/deps/npm/man/man3/npm-bugs.3
+++ b/deps/npm/man/man3/npm-bugs.3
@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "3" "October 2015" "" ""
+.TH "NPM\-BUGS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-cache.3 b/deps/npm/man/man3/npm-cache.3
index 5ca2d8c706..50a6b7a38c 100644
--- a/deps/npm/man/man3/npm-cache.3
+++ b/deps/npm/man/man3/npm-cache.3
@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "3" "October 2015" "" ""
+.TH "NPM\-CACHE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- manage the npm cache programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-commands.3 b/deps/npm/man/man3/npm-commands.3
index 9036288732..03d0dc40bd 100644
--- a/deps/npm/man/man3/npm-commands.3
+++ b/deps/npm/man/man3/npm-commands.3
@@ -1,4 +1,4 @@
-.TH "NPM\-COMMANDS" "3" "October 2015" "" ""
+.TH "NPM\-COMMANDS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-commands\fR \- npm commands
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-config.3 b/deps/npm/man/man3/npm-config.3
index d27e2dcc45..d2e57c26b5 100644
--- a/deps/npm/man/man3/npm-config.3
+++ b/deps/npm/man/man3/npm-config.3
@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "3" "October 2015" "" ""
+.TH "NPM\-CONFIG" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-deprecate.3 b/deps/npm/man/man3/npm-deprecate.3
index 39cf6336c2..f0e35ab9d3 100644
--- a/deps/npm/man/man3/npm-deprecate.3
+++ b/deps/npm/man/man3/npm-deprecate.3
@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "3" "October 2015" "" ""
+.TH "NPM\-DEPRECATE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-docs.3 b/deps/npm/man/man3/npm-docs.3
index f0c01390e2..4305dae163 100644
--- a/deps/npm/man/man3/npm-docs.3
+++ b/deps/npm/man/man3/npm-docs.3
@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "3" "October 2015" "" ""
+.TH "NPM\-DOCS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Docs for a package in a web browser maybe
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-edit.3 b/deps/npm/man/man3/npm-edit.3
index c1c79f8229..27ccd879fa 100644
--- a/deps/npm/man/man3/npm-edit.3
+++ b/deps/npm/man/man3/npm-edit.3
@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "3" "October 2015" "" ""
+.TH "NPM\-EDIT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-explore.3 b/deps/npm/man/man3/npm-explore.3
index 702d5bfc80..9fb6e008aa 100644
--- a/deps/npm/man/man3/npm-explore.3
+++ b/deps/npm/man/man3/npm-explore.3
@@ -1,4 +1,4 @@
-.TH "NPM\-EXPLORE" "3" "October 2015" "" ""
+.TH "NPM\-EXPLORE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-help-search.3 b/deps/npm/man/man3/npm-help-search.3
index 8e8053b588..243e5d2a28 100644
--- a/deps/npm/man/man3/npm-help-search.3
+++ b/deps/npm/man/man3/npm-help-search.3
@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "3" "October 2015" "" ""
+.TH "NPM\-HELP\-SEARCH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search the help pages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-init.3 b/deps/npm/man/man3/npm-init.3
index b2eab12fe3..947398d7a8 100644
--- a/deps/npm/man/man3/npm-init.3
+++ b/deps/npm/man/man3/npm-init.3
@@ -1,4 +1,4 @@
-.TH "NPM" "" "October 2015" "" ""
+.TH "NPM" "" "August 2015" "" ""
 .SH "NAME"
 \fBnpm\fR
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-install.3 b/deps/npm/man/man3/npm-install.3
index 75397cdc95..d2951dd0d4 100644
--- a/deps/npm/man/man3/npm-install.3
+++ b/deps/npm/man/man3/npm-install.3
@@ -1,4 +1,4 @@
-.TH "NPM\-INSTALL" "3" "October 2015" "" ""
+.TH "NPM\-INSTALL" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-install\fR \- install a package programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-link.3 b/deps/npm/man/man3/npm-link.3
index 2829bab6af..5877e03fbe 100644
--- a/deps/npm/man/man3/npm-link.3
+++ b/deps/npm/man/man3/npm-link.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LINK" "3" "October 2015" "" ""
+.TH "NPM\-LINK" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-link\fR \- Symlink a package folder
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-load.3 b/deps/npm/man/man3/npm-load.3
index dd0017ec74..ce409b6a5f 100644
--- a/deps/npm/man/man3/npm-load.3
+++ b/deps/npm/man/man3/npm-load.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LOAD" "3" "October 2015" "" ""
+.TH "NPM\-LOAD" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-load\fR \- Load config settings
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-ls.3 b/deps/npm/man/man3/npm-ls.3
index 3f99826617..4fc976f2ed 100644
--- a/deps/npm/man/man3/npm-ls.3
+++ b/deps/npm/man/man3/npm-ls.3
@@ -1,4 +1,4 @@
-.TH "NPM\-LS" "3" "October 2015" "" ""
+.TH "NPM\-LS" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-ls\fR \- List installed packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-outdated.3 b/deps/npm/man/man3/npm-outdated.3
index 09e51e92ef..f2fd1f73b7 100644
--- a/deps/npm/man/man3/npm-outdated.3
+++ b/deps/npm/man/man3/npm-outdated.3
@@ -1,4 +1,4 @@
-.TH "NPM\-OUTDATED" "3" "October 2015" "" ""
+.TH "NPM\-OUTDATED" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-outdated\fR \- Check for outdated packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-owner.3 b/deps/npm/man/man3/npm-owner.3
index d0b24cbd54..16e2c54019 100644
--- a/deps/npm/man/man3/npm-owner.3
+++ b/deps/npm/man/man3/npm-owner.3
@@ -1,4 +1,4 @@
-.TH "NPM\-OWNER" "3" "October 2015" "" ""
+.TH "NPM\-OWNER" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-owner\fR \- Manage package owners
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-pack.3 b/deps/npm/man/man3/npm-pack.3
index be86942dd4..037ec3c346 100644
--- a/deps/npm/man/man3/npm-pack.3
+++ b/deps/npm/man/man3/npm-pack.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PACK" "3" "October 2015" "" ""
+.TH "NPM\-PACK" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-pack\fR \- Create a tarball from a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-ping.3 b/deps/npm/man/man3/npm-ping.3
index 9963edd15d..607fc8423e 100644
--- a/deps/npm/man/man3/npm-ping.3
+++ b/deps/npm/man/man3/npm-ping.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PING" "3" "October 2015" "" ""
+.TH "NPM\-PING" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-ping\fR \- Ping npm registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-prefix.3 b/deps/npm/man/man3/npm-prefix.3
index 33c118fc2f..5ca38b5ec2 100644
--- a/deps/npm/man/man3/npm-prefix.3
+++ b/deps/npm/man/man3/npm-prefix.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PREFIX" "3" "October 2015" "" ""
+.TH "NPM\-PREFIX" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-prefix\fR \- Display prefix
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-prune.3 b/deps/npm/man/man3/npm-prune.3
index 49f4d0ad65..4bf3f28039 100644
--- a/deps/npm/man/man3/npm-prune.3
+++ b/deps/npm/man/man3/npm-prune.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PRUNE" "3" "October 2015" "" ""
+.TH "NPM\-PRUNE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-prune\fR \- Remove extraneous packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-publish.3 b/deps/npm/man/man3/npm-publish.3
index 5be59e8382..4a303370b0 100644
--- a/deps/npm/man/man3/npm-publish.3
+++ b/deps/npm/man/man3/npm-publish.3
@@ -1,4 +1,4 @@
-.TH "NPM\-PUBLISH" "3" "October 2015" "" ""
+.TH "NPM\-PUBLISH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-publish\fR \- Publish a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-rebuild.3 b/deps/npm/man/man3/npm-rebuild.3
index 714c5778b8..b59df54005 100644
--- a/deps/npm/man/man3/npm-rebuild.3
+++ b/deps/npm/man/man3/npm-rebuild.3
@@ -1,4 +1,4 @@
-.TH "NPM\-REBUILD" "3" "October 2015" "" ""
+.TH "NPM\-REBUILD" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-rebuild\fR \- Rebuild a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-repo.3 b/deps/npm/man/man3/npm-repo.3
index dae556f6a9..53983bca9b 100644
--- a/deps/npm/man/man3/npm-repo.3
+++ b/deps/npm/man/man3/npm-repo.3
@@ -1,4 +1,4 @@
-.TH "NPM\-REPO" "3" "October 2015" "" ""
+.TH "NPM\-REPO" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-repo\fR \- Open package repository page in the browser
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-restart.3 b/deps/npm/man/man3/npm-restart.3
index dad6281d12..478c2f5f30 100644
--- a/deps/npm/man/man3/npm-restart.3
+++ b/deps/npm/man/man3/npm-restart.3
@@ -1,4 +1,4 @@
-.TH "NPM\-RESTART" "3" "October 2015" "" ""
+.TH "NPM\-RESTART" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-restart\fR \- Restart a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-root.3 b/deps/npm/man/man3/npm-root.3
index 3fd75ab7b1..8ade1a6826 100644
--- a/deps/npm/man/man3/npm-root.3
+++ b/deps/npm/man/man3/npm-root.3
@@ -1,4 +1,4 @@
-.TH "NPM\-ROOT" "3" "October 2015" "" ""
+.TH "NPM\-ROOT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-root\fR \- Display npm root
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-run-script.3 b/deps/npm/man/man3/npm-run-script.3
index bc4508c040..416f1ff792 100644
--- a/deps/npm/man/man3/npm-run-script.3
+++ b/deps/npm/man/man3/npm-run-script.3
@@ -1,4 +1,4 @@
-.TH "NPM\-RUN\-SCRIPT" "3" "October 2015" "" ""
+.TH "NPM\-RUN\-SCRIPT" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-run-script\fR \- Run arbitrary package scripts
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-search.3 b/deps/npm/man/man3/npm-search.3
index 85a9ede36c..823eff13b0 100644
--- a/deps/npm/man/man3/npm-search.3
+++ b/deps/npm/man/man3/npm-search.3
@@ -1,4 +1,4 @@
-.TH "NPM\-SEARCH" "3" "October 2015" "" ""
+.TH "NPM\-SEARCH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-search\fR \- Search for packages
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-shrinkwrap.3 b/deps/npm/man/man3/npm-shrinkwrap.3
index 7211d969a6..fa89d927dd 100644
--- a/deps/npm/man/man3/npm-shrinkwrap.3
+++ b/deps/npm/man/man3/npm-shrinkwrap.3
@@ -1,4 +1,4 @@
-.TH "NPM\-SHRINKWRAP" "3" "October 2015" "" ""
+.TH "NPM\-SHRINKWRAP" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-shrinkwrap\fR \- programmatically generate package shrinkwrap file
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-start.3 b/deps/npm/man/man3/npm-start.3
index 7629bc9ee4..050c108e81 100644
--- a/deps/npm/man/man3/npm-start.3
+++ b/deps/npm/man/man3/npm-start.3
@@ -1,4 +1,4 @@
-.TH "NPM\-START" "3" "October 2015" "" ""
+.TH "NPM\-START" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-start\fR \- Start a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-stop.3 b/deps/npm/man/man3/npm-stop.3
index 95f6e61542..9df3b4c69b 100644
--- a/deps/npm/man/man3/npm-stop.3
+++ b/deps/npm/man/man3/npm-stop.3
@@ -1,4 +1,4 @@
-.TH "NPM\-STOP" "3" "October 2015" "" ""
+.TH "NPM\-STOP" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-stop\fR \- Stop a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-tag.3 b/deps/npm/man/man3/npm-tag.3
index 643c57c968..5c3f355830 100644
--- a/deps/npm/man/man3/npm-tag.3
+++ b/deps/npm/man/man3/npm-tag.3
@@ -1,4 +1,4 @@
-.TH "NPM\-TAG" "3" "October 2015" "" ""
+.TH "NPM\-TAG" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-tag\fR \- Tag a published version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-test.3 b/deps/npm/man/man3/npm-test.3
index 5434f91e74..f0a67f1241 100644
--- a/deps/npm/man/man3/npm-test.3
+++ b/deps/npm/man/man3/npm-test.3
@@ -1,4 +1,4 @@
-.TH "NPM\-TEST" "3" "October 2015" "" ""
+.TH "NPM\-TEST" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-test\fR \- Test a package
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-uninstall.3 b/deps/npm/man/man3/npm-uninstall.3
index 168df5f0eb..fe9ebaaf17 100644
--- a/deps/npm/man/man3/npm-uninstall.3
+++ b/deps/npm/man/man3/npm-uninstall.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UNINSTALL" "3" "October 2015" "" ""
+.TH "NPM\-UNINSTALL" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-uninstall\fR \- uninstall a package programmatically
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-unpublish.3 b/deps/npm/man/man3/npm-unpublish.3
index 1d10b121f3..721bf206b5 100644
--- a/deps/npm/man/man3/npm-unpublish.3
+++ b/deps/npm/man/man3/npm-unpublish.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UNPUBLISH" "3" "October 2015" "" ""
+.TH "NPM\-UNPUBLISH" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-unpublish\fR \- Remove a package from the registry
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-update.3 b/deps/npm/man/man3/npm-update.3
index 2f67a13b9a..da780d598e 100644
--- a/deps/npm/man/man3/npm-update.3
+++ b/deps/npm/man/man3/npm-update.3
@@ -1,4 +1,4 @@
-.TH "NPM\-UPDATE" "3" "October 2015" "" ""
+.TH "NPM\-UPDATE" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-update\fR \- Update a package
 .SH SYNOPSIS
@@ -8,7 +8,7 @@
 npm\.commands\.update(packages, callback)
 .fi
 .RE
-.TH "DESCRIPTION" "" "October 2015" "" ""
+.TH "DESCRIPTION" "" "August 2015" "" ""
 .SH "NAME"
 \fBDESCRIPTION\fR
 .P
diff --git a/deps/npm/man/man3/npm-version.3 b/deps/npm/man/man3/npm-version.3
index 32d8ce6c8a..7a13475c43 100644
--- a/deps/npm/man/man3/npm-version.3
+++ b/deps/npm/man/man3/npm-version.3
@@ -1,4 +1,4 @@
-.TH "NPM\-VERSION" "3" "October 2015" "" ""
+.TH "NPM\-VERSION" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-version\fR \- Bump a package version
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-view.3 b/deps/npm/man/man3/npm-view.3
index 45ece20c3a..8c3d191f54 100644
--- a/deps/npm/man/man3/npm-view.3
+++ b/deps/npm/man/man3/npm-view.3
@@ -1,4 +1,4 @@
-.TH "NPM\-VIEW" "3" "October 2015" "" ""
+.TH "NPM\-VIEW" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-view\fR \- View registry info
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm-whoami.3 b/deps/npm/man/man3/npm-whoami.3
index a580afe2e5..0c29cf7484 100644
--- a/deps/npm/man/man3/npm-whoami.3
+++ b/deps/npm/man/man3/npm-whoami.3
@@ -1,4 +1,4 @@
-.TH "NPM\-WHOAMI" "3" "October 2015" "" ""
+.TH "NPM\-WHOAMI" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm-whoami\fR \- Display npm username
 .SH SYNOPSIS
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index 1cbe624eeb..c45b9788a3 100644
--- a/deps/npm/man/man3/npm.3
+++ b/deps/npm/man/man3/npm.3
@@ -1,4 +1,4 @@
-.TH "NPM" "3" "October 2015" "" ""
+.TH "NPM" "3" "August 2015" "" ""
 .SH "NAME"
 \fBnpm\fR \- javascript package manager
 .SH SYNOPSIS
@@ -20,7 +20,7 @@ npm\.load([configObject, ]function (er, npm) {
 .RE
 .SH VERSION
 .P
-2.14.7
+3.3.0
 .SH DESCRIPTION
 .P
 This is the API documentation for npm\.
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index c41943c22d..0aed3a4db0 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -758,17 +758,10 @@ Note that, unless the user has set the \fBengine\-strict\fP config flag, this
 field is advisory only\.
 .SH engineStrict
 .P
-\fBNOTE: This feature is deprecated and will be removed in npm 3\.0\.0\.\fR
+\fBThis feature was deprecated with npm 3\.0\.0\fR
 .P
-If you are sure that your module will \fIdefinitely not\fR run properly on
-versions of Node/npm other than those specified in the \fBengines\fP object,
-then you can set \fB"engineStrict": true\fP in your package\.json file\.
-This will override the user's \fBengine\-strict\fP config setting\.
-.P
-Please do not do this unless you are really very very sure\.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node\.  Consider this choice carefully\.
+Prior to npm 3\.0\.0, this feature was used to treat this package as if the
+user had set \fBengine\-strict\fP\|\.
 .SH os
 .P
 You can specify which operating systems your
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index c41943c22d..0aed3a4db0 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -758,17 +758,10 @@ Note that, unless the user has set the \fBengine\-strict\fP config flag, this
 field is advisory only\.
 .SH engineStrict
 .P
-\fBNOTE: This feature is deprecated and will be removed in npm 3\.0\.0\.\fR
+\fBThis feature was deprecated with npm 3\.0\.0\fR
 .P
-If you are sure that your module will \fIdefinitely not\fR run properly on
-versions of Node/npm other than those specified in the \fBengines\fP object,
-then you can set \fB"engineStrict": true\fP in your package\.json file\.
-This will override the user's \fBengine\-strict\fP config setting\.
-.P
-Please do not do this unless you are really very very sure\.  If your
-engines object is something overly restrictive, you can quite easily and
-inadvertently lock yourself into obscurity and prevent your users from
-updating to new versions of Node\.  Consider this choice carefully\.
+Prior to npm 3\.0\.0, this feature was used to treat this package as if the
+user had set \fBengine\-strict\fP\|\.
 .SH os
 .P
 You can specify which operating systems your
diff --git a/deps/npm/man/man7/npm-config.7 b/deps/npm/man/man7/npm-config.7
index 6fa530413b..c810392761 100644
--- a/deps/npm/man/man7/npm-config.7
+++ b/deps/npm/man/man7/npm-config.7
@@ -28,7 +28,7 @@ per\-project config file (/path/to/my/project/\.npmrc)
 .IP \(bu 2
 per\-user config file (~/\.npmrc)
 .IP \(bu 2
-global config file ($PREFIX/npmrc)
+global config file ($PREFIX/etc/npmrc)
 .IP \(bu 2
 npm builtin config file (/path/to/npm/npmrc)
 
@@ -173,6 +173,17 @@ Type: Boolean
 .P
 Force npm to always require authentication when accessing the registry,
 even for \fBGET\fP requests\.
+.SS also
+.RS 0
+.IP \(bu 2
+Default: null
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development" and running local \fBnpm shrinkwrap\fP,
+\fBnpm outdated\fP, or \fBnpm update\fP, is an alias for \fB\-\-dev\fP\|\.
 .SS bin\-links
 .RS 0
 .IP \(bu 2
@@ -370,6 +381,20 @@ Install \fBdev\-dependencies\fP along with packages\.
 .P
 Note that \fBdev\-dependencies\fP are also installed if the \fBnpat\fP flag is
 set\.
+.SS dry\-run
+.RS 0
+.IP \(bu 2
+Default: false
+.IP \(bu 2
+Type: Boolean
+
+.RE
+.P
+Indicates that you don't want npm to make any changes and that it should
+only report what it would have done\.  This can be passed into any of the
+commands that modify your local installation, eg, \fBinstall\fP, \fBupdate\fP,
+\fBdedupe\fP, \fBuninstall\fP\|\.  This is NOT currently honored by network related
+commands, eg \fBdist\-tags\fP, \fBowner\fP, \fBpublish\fP, etc\.
 .SS editor
 .RS 0
 .IP \(bu 2
@@ -778,6 +803,27 @@ Type: path
 .P
 A node module to \fBrequire()\fP when npm loads\.  Useful for programmatic
 usage\.
+.SS only
+.RS 0
+.IP \(bu 2
+Default: null
+.IP \(bu 2
+Type: String
+
+.RE
+.P
+When "dev" or "development" and running local \fBnpm install\fP without any
+arguments, only devDependencies (and their dependencies) are installed\.
+.P
+When "dev" or "development" and running local \fBnpm ls\fP, \fBnpm outdated\fP, or
+\fBnpm update\fP, is an alias for \fB\-\-dev\fP\|\.
+.P
+When "prod" or "production" and running local \fBnpm install\fP without any
+arguments, only non\-devDependencies (and their dependencies) are
+installed\.
+.P
+When "prod" or "production" and running local \fBnpm ls\fP, \fBnpm outdated\fP, or
+\fBnpm update\fP, is an alias for \fB\-\-production\fP\|\.
 .SS optional
 .RS 0
 .IP \(bu 2
@@ -830,6 +876,19 @@ local \fBnpm install\fP without any arguments\.
 Set the NODE_ENV="production" for lifecycle scripts\.
 
 .RE
+.SS progress
+.RS 0
+.IP \(bu 2
+Default: true
+.IP \(bu 2
+Type: Boolean
+
+.RE
+.P
+When set to \fBtrue\fP, npm will display a progress bar during time intensive
+operations, if \fBprocess\.stderr\fP is a TTY\.
+.P
+Set to \fBfalse\fP to suppress the progress bar\.
 .SS proprietary\-attribs
 .RS 0
 .IP \(bu 2
@@ -1060,20 +1119,6 @@ using \fB\-s\fP to add a signature\.
 .P
 Note that git requires you to have set up GPG keys in your git configs
 for this to work properly\.
-.SS spin
-.RS 0
-.IP \(bu 2
-Default: true
-.IP \(bu 2
-Type: Boolean or \fB"always"\fP
-
-.RE
-.P
-When set to \fBtrue\fP, npm will display an ascii spinner while it is doing
-things, if \fBprocess\.stderr\fP is a TTY\.
-.P
-Set to \fBfalse\fP to suppress the spinner, or set to \fBalways\fP to output
-the spinner even for non\-TTY outputs\.
 .SS strict\-ssl
 .RS 0
 .IP \(bu 2
@@ -1131,7 +1176,7 @@ on success, but left behind on failure for forensic purposes\.
 .SS unicode
 .RS 0
 .IP \(bu 2
-Default: true
+Default: true on windows and mac/unix systems with a unicode locale
 .IP \(bu 2
 Type: Boolean
 
diff --git a/deps/npm/man/man7/npm-index.7 b/deps/npm/man/man7/npm-index.7
index 4ab8ccd28a..8134075c0d 100644
--- a/deps/npm/man/man7/npm-index.7
+++ b/deps/npm/man/man7/npm-index.7
@@ -106,9 +106,6 @@ Open package repository page in the browser
 .SS npm help restart
 .P
 Restart a package
-.SS npm help rm
-.P
-Remove a package
 .SS npm help root
 .P
 Display npm root
@@ -163,126 +160,6 @@ Display npm username
 .SH API Documentation
 .P
 Using npm in your Node programs
-.SS npm apihelp npm
-.P
-javascript package manager
-.SS npm apihelp bin
-.P
-Display npm bin folder
-.SS npm apihelp bugs
-.P
-Bugs for a package in a web browser maybe
-.SS npm apihelp cache
-.P
-manage the npm cache programmatically
-.SS npm apihelp commands
-.P
-npm commands
-.SS npm apihelp config
-.P
-Manage the npm configuration files
-.SS npm apihelp deprecate
-.P
-Deprecate a version of a package
-.SS npm apihelp docs
-.P
-Docs for a package in a web browser maybe
-.SS npm apihelp edit
-.P
-Edit an installed package
-.SS npm apihelp explore
-.P
-Browse an installed package
-.SS npm apihelp help\-search
-.P
-Search the help pages
-.SS npm apihelp init
-.P
-Interactively create a package\.json file
-.SS npm apihelp install
-.P
-install a package programmatically
-.SS npm apihelp link
-.P
-Symlink a package folder
-.SS npm apihelp load
-.P
-Load config settings
-.SS npm apihelp ls
-.P
-List installed packages
-.SS npm apihelp outdated
-.P
-Check for outdated packages
-.SS npm apihelp owner
-.P
-Manage package owners
-.SS npm apihelp pack
-.P
-Create a tarball from a package
-.SS npm apihelp ping
-.P
-Ping npm registry
-.SS npm apihelp prefix
-.P
-Display prefix
-.SS npm apihelp prune
-.P
-Remove extraneous packages
-.SS npm apihelp publish
-.P
-Publish a package
-.SS npm apihelp rebuild
-.P
-Rebuild a package
-.SS npm apihelp repo
-.P
-Open package repository page in the browser
-.SS npm apihelp restart
-.P
-Restart a package
-.SS npm apihelp root
-.P
-Display npm root
-.SS npm apihelp run\-script
-.P
-Run arbitrary package scripts
-.SS npm apihelp search
-.P
-Search for packages
-.SS npm apihelp shrinkwrap
-.P
-programmatically generate package shrinkwrap file
-.SS npm apihelp start
-.P
-Start a package
-.SS npm apihelp stop
-.P
-Stop a package
-.SS npm apihelp tag
-.P
-Tag a published version
-.SS npm apihelp test
-.P
-Test a package
-.SS npm apihelp uninstall
-.P
-uninstall a package programmatically
-.SS npm apihelp unpublish
-.P
-Remove a package from the registry
-.SS npm apihelp update
-.P
-Update a package
-.SS npm apihelp version
-.P
-Bump a package version
-.SS npm apihelp view
-.P
-View registry info
-.SS npm apihelp whoami
-.P
-Display npm username
 .SH Files
 .P
 File system structures npm uses
@@ -316,9 +193,6 @@ Frequently Asked Questions
 .SS npm help 7 index
 .P
 Index of all npm documentation
-.SS npm help 7 orgs
-.P
-Working with Teams & Orgs
 .SS npm help 7 registry
 .P
 The JavaScript Package Registry