5 files changed, 17 insertions, 22 deletions
diff --git a/deps/npm/man/man5/npm-folders.5 b/deps/npm/man/man5/npm-folders.5
index e30e11c5a6..d7be667000 100644
--- a/deps/npm/man/man5/npm-folders.5
+++ b/deps/npm/man/man5/npm-folders.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "November 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "December 2016" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-global.5 b/deps/npm/man/man5/npm-global.5
index e30e11c5a6..d7be667000 100644
--- a/deps/npm/man/man5/npm-global.5
+++ b/deps/npm/man/man5/npm-global.5
@@ -1,4 +1,4 @@
-.TH "NPM\-FOLDERS" "5" "November 2016" "" ""
+.TH "NPM\-FOLDERS" "5" "December 2016" "" ""
 .SH "NAME"
 \fBnpm-folders\fR \- Folder Structures Used by npm
 .SH DESCRIPTION
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index fafa100f77..7464f9609f 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "November 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "December 2016" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -520,7 +520,7 @@ See npm help 7 semver for more details about specifying version ranges\.
 .IP \(bu 2
 \fBuser/repo\fP See 'GitHub URLs' below
 .IP \(bu 2
-\fBtag\fP A specific version tagged and published as \fBtag\fP  See npm help \fBnpm\-tag\fP
+\fBtag\fP A specific version tagged and published as \fBtag\fP  See npm help \fBnpm\-dist\-tag\fP
 .IP \(bu 2
 \fBpath/path/path\fP See Local Paths \fI#local\-paths\fR below
 
@@ -581,8 +581,8 @@ included\.  For example:
   "name": "foo",
   "version": "0\.0\.0",
   "dependencies": {
-    "express": "visionmedia/express",
-    "mocha": "visionmedia/mocha#4727d357ea",
+    "express": "expressjs/express",
+    "mocha": "mochajs/mocha#4727d357ea",
     "module": "user/repo#feature\\/branch"
   }
 }
@@ -635,7 +635,7 @@ from the root of a package, and can be managed like any other npm
 configuration param\.  See npm help 7 \fBnpm\-config\fP for more on the topic\.
 .P
 For build steps that are not platform\-specific, such as compiling
-CoffeeScript or other languages to JavaScript, use the \fBprepublish\fP
+CoffeeScript or other languages to JavaScript, use the \fBprepare\fP
 script to do this, and make the required package a devDependency\.
 .P
 For example:
@@ -649,14 +649,14 @@ For example:
     "coffee\-script": "~1\.6\.3"
   },
   "scripts": {
-    "prepublish": "coffee \-o lib/ \-c src/waza\.coffee"
+    "prepare": "coffee \-o lib/ \-c src/waza\.coffee"
   },
   "main": "lib/waza\.js"
 }
 .fi
 .RE
 .P
-The \fBprepublish\fP script will be run before publishing, so that users
+The \fBprepare\fP script will be run before publishing, so that users
 can consume the functionality without requiring them to compile it
 themselves\.  In dev mode (ie, locally running \fBnpm install\fP), it'll
 run this script as well, so that you can test it easily\.
diff --git a/deps/npm/man/man5/npmrc.5 b/deps/npm/man/man5/npmrc.5
index b40918d84f..45aa7ace8f 100644
--- a/deps/npm/man/man5/npmrc.5
+++ b/deps/npm/man/man5/npmrc.5
@@ -1,4 +1,4 @@
-.TH "NPMRC" "5" "November 2016" "" ""
+.TH "NPMRC" "5" "December 2016" "" ""
 .SH "NAME"
 \fBnpmrc\fR \- The npm config files
 .SH DESCRIPTION
@@ -48,11 +48,6 @@ key[] = "first value"
 key[] = "second value"
 .fi
 .RE
-.P
-\fBNOTE:\fR Because local (per\-project or per\-user) \fB\|\.npmrc\fP files can contain
-sensitive credentials, they must be readable and writable \fIonly\fR by your user
-account (i\.e\. must have a mode of \fB0600\fP), otherwise they \fIwill be ignored by
-npm!\fR
 .SS Comments
 .P
 Lines in \fB\|\.npmrc\fP files are interpreted as comments when they begin with a \fB;\fP or \fB#\fP character\. \fB\|\.npmrc\fP files are parsed by npm/ini \fIhttps://github\.com/npm/ini\fR, which specifies this comment syntax\.
diff --git a/deps/npm/man/man5/package.json.5 b/deps/npm/man/man5/package.json.5
index fafa100f77..7464f9609f 100644
--- a/deps/npm/man/man5/package.json.5
+++ b/deps/npm/man/man5/package.json.5
@@ -1,4 +1,4 @@
-.TH "PACKAGE\.JSON" "5" "November 2016" "" ""
+.TH "PACKAGE\.JSON" "5" "December 2016" "" ""
 .SH "NAME"
 \fBpackage.json\fR \- Specifics of npm's package\.json handling
 .SH DESCRIPTION
@@ -520,7 +520,7 @@ See npm help 7 semver for more details about specifying version ranges\.
 .IP \(bu 2
 \fBuser/repo\fP See 'GitHub URLs' below
 .IP \(bu 2
-\fBtag\fP A specific version tagged and published as \fBtag\fP  See npm help \fBnpm\-tag\fP
+\fBtag\fP A specific version tagged and published as \fBtag\fP  See npm help \fBnpm\-dist\-tag\fP
 .IP \(bu 2
 \fBpath/path/path\fP See Local Paths \fI#local\-paths\fR below
 
@@ -581,8 +581,8 @@ included\.  For example:
   "name": "foo",
   "version": "0\.0\.0",
   "dependencies": {
-    "express": "visionmedia/express",
-    "mocha": "visionmedia/mocha#4727d357ea",
+    "express": "expressjs/express",
+    "mocha": "mochajs/mocha#4727d357ea",
     "module": "user/repo#feature\\/branch"
   }
 }
@@ -635,7 +635,7 @@ from the root of a package, and can be managed like any other npm
 configuration param\.  See npm help 7 \fBnpm\-config\fP for more on the topic\.
 .P
 For build steps that are not platform\-specific, such as compiling
-CoffeeScript or other languages to JavaScript, use the \fBprepublish\fP
+CoffeeScript or other languages to JavaScript, use the \fBprepare\fP
 script to do this, and make the required package a devDependency\.
 .P
 For example:
@@ -649,14 +649,14 @@ For example:
     "coffee\-script": "~1\.6\.3"
   },
   "scripts": {
-    "prepublish": "coffee \-o lib/ \-c src/waza\.coffee"
+    "prepare": "coffee \-o lib/ \-c src/waza\.coffee"
   },
   "main": "lib/waza\.js"
 }
 .fi
 .RE
 .P
-The \fBprepublish\fP script will be run before publishing, so that users
+The \fBprepare\fP script will be run before publishing, so that users
 can consume the functionality without requiring them to compile it
 themselves\.  In dev mode (ie, locally running \fBnpm install\fP), it'll
 run this script as well, so that you can test it easily\.