===================================================================
RCS file: /cvs/mandoc/man.1,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- mandoc/man.1	2017/03/18 19:51:19	1.23
+++ mandoc/man.1	2017/03/25 12:46:36	1.26
@@ -1,4 +1,4 @@
-.\"	$Id: man.1,v 1.23 2017/03/18 19:51:19 schwarze Exp $
+.\"	$Id: man.1,v 1.26 2017/03/25 12:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)man.1	8.2 (Berkeley) 1/2/94
 .\"
-.Dd $Mdocdate: March 18 2017 $
+.Dd $Mdocdate: March 25 2017 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -102,28 +102,6 @@ Implies
 .Fl a
 and
 .Fl c .
-.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 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 .
@@ -184,15 +162,8 @@ the directories specified using the
 option or the
 .Ev MANPATH
 environment variable.
-.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
-will search to those of a specific
+Only show pages for the specified
 .Xr machine 1
 architecture.
 .Ar subsection
@@ -238,53 +209,16 @@ Kernel internals.
 If not specified and a match is found in more than one section,
 the first match is selected from the following list:
 1, 8, 6, 2, 3, 5, 7, 4, 9, 3p.
-.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 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 ,
-.Cm error ,
-or
-.Cm unsupp ;
-.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
-would display for the specified
-.Ar section
-and
-.Ar name
-combination.
+List the pathnames of all matching manual pages instead of displaying
+any of them.
 .El
 .Pp
+The options
+.Fl IKOTW
+are also supported and are documented in
+.Xr mandoc 1 .
+.Pp
 Guidelines for writing
 man pages can be found in
 .Xr mdoc 7 .
@@ -294,13 +228,7 @@ for example
 .Pa cat1/foo.0
 and
 .Pa man1/foo.1 ,
-exist in the same directory, and at least one of them is selected,
-only the newer one is used.
-However, if both the
-.Fl a
-and the
-.Fl w
-options are specified, both file names are printed.
+exist in the same directory, only the unformatted version is used.
 .Sh ENVIRONMENT
 .Bl -tag -width MANPATHX
 .It Ev MACHINE
@@ -388,10 +316,12 @@ default man configuration file
 .El
 .Sh EXIT STATUS
 .Ex -std man
+See
+.Xr mandoc 1
+for details.
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr intro 1 ,
-.Xr whatis 1 ,
 .Xr whereis 1 ,
 .Xr intro 2 ,
 .Xr intro 3 ,