===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.conf.5,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/mandoc/man.conf.5	2015/03/26 23:45:37	1.1
--- src/usr.bin/mandoc/man.conf.5	2015/03/27 15:00:06	1.2
***************
*** 1,4 ****
! .\"	$OpenBSD: man.conf.5,v 1.1 2015/03/26 23:45:37 schwarze Exp $
  .\"
  .\" Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  .\"
--- 1,4 ----
! .\"	$OpenBSD: man.conf.5,v 1.2 2015/03/27 15:00:06 jmc Exp $
  .\"
  .\" Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  .\"
***************
*** 14,36 ****
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: March 26 2015 $
  .Dt MAN.CONF 5
  .Os
  .Sh NAME
  .Nm man.conf
! .Nd configuration file for man(1)
  .Sh DESCRIPTION
! The
! .Nm
! configuration file allows to specify non-standard directory trees
! for use by the
  .Xr man 1 ,
  .Xr apropos 1 ,
  and
  .Xr makewhatis 8
  utilities.
! Its presence and all directives are optional.
  .Pp
  This file is an ASCII text file.
  Leading whitespace on lines, lines starting with
--- 14,34 ----
  .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
! .Dd $Mdocdate: March 27 2015 $
  .Dt MAN.CONF 5
  .Os
  .Sh NAME
  .Nm man.conf
! .Nd configuration file for man
  .Sh DESCRIPTION
! This is the configuration file
! for the
  .Xr man 1 ,
  .Xr apropos 1 ,
  and
  .Xr makewhatis 8
  utilities.
! Its presence, and all directives, are optional.
  .Pp
  This file is an ASCII text file.
  Leading whitespace on lines, lines starting with
***************
*** 42,56 ****
  The following directives are supported:
  .Bl -tag -width Ds
  .It Ic manpath Ar path
! Specify that the absolute
  .Ar path
! contains a tree of manual pages, and that
  .Xr man 1 ,
  .Xr apropos 1 ,
  and
! .Xr makewhatis 8
! shall use it by default.
! Each such tree is supposed to contain subdirectories
  whose names consist of the strings
  .Sq man
  and/or
--- 40,56 ----
  The following directives are supported:
  .Bl -tag -width Ds
  .It Ic manpath Ar path
! Override the default search
  .Ar path
! for
  .Xr man 1 ,
  .Xr apropos 1 ,
  and
! .Xr makewhatis 8 .
! It can be used multiple times to specify multiple paths,
! with the order determining the manual page search order.
! .Pp
! Each path is a tree containing subdirectories
  whose names consist of the strings
  .Sq man
  and/or
***************
*** 60,70 ****
  .Xr mdoc 7
  and/or
  .Xr man 7
! format; file names are supposed to end with the name of the section
  preceded by a dot.
! The latter are supposed to contain preformatted manual pages;
! file names are supposed to end with
  .Ql .0 .
  Creating a
  .Xr mandoc.db 5
  database with
--- 60,71 ----
  .Xr mdoc 7
  and/or
  .Xr man 7
! format; file names should end with the name of the section
  preceded by a dot.
! The latter should contain preformatted manual pages;
! file names should end with
  .Ql .0 .
+ .Pp
  Creating a
  .Xr mandoc.db 5
  database with
***************
*** 75,88 ****
  .Xr apropos 1
  to work, but not strictly required for
  .Xr man 1 .
- .Pp
- Specifying at least one
- .Ic manpath
- directive does not append to the default search path
- but instead overrides it.
- The order of
- .Ic manpath
- directives determines the manual page search order.
  .It Ic _whatdb Ar path Ns Cm /whatis.db
  This directive provides the same functionality as
  .Ic manpath ,
--- 76,81 ----
***************
*** 94,102 ****
  .Pa /etc/man.conf
  .Sh EXAMPLES
  The following configuration file reproduces the defaults:
! Installing it is equivalent to not having a file
  .Nm
! at all.
  .Bd -literal -offset indent
  manpath /usr/share/man
  manpath /usr/X11R6/man
--- 87,95 ----
  .Pa /etc/man.conf
  .Sh EXAMPLES
  The following configuration file reproduces the defaults:
! installing it is equivalent to not having a
  .Nm
! file at all.
  .Bd -literal -offset indent
  manpath /usr/share/man
  manpath /usr/X11R6/man