=================================================================== RCS file: /cvs/mandoc/apropos.1,v retrieving revision 1.27 retrieving revision 1.30 diff -u -p -r1.27 -r1.30 --- mandoc/apropos.1 2014/04/18 09:47:09 1.27 +++ mandoc/apropos.1 2014/08/21 01:52:59 1.30 @@ -1,4 +1,4 @@ -.\" $Id: apropos.1,v 1.27 2014/04/18 09:47:09 schwarze Exp $ +.\" $Id: apropos.1,v 1.30 2014/08/21 01:52:59 schwarze Exp $ .\" .\" Copyright (c) 2011, 2012 Kristaps Dzonsons .\" Copyright (c) 2011, 2012, 2014 Ingo Schwarze @@ -15,7 +15,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: April 18 2014 $ +.Dd $Mdocdate: August 21 2014 $ .Dt APROPOS 1 .Os .Sh NAME @@ -37,17 +37,17 @@ The and .Nm whatis utilities query manual page databases generated by -.Xr mandocdb 8 , +.Xr makewhatis 8 , evaluating .Ar expression for each file in each database. -By default, it displays the names, section numbers, and description lines +By default, they display the names, section numbers, and description lines of all matching manuals. .Pp By default, .Nm searches for -.Xr mandocdb 8 +.Xr makewhatis 8 databases in the default paths stipulated by .Xr man 1 and uses case-insensitive substring matching @@ -70,13 +70,13 @@ format. .It Fl M Ar path Use the colon-separated path instead of the default list of paths searched for -.Xr mandocdb 8 +.Xr makewhatis 8 databases. Invalid paths, or paths without manual databases, are ignored. .It Fl m Ar path Prepend the colon-separated paths to the list of paths searched for -.Xr mandocdb 8 +.Xr makewhatis 8 databases. Invalid paths, or paths without manual databases, are ignored. .It Fl O Ar outkey @@ -140,8 +140,8 @@ This has syntax .Op Ar key Op , Ar key ... .Pq Cm = | ~ .Oc -.Ar val -.Sm on , +.Ar val , +.Sm on where .Ar key is an @@ -196,7 +196,7 @@ If an architecture is specified in the output, use Queries evaluate over a subset of .Xr mdoc 7 macros indexed by -.Xr mandocdb 8 . +.Xr makewhatis 8 . In addition to the macro keys listed below, the special key .Cm any may be used to match any available macro key. @@ -293,7 +293,7 @@ standard search path. .Bl -tag -width "/etc/man.conf" -compact .It Pa mandoc.db name of the -.Xr mandocdb 8 +.Xr makewhatis 8 keyword database .It Pa /etc/man.conf default @@ -347,13 +347,21 @@ The following two invocations are equivalent: .Sh SEE ALSO .Xr man 1 , .Xr re_format 7 , -.Xr mandocdb 8 +.Xr makewhatis 8 .Sh HISTORY -An +Part of the functionality of +.Nm whatis +was already provided by the former +.Nm manwhere +utility in +.Bx 1 . +The .Nm -utility first appeared in +and +.Nm whatis +utilities first appeared in .Bx 2 . -It was rewritten from scratch for +They were rewritten from scratch for .Ox 5.6 . .Pp The @@ -373,13 +381,23 @@ and and .Fl s in -.Ox 4.5 . +.Ox 4.5 +for +.Nm +and in +.Ox 5.6 +for +.Nm whatis . .Sh AUTHORS .An -nosplit .An Bill Joy -wrote the original +wrote +.Nm manwhere +in 1977 and the original .Bx .Nm +and +.Nm whatis in February 1979. The current version was written by .An Kristaps Dzonsons Aq Mt kristaps@bsd.lv