===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandoc.1,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** src/usr.bin/mandoc/mandoc.1	2014/08/27 00:06:08	1.60
--- src/usr.bin/mandoc/mandoc.1	2014/08/30 18:04:52	1.61
***************
*** 1,4 ****
! .\"	$OpenBSD: mandoc.1,v 1.60 2014/08/27 00:06:08 schwarze Exp $
  .\"
  .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! .\"	$OpenBSD: mandoc.1,v 1.61 2014/08/30 18:04:52 schwarze Exp $
  .\"
  .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 15,21 ****
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: August 27 2014 $
  .Dt MANDOC 1
  .Os
  .Sh NAME
--- 15,21 ----
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: August 30 2014 $
  .Dt MANDOC 1
  .Os
  .Sh NAME
***************
*** 23,29 ****
  .Nd format and display UNIX manuals
  .Sh SYNOPSIS
  .Nm mandoc
! .Op Fl acV
  .Sm off
  .Op Fl I Cm os Li = Ar name
  .Sm on
--- 23,29 ----
  .Nd format and display UNIX manuals
  .Sh SYNOPSIS
  .Nm mandoc
! .Op Fl acfklV
  .Sm off
  .Op Fl I Cm os Li = Ar name
  .Sm on
***************
*** 51,57 ****
  .Fl T Ns Cm ascii
  output.
  .Pp
! The arguments are as follows:
  .Bl -tag -width Ds
  .It Fl a
  If the standard output is a terminal device and
--- 51,57 ----
  .Fl T Ns Cm ascii
  output.
  .Pp
! The options are as follows:
  .Bl -tag -width Ds
  .It Fl a
  If the standard output is a terminal device and
***************
*** 68,73 ****
--- 68,81 ----
  This is the default.
  It can be specified to override
  .Fl a .
+ .It Fl f
+ A synonym for
+ .Xr whatis 1 .
+ This overrides any earlier
+ .Fl k
+ and
+ .Fl l
+ options.
  .Sm off
  .It Fl I Cm os Li = Ar name
  .Sm on
***************
*** 77,82 ****
--- 85,106 ----
  .Xr mdoc 7
  .Sq \&Os
  macro.
+ .It Fl k
+ A synonym for
+ .Xr apropos 1 .
+ This overrides any earlier
+ .Fl f
+ and
+ .Fl l
+ options.
+ .It Fl l
+ A synonym for
+ .Fl a .
+ Also reverts any earlier
+ .Fl f
+ and
+ .Fl k
+ options.
  .It Fl m Ns Ar format
  Input format.
  See
***************
*** 137,142 ****
--- 161,178 ----
  .Nm
  will halt with the first failed parse.
  .El
+ .Pp
+ In
+ .Fl f
+ and
+ .Fl k
+ mode,
+ .Nm
+ also supports the options
+ .Fl CMmOSsw
+ described in the
+ .Xr apropos 1
+ manual.
  .Ss Input Formats
  The
  .Nm