do not crash when a manpath directory contains a symbolic link

[mandoc.git] / man.conf.5

diff --git a/man.conf.5 b/man.conf.5
index be0998087d171a74eba2b63b66a16d0c5fe050f3..ffe9fcc070580078819252eb1b7fe30bfdc773db 100644 (file)
--- a/man.conf.5
+++ b/man.conf.5
@@ -1,6 +1,6 @@
-.\"    $Id: man.conf.5,v 1.5 2017/08/22 18:17:52 schwarze Exp $
+.\"    $Id: man.conf.5,v 1.8 2020/02/10 14:42:10 schwarze Exp $

 .\"
 .\"

-.\" Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>

 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above


@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"

-.Dd $Mdocdate: August 22 2017 $
+.Dd $Mdocdate: February 10 2020 $

 .Dt MAN.CONF 5
 .Os
 .Sh NAME
 .Dt MAN.CONF 5
 .Os
 .Sh NAME


@@ -98,17 +98,14 @@ manual.
 .It Ic man      Ta string   Ta Cm html Ta path for \&Xr links
 .It Ic paper    Ta string   Ta Cm ps , pdf Ta paper size
 .It Ic style    Ta string   Ta Cm html Ta CSS file
 .It Ic man      Ta string   Ta Cm html Ta path for \&Xr links
 .It Ic paper    Ta string   Ta Cm ps , pdf Ta paper size
 .It Ic style    Ta string   Ta Cm html Ta CSS file

+.It Ic toc      Ta none     Ta Cm html Ta print table of contents

 .It Ic width    Ta integer  Ta Cm ascii , utf8 Ta right margin
 .El
 .It Ic width    Ta integer  Ta Cm ascii , utf8 Ta right margin
 .El

-.It Ic _whatdb Ar path Ns Cm /whatis.db
-This directive provides the same functionality as
-.Ic manpath ,
-but using a historic and misleading syntax.
-It is kept for backward compatibility for now,
-but will eventually be removed.

 .El
 .Sh FILES
 .El
 .Sh FILES

-.Pa /etc/man.conf
+.Bl -tag -width /etc/examples/man.conf -compact
+.It Pa /etc/man.conf
+.El

 .Sh EXAMPLES
 The following configuration file reproduces the defaults:
 installing it is equivalent to not having a
 .Sh EXAMPLES
 The following configuration file reproduces the defaults:
 installing it is equivalent to not having a