One of the WARNING messages has to use the word "section" twice in two

[mandoc.git] / apropos.1

diff --git a/apropos.1 b/apropos.1
index 55b16f7f940088acccc2deb26afdcf663611fead..dc849ce218132f3d8e4fcb342a7c585eb84b54aa 100644 (file)
--- a/apropos.1
+++ b/apropos.1
@@ -1,6 +1,6 @@
-.\"    $Id: apropos.1,v 1.8 2011/11/23 10:09:30 kristaps Exp $
+.\"    $Id: apropos.1,v 1.21 2013/07/13 19:41:16 schwarze Exp $

 .\"
 .\"

-.\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>

 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above


@@ -14,37 +14,60 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"

-.Dd $Mdocdate: November 23 2011 $
+.Dd $Mdocdate: July 13 2013 $

 .Dt APROPOS 1
 .Os
 .Sh NAME
 .Dt APROPOS 1
 .Os
 .Sh NAME

-.Nm apropos
+.Nm apropos ,
+.Nm whatis

 .Nd search manual page databases
 .Sh SYNOPSIS
 .Nm
 .Nd search manual page databases
 .Sh SYNOPSIS
 .Nm

-.Op Fl M Ar manpath
-.Op Fl m Ar manpath
+.Op Fl C Ar file
+.Op Fl M Ar path
+.Op Fl m Ar path

 .Op Fl S Ar arch
 .Op Fl s Ar section
 .Op Fl S Ar arch
 .Op Fl s Ar section

-.Ar expression...
+.Ar expression ...

 .Sh DESCRIPTION
 The
 .Sh DESCRIPTION
 The

-.Nm
-utility queries manual page databases generated by
+.Nm apropos
+and
+.Nm whatis
+utilities query manual page databases generated by

 .Xr mandocdb 8 ,
 evaluating on
 .Ar expression
 for each file in each database.
 .Xr mandocdb 8 ,
 evaluating on
 .Ar expression
 for each file in each database.

+.Pp
+By default,
+.Nm
+searches for
+.Xr mandocdb 8
+databases in the default paths stipulated by
+.Xr man 1
+and
+maps terms to case-sensitive manual names and descriptions.
+Multiple terms are OR'd.
+.Nm whatis
+maps terms only to case-sensitive manual names.
+.Pp

 Its arguments are as follows:
 .Bl -tag -width Ds
 Its arguments are as follows:
 .Bl -tag -width Ds

-.It Fl M Ar manpath
+.It Fl C Ar file
+Specify an alternative configuration
+.Ar file
+in
+.Xr man.conf 5
+format.
+.It Fl M Ar path

 Use the colon-separated path instead of the default list of paths
 searched for
 .Xr mandocdb 8
 databases.
 Invalid paths, or paths without manual databases, are ignored.
 Use the colon-separated path instead of the default list of paths
 searched for
 .Xr mandocdb 8
 databases.
 Invalid paths, or paths without manual databases, are ignored.

-.It Fl m Ar manpath
-Append the colon-separated paths to the list of paths searched
+.It Fl m Ar path
+Prepend the colon-separated paths to the list of paths searched

 for
 .Xr mandocdb 8
 databases.
 for
 .Xr mandocdb 8
 databases.


@@ -58,81 +81,37 @@ See
 for a listing of manual sections.
 .El
 .Pp
 for a listing of manual sections.
 .El
 .Pp

-An
+.Nm whatis
+considers an

 .Ar expression
 .Ar expression

