aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/apropos.1
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-04-04 15:51:28 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-04-04 15:51:28 +0000
commit7fb2fd7f16e762237be097523fb48320a165689e (patch)
tree4b9441e374e75e465648d6cdc09e8b523b1d2a28 /apropos.1
parent82bb800220e99f4a7ed77fa40ad9d82cf32010bd (diff)
downloadmandoc-7fb2fd7f16e762237be097523fb48320a165689e.tar.gz
mandoc-7fb2fd7f16e762237be097523fb48320a165689e.tar.zst
mandoc-7fb2fd7f16e762237be097523fb48320a165689e.zip
merge OpenBSD rev. 1.20, describing new features
Diffstat (limited to 'apropos.1')
-rw-r--r--apropos.126
1 files changed, 22 insertions, 4 deletions
diff --git a/apropos.1 b/apropos.1
index 10eb3d5e..bdbb9aa4 100644
--- a/apropos.1
+++ b/apropos.1
@@ -1,4 +1,4 @@
-.\" $Id: apropos.1,v 1.23 2014/03/17 09:43:56 schwarze Exp $
+.\" $Id: apropos.1,v 1.24 2014/04/04 15:51:28 schwarze Exp $
.\"
.\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: March 17 2014 $
+.Dd $Mdocdate: April 4 2014 $
.Dt APROPOS 1
.Os
.Sh NAME
@@ -26,6 +26,7 @@
.Op Fl C Ar file
.Op Fl M Ar path
.Op Fl m Ar path
+.Op Fl O Ar outkey
.Op Fl S Ar arch
.Op Fl s Ar section
.Ar expression ...
@@ -75,6 +76,10 @@ for
.Xr mandocdb 8
databases.
Invalid paths, or paths without manual databases, are ignored.
+.It Fl O Ar outkey
+Show the values associated with the key
+.Ar outkey
+instead of the manual descriptions.
.It Fl S Ar arch
Restrict the search to pages for the specified
.Xr machine 1
@@ -192,6 +197,8 @@ Names and description:
.Bl -column "xLix" description -offset indent -compact
.It Li \&Nm Ta manual name
.It Li \&Nd Ta one-line manual description
+.It Li arch Ta machine architecture (case-insensitive)
+.It Li sec Ta manual section number
.El
.Pp
Sections and cross references:
@@ -320,6 +327,15 @@ with the argument
.Qq ssh :
.Pp
.Dl $ apropos \-\- \-i 'Nm~[[:<:]]ssh[[:>:]]'
+.Pp
+The following two invocations are equivalent:
+.Pp
+.D1 Li $ apropos -S Ar arch Li -s Ar section expression
+.Bd -ragged -offset indent
+.Li $ apropos \e( Ar expression Li \e)
+.Li -a arch~^( Ns Ar arch Ns Li |any)$
+.Li -a sec~^ Ns Ar section Ns Li $
+.Ed
.Sh SEE ALSO
.Xr man 1 ,
.Xr re_format 7 ,
@@ -330,7 +346,7 @@ An
utility first appeared in
.Bx 2 .
It was rewritten from scratch for
-.Ox 5.1 .
+.Ox 5.6 .
.Pp
The
.Fl M
@@ -358,4 +374,6 @@ wrote the original
.Nm
in February 1979.
The current version was written by
-.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv
+and
+.An Ingo Schwarze Aq Mt schwarze@openbsd.org .