===================================================================
RCS file: /cvs/mandoc/man.1,v
retrieving revision 1.21
retrieving revision 1.23
diff -u -p -r1.21 -r1.23
--- mandoc/man.1	2017/01/31 19:44:04	1.21
+++ mandoc/man.1	2017/03/18 19:51:19	1.23
@@ -1,9 +1,9 @@
-.\"	$Id: man.1,v 1.21 2017/01/31 19:44:04 schwarze Exp $
+.\"	$Id: man.1,v 1.23 2017/03/18 19:51:19 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, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2010, 2011, 2014-2017 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: January 31 2017 $
+.Dd $Mdocdate: March 18 2017 $
 .Dt MAN 1
 .Os
 .Sh NAME
@@ -234,6 +234,10 @@ System maintenance and operation commands.
 .It 9
 Kernel internals.
 .El
+.Pp
+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
@@ -318,7 +322,7 @@ is case insensitive.
 .It Ev MANPAGER
 Any non-empty value of the environment variable
 .Ev MANPAGER
-will be used instead of the standard pagination program,
+is used instead of the standard pagination program,
 .Xr more 1 .
 If
 .Xr less 1
@@ -342,13 +346,27 @@ information about the term last searched for with
 .It Ev MANPATH
 The standard search path used by
 .Nm
-may be overridden by specifying a path in the
+may be changed by specifying a path in the
 .Ev MANPATH
-environment
-variable.
+environment variable.
 The format of the path is a colon
 .Pq Ql \&:
 separated list of directories.
+Invalid paths, or paths without manual databases, are ignored.
+Overridden by
+.Fl M ,
+ignored if
+.Fl l
+is specified.
+.Pp
+If
+.Ev MANPATH
+begins with a colon, it is appended to the default list;
+if it ends with a colon, it is prepended to the default list;
+or if it contains two adjacent colons,
+the standard search path is inserted between the colons.
+If none of these conditions are met, it overrides the
+standard search path.
 .It Ev PAGER
 Specifies the pagination program to use when
 .Ev MANPAGER
@@ -356,7 +374,12 @@ is not defined.
 If neither PAGER nor MANPAGER is defined,
 .Xr more 1
 .Fl s
-will be used.
+is used.
+Only used if
+.Fl a
+or
+.Fl l
+is specified.
 .El
 .Sh FILES
 .Bl -tag -width /etc/man.conf -compact