-consists of search terms joined by logical operators
-.Fl a
-.Pq and
-and
-.Fl o
-.Pq or .
-The
-.Fl a
-operator has precedence over
-.Fl o
-and both are evaluated left-to-right.
-.Bl -tag -width Ds
-.It \&( Ar expr No \&)
-True if the subexpression
-.Ar expr
-is true.
-.It Ar expr1 Fl a Ar expr2
-True if both
-.Ar expr1
-and
-.Ar expr2
-are true (logical
-.Qq and ) .
-.It Ar expr1 Oo Fl o Oc Ar expr2
-True if
-.Ar expr1
-and/or
-.Ar expr2
-evaluate to true (logical
-.Qq or ) .
-.It Ar term
-True if
-.Ar term
-is satisfied.
-This has syntax
+to consist of an opaque keyword.
+.Nm apropos
+parses a
+.Ar expression
+into type and keyword pairs.
+This pair syntax

 .Li [key[,key]*(=~)]?val ,
 where operand
 .Li [key[,key]*(=~)]?val ,
 where operand

-.Li key
+.Cm key

 is an
 .Xr mdoc 7
 macro to query and
 is an
 .Xr mdoc 7
 macro to query and

-.Li val
+.Cm val

 is its value.
 is its value.

+See
+.Sx Macro Keys
+for a list of available keys.

 Operator
 .Li \&=
 Operator
 .Li \&=

-evaluates a substring, while
+evaluates a full string, while

 .Li \&~
 .Li \&~

-evaluates a regular expression.
-.It Fl i Ar term
-Same as
-.Ar term ,
-but
-.Ar term
-is evaluated case-insensitively.
-.El
+evaluates a
+.Xr glob 7
+pattern.

 .Pp
 .Pp

-By default,
-.Nm
-searches for
-.Xr mandocdb 8
-databases in the default paths stipulated by
-.Xr man 1 ,
-parses terms as case-sensitive regular expressions
-.Pq the Li \&~ operator
-over manual names and descriptions
-.Pq the Li \&Nm No and Li \&Nd No macros .
-Multiple terms imply pairwise
-.Fl o .

 Results are sorted by manual title, with output formatted as
 Results are sorted by manual title, with output formatted as

-.Pp
-.D1 title(sec) \- description
-.Pp
-Where
+.Qq title(sec) \- description
+where

 .Qq title
 is the manual's title (note multiple manual names may exist for one
 title),
 .Qq title
 is the manual's title (note multiple manual names may exist for one
 title),


@@ -141,65 +120,146 @@ is the manual section, and
 .Qq description
 is the manual's short description.
 If an architecture is specified for the manual, it is displayed as
 .Qq description
 is the manual's short description.
 If an architecture is specified for the manual, it is displayed as

+.Qq title(cat/arch) \- description .
+.Ss Macro Keys
+.Nm apropos
+queries evaluate over a subset of
+.Xr mdoc 7
+macros indexed by
+.Xr mandocdb 8 .
+In addition to the macro keys listed below, the special key
+.Cm any
+may be used to match any available macro key.

 .Pp
 .Pp

-.D1 title(cat/arch) \- description
+Names and description:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&Nm Ta manual name
+.It Li \&Nd Ta one-line manual description
+.El
+.Pp
+Sections and cross references:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&Sh Ta section header (excluding standard sections)
+.It Li \&Ss Ta subsection header
+.It Li \&Xr Ta cross reference to another manual page
+.It Li \&Rs Ta bibliographic reference
+.El

 .Pp
 .Pp

-Resulting manuals may be accessed as
+Semantic markup for command line utilities:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&Fl Ta command line options (flags)
+.It Li \&Cm Ta command modifier
+.It Li \&Ar Ta command argument
+.It Li \&Ic Ta internal or interactive command
+.It Li \&Ev Ta environmental variable
+.It Li \&Pa Ta file system path
+.El

 .Pp
 .Pp

-.Dl $ man \-s sec title
+Semantic markup for function libraries:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&Lb Ta function library name
+.It Li \&In Ta include file
+.It Li \&Ft Ta function return type
+.It Li \&Fn Ta function name
+.It Li \&Fa Ta function argument type and name
+.It Li \&Vt Ta variable type
+.It Li \&Va Ta variable name
+.It Li \&Dv Ta defined variable or preprocessor constant
+.It Li \&Er Ta error constant
+.It Li \&Ev Ta environmental variable
+.El

 .Pp
 .Pp

