summaryrefslogtreecommitdiff
path: root/deps/npm/doc/cli
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2014-01-22 08:42:05 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2014-01-22 08:42:05 -0800
commitfdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch)
tree0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/doc/cli
parent6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff)
parent25f9e92813eda927c3d3eaa56dab3a397afadebe (diff)
downloadnode-merge-test.tar.gz
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts: node.gyp
Diffstat (limited to 'deps/npm/doc/cli')
-rw-r--r--deps/npm/doc/cli/npm-docs.md9
-rw-r--r--deps/npm/doc/cli/npm-search.md14
2 files changed, 18 insertions, 5 deletions
diff --git a/deps/npm/doc/cli/npm-docs.md b/deps/npm/doc/cli/npm-docs.md
index cece021f1..5db3d9f7e 100644
--- a/deps/npm/doc/cli/npm-docs.md
+++ b/deps/npm/doc/cli/npm-docs.md
@@ -3,17 +3,18 @@ npm-docs(1) -- Docs for a package in a web browser maybe
## SYNOPSIS
- npm docs <pkgname>
+ npm docs [<pkgname> [<pkgname> ...]]
npm docs (with no args in a package dir)
- npm home <pkgname>
+ npm home [<pkgname> [<pkgname> ...]]
npm home (with no args in a package dir)
## DESCRIPTION
This command tries to guess at the likely location of a package's
documentation URL, and then tries to open it using the `--browser`
-config param. If no package name is provided, it will search for
-a `package.json` in the current folder and use the `name` property.
+config param. You can pass multiple package names at once. If no
+package name is provided, it will search for a `package.json` in
+the current folder and use the `name` property.
## CONFIGURATION
diff --git a/deps/npm/doc/cli/npm-search.md b/deps/npm/doc/cli/npm-search.md
index 79807f994..4757ad320 100644
--- a/deps/npm/doc/cli/npm-search.md
+++ b/deps/npm/doc/cli/npm-search.md
@@ -3,7 +3,7 @@ npm-search(1) -- Search for packages
## SYNOPSIS
- npm search [search terms ...]
+ npm search [--long] [search terms ...]
npm s [search terms ...]
npm se [search terms ...]
@@ -15,6 +15,18 @@ If a term starts with `/`, then it's interpreted as a regular expression.
A trailing `/` will be ignored in this case. (Note that many regular
expression characters must be escaped or quoted in most shells.)
+## CONFIGURATION
+
+### long
+
+* Default: false
+* Type: Boolean
+
+Display full package descriptions and other long text across multiple
+lines. When disabled (default) search results are truncated to fit
+neatly on a single line. Modules with extremely long names will
+fall on multiple lines.
+
## SEE ALSO
* npm-registry(7)