summaryrefslogtreecommitdiff
path: root/man/man1/apropos.man1
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-08-29 12:04:57 +0100
committerColin Watson <cjwatson@debian.org>2007-08-29 12:04:57 +0100
commit935dca567d8efa15d0c4f5464ad710fdaa9ad511 (patch)
tree3c97396e67f88664dfee0473b899e05f0d4f4ee1 /man/man1/apropos.man1
parentb545400e02e8b89570041787a22885344111f0ff (diff)
Add an option to apropos to display only items matching all keywords
(thanks, Alfie Costa; Debian bug #259340). * src/whatis.c (args, long_options, main): New -a/--and option for apropos. (usage): Document it. (apropos): Store a count of how many times each item has been seen in the hashtable. If --and was given, only display an item if its count equals the number of supplied keywords. (main): Store the number of supplied keywords. Adjust hash free function. * man/man1/apropos.man1 (SYNOPSIS, OPTIONS): Document --and. * docs/NEWS: Document this.
Diffstat (limited to 'man/man1/apropos.man1')
-rw-r--r--man/man1/apropos.man16
1 files changed, 5 insertions, 1 deletions
diff --git a/man/man1/apropos.man1 b/man/man1/apropos.man1
index 21eb8bb2..f557a92c 100644
--- a/man/man1/apropos.man1
+++ b/man/man1/apropos.man1
@@ -14,7 +14,7 @@
%apropos% \- search the manual page names and descriptions
.SH SYNOPSIS
.B %apropos%
-.RB [\| \-dlhV \|]
+.RB [\| \-dalhV \|]
.RB [\| \-e \||\| \-w \||\| \-r\c
\|]
.RB [\| \-s
@@ -88,6 +88,10 @@ description.
Each keyword will be exactly matched against the page names and the
descriptions.
.TP
+.B \-a, \-\-and
+Only display items that match all the supplied keywords.
+The default is to display items that match any keyword.
+.TP
.B \-l, \-\-long
Do not trim output to the terminal width.
Normally, output will be truncated to the terminal width to avoid ugly