From e0c4fba0ac2392566258d99f6973bba89ee3b35a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 18 Jul 2013 20:47:56 +0200 Subject: [PATCH 01/21] doc: events: clarify 'newListener' emitter state Ditto for the 'removeListener' event. --- doc/api/events.markdown | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/api/events.markdown b/doc/api/events.markdown index 84d2bc0a3a..77d0418e21 100644 --- a/doc/api/events.markdown +++ b/doc/api/events.markdown @@ -108,7 +108,8 @@ Return the number of listeners for a given event. * `event` {String} The event name * `listener` {Function} The event handler function -This event is emitted any time someone adds a new listener. +This event is emitted any time someone adds a new listener. It is unspecified +if `listener` is in the list returned by `emitter.listeners(event)`. ### Event: 'removeListener' @@ -116,4 +117,5 @@ This event is emitted any time someone adds a new listener. * `event` {String} The event name * `listener` {Function} The event handler function -This event is emitted any time someone removes a listener. +This event is emitted any time someone removes a listener. It is unspecified +if `listener` is in the list returned by `emitter.listeners(event)`. From 14f45ba739ac660fd437df9fc4a10415fa35d9a4 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 20 Jul 2013 12:34:53 +0200 Subject: [PATCH 02/21] test: move two tests from simple/ to internet/ Fixes #5876. --- test/{simple => internet}/test-dgram-multicast-multi-process.js | 0 test/{simple => internet}/test-net-connect-unref.js | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename test/{simple => internet}/test-dgram-multicast-multi-process.js (100%) rename test/{simple => internet}/test-net-connect-unref.js (100%) diff --git a/test/simple/test-dgram-multicast-multi-process.js b/test/internet/test-dgram-multicast-multi-process.js similarity index 100% rename from test/simple/test-dgram-multicast-multi-process.js rename to test/internet/test-dgram-multicast-multi-process.js diff --git a/test/simple/test-net-connect-unref.js b/test/internet/test-net-connect-unref.js similarity index 100% rename from test/simple/test-net-connect-unref.js rename to test/internet/test-net-connect-unref.js From ed806385bfd6d7d0e7e31b49586a78dd33d82d37 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 23 Jul 2013 13:28:14 +0200 Subject: [PATCH 03/21] fs: uids and gids must be unsigned ints Before this commit, fs.chown() and fs.fchown() coerced the uid and gid arguments to signed integers which is wrong because uid_t and gid_t are unsigned on most all platforms and IDs that don't fit in a signed integer do exist. This commit changes the aforementioned functions to take unsigned ints instead. No test because we can't assume the system has [GU]IDs that large. This change depends on joyent/libuv@d779eb5. Fixes #5890. --- src/node_file.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/node_file.cc b/src/node_file.cc index c4441bd125..589ecdf7c9 100644 --- a/src/node_file.cc +++ b/src/node_file.cc @@ -826,12 +826,12 @@ static Handle Chown(const Arguments& args) { if (len < 2) return TYPE_ERROR("uid required"); if (len < 3) return TYPE_ERROR("gid required"); if (!args[0]->IsString()) return TYPE_ERROR("path must be a string"); - if (!args[1]->IsInt32()) return TYPE_ERROR("uid must be an int"); - if (!args[2]->IsInt32()) return TYPE_ERROR("gid must be an int"); + if (!args[1]->IsUint32()) return TYPE_ERROR("uid must be an unsigned int"); + if (!args[2]->IsUint32()) return TYPE_ERROR("gid must be an unsigned int"); String::Utf8Value path(args[0]); - int uid = static_cast(args[1]->Int32Value()); - int gid = static_cast(args[2]->Int32Value()); + uv_uid_t uid = static_cast(args[1]->Uint32Value()); + uv_gid_t gid = static_cast(args[2]->Uint32Value()); if (args[3]->IsFunction()) { ASYNC_CALL(chown, args[3], *path, uid, gid); @@ -853,12 +853,12 @@ static Handle FChown(const Arguments& args) { if (len < 2) return TYPE_ERROR("uid required"); if (len < 3) return TYPE_ERROR("gid required"); if (!args[0]->IsInt32()) return TYPE_ERROR("fd must be an int"); - if (!args[1]->IsInt32()) return TYPE_ERROR("uid must be an int"); - if (!args[2]->IsInt32()) return TYPE_ERROR("gid must be an int"); + if (!args[1]->IsUint32()) return TYPE_ERROR("uid must be an unsigned int"); + if (!args[2]->IsUint32()) return TYPE_ERROR("gid must be an unsigned int"); int fd = args[0]->Int32Value(); - int uid = static_cast(args[1]->Int32Value()); - int gid = static_cast(args[2]->Int32Value()); + uv_uid_t uid = static_cast(args[1]->Uint32Value()); + uv_gid_t gid = static_cast(args[2]->Uint32Value()); if (args[3]->IsFunction()) { ASYNC_CALL(fchown, args[3], fd, uid, gid); From e20811a62881603ae2b2471a34f21d88716be99f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 23 Jul 2013 17:09:09 +0200 Subject: [PATCH 04/21] src: os: use Number::New() for CPU info The return values from uv_cpu_info() don't necessarily fit in a 32 bits signed integer. Fixes #5732. --- src/node_os.cc | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/node_os.cc b/src/node_os.cc index 663fa9c6bf..4b325d8207 100644 --- a/src/node_os.cc +++ b/src/node_os.cc @@ -125,24 +125,21 @@ static Handle GetCPUInfo(const Arguments& args) { Local cpus = Array::New(); for (i = 0; i < count; i++) { + uv_cpu_info_t* ci = cpu_infos + i; + Local times_info = Object::New(); - times_info->Set(String::New("user"), - Integer::New(cpu_infos[i].cpu_times.user)); - times_info->Set(String::New("nice"), - Integer::New(cpu_infos[i].cpu_times.nice)); - times_info->Set(String::New("sys"), - Integer::New(cpu_infos[i].cpu_times.sys)); - times_info->Set(String::New("idle"), - Integer::New(cpu_infos[i].cpu_times.idle)); - times_info->Set(String::New("irq"), - Integer::New(cpu_infos[i].cpu_times.irq)); + times_info->Set(String::New("user"), Number::New(ci->cpu_times.user)); + times_info->Set(String::New("nice"), Number::New(ci->cpu_times.nice)); + times_info->Set(String::New("sys"), Number::New(ci->cpu_times.sys)); + times_info->Set(String::New("idle"), Number::New(ci->cpu_times.idle)); + times_info->Set(String::New("irq"), Number::New(ci->cpu_times.irq)); Local cpu_info = Object::New(); - cpu_info->Set(String::New("model"), String::New(cpu_infos[i].model)); - cpu_info->Set(String::New("speed"), - Integer::New(cpu_infos[i].speed)); + cpu_info->Set(String::New("model"), String::New(ci->model)); + cpu_info->Set(String::New("speed"), Number::New(ci->speed)); cpu_info->Set(String::New("times"), times_info); - (*cpus)->Set(i,cpu_info); + + (*cpus)->Set(i, cpu_info); } uv_free_cpu_info(cpu_infos, count); From ff0de45929ab130bec268097c46a1047aba29825 Mon Sep 17 00:00:00 2001 From: isaacs Date: Wed, 24 Jul 2013 13:23:44 -0700 Subject: [PATCH 05/21] npm: Upgrade to v1.3.5 --- deps/npm/doc/cli/npm-bin.md | 2 +- deps/npm/doc/cli/npm-cache.md | 2 +- deps/npm/doc/cli/npm-edit.md | 2 +- deps/npm/doc/cli/npm-explore.md | 2 +- deps/npm/doc/cli/npm-help.md | 2 +- deps/npm/doc/cli/npm-install.md | 9 +- deps/npm/doc/cli/npm-link.md | 2 +- deps/npm/doc/cli/npm-ls.md | 2 +- deps/npm/doc/cli/npm-outdated.md | 2 +- deps/npm/doc/cli/npm-prefix.md | 2 +- deps/npm/doc/cli/npm-prune.md | 4 +- deps/npm/doc/cli/npm-rm.md | 2 +- deps/npm/doc/cli/npm-root.md | 2 +- deps/npm/doc/cli/npm-shrinkwrap.md | 2 +- deps/npm/doc/cli/npm-uninstall.md | 2 +- deps/npm/doc/cli/npm-update.md | 4 +- deps/npm/doc/cli/npm.md | 2 +- deps/npm/doc/misc/npm-config.md | 4 +- deps/npm/html/doc/README.html | 2 +- deps/npm/html/doc/api/npm-bin.html | 2 +- deps/npm/html/doc/api/npm-bugs.html | 2 +- deps/npm/html/doc/api/npm-commands.html | 2 +- deps/npm/html/doc/api/npm-config.html | 2 +- deps/npm/html/doc/api/npm-deprecate.html | 2 +- deps/npm/html/doc/api/npm-docs.html | 2 +- deps/npm/html/doc/api/npm-edit.html | 2 +- deps/npm/html/doc/api/npm-explore.html | 2 +- deps/npm/html/doc/api/npm-help-search.html | 2 +- deps/npm/html/doc/api/npm-init.html | 2 +- deps/npm/html/doc/api/npm-install.html | 2 +- deps/npm/html/doc/api/npm-link.html | 2 +- deps/npm/html/doc/api/npm-load.html | 2 +- deps/npm/html/doc/api/npm-ls.html | 2 +- deps/npm/html/doc/api/npm-outdated.html | 2 +- deps/npm/html/doc/api/npm-owner.html | 2 +- deps/npm/html/doc/api/npm-pack.html | 2 +- deps/npm/html/doc/api/npm-prefix.html | 2 +- deps/npm/html/doc/api/npm-prune.html | 2 +- deps/npm/html/doc/api/npm-publish.html | 2 +- deps/npm/html/doc/api/npm-rebuild.html | 2 +- deps/npm/html/doc/api/npm-restart.html | 2 +- deps/npm/html/doc/api/npm-root.html | 2 +- deps/npm/html/doc/api/npm-run-script.html | 2 +- deps/npm/html/doc/api/npm-search.html | 2 +- deps/npm/html/doc/api/npm-shrinkwrap.html | 2 +- deps/npm/html/doc/api/npm-start.html | 2 +- deps/npm/html/doc/api/npm-stop.html | 2 +- deps/npm/html/doc/api/npm-submodule.html | 2 +- deps/npm/html/doc/api/npm-tag.html | 2 +- deps/npm/html/doc/api/npm-test.html | 2 +- deps/npm/html/doc/api/npm-uninstall.html | 2 +- deps/npm/html/doc/api/npm-unpublish.html | 2 +- deps/npm/html/doc/api/npm-update.html | 2 +- deps/npm/html/doc/api/npm-version.html | 2 +- deps/npm/html/doc/api/npm-view.html | 2 +- deps/npm/html/doc/api/npm-whoami.html | 2 +- deps/npm/html/doc/api/npm.html | 4 +- deps/npm/html/doc/cli/npm-adduser.html | 2 +- deps/npm/html/doc/cli/npm-bin.html | 4 +- deps/npm/html/doc/cli/npm-bugs.html | 2 +- deps/npm/html/doc/cli/npm-build.html | 2 +- deps/npm/html/doc/cli/npm-bundle.html | 2 +- deps/npm/html/doc/cli/npm-cache.html | 4 +- deps/npm/html/doc/cli/npm-completion.html | 2 +- deps/npm/html/doc/cli/npm-config.html | 2 +- deps/npm/html/doc/cli/npm-dedupe.html | 2 +- deps/npm/html/doc/cli/npm-deprecate.html | 2 +- deps/npm/html/doc/cli/npm-docs.html | 2 +- deps/npm/html/doc/cli/npm-edit.html | 4 +- deps/npm/html/doc/cli/npm-explore.html | 4 +- deps/npm/html/doc/cli/npm-help-search.html | 2 +- deps/npm/html/doc/cli/npm-help.html | 4 +- deps/npm/html/doc/cli/npm-init.html | 2 +- deps/npm/html/doc/cli/npm-install.html | 9 +- deps/npm/html/doc/cli/npm-link.html | 4 +- deps/npm/html/doc/cli/npm-ls.html | 6 +- deps/npm/html/doc/cli/npm-outdated.html | 4 +- deps/npm/html/doc/cli/npm-owner.html | 2 +- deps/npm/html/doc/cli/npm-pack.html | 2 +- deps/npm/html/doc/cli/npm-prefix.html | 4 +- deps/npm/html/doc/cli/npm-prune.html | 4 +- deps/npm/html/doc/cli/npm-publish.html | 2 +- deps/npm/html/doc/cli/npm-rebuild.html | 2 +- deps/npm/html/doc/cli/npm-restart.html | 2 +- deps/npm/html/doc/cli/npm-rm.html | 4 +- deps/npm/html/doc/cli/npm-root.html | 4 +- deps/npm/html/doc/cli/npm-run-script.html | 2 +- deps/npm/html/doc/cli/npm-search.html | 2 +- deps/npm/html/doc/cli/npm-shrinkwrap.html | 4 +- deps/npm/html/doc/cli/npm-star.html | 2 +- deps/npm/html/doc/cli/npm-stars.html | 2 +- deps/npm/html/doc/cli/npm-start.html | 2 +- deps/npm/html/doc/cli/npm-stop.html | 2 +- deps/npm/html/doc/cli/npm-submodule.html | 2 +- deps/npm/html/doc/cli/npm-tag.html | 2 +- deps/npm/html/doc/cli/npm-test.html | 2 +- deps/npm/html/doc/cli/npm-uninstall.html | 4 +- deps/npm/html/doc/cli/npm-unpublish.html | 2 +- deps/npm/html/doc/cli/npm-update.html | 4 +- deps/npm/html/doc/cli/npm-version.html | 2 +- deps/npm/html/doc/cli/npm-view.html | 2 +- deps/npm/html/doc/cli/npm-whoami.html | 2 +- deps/npm/html/doc/cli/npm.html | 6 +- deps/npm/html/doc/files/npm-folders.html | 2 +- deps/npm/html/doc/files/npm-global.html | 2 +- deps/npm/html/doc/files/npm-json.html | 2 +- deps/npm/html/doc/files/npmrc.html | 2 +- deps/npm/html/doc/files/package.json.html | 2 +- deps/npm/html/doc/index.html | 2 +- deps/npm/html/doc/misc/npm-coding-style.html | 2 +- deps/npm/html/doc/misc/npm-config.html | 6 +- deps/npm/html/doc/misc/npm-developers.html | 2 +- deps/npm/html/doc/misc/npm-disputes.html | 2 +- deps/npm/html/doc/misc/npm-faq.html | 2 +- deps/npm/html/doc/misc/npm-index.html | 2 +- deps/npm/html/doc/misc/npm-registry.html | 2 +- deps/npm/html/doc/misc/npm-scripts.html | 2 +- deps/npm/html/doc/misc/removing-npm.html | 2 +- deps/npm/html/doc/misc/semver.html | 2 +- deps/npm/lib/cache.js | 2 +- deps/npm/lib/install.js | 11 +- deps/npm/man/man1/npm-install.1 | 1 - deps/npm/man/man1/npm-ls.1 | 2 +- deps/npm/man/man1/npm-prune.1 | 2 +- deps/npm/man/man1/npm-shrinkwrap.1 | 2 +- deps/npm/man/man1/npm-update.1 | 2 +- deps/npm/man/man1/npm.1 | 2 +- deps/npm/man/man3/npm.3 | 2 +- .../node_modules/block-stream/package.json | 12 +- deps/npm/node_modules/cmd-shim/.npmignore | 32 +- deps/npm/node_modules/cmd-shim/.travis.yml | 4 - deps/npm/node_modules/cmd-shim/LICENSE | 54 +-- deps/npm/node_modules/cmd-shim/README.md | 82 ++-- deps/npm/node_modules/cmd-shim/index.js | 360 +++++++++--------- deps/npm/node_modules/cmd-shim/package.json | 15 +- .../node_modules/cmd-shim/test/00-setup.js | 70 ++-- deps/npm/node_modules/cmd-shim/test/basic.js | 336 ++++++++-------- .../node_modules/cmd-shim/test/zz-cleanup.js | 26 +- .../node_modules/fstream-ignore/package.json | 9 +- .../npm/node_modules/fstream-npm/package.json | 11 +- deps/npm/node_modules/fstream/package.json | 6 +- .../glob/node_modules/inherits/LICENSE | 14 - .../glob/node_modules/inherits/README.md | 42 -- .../glob/node_modules/inherits/inherits.js | 1 - .../node_modules/inherits/inherits_browser.js | 23 -- .../glob/node_modules/inherits/package.json | 39 -- .../glob/node_modules/inherits/test.js | 25 -- deps/npm/node_modules/inherits/README.md | 93 ++--- .../npm/node_modules/inherits/inherits-old.js | 40 -- deps/npm/node_modules/inherits/inherits.js | 30 +- deps/npm/node_modules/inherits/package.json | 37 +- deps/npm/node_modules/nopt/lib/nopt.js | 12 +- deps/npm/node_modules/nopt/package.json | 7 +- deps/npm/node_modules/npmconf/package.json | 6 +- .../node_modules/read-installed/package.json | 8 +- .../node_modules/read-package-json/README.md | 2 +- .../read-package-json/package.json | 16 +- deps/npm/node_modules/read/README.md | 4 +- deps/npm/node_modules/read/lib/read.js | 27 +- .../read/node_modules/mute-stream/README.md | 6 + .../read/node_modules/mute-stream/mute.js | 19 +- .../node_modules/mute-stream/package.json | 12 +- .../node_modules/mute-stream/test/basic.js | 1 + deps/npm/node_modules/read/package.json | 14 +- deps/npm/node_modules/read/rs.js | 4 + deps/npm/node_modules/read/test/basic.js | 2 + deps/npm/node_modules/read/test/defaults.js | 2 + deps/npm/node_modules/read/test/many.js | 2 + deps/npm/node_modules/rimraf/package.json | 14 +- deps/npm/node_modules/rimraf/rimraf.js | 90 ++++- deps/npm/node_modules/semver/README.md | 11 +- deps/npm/node_modules/semver/bin/semver | 77 +++- deps/npm/node_modules/semver/package.json | 6 +- deps/npm/node_modules/semver/r.js | 4 + .../npm/node_modules/semver/semver.browser.js | 13 +- .../node_modules/semver/semver.browser.js.gz | Bin 6072 -> 6077 bytes deps/npm/node_modules/semver/semver.js | 15 +- deps/npm/node_modules/semver/semver.min.js | 2 +- deps/npm/node_modules/semver/semver.min.js.gz | Bin 2842 -> 2850 bytes deps/npm/node_modules/semver/test/index.js | 6 +- deps/npm/node_modules/sha/LICENSE | 46 +++ deps/npm/node_modules/sha/README.md | 23 +- deps/npm/node_modules/sha/index.js | 75 +++- deps/npm/node_modules/sha/package.json | 19 +- deps/npm/node_modules/tar/README.md | 27 +- deps/npm/node_modules/tar/lib/buffer-entry.js | 4 +- deps/npm/node_modules/tar/lib/entry.js | 273 ++++++------- .../tar/lib/extended-header-writer.js | 1 - .../node_modules/tar/lib/extended-header.js | 3 +- deps/npm/node_modules/tar/package.json | 15 +- deps/npm/package.json | 15 +- 191 files changed, 1323 insertions(+), 1247 deletions(-) delete mode 100644 deps/npm/node_modules/cmd-shim/.travis.yml mode change 100644 => 100755 deps/npm/node_modules/cmd-shim/test/basic.js delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/LICENSE delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/README.md delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/inherits.js delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/inherits_browser.js delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/package.json delete mode 100644 deps/npm/node_modules/glob/node_modules/inherits/test.js delete mode 100644 deps/npm/node_modules/inherits/inherits-old.js create mode 100644 deps/npm/node_modules/read/rs.js create mode 100644 deps/npm/node_modules/semver/r.js create mode 100644 deps/npm/node_modules/sha/LICENSE diff --git a/deps/npm/doc/cli/npm-bin.md b/deps/npm/doc/cli/npm-bin.md index 49d209d7f9..33863b4571 100644 --- a/deps/npm/doc/cli/npm-bin.md +++ b/deps/npm/doc/cli/npm-bin.md @@ -13,7 +13,7 @@ Print the folder where npm will install executables. * npm-prefix(1) * npm-root(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-cache.md b/deps/npm/doc/cli/npm-cache.md index 195c4aa202..90a55d9b2a 100644 --- a/deps/npm/doc/cli/npm-cache.md +++ b/deps/npm/doc/cli/npm-cache.md @@ -63,7 +63,7 @@ The root cache folder. ## SEE ALSO -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-edit.md b/deps/npm/doc/cli/npm-edit.md index d833bc06f7..6a73317b81 100644 --- a/deps/npm/doc/cli/npm-edit.md +++ b/deps/npm/doc/cli/npm-edit.md @@ -29,7 +29,7 @@ The command to run for `npm edit` or `npm config edit`. ## SEE ALSO -* npm-folders(7) +* npm-folders(5) * npm-explore(1) * npm-install(1) * npm-config(1) diff --git a/deps/npm/doc/cli/npm-explore.md b/deps/npm/doc/cli/npm-explore.md index 51846f5313..1c611211b3 100644 --- a/deps/npm/doc/cli/npm-explore.md +++ b/deps/npm/doc/cli/npm-explore.md @@ -33,7 +33,7 @@ The shell to run for the `npm explore` command. ## SEE ALSO * npm-submodule(1) -* npm-folders(7) +* npm-folders(5) * npm-edit(1) * npm-rebuild(1) * npm-build(1) diff --git a/deps/npm/doc/cli/npm-help.md b/deps/npm/doc/cli/npm-help.md index 7a7eadf1f4..7991b1d38d 100644 --- a/deps/npm/doc/cli/npm-help.md +++ b/deps/npm/doc/cli/npm-help.md @@ -31,7 +31,7 @@ Set to `"browser"` to view html help content in the default web browser. * npm(1) * README * npm-faq(7) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md index f460f2c96d..5baa78b0fd 100644 --- a/deps/npm/doc/cli/npm-install.md +++ b/deps/npm/doc/cli/npm-install.md @@ -11,7 +11,6 @@ npm-install(1) -- Install a package npm install @ npm install @ npm install @ - npm install @ ## DESCRIPTION @@ -160,7 +159,7 @@ local copy exists on disk. npm install sax --force The `--global` argument will cause npm to install the package globally -rather than locally. See `npm-folders(7)`. +rather than locally. See `npm-folders(5)`. The `--link` argument will cause npm to link global installs into the local space in some cases. @@ -202,7 +201,7 @@ this algorithm produces: That is, the dependency from B to C is satisfied by the fact that A already caused C to be installed at a higher level. -See npm-folders(7) for a more detailed description of the specific +See npm-folders(5) for a more detailed description of the specific folder structures that npm creates. ### Limitations of npm's Install Algorithm @@ -228,7 +227,7 @@ affects a real use-case, it will be investigated. ## SEE ALSO -* npm-folders(7) +* npm-folders(5) * npm-update(1) * npm-link(1) * npm-rebuild(1) @@ -238,7 +237,7 @@ affects a real use-case, it will be investigated. * npm-config(7) * npmrc(5) * npm-registry(7) -* npm-folders(7) +* npm-folders(5) * npm-tag(1) * npm-rm(1) * npm-shrinkwrap(1) diff --git a/deps/npm/doc/cli/npm-link.md b/deps/npm/doc/cli/npm-link.md index 65476d5c1e..cfd7f3a76d 100644 --- a/deps/npm/doc/cli/npm-link.md +++ b/deps/npm/doc/cli/npm-link.md @@ -56,7 +56,7 @@ installation target into your project's `node_modules` folder. * npm-faq(7) * package.json(5) * npm-install(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-ls.md b/deps/npm/doc/cli/npm-ls.md index 7f1fda6699..d80a2cc27a 100644 --- a/deps/npm/doc/cli/npm-ls.md +++ b/deps/npm/doc/cli/npm-ls.md @@ -66,7 +66,7 @@ project. * npm-config(1) * npm-config(7) * npmrc(5) -* npm-folders(7) +* npm-folders(5) * npm-install(1) * npm-link(1) * npm-prune(1) diff --git a/deps/npm/doc/cli/npm-outdated.md b/deps/npm/doc/cli/npm-outdated.md index b82b666fd2..25269eb8c0 100644 --- a/deps/npm/doc/cli/npm-outdated.md +++ b/deps/npm/doc/cli/npm-outdated.md @@ -14,4 +14,4 @@ packages are currently outdated. * npm-update(1) * npm-registry(7) -* npm-folders(7) +* npm-folders(5) diff --git a/deps/npm/doc/cli/npm-prefix.md b/deps/npm/doc/cli/npm-prefix.md index 8d88737a9a..f99a401d14 100644 --- a/deps/npm/doc/cli/npm-prefix.md +++ b/deps/npm/doc/cli/npm-prefix.md @@ -13,7 +13,7 @@ Print the prefix to standard out. * npm-root(1) * npm-bin(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-prune.md b/deps/npm/doc/cli/npm-prune.md index 292bacc91d..0410214d8d 100644 --- a/deps/npm/doc/cli/npm-prune.md +++ b/deps/npm/doc/cli/npm-prune.md @@ -17,5 +17,5 @@ package's dependencies list. ## SEE ALSO * npm-rm(1) -* npm-folders(7) -* npm-list(1) +* npm-folders(5) +* npm-ls(1) diff --git a/deps/npm/doc/cli/npm-rm.md b/deps/npm/doc/cli/npm-rm.md index 7839d9dddb..21cc16e69c 100644 --- a/deps/npm/doc/cli/npm-rm.md +++ b/deps/npm/doc/cli/npm-rm.md @@ -15,7 +15,7 @@ on its behalf. * npm-prune(1) * npm-install(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-root.md b/deps/npm/doc/cli/npm-root.md index 3467331609..ca99e1206b 100644 --- a/deps/npm/doc/cli/npm-root.md +++ b/deps/npm/doc/cli/npm-root.md @@ -13,7 +13,7 @@ Print the effective `node_modules` folder to standard out. * npm-prefix(1) * npm-bin(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-shrinkwrap.md b/deps/npm/doc/cli/npm-shrinkwrap.md index 0ecf64466f..70f330be8c 100644 --- a/deps/npm/doc/cli/npm-shrinkwrap.md +++ b/deps/npm/doc/cli/npm-shrinkwrap.md @@ -182,4 +182,4 @@ contents rather than versions. * npm-install(1) * package.json(5) -* npm-list(1) +* npm-ls(1) diff --git a/deps/npm/doc/cli/npm-uninstall.md b/deps/npm/doc/cli/npm-uninstall.md index 7839d9dddb..21cc16e69c 100644 --- a/deps/npm/doc/cli/npm-uninstall.md +++ b/deps/npm/doc/cli/npm-uninstall.md @@ -15,7 +15,7 @@ on its behalf. * npm-prune(1) * npm-install(1) -* npm-folders(7) +* npm-folders(5) * npm-config(1) * npm-config(7) * npmrc(5) diff --git a/deps/npm/doc/cli/npm-update.md b/deps/npm/doc/cli/npm-update.md index 9ebdda72ab..1ea6b62756 100644 --- a/deps/npm/doc/cli/npm-update.md +++ b/deps/npm/doc/cli/npm-update.md @@ -20,5 +20,5 @@ If no package name is specified, all packages in the specified location (global * npm-install(1) * npm-outdated(1) * npm-registry(7) -* npm-folders(7) -* npm-list(1) +* npm-folders(5) +* npm-ls(1) diff --git a/deps/npm/doc/cli/npm.md b/deps/npm/doc/cli/npm.md index 5c935af847..91357e9300 100644 --- a/deps/npm/doc/cli/npm.md +++ b/deps/npm/doc/cli/npm.md @@ -33,7 +33,7 @@ Use `npm ls` to show everything you've installed. ## DIRECTORIES -See `npm-folders(7)` to learn about where npm puts stuff. +See `npm-folders(5)` to learn about where npm puts stuff. In particular, npm has two modes of operation: diff --git a/deps/npm/doc/misc/npm-config.md b/deps/npm/doc/misc/npm-config.md index d622f07e1f..19eaf9347e 100644 --- a/deps/npm/doc/misc/npm-config.md +++ b/deps/npm/doc/misc/npm-config.md @@ -312,7 +312,7 @@ the git binary. Operates in "global" mode, so that packages are installed into the `prefix` folder instead of the current working directory. See -`npm-folders(7)` for more on the differences in behavior. +`npm-folders(5)` for more on the differences in behavior. * packages are installed into the `{prefix}/lib/node_modules` folder, instead of the current working directory. @@ -525,7 +525,7 @@ standard output. ### prefix -* Default: see npm-folders(7) +* Default: see npm-folders(5) * Type: path The location to install global items. If set on the command line, then diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html index f1611d5386..d9c309b102 100644 --- a/deps/npm/html/doc/README.html +++ b/deps/npm/html/doc/README.html @@ -240,7 +240,7 @@ will no doubt tell you to put the output in a gist or email.

- +