-If an architecture is specified in the output, use
+Various semantic markup:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&An Ta author name
+.It Li \&Lk Ta hyperlink
+.It Li \&Mt Ta Do mailto Dc hyperlink
+.It Li \&Cd Ta kernel configuration declaration
+.It Li \&Ms Ta mathematical symbol
+.It Li \&Tn Ta tradename
+.El

 .Pp
 .Pp

-.Dl $ man \-s sec \-S arch title
+Physical markup:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&Em Ta italic font or underline
+.It Li \&Sy Ta boldface font
+.It Li \&Li Ta typewriter font
+.El
+.Pp
+Text production:
+.Bl -column "xLix" description -offset indent -compact
+.It Li \&St Ta reference to a standards document
+.It Li \&At Ta At No version reference
+.It Li \&Bx Ta Bx No version reference
+.It Li \&Bsx Ta Bsx No version reference
+.It Li \&Nx Ta Nx No version reference
+.It Li \&Fx Ta Fx No version reference
+.It Li \&Ox Ta Ox No version reference
+.It Li \&Dx Ta Dx No version reference
+.El

 .Sh ENVIRONMENT
 .Bl -tag -width Ds
 .It Ev MANPATH
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
 .It Ev MANPATH

-Comma-separated paths overriding the default list of paths searched for
+Colon-separated paths modifying the default list of paths searched for

 manual databases.
 Invalid paths, or paths without manual databases, are ignored.
 manual databases.
 Invalid paths, or paths without manual databases, are ignored.

-Takes precedence over
+Overridden by

 .Fl M .
 .Fl M .

+If
+.Ev MANPATH
+begins with a
+.Sq \&: ,
+it is appended to the default list;
+else if it ends with
+.Sq \&: ,
+it is prepended to the default list; else if it contains
+.Sq \&:: ,
+the default list is inserted between the colons.
+If none of these conditions are met, it overrides the default list.
+.El
+.Sh FILES
+.Bl -tag -width "/etc/man.conf" -compact
+.It Pa mandocdb.db
+name of the
+.Xr mandocdb 8
+keyword database
+.It Pa /etc/man.conf
+default
+.Xr man 1
+configuration file

 .El
 .El

-.\" .Sh FILES

 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 Search for
 .Qq mdoc
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 Search for
 .Qq mdoc

-within the manual name and description:
+as a word or
+.Xr glob 7
+expression:

 .Pp
 .Dl $ apropos mdoc
 .Pp
 .Dl $ apropos mdoc

+.Dl $ apropos any~mdoc*

 .Pp
 .Pp

-Two variants of searching for
-.Qq mdoc ,
-.Qq roff ,
-or
+Include matches for
+.Qq roff
+and

 .Qq man
 .Qq man

-within manual names and descriptions:
+using
+.Xr glob 7
+expressions:

 .Pp
 .Pp

-.Dl $ apropos mdoc roff man
-.Dl $ apropos mdoc \-o roff \-o man
+.Dl $ apropos ~*mdoc* ~*roff*

 .Pp
 Search for
 .Pp
 Search for

-.Qq optind
-and

 .Qq optarg
 .Qq optarg

-as variable names in the library category:
-.Pp
-.Dl $ apropos \-s 3 \(dqVa~^optind$\(dq -a \(dqVa~^optarg$\(dq
+as a variable name in the library category:

 .Pp
 .Pp

-Search for all manuals referencing
-.Qq POSIX
-in any letter case:
-.Pp
-.Dl $ apropos \-\- \-i posix
+.Dl $ apropos \-s 3 Va=optarg

 .Sh SEE ALSO
 .Sh SEE ALSO

-.Xr man 1 ,
-.Xr mandoc 1 ,
-.Xr re_format 7
+.Xr glob 7 ,
+.Xr mandocdb 8

 .Sh AUTHORS
 The
 .Nm
 utility was written by
 .Sh AUTHORS
 The
 .Nm
 utility was written by

-.An Kristaps Dzonsons ,
-.Mt kristaps@bsd.lv .
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .