folder structure change

doc/{cli,api} man/{man1,man3}
npm · Aug 23, 2011 · 5021c4d · 5021c4d
1 parent 001b6d0
commit 5021c4d
Show file tree

Hide file tree

Showing 208 changed files with 48 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 SHELL = bash
 
-cli_docs = $(shell find doc -name '*.md' \
+cli_docs = $(shell find doc/cli -name '*.md' \
 				|sed 's|.md|.1|g' \
-				|sed 's|doc/|man1/|g' )
+				|sed 's|doc/cli/|man/man1/|g' )
 
-api_docs = $(shell find api-doc -name '*.md' \
+api_docs = $(shell find doc/api -name '*.md' \
 				|sed 's|.md|.3|g' \
-				|sed 's|api-doc/|man3/|g' )
+				|sed 's|doc/api/|man/man3/|g' )
 
 cli_doc_subfolders = $(shell find doc -type d \
 									|sed 's|doc/|man1/|g' )
@@ -41,31 +41,25 @@ clean: uninstall
 uninstall: submodules
 	node cli.js rm npm -g -f
 
-man: man1 man3
+doc: man
 
-man1: $(cli_doc_subfolders)
-	[ -d man1 ] || mkdir -p man1
+man: man/man1 man/man3
 
-man3: $(api_doc_subfolders)
-	[ -d man3 ] || mkdir -p man3
+man/man1: $(cli_docs)
+	[ -d man/man1 ] || mkdir -p man/man1
 
-doc: man1 $(cli_docs) man3 $(api_docs)
+man/man3: $(api_docs)
+	[ -d man/man3 ] || mkdir -p man/man3
 
 # use `npm install ronn` for this to work.
-man1/%.1: doc/%.md
+man/man1/%.1: doc/cli/%.md
 	@[ -x ./node_modules/.bin/ronn ] || node cli.js install ronn
 	./node_modules/.bin/ronn --roff $< > $@
 
-man1/%/: doc/%/
-	@[ -d $@ ] || mkdir -p $@
-
-man3/%.3: api-doc/%.md
+man/man3/%.3: doc/api/%.md
 	@[ -x ./node_modules/.bin/ronn ] || node cli.js install ronn
 	./node_modules/.bin/ronn --roff $< > $@
 
-man3/%/: api-doc/%/
-	@[ -d $@ ] || mkdir -p $@
-
 test: submodules
 	node cli.js test
 

