summaryrefslogtreecommitdiff
path: root/deps/npm/man/man5/npm-json.5
diff options
context:
space:
mode:
authorForrest L Norvell <forrest@npmjs.com>2015-07-09 20:48:26 -0700
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2015-07-16 12:26:54 -0700
commit938cc757bb996244df6301cd91187789f4f8a909 (patch)
treee701fd52797d3babf9f1ab3355c96d2d8457c0eb /deps/npm/man/man5/npm-json.5
parent6c3aabf455f5ed9c65bd6ae1ea208c752317216b (diff)
downloadnode-new-938cc757bb996244df6301cd91187789f4f8a909.tar.gz
deps: upgrade to npm 2.13.0
PR-URL: https://github.com/nodejs/io.js/pull/2152 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/man/man5/npm-json.5')
-rw-r--r--deps/npm/man/man5/npm-json.59
1 files changed, 6 insertions, 3 deletions
diff --git a/deps/npm/man/man5/npm-json.5 b/deps/npm/man/man5/npm-json.5
index 855b5bd0e2..23280ede2c 100644
--- a/deps/npm/man/man5/npm-json.5
+++ b/deps/npm/man/man5/npm-json.5
@@ -339,10 +339,13 @@ Tell people where the bulk of your library is\. Nothing special is done
with the lib folder in any way, but it's useful meta info\.
.SS directories\.bin
.P
-If you specify a \fBbin\fR directory, then all the files in that folder will
-be added as children of the \fBbin\fR path\.
+If you specify a \fBbin\fR directory in \fBdirectories\.bin\fR, all the files in
+that folder will be added\.
.P
-If you have a \fBbin\fR path already, then this has no effect\.
+Because of the way the \fBbin\fR directive works, specifying both a
+\fBbin\fR path and setting \fBdirectories\.bin\fR is an error\. If you want to
+specify individual files, use \fBbin\fR, and for all the files in an
+existing \fBbin\fR directory, use \fBdirectories\.bin\fR\|\.
.SS directories\.man
.P
A folder that is full of man pages\. Sugar to generate a "man" array by