diff --git a/deps/npm/Makefile b/deps/npm/Makefile
index 28c7ff6b3f..326d6f0d50 100644
--- a/deps/npm/Makefile
+++ b/deps/npm/Makefile
@@ -71,7 +71,7 @@ link: uninstall
node cli.js link -f
clean: ronnclean doc-clean uninstall
- rm npmrc
+ rm -rf npmrc
node cli.js cache clean
uninstall:
@@ -154,13 +154,13 @@ html/doc/misc/%.html: doc/misc/%.md $(html_docdeps)
ronn: node_modules/.bin/ronn
node_modules/.bin/ronn:
- node cli.js install ronn
+ node cli.js install ronn --no-global
doc: man
man: $(cli_docs) $(api_docs)
-test:
+test: doc
node cli.js test
publish: link doc
diff --git a/deps/npm/doc/cli/npm-cache.md b/deps/npm/doc/cli/npm-cache.md
index 90a55d9b2a..af3cfac4da 100644
--- a/deps/npm/doc/cli/npm-cache.md
+++ b/deps/npm/doc/cli/npm-cache.md
@@ -33,9 +33,9 @@ Used to add, list, or clear the npm cache folder.
## DETAILS
-npm stores cache data in `$HOME/.npm`. For each package that is added
-to the cache, three pieces of information are stored in
-`{cache}/{name}/{version}`:
+npm stores cache data in the directory specified in `npm config get cache`.
+For each package that is added to the cache, three pieces of information are
+stored in `{cache}/{name}/{version}`:
* .../package/:
A folder containing the package contents as they appear in the tarball.
@@ -57,7 +57,7 @@ they do not make an HTTP request to the registry.
### cache
-Default: `$HOME/.npm` on Posix, or `$HOME/npm-cache` on Windows.
+Default: `~/.npm` on Posix, or `%AppData%/npm-cache` on Windows.
The root cache folder.
diff --git a/deps/npm/doc/cli/npm-dedupe.md b/deps/npm/doc/cli/npm-dedupe.md
index 849d98f20a..d3be01050c 100644
--- a/deps/npm/doc/cli/npm-dedupe.md
+++ b/deps/npm/doc/cli/npm-dedupe.md
@@ -47,6 +47,10 @@ registry.
This feature is experimental, and may change in future versions.
+The `--tag` argument will apply to all of the affected dependencies. If a
+tag with the given name exists, the tagged version is preferred over newer
+versions.
+
## SEE ALSO
* npm-ls(1)
diff --git a/deps/npm/doc/cli/npm-install.md b/deps/npm/doc/cli/npm-install.md
index 07ba2b03f9..a537bb878d 100644
--- a/deps/npm/doc/cli/npm-install.md
+++ b/deps/npm/doc/cli/npm-install.md
@@ -152,7 +152,9 @@ For example:
npm install sax@">=0.1.0 <0.2.0" bench supervisor
-The `--tag` argument will apply to all of the specified install targets.
+The `--tag` argument will apply to all of the specified install targets. If a
+tag with the given name exists, the tagged version is preferred over newer
+versions.
The `--force` argument will force npm to fetch remote resources even if a
local copy exists on disk.
diff --git a/deps/npm/doc/cli/npm-outdated.md b/deps/npm/doc/cli/npm-outdated.md
index 25269eb8c0..4d58353787 100644
--- a/deps/npm/doc/cli/npm-outdated.md
+++ b/deps/npm/doc/cli/npm-outdated.md
@@ -10,6 +10,10 @@ npm-outdated(1) -- Check for outdated packages
This command will check the registry to see if any (or, specific) installed
packages are currently outdated.
+The resulting field 'wanted' shows the latest version according to the
+version specified in the package.json, the field 'latest' the very latest
+version of the package.
+
## SEE ALSO
* npm-update(1)
diff --git a/deps/npm/doc/cli/npm-prune.md b/deps/npm/doc/cli/npm-prune.md
index 0410214d8d..88c54754bb 100644
--- a/deps/npm/doc/cli/npm-prune.md
+++ b/deps/npm/doc/cli/npm-prune.md
@@ -4,6 +4,7 @@ npm-prune(1) -- Remove extraneous packages
## SYNOPSIS
npm prune [