diff --git a/api-doc/author.md → doc/api/author.md b/api-doc/author.md → doc/api/author.md
diff --git a/api-doc/bin.md → doc/api/bin.md b/api-doc/bin.md → doc/api/bin.md
diff --git a/api-doc/commands.md → doc/api/commands.md b/api-doc/commands.md → doc/api/commands.md
diff --git a/api-doc/config.md → doc/api/config.md b/api-doc/config.md → doc/api/config.md
diff --git a/api-doc/deprecate.md → doc/api/deprecate.md b/api-doc/deprecate.md → doc/api/deprecate.md
diff --git a/api-doc/docs.md → doc/api/docs.md b/api-doc/docs.md → doc/api/docs.md
diff --git a/api-doc/edit.md → doc/api/edit.md b/api-doc/edit.md → doc/api/edit.md
diff --git a/api-doc/explore.md → doc/api/explore.md b/api-doc/explore.md → doc/api/explore.md
diff --git a/api-doc/find.md → doc/api/find.md b/api-doc/find.md → doc/api/find.md
diff --git a/api-doc/get.md → doc/api/get.md b/api-doc/get.md → doc/api/get.md
diff --git a/api-doc/help-search.md → doc/api/help-search.md b/api-doc/help-search.md → doc/api/help-search.md
diff --git a/api-doc/home.md → doc/api/home.md b/api-doc/home.md → doc/api/home.md
diff --git a/api-doc/init.md → doc/api/init.md b/api-doc/init.md → doc/api/init.md
diff --git a/api-doc/install.md → doc/api/install.md b/api-doc/install.md → doc/api/install.md
diff --git a/api-doc/link.md → doc/api/link.md b/api-doc/link.md → doc/api/link.md
diff --git a/api-doc/list.md → doc/api/list.md b/api-doc/list.md → doc/api/list.md
diff --git a/api-doc/ln.md → doc/api/ln.md b/api-doc/ln.md → doc/api/ln.md
diff --git a/api-doc/load.md → doc/api/load.md b/api-doc/load.md → doc/api/load.md
diff --git a/api-doc/ls.md → doc/api/ls.md b/api-doc/ls.md → doc/api/ls.md
diff --git a/api-doc/npm.md → doc/api/npm.md b/api-doc/npm.md → doc/api/npm.md
diff --git a/api-doc/outdated.md → doc/api/outdated.md b/api-doc/outdated.md → doc/api/outdated.md
diff --git a/api-doc/owner.md → doc/api/owner.md b/api-doc/owner.md → doc/api/owner.md
diff --git a/api-doc/pack.md → doc/api/pack.md b/api-doc/pack.md → doc/api/pack.md
diff --git a/api-doc/prefix.md → doc/api/prefix.md b/api-doc/prefix.md → doc/api/prefix.md
diff --git a/api-doc/prune.md → doc/api/prune.md b/api-doc/prune.md → doc/api/prune.md
diff --git a/api-doc/publish.md → doc/api/publish.md b/api-doc/publish.md → doc/api/publish.md
diff --git a/api-doc/rebuild.md → doc/api/rebuild.md b/api-doc/rebuild.md → doc/api/rebuild.md
diff --git a/api-doc/restart.md → doc/api/restart.md b/api-doc/restart.md → doc/api/restart.md
diff --git a/api-doc/rm.md → doc/api/rm.md b/api-doc/rm.md → doc/api/rm.md
diff --git a/api-doc/root.md → doc/api/root.md b/api-doc/root.md → doc/api/root.md
diff --git a/api-doc/run-script.md → doc/api/run-script.md b/api-doc/run-script.md → doc/api/run-script.md
diff --git a/api-doc/search.md → doc/api/search.md b/api-doc/search.md → doc/api/search.md
diff --git a/api-doc/set.md → doc/api/set.md b/api-doc/set.md → doc/api/set.md
diff --git a/api-doc/start.md → doc/api/start.md b/api-doc/start.md → doc/api/start.md
diff --git a/api-doc/stop.md → doc/api/stop.md b/api-doc/stop.md → doc/api/stop.md
diff --git a/api-doc/submodule.md → doc/api/submodule.md b/api-doc/submodule.md → doc/api/submodule.md
diff --git a/api-doc/tag.md → doc/api/tag.md b/api-doc/tag.md → doc/api/tag.md
diff --git a/api-doc/test.md → doc/api/test.md b/api-doc/test.md → doc/api/test.md
diff --git a/api-doc/uninstall.md → doc/api/uninstall.md b/api-doc/uninstall.md → doc/api/uninstall.md
diff --git a/api-doc/unpublish.md → doc/api/unpublish.md b/api-doc/unpublish.md → doc/api/unpublish.md
diff --git a/api-doc/update.md → doc/api/update.md b/api-doc/update.md → doc/api/update.md
diff --git a/api-doc/version.md → doc/api/version.md b/api-doc/version.md → doc/api/version.md
diff --git a/api-doc/view.md → doc/api/view.md b/api-doc/view.md → doc/api/view.md
diff --git a/api-doc/whoami.md → doc/api/whoami.md b/api-doc/whoami.md → doc/api/whoami.md
diff --git a/doc/adduser.md → doc/cli/adduser.md b/doc/adduser.md → doc/cli/adduser.md
diff --git a/doc/author.md → doc/cli/author.md b/doc/author.md → doc/cli/author.md
diff --git a/doc/bin.md → doc/cli/bin.md b/doc/bin.md → doc/cli/bin.md
diff --git a/doc/build.md → doc/cli/build.md b/doc/build.md → doc/cli/build.md
diff --git a/doc/bundle.md → doc/cli/bundle.md b/doc/bundle.md → doc/cli/bundle.md
diff --git a/doc/cache.md → doc/cli/cache.md b/doc/cache.md → doc/cli/cache.md
diff --git a/doc/changelog.md → doc/cli/changelog.md b/doc/changelog.md → doc/cli/changelog.md
diff --git a/doc/coding-style.md → doc/cli/coding-style.md b/doc/coding-style.md → doc/cli/coding-style.md
diff --git a/doc/completion.md → doc/cli/completion.md b/doc/completion.md → doc/cli/completion.md
diff --git a/doc/config.md → doc/cli/config.md b/doc/config.md → doc/cli/config.md
diff --git a/doc/deprecate.md → doc/cli/deprecate.md b/doc/deprecate.md → doc/cli/deprecate.md
diff --git a/doc/developers.md → doc/cli/developers.md b/doc/developers.md → doc/cli/developers.md
diff --git a/doc/docs.md → doc/cli/docs.md b/doc/docs.md → doc/cli/docs.md
diff --git a/doc/edit.md → doc/cli/edit.md b/doc/edit.md → doc/cli/edit.md
diff --git a/doc/explore.md → doc/cli/explore.md b/doc/explore.md → doc/cli/explore.md
diff --git a/doc/faq.md → doc/cli/faq.md b/doc/faq.md → doc/cli/faq.md
diff --git a/doc/find.md → doc/cli/find.md b/doc/find.md → doc/cli/find.md
diff --git a/doc/folders.md → doc/cli/folders.md b/doc/folders.md → doc/cli/folders.md
diff --git a/doc/get.md → doc/cli/get.md b/doc/get.md → doc/cli/get.md
diff --git a/doc/global.md → doc/cli/global.md b/doc/global.md → doc/cli/global.md
diff --git a/doc/help-search.md → doc/cli/help-search.md b/doc/help-search.md → doc/cli/help-search.md
diff --git a/doc/home.md → doc/cli/home.md b/doc/home.md → doc/cli/home.md
diff --git a/doc/init.md → doc/cli/init.md b/doc/init.md → doc/cli/init.md
diff --git a/doc/install.md → doc/cli/install.md b/doc/install.md → doc/cli/install.md
diff --git a/doc/json.md → doc/cli/json.md b/doc/json.md → doc/cli/json.md
diff --git a/doc/link.md → doc/cli/link.md b/doc/link.md → doc/cli/link.md
diff --git a/doc/list.md → doc/cli/list.md b/doc/list.md → doc/cli/list.md
diff --git a/doc/ln.md → doc/cli/ln.md b/doc/ln.md → doc/cli/ln.md
diff --git a/doc/ls.md → doc/cli/ls.md b/doc/ls.md → doc/cli/ls.md
diff --git a/doc/npm.md → doc/cli/npm.md b/doc/npm.md → doc/cli/npm.md
diff --git a/doc/outdated.md → doc/cli/outdated.md b/doc/outdated.md → doc/cli/outdated.md
diff --git a/doc/owner.md → doc/cli/owner.md b/doc/owner.md → doc/cli/owner.md
diff --git a/doc/pack.md → doc/cli/pack.md b/doc/pack.md → doc/cli/pack.md
diff --git a/doc/prefix.md → doc/cli/prefix.md b/doc/prefix.md → doc/cli/prefix.md
diff --git a/doc/prune.md → doc/cli/prune.md b/doc/prune.md → doc/cli/prune.md
diff --git a/doc/publish.md → doc/cli/publish.md b/doc/publish.md → doc/cli/publish.md
diff --git a/doc/rebuild.md → doc/cli/rebuild.md b/doc/rebuild.md → doc/cli/rebuild.md
diff --git a/doc/registry.md → doc/cli/registry.md b/doc/registry.md → doc/cli/registry.md
diff --git a/doc/removing-npm.md → doc/cli/removing-npm.md b/doc/removing-npm.md → doc/cli/removing-npm.md
diff --git a/doc/restart.md → doc/cli/restart.md b/doc/restart.md → doc/cli/restart.md
diff --git a/doc/rm.md → doc/cli/rm.md b/doc/rm.md → doc/cli/rm.md
diff --git a/doc/root.md → doc/cli/root.md b/doc/root.md → doc/cli/root.md
diff --git a/doc/run-script.md → doc/cli/run-script.md b/doc/run-script.md → doc/cli/run-script.md
diff --git a/doc/scripts.md → doc/cli/scripts.md b/doc/scripts.md → doc/cli/scripts.md
diff --git a/doc/search.md → doc/cli/search.md b/doc/search.md → doc/cli/search.md
diff --git a/doc/semver.md → doc/cli/semver.md b/doc/semver.md → doc/cli/semver.md
diff --git a/doc/set.md → doc/cli/set.md b/doc/set.md → doc/cli/set.md
diff --git a/doc/start.md → doc/cli/start.md b/doc/start.md → doc/cli/start.md
diff --git a/doc/stop.md → doc/cli/stop.md b/doc/stop.md → doc/cli/stop.md
diff --git a/doc/submodule.md → doc/cli/submodule.md b/doc/submodule.md → doc/cli/submodule.md
diff --git a/doc/tag.md → doc/cli/tag.md b/doc/tag.md → doc/cli/tag.md
diff --git a/doc/test.md → doc/cli/test.md b/doc/test.md → doc/cli/test.md
diff --git a/doc/uninstall.md → doc/cli/uninstall.md b/doc/uninstall.md → doc/cli/uninstall.md
diff --git a/doc/unpublish.md → doc/cli/unpublish.md b/doc/unpublish.md → doc/cli/unpublish.md
diff --git a/doc/update.md → doc/cli/update.md b/doc/update.md → doc/cli/update.md
diff --git a/doc/version.md → doc/cli/version.md b/doc/version.md → doc/cli/version.md
diff --git a/doc/view.md → doc/cli/view.md b/doc/view.md → doc/cli/view.md
diff --git a/doc/whoami.md → doc/cli/whoami.md b/doc/whoami.md → doc/cli/whoami.md
diff --git a/lib/help-search.js b/lib/help-search.js
@@ -5,7 +5,7 @@ var fs = require("graceful-fs")
   , output = require("./utils/output.js")
   , path = require("path")
   , asyncMap = require("slide").asyncMap
