===================================================================
RCS file: /cvs/mandoc/man.1,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- mandoc/man.1	2014/11/11 02:43:41	1.7
+++ mandoc/man.1	2015/01/15 04:26:40	1.11
@@ -1,9 +1,9 @@
-.\"	$Id: man.1,v 1.7 2014/11/11 02:43:41 schwarze Exp $
+.\"	$Id: man.1,v 1.11 2015/01/15 04:26:40 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 2003, 2007, 2008, 2014 Jason McIntyre <jmc@openbsd.org>
-.\" Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2010, 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)man.1	8.2 (Berkeley) 1/2/94
 .\"
-.Dd $Mdocdate: November 11 2014 $
+.Dd $Mdocdate: January 15 2015 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -41,10 +41,15 @@
 .Nm man
 .Op Fl acfhklVw
 .Op Fl C Ar file
+.Op Fl I Cm os Ns = Ns Ar name
+.Op Fl K Ar encoding
 .Op Fl M Ar path
 .Op Fl m Ar path
+.Op Fl O Ar option Ns = Ns Ar value
 .Op Fl S Ar subsection
 .Op Fl s Ar section
+.Op Fl T Ar output
+.Op Fl W Ar level
 .Op Ar section
 .Ar name ...
 .Sh DESCRIPTION
@@ -95,12 +100,34 @@ This overrides any earlier
 and
 .Fl l
 options.
+.It Fl I Cm os Ns = Ns Ar name
+Override the default operating system
+.Ar name
+for the
+.Xr mdoc 7
+.Ic \&Os
+and for the
+.Xr man 7
+.Ic \&TH
+macro.
 .It Fl h
 Display only the SYNOPSIS lines of the requested manual pages.
 Implies
 .Fl a
 and
 .Fl c .
+.It Fl K Ar encoding
+Specify the input encoding.
+The supported
+.Ar encoding
+arguments are
+.Cm us-ascii ,
+.Cm iso-8859-1 ,
+and
+.Cm utf-8 .
+By default, the encoding is automatically detected as described in the
+.Xr mandoc 1
+manual.
 .It Fl k
 A synonym for
 .Xr apropos 1 .
@@ -173,6 +200,11 @@ are specified by the
 line in the
 .Nm
 configuration file.
+.It Fl O Ar option Ns = Ns Ar value
+Comma-separated output options.
+For each output format, the available options are described in the
+.Xr mandoc 1
+manual.
 .It Fl S Ar subsection
 Restricts the directories that
 .Nm
@@ -242,8 +274,44 @@ specifies the possible
 .Ar section
 values, and their search order.
 Additional sections may be specified.
+.It Fl T Ar output
+Select the output format.
+The default is
+.Cm locale .
+The other output modes
+.Cm ascii ,
+.Cm html ,
+.Cm lint ,
+.Cm man ,
+.Cm pdf ,
+.Cm ps ,
+.Cm tree ,
+and
+.Cm utf8
+are described in the
+.Xr mandoc 1
+manual.
 .It Fl V
 Print version and exit.
+.It Fl W Ar level
+Specify the minimum message
+.Ar level
+to be reported on the standard error output and to affect the exit status.
+The
+.Ar level
+can be
+.Cm warning
+or
+.Cm error ;
+.Cm all
+is an alias for
+.Cm warning .
+By default,
+.Nm
+is silent.
+See the
+.Xr mandoc 1
+manual for details.
 .It Fl w
 List the pathnames of the manual pages which
 .Nm
@@ -254,14 +322,6 @@ and
 combination.
 .El
 .Pp
-The
-.Nm
-utility also supports the options
-.Fl IKOTW
-described in the
-.Xr mandoc 1
-manual.
-.Pp
 Guidelines for writing
 man pages can be found in
 .Xr mdoc 7 .
@@ -355,7 +415,7 @@ utility is compliant with the
 specification.
 .Pp
 The flags
-.Op Fl aCcfhMmSsw ,
+.Op Fl aCcfhIKlMmOSsTVWw ,
 as well as the environment variables
 .Ev MACHINE ,
 .Ev MANPAGER ,