===================================================================
RCS file: /cvs/mandoc/apropos.1,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- mandoc/apropos.1	2011/11/18 07:02:19	1.4
+++ mandoc/apropos.1	2011/11/23 10:09:30	1.8
@@ -1,4 +1,4 @@
-.\"	$Id: apropos.1,v 1.4 2011/11/18 07:02:19 kristaps Exp $
+.\"	$Id: apropos.1,v 1.8 2011/11/23 10:09:30 kristaps Exp $
 .\"
 .\" Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,27 +14,41 @@
 .\" 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 18 2011 $
+.Dd $Mdocdate: November 23 2011 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
 .Nm apropos
-.Nd search the manual page database
+.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 a manual page database generated by
-.Xr mandocdb 8 , 
+utility queries manual page databases generated by
+.Xr mandocdb 8 ,
 evaluating on
 .Ar expression
-for each file in the database.
+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
+Append 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
@@ -57,7 +71,6 @@ The
 operator has precedence over
 .Fl o
 and both are evaluated left-to-right.
-.Pp
 .Bl -tag -width Ds
 .It \&( Ar expr No \&)
 True if the subexpression
@@ -105,6 +118,10 @@ is evaluated case-insensitively.
 .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
@@ -134,12 +151,15 @@ Resulting manuals may be accessed as
 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 ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev MANPATH
+Comma-separated paths overriding the default list of paths searched for
+manual databases.
+Invalid paths, or paths without manual databases, are ignored.
+Takes precedence over
+.Fl M .
+.El
 .\" .Sh FILES
 .Sh EXIT STATUS
 .Ex -std
@@ -173,23 +193,13 @@ Search for all manuals referencing
 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.