-  , docsPath = path.join(__dirname, "..", "doc")
+  , docsPath = path.join(__dirname, "..", "doc", "cli")
   , log = require("./utils/log.js")
   , npm = require("../npm.js")
 

diff --git a/lib/help.js b/lib/help.js
@@ -26,13 +26,13 @@ function help (args, cb) {
       npm.config.set("loglevel", "silent")
       return output.write(npm.commands[section].usage, cb)
     }
-    var section_path = path.join(__dirname, "../man1/"+section+".1")
+    var section_path = path.join(__dirname, "../man/man1/"+section+".1")
     return fs.stat
       ( section_path
       , function (e, o) {
           if (e) return npm.commands["help-search"](args, cb)
 
-          var manpath = path.join(__dirname, "..")
+          var manpath = path.join(__dirname, "..", "man")
             , env = {}
           Object.keys(process.env).forEach(function (i) { env[i] = process.env[i] })
           env.MANPATH = manpath
@@ -85,7 +85,7 @@ function wrap (arr) {
 }
 
 function getSections(cb) {
-  fs.readdir(path.join(__dirname, "../man1/"), function (er, files) {
+  fs.readdir(path.join(__dirname, "../man/man1/"), function (er, files) {
     if (er) return cb(er)
     var sectionList = files.concat("help.1")
       .filter(function (s) { return s.match(/\.1$/) })

diff --git a/man1/adduser.1 → man/man1/adduser.1 b/man1/adduser.1 → man/man1/adduser.1
diff --git a/man1/author.1 → man/man1/author.1 b/man1/author.1 → man/man1/author.1
diff --git a/man1/bin.1 → man/man1/bin.1 b/man1/bin.1 → man/man1/bin.1
diff --git a/man1/build.1 → man/man1/build.1 b/man1/build.1 → man/man1/build.1
diff --git a/man1/bundle.1 → man/man1/bundle.1 b/man1/bundle.1 → man/man1/bundle.1
diff --git a/man1/cache.1 → man/man1/cache.1 b/man1/cache.1 → man/man1/cache.1
diff --git a/man1/changelog.1 → man/man1/changelog.1 b/man1/changelog.1 → man/man1/changelog.1
diff --git a/man1/coding-style.1 → man/man1/coding-style.1 b/man1/coding-style.1 → man/man1/coding-style.1
diff --git a/man1/completion.1 → man/man1/completion.1 b/man1/completion.1 → man/man1/completion.1
diff --git a/man1/config.1 → man/man1/config.1 b/man1/config.1 → man/man1/config.1
diff --git a/man1/deprecate.1 → man/man1/deprecate.1 b/man1/deprecate.1 → man/man1/deprecate.1
diff --git a/man1/developers.1 → man/man1/developers.1 b/man1/developers.1 → man/man1/developers.1
diff --git a/man1/docs.1 → man/man1/docs.1 b/man1/docs.1 → man/man1/docs.1
diff --git a/man1/edit.1 → man/man1/edit.1 b/man1/edit.1 → man/man1/edit.1
diff --git a/man1/explore.1 → man/man1/explore.1 b/man1/explore.1 → man/man1/explore.1
diff --git a/man1/faq.1 → man/man1/faq.1 b/man1/faq.1 → man/man1/faq.1
@@ -156,6 +156,9 @@ e) a \fB<name>@<tag>\fR that points to (d)
 .IP "\(bu" 4
 f) a \fB<name>\fR that has a "latest" tag satisfying (e)
 .
+.IP "\(bu" 4
+g) a \fBgit\fR url that, when cloned, results in (a)\.
+.
 .IP "" 0
 .
 .P
@@ -164,6 +167,25 @@ benefits of using npm if you just want to write a node program (a), and
 perhaps if you also want to be able to easily install it elsewhere
 after packing it up into a tarball (b)\.
 .
+.P
+Git urls can be of the form:
+.
+.IP "" 4
+.
+.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
+.
+.fi
+.
+.IP "" 0
+.
+.P
+The \fBcommit\-ish\fR can be any tag, sha, or branch which can be supplied as
+an argument to \fBgit checkout\fR\|\.  The default is \fBmaster\fR\|\.
+.
 .SH "How do I install node with npm?"
 You don\'t\.  Try one of these:
 .
@@ -190,13 +212,8 @@ To set up your own private registry, check out \fBnpm help registry\fR\|\.
 .
 .SH "Can I list a url as a dependency?"
 Yes\.  It should be a url to a gzipped tarball containing a single folder
-that has a package\.json in its root\.  (See "what is a package?" above\.)
-.
-.SH "OK, but can I list a git repo as a dependency?"
-No\.
-.
-.P
-However, you can list a url as a dependency\.
+that has a package\.json in its root, or a git url\.
+(See "what is a package?" above\.)
 .
 .SH "How do I symlink to a dev folder so I don\'t have to keep re\-installing?"
 See \fBnpm help link\fR

diff --git a/man1/find.1 → man/man1/find.1 b/man1/find.1 → man/man1/find.1
diff --git a/man1/folders.1 → man/man1/folders.1 b/man1/folders.1 → man/man1/folders.1
diff --git a/man1/get.1 → man/man1/get.1 b/man1/get.1 → man/man1/get.1
diff --git a/man1/global.1 → man/man1/global.1 b/man1/global.1 → man/man1/global.1
diff --git a/man1/help-search.1 → man/man1/help-search.1 b/man1/help-search.1 → man/man1/help-search.1
diff --git a/man1/home.1 → man/man1/home.1 b/man1/home.1 → man/man1/home.1
diff --git a/man1/init.1 → man/man1/init.1 b/man1/init.1 → man/man1/init.1
diff --git a/man1/install.1 → man/man1/install.1 b/man1/install.1 → man/man1/install.1
diff --git a/man1/json.1 → man/man1/json.1 b/man1/json.1 → man/man1/json.1
diff --git a/man1/link.1 → man/man1/link.1 b/man1/link.1 → man/man1/link.1
diff --git a/man1/list.1 → man/man1/list.1 b/man1/list.1 → man/man1/list.1
diff --git a/man1/ln.1 → man/man1/ln.1 b/man1/ln.1 → man/man1/ln.1
diff --git a/man1/ls.1 → man/man1/ls.1 b/man1/ls.1 → man/man1/ls.1
diff --git a/man1/npm.1 → man/man1/npm.1 b/man1/npm.1 → man/man1/npm.1
diff --git a/man1/outdated.1 → man/man1/outdated.1 b/man1/outdated.1 → man/man1/outdated.1
diff --git a/man1/owner.1 → man/man1/owner.1 b/man1/owner.1 → man/man1/owner.1
diff --git a/man1/pack.1 → man/man1/pack.1 b/man1/pack.1 → man/man1/pack.1
diff --git a/man1/prefix.1 → man/man1/prefix.1 b/man1/prefix.1 → man/man1/prefix.1
diff --git a/man1/prune.1 → man/man1/prune.1 b/man1/prune.1 → man/man1/prune.1
diff --git a/man1/publish.1 → man/man1/publish.1 b/man1/publish.1 → man/man1/publish.1
diff --git a/man1/rebuild.1 → man/man1/rebuild.1 b/man1/rebuild.1 → man/man1/rebuild.1
diff --git a/man1/registry.1 → man/man1/registry.1 b/man1/registry.1 → man/man1/registry.1
diff --git a/man1/removing-npm.1 → man/man1/removing-npm.1 b/man1/removing-npm.1 → man/man1/removing-npm.1
diff --git a/man1/restart.1 → man/man1/restart.1 b/man1/restart.1 → man/man1/restart.1
diff --git a/man1/rm.1 → man/man1/rm.1 b/man1/rm.1 → man/man1/rm.1
diff --git a/man1/root.1 → man/man1/root.1 b/man1/root.1 → man/man1/root.1
diff --git a/man1/run-script.1 → man/man1/run-script.1 b/man1/run-script.1 → man/man1/run-script.1
diff --git a/man1/scripts.1 → man/man1/scripts.1 b/man1/scripts.1 → man/man1/scripts.1
@@ -1,7 +1,7 @@
 .\" Generated with Ronnjs/v0.1
 .\" http://github.com/kapouer/ronnjs/
 .
-.TH "NPM\-SCRIPTS" "1" "July 2011" "" ""
+.TH "NPM\-SCRIPTS" "1" "August 2011" "" ""
 .
 .SH "NAME"
 \fBnpm-scripts\fR \-\- How npm handles the "scripts" field
@@ -83,6 +83,12 @@ default the \fBpreinstall\fR command to compile using node\-waf\.
 .
 .IP "" 0
 .
+.SH "USER"
+If npm was invoked with root privileges, then it will change the uid to
+the user account or uid specified by the \fBuser\fR config, which defaults
+to \fBnobody\fR\|\.  Set the \fBunsafe\-perm\fR flag to run scripts with root
+privileges\.
+.
 .SH "ENVIRONMENT"
 Package scripts run in an environment where many pieces of information are
 made available regarding the setup of npm and the current state of the

diff --git a/man1/search.1 → man/man1/search.1 b/man1/search.1 → man/man1/search.1
diff --git a/man1/semver.1 → man/man1/semver.1 b/man1/semver.1 → man/man1/semver.1
diff --git a/man1/set.1 → man/man1/set.1 b/man1/set.1 → man/man1/set.1
diff --git a/man1/start.1 → man/man1/start.1 b/man1/start.1 → man/man1/start.1
diff --git a/man1/stop.1 → man/man1/stop.1 b/man1/stop.1 → man/man1/stop.1
diff --git a/man1/submodule.1 → man/man1/submodule.1 b/man1/submodule.1 → man/man1/submodule.1
diff --git a/man1/tag.1 → man/man1/tag.1 b/man1/tag.1 → man/man1/tag.1
diff --git a/man1/test.1 → man/man1/test.1 b/man1/test.1 → man/man1/test.1
diff --git a/man1/uninstall.1 → man/man1/uninstall.1 b/man1/uninstall.1 → man/man1/uninstall.1
diff --git a/man1/unpublish.1 → man/man1/unpublish.1 b/man1/unpublish.1 → man/man1/unpublish.1
diff --git a/man1/update.1 → man/man1/update.1 b/man1/update.1 → man/man1/update.1
diff --git a/man1/version.1 → man/man1/version.1 b/man1/version.1 → man/man1/version.1
diff --git a/man1/view.1 → man/man1/view.1 b/man1/view.1 → man/man1/view.1
diff --git a/man1/whoami.1 → man/man1/whoami.1 b/man1/whoami.1 → man/man1/whoami.1
diff --git a/man3/author.3 → man/man3/author.3 b/man3/author.3 → man/man3/author.3
diff --git a/man3/bin.3 → man/man3/bin.3 b/man3/bin.3 → man/man3/bin.3
diff --git a/man3/commands.3 → man/man3/commands.3 b/man3/commands.3 → man/man3/commands.3
diff --git a/man3/config.3 → man/man3/config.3 b/man3/config.3 → man/man3/config.3
diff --git a/man3/deprecate.3 → man/man3/deprecate.3 b/man3/deprecate.3 → man/man3/deprecate.3
diff --git a/man3/docs.3 → man/man3/docs.3 b/man3/docs.3 → man/man3/docs.3
diff --git a/man3/edit.3 → man/man3/edit.3 b/man3/edit.3 → man/man3/edit.3
diff --git a/man3/explore.3 → man/man3/explore.3 b/man3/explore.3 → man/man3/explore.3
diff --git a/man3/find.3 → man/man3/find.3 b/man3/find.3 → man/man3/find.3
diff --git a/man3/get.3 → man/man3/get.3 b/man3/get.3 → man/man3/get.3
diff --git a/man3/help-search.3 → man/man3/help-search.3 b/man3/help-search.3 → man/man3/help-search.3
diff --git a/man3/home.3 → man/man3/home.3 b/man3/home.3 → man/man3/home.3
diff --git a/man3/init.3 → man/man3/init.3 b/man3/init.3 → man/man3/init.3
diff --git a/man3/install.3 → man/man3/install.3 b/man3/install.3 → man/man3/install.3
diff --git a/man3/link.3 → man/man3/link.3 b/man3/link.3 → man/man3/link.3
diff --git a/man3/list.3 → man/man3/list.3 b/man3/list.3 → man/man3/list.3
diff --git a/man3/ln.3 → man/man3/ln.3 b/man3/ln.3 → man/man3/ln.3
diff --git a/man3/load.3 → man/man3/load.3 b/man3/load.3 → man/man3/load.3
diff --git a/man3/ls.3 → man/man3/ls.3 b/man3/ls.3 → man/man3/ls.3
diff --git a/man3/npm.3 → man/man3/npm.3 b/man3/npm.3 → man/man3/npm.3
diff --git a/man3/outdated.3 → man/man3/outdated.3 b/man3/outdated.3 → man/man3/outdated.3
diff --git a/man3/owner.3 → man/man3/owner.3 b/man3/owner.3 → man/man3/owner.3
diff --git a/man3/pack.3 → man/man3/pack.3 b/man3/pack.3 → man/man3/pack.3
diff --git a/man3/prefix.3 → man/man3/prefix.3 b/man3/prefix.3 → man/man3/prefix.3
diff --git a/man3/prune.3 → man/man3/prune.3 b/man3/prune.3 → man/man3/prune.3
diff --git a/man3/publish.3 → man/man3/publish.3 b/man3/publish.3 → man/man3/publish.3
diff --git a/man3/rebuild.3 → man/man3/rebuild.3 b/man3/rebuild.3 → man/man3/rebuild.3
diff --git a/man3/restart.3 → man/man3/restart.3 b/man3/restart.3 → man/man3/restart.3
diff --git a/man3/rm.3 → man/man3/rm.3 b/man3/rm.3 → man/man3/rm.3
diff --git a/man3/root.3 → man/man3/root.3 b/man3/root.3 → man/man3/root.3
diff --git a/man3/run-script.3 → man/man3/run-script.3 b/man3/run-script.3 → man/man3/run-script.3
diff --git a/man3/search.3 → man/man3/search.3 b/man3/search.3 → man/man3/search.3
diff --git a/man3/set.3 → man/man3/set.3 b/man3/set.3 → man/man3/set.3
diff --git a/man3/start.3 → man/man3/start.3 b/man3/start.3 → man/man3/start.3
diff --git a/man3/stop.3 → man/man3/stop.3 b/man3/stop.3 → man/man3/stop.3
diff --git a/man3/submodule.3 → man/man3/submodule.3 b/man3/submodule.3 → man/man3/submodule.3
diff --git a/man3/tag.3 → man/man3/tag.3 b/man3/tag.3 → man/man3/tag.3
diff --git a/man3/test.3 → man/man3/test.3 b/man3/test.3 → man/man3/test.3
diff --git a/man3/uninstall.3 → man/man3/uninstall.3 b/man3/uninstall.3 → man/man3/uninstall.3
diff --git a/man3/unpublish.3 → man/man3/unpublish.3 b/man3/unpublish.3 → man/man3/unpublish.3
diff --git a/man3/update.3 → man/man3/update.3 b/man3/update.3 → man/man3/update.3
diff --git a/man3/version.3 → man/man3/version.3 b/man3/version.3 → man/man3/version.3
diff --git a/man3/view.3 → man/man3/view.3 b/man3/view.3 → man/man3/view.3
diff --git a/man3/whoami.3 → man/man3/whoami.3 b/man3/whoami.3 → man/man3/whoami.3
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   , "web" : "http://github.com/isaacs/npm/issues"
   }
 , "directories" : { "doc" : "./doc"
-                  , "man" : "./man1"
+                  , "man" : "./man"
                   , "lib" : "./lib"
                   , "bin" : "./bin"
                   }