===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/apropos.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/mandoc/apropos.1	2011/11/26 13:07:15	1.5
--- src/usr.bin/mandoc/apropos.1	2011/11/26 16:41:35	1.6
***************
*** 1,4 ****
! .\"	$Id: apropos.1,v 1.5 2011/11/26 13:07:15 schwarze Exp $
  .\"
  .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\"
--- 1,4 ----
! .\"	$Id: apropos.1,v 1.6 2011/11/26 16:41:35 schwarze Exp $
  .\"
  .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\"
***************
*** 19,40 ****
  .Os
  .Sh NAME
  .Nm apropos
! .Nd search the manual page database
  .Sh SYNOPSIS
  .Nm
  .Op Fl S Ar arch
  .Op Fl s Ar section
  .Ar expression...
  .Sh DESCRIPTION
  The
  .Nm
! utility queries a manual page database generated by
  .Xr mandocdb 8 ,
  evaluating on
  .Ar expression
! for each file in the database.
  Its arguments are as follows:
  .Bl -tag -width Ds
  .It Fl S Ar arch
  Search only for a particular architecture.
  .It Fl s Ar cat
--- 19,54 ----
  .Os
  .Sh NAME
  .Nm apropos
! .Nd search manual page databases
  .Sh SYNOPSIS
  .Nm
+ .Op Fl M Ar manpath
+ .Op Fl m Ar manpath
  .Op Fl S Ar arch
  .Op Fl s Ar section
  .Ar expression...
  .Sh DESCRIPTION
  The
  .Nm
! utility queries manual page databases generated by
  .Xr mandocdb 8 ,
  evaluating on
  .Ar expression
! for each file in each database.
  Its arguments are as follows:
  .Bl -tag -width Ds
+ .It Fl M Ar manpath
+ 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
+ Prepend the colon-separated paths to the list of paths searched
+ for
+ .Xr mandocdb 8
+ databases.
+ Invalid paths, or paths without manual databases, are ignored.
  .It Fl S Ar arch
  Search only for a particular architecture.
  .It Fl s Ar cat
***************
*** 104,109 ****
--- 118,127 ----
  .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
***************
*** 133,144 ****
  If an architecture is specified in the output, use
  .Pp
  .Dl $ man \-s sec \-S arch title
! .\" .Sh IMPLEMENTATION NOTES
! .\" Not used in OpenBSD.
! .\" .Sh RETURN VALUES
! .\" For sections 2, 3, & 9 only.
! .\" .Sh ENVIRONMENT
! .\" For sections 1, 6, 7, & 8 only.
  .\" .Sh FILES
  .Sh EXIT STATUS
  .Ex -std
--- 151,165 ----
  If an architecture is specified in the output, use
  .Pp
  .Dl $ man \-s sec \-S arch title
! .Sh ENVIRONMENT
! .Bl -tag -width Ds
! .It Ev MANPATH
! Colon-separated paths overriding the default list of paths searched for
! manual databases.
! Invalid paths, or paths without manual databases, are ignored.
! Overridden by
! .Fl M .
! .El
  .\" .Sh FILES
  .Sh EXIT STATUS
  .Ex -std
***************
*** 172,194 ****
  in any letter case:
  .Pp
  .Dl $ apropos \-\- \-i posix
- .\" .Sh DIAGNOSTICS
- .\" For sections 1, 4, 6, 7, & 8 only.
- .\" .Sh ERRORS
- .\" For sections 2, 3, & 9 only.
  .Sh SEE ALSO
  .Xr man 1 ,
  .Xr mandoc 1 ,
  .Xr re_format 7
- .\" .Sh STANDARDS
- .\" .Sh HISTORY
  .Sh AUTHORS
  The
  .Nm
  utility was written by
  .An Kristaps Dzonsons ,
  .Mt kristaps@bsd.lv .
- .\" .Sh CAVEATS
- .\" .Sh BUGS
- .\" .Sh SECURITY CONSIDERATIONS
- .\" Not used in OpenBSD.
--- 193,205 ----