===================================================================
RCS file: /cvs/mandoc/man.1,v
retrieving revision 1.23
retrieving revision 1.25
diff -u -p -r1.23 -r1.25
--- mandoc/man.1	2017/03/18 19:51:19	1.23
+++ mandoc/man.1	2017/03/22 13:31:49	1.25
@@ -1,4 +1,4 @@
-.\"	$Id: man.1,v 1.23 2017/03/18 19:51:19 schwarze Exp $
+.\"	$Id: man.1,v 1.25 2017/03/22 13:31:49 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 22 2017 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -190,9 +190,7 @@ For each output format, the available options are desc
 .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
@@ -276,13 +274,8 @@ 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
 Guidelines for writing
@@ -294,13 +287,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 +375,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 ,