npm: upgrade to 1.1.41

5 files changed, 61 insertions, 14 deletions

diff --git a/deps/npm/man/man1/config.1 b/deps/npm/man/man1/config.1
index 61eee6d5c3..a67e5acfea 100644
--- a/deps/npm/man/man1/config.1
+++ b/deps/npm/man/man1/config.1
@@ -1199,6 +1199,24 @@ Type: path
 .P
 The shell to run for the \fBnpm explore\fR command\.
 .
+.SS "sign\-git\-tag"
+.
+.IP "\(bu" 4
+Default: false
+.
+.IP "\(bu" 4
+Type: Boolean
+.
+.IP "" 0
+.
+.P
+If set to true, then the \fBnpm version\fR command will tag the version
+using \fB\-s\fR 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 "strict\-ssl"
 .
 .IP "\(bu" 4
diff --git a/deps/npm/man/man1/list.1 b/deps/npm/man/man1/list.1
index 6e84ff43d6..7d26e62523 100644
--- a/deps/npm/man/man1/list.1
+++ b/deps/npm/man/man1/list.1
@@ -9,10 +9,10 @@
 .SH "SYNOPSIS"
 .
 .nf
-npm list
-npm ls
-npm la
-npm ll
+npm list [<pkg> \.\.\.]
+npm ls [<pkg> \.\.\.]
+npm la [<pkg> \.\.\.]
+npm ll [<pkg> \.\.\.]
 .
 .fi
 .
@@ -21,11 +21,24 @@ This command will print to stdout all the versions of packages that are
 installed, as well as their dependencies, in a tree\-structure\.
 .
 .P
-It does not take positional arguments, though you may set config flags
-like with any other command, such as \fB\-g\fR to list global packages\.
+Positional arguments are \fBname@version\-range\fR identifiers, which will
+limit the results to only the paths to the packages named\.  Note that
+nested packages will \fIalso\fR show the paths to the specified packages\.
+For example, running \fBnpm ls promzard\fR in npm\'s source tree will show:
+.
+.IP "" 4
+.
+.nf
+npm@1.1.41 /path/to/npm
+└─┬ init\-package\-json@0\.0\.4
+  └── promzard@0\.1\.5
+.
+.fi
+.
+.IP "" 0
 .
 .P
-It will print out extraneous, missing, and invalid packages\.
+It will show print out extraneous, missing, and invalid packages\.
 .
 .P
 When run as \fBll\fR or \fBla\fR, it shows extended information by default\.
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index a6129e0a99..fd3eb006b3 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.36
+1.1.41
 .
 .SH "DESCRIPTION"
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man1/version.1 b/deps/npm/man/man1/version.1
index d5197ceb2f..757f661866 100644
--- a/deps/npm/man/man1/version.1
+++ b/deps/npm/man/man1/version.1
@@ -9,7 +9,7 @@
 .SH "SYNOPSIS"
 .
 .nf
-npm version <newversion> [\-\-message commit\-message]
+npm version [<newversion> | major | minor | patch | build]
 .
 .fi
 .
@@ -19,16 +19,32 @@ data back to the package\.json file\.
 .
 .P
 The \fBnewversion\fR argument should be a valid semver string, \fIor\fR a valid
-second argument to semver\.inc (one of "patch", "minor", or "major")\. In 
-the second case, the existing version will be incremented by that amount\.
+second argument to semver\.inc (one of "build", "patch", "minor", or
+"major")\. In the second case, the existing version will be incremented
+by 1 in the specified field\.
 .
 .P
 If run in a git repo, it will also create a version commit and tag, and
 fail if the repo is not clean\.
 .
 .P
-If supplied with \fB\-\-message\fR (shorthand: \fB\-m\fR) command line option, npm
-will use it as a commit message when creating a version commit\.
+If supplied with \fB\-\-message\fR (shorthand: \fB\-m\fR) config option, npm will
+use it as a commit message when creating a version commit\.  If the \fBmessage\fR config contains \fB%s\fR then that will be replaced with the
+resulting version number\.  For example:
+.
+.IP "" 4
+.
+.nf
+npm version patch \-m "Upgrade to %s for reasons"
+.
+.fi
+.
+.IP "" 0
+.
+.P
+If the \fBsign\-git\-tag\fR config is set, then the tag will be signed using
+the \fB\-s\fR flag to git\.  Note that you must have a default GPG key set up
+in your git config for this to work properly\.
 .
 .SH "SEE ALSO"
 .
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index a6860c9199..71ba61d327 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.36
+1.1.41
 .
 .SH "DESCRIPTION"
 This is the API documentation for npm\.