Upgrade npm to 1.1.25

4 files changed, 8 insertions, 66 deletions

diff --git a/deps/npm/man/man1/coding-style.1 b/deps/npm/man/man1/coding-style.1
index 16f27621b0..11adb5f989 100644
--- a/deps/npm/man/man1/coding-style.1
+++ b/deps/npm/man/man1/coding-style.1
@@ -187,37 +187,19 @@ Just send the error message back as the first argument to the callback\.
 Always create a new Error object with your message\.  Don\'t just return a
 string message to the callback\.  Stack traces are handy\.
 .
-.P
-Use the \fBrequire("\./utils/log")\.er\fR function\.  It takes a callback and an
-error message, and returns an object that will report the message in the
-event of a failure\.  It\'s quite handy\.
-.
-.IP "" 4
-.
-.nf
-function myThing (args, cb) {
-  getData(args, function (er, data) {
-    if (er) return log\.er(cb, "Couldn\'t get data")(er)
-    doSomethingElse(data, cb)
-  })
-}
-function justHasToWork (cb) {
-  doSomething(log\.er(cb, "the doSomething failed\."))
-}
-.
-.fi
-.
-.IP "" 0
-.
 .SH "Logging"
+Logging is done using the npmlog \fIhttps://github\.com/isaacs/npmlog\fR
+utility\.
+.
+.P
 Please clean up logs when they are no longer helpful\.  In particular,
 logging the same object over and over again is not helpful\.  Logs should
 report what\'s happening so that it\'s easier to track down where a fault
 occurs\.
 .
 .P
-Use appropriate log levels\.  The default log() function logs at the
-"info" level\.  See \fBnpm help config\fR and search for "loglevel"\.
+Use appropriate log levels\.  See \fBnpm help config\fR and search for
+"loglevel"\.
 .
 .SH "Case, naming, etc\."
 Use \fBlowerCamelCase\fR for multiword identifiers when they refer to objects,
diff --git a/deps/npm/man/man1/config.1 b/deps/npm/man/man1/config.1
index d5c8ac504f..59c44d3d64 100644
--- a/deps/npm/man/man1/config.1
+++ b/deps/npm/man/man1/config.1
@@ -734,19 +734,6 @@ being installed locally\.
 .
 .IP "" 0
 .
-.SS "logfd"
-.
-.IP "\(bu" 4
-Default: stderr file descriptor
-.
-.IP "\(bu" 4
-Type: Number or Stream
-.
-.IP "" 0
-.
-.P
-The location to write log output\.
-.
 .SS "loglevel"
 .
 .IP "\(bu" 4
@@ -767,20 +754,6 @@ What level of logs to report\.  On failure, \fIall\fR logs are written to \fBnpm
 Any logs of a higher level than the setting are shown\.
 The default is "http", which shows http, warn, and error output\.
 .
-.SS "logprefix"
-.
-.IP "\(bu" 4
-Default: true on Posix, false on Windows
-.
-.IP "\(bu" 4
-Type: Boolean
-.
-.IP "" 0
-.
-.P
-Whether or not to prefix log messages with "npm" and the log level\.  See
-also "color" and "loglevel"\.
-.
 .SS "long"
 .
 .IP "\(bu" 4
@@ -863,19 +836,6 @@ Type: path
 A node module to \fBrequire()\fR when npm loads\.  Useful for programmatic
 usage\.
 .
-.SS "outfd"
-.
-.IP "\(bu" 4
-Default: standard output file descriptor
-.
-.IP "\(bu" 4
-Type: Number or Stream
-.
-.IP "" 0
-.
-.P
-Where to write "normal" output\.  This has no effect on log output\.
-.
 .SS "parseable"
 .
 .IP "\(bu" 4
diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
index 21584cbe9a..553b4bf4bb 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.24
+1.1.25
 .
 .SH "DESCRIPTION"
 npm is the package manager for the Node JavaScript platform\.  It puts
diff --git a/deps/npm/man/man3/npm.3 b/deps/npm/man/man3/npm.3
index b9e6854234..fbb2b865d7 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.24
+1.1.25
 .
 .SH "DESCRIPTION"
 This is the API documentation for npm\.