===================================================================
RCS file: /cvs/mandoc/apropos.1,v
retrieving revision 1.16
retrieving revision 1.16.2.3
diff -u -p -r1.16 -r1.16.2.3
--- mandoc/apropos.1	2011/12/25 19:35:44	1.16
+++ mandoc/apropos.1	2013/10/05 01:25:20	1.16.2.3
@@ -1,4 +1,4 @@
-.\"	$Id: apropos.1,v 1.16 2011/12/25 19:35:44 kristaps Exp $
+.\"	$Id: apropos.1,v 1.16.2.3 2013/10/05 01:25:20 schwarze Exp $
 .\"
 .\" Copyright (c) 2011 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: December 25 2011 $
+.Dd $Mdocdate: October 5 2013 $
 .Dt APROPOS 1
 .Os
 .Sh NAME
@@ -23,8 +23,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl C Ar file
-.Op Fl M Ar manpath
-.Op Fl m Ar manpath
+.Op Fl M Ar path
+.Op Fl m Ar path
 .Op Fl S Ar arch
 .Op Fl s Ar section
 .Ar expression ...
@@ -58,13 +58,13 @@ Specify an alternative configuration
 in
 .Xr man.conf 5
 format.
-.It Fl M Ar manpath
+.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.
-.It Fl m Ar manpath
+.It Fl m Ar path
 Prepend the colon-separated paths to the list of paths searched
 for
 .Xr mandocdb 8
@@ -260,11 +260,11 @@ If none of these conditions are met, it overrides the 
 .El
 .Sh FILES
 .Bl -tag -width "/etc/man.conf" -compact
-.It Pa whatis.db
+.It Pa mandoc.db
 name of the
 .Xr mandocdb 8
 keyword database
-.It Pa whatis.index
+.It Pa mandoc.index
 name of the
 .Xr mandocdb 8
 filename database
@@ -308,5 +308,4 @@ as variable names in the library category:
 The
 .Nm
 utility was written by
-.An Kristaps Dzonsons ,
-.Mt kristaps@bsd.lv .
+.An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .