npm: Upgrade to v2.1.6

1 files changed, 16 insertions, 16 deletions

diff --git a/deps/npm/man/man7/npm-developers.7 b/deps/npm/man/man7/npm-developers.7
index fbf7a3c10b..bf8edb29f2 100644
--- a/deps/npm/man/man7/npm-developers.7
+++ b/deps/npm/man/man7/npm-developers.7
@@ -1,4 +1,4 @@
-.TH "NPM\-DEVELOPERS" "7" "September 2014" "" ""
+.TH "NPM\-DEVELOPERS" "7" "October 2014" "" ""
 .SH "NAME"
 \fBnpm-developers\fR \- Developer Guide
 .SH DESCRIPTION
@@ -44,12 +44,12 @@ after packing it up into a tarball (b)\.
 Git urls can be of the form:
 .P
 .RS 2
-.EX
+.nf
 git://github\.com/user/project\.git#commit\-ish
 git+ssh://user@hostname:project\.git#commit\-ish
 git+http://user@hostname/project/blah\.git#commit\-ish
 git+https://user@hostname/project/blah\.git#commit\-ish
-.EE
+.fi
 .RE
 .P
 The \fBcommit\-ish\fR can be any tag, sha, or branch which can be supplied as
@@ -85,7 +85,7 @@ Take some credit\.
 .IP \(bu 2
 scripts:
 If you have a special compilation or installation script, then you
-should put it in the \fBscripts\fR hash\.  You should definitely have at
+should put it in the \fBscripts\fR object\.  You should definitely have at
 least a basic smoke\-test command as the "scripts\.test" field\.
 See npm help 7 scripts\.
 .IP \(bu 2
@@ -95,8 +95,8 @@ program (like what the "foo" package gives you at require("foo")),
 then you need to specify that in the "main" field\.
 .IP \(bu 2
 directories:
-This is a hash of folders\.  The best ones to include are "lib" and
-"doc", but if you specify a folder full of man pages in "man", then
+This is an object mapping names to folders\.  The best ones to include are
+"lib" and "doc", but if you use "man" to specify a folder full of man pages,
 they'll get installed just like these ones\.
 
 .RE
@@ -171,18 +171,18 @@ So don't do that\.
 In the root of your package, do this:
 .P
 .RS 2
-.EX
+.nf
 npm install \. \-g
-.EE
+.fi
 .RE
 .P
 That'll show you that it's working\.  If you'd rather just create a symlink
 package that points to your working directory, then do this:
 .P
 .RS 2
-.EX
+.nf
 npm link
-.EE
+.fi
 .RE
 .P
 Use \fBnpm ls \-g\fR to see if it's there\.
@@ -190,10 +190,10 @@ Use \fBnpm ls \-g\fR to see if it's there\.
 To test a local install, go into some other folder, and then do:
 .P
 .RS 2
-.EX
+.nf
 cd \.\./some\-other\-folder
 npm install \.\./my\-package
-.EE
+.fi
 .RE
 .P
 to install it locally into the node_modules folder in that other place\.
@@ -205,9 +205,9 @@ bring in your module's main module\.
 Create a user with the adduser command\.  It works like this:
 .P
 .RS 2
-.EX
+.nf
 npm adduser
-.EE
+.fi
 .RE
 .P
 and then follow the prompts\.
@@ -218,9 +218,9 @@ This is documented better in npm help adduser\.
 This part's easy\.  IN the root of your folder, do this:
 .P
 .RS 2
-.EX
+.nf
 npm publish
-.EE
+.fi
 .RE
 .P
 You can give publish a url to a tarball, or a filename of a tarball,