- Add an OPTIONAL_MANPATH directive (same as MANDATORY_MANPATH,

  except an absence of the directory is not considered an error
  and doesn't produce a warning).
  Put /usr/local/lib/perl5/*/man under OPTIONAL_MANPATH.

- An order of directives in manpath.config is now irrelevant.

- Get rid of infinite loop when PATH is unset or NULL, and
  MANDATORY_MANPATH directory doesn't exist.

- mdoc(9)ify manpage.

Reviewed by:	des, markm, sheldonh

1 files changed, 22 insertions, 14 deletions

diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index 3a80dbc..c27c074 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -4,7 +4,7 @@
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the README file that comes with the man 1.0
-.\" distribution.  
+.\" distribution.
 .\"
 .\" John W. Eaton
 .\" jwe@che.utexas.edu
@@ -12,7 +12,8 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.Dd Jan 5, 1991
+.\" $Id$
+.Dd Aug 16, 1999
 .Dt MANPATH 1
 .Os
 .Sh NAME
@@ -22,27 +23,34 @@
 .Nm
 .Op Fl q
 .Sh DESCRIPTION
-.Nm manpath
+.Nm Manpath
 tries to determine the user's manpath from a set of system
 defaults and the user's
 .Ev PATH ,
-echoing the result to the standard output.  Warnings and errors are
-written to the standard error.
-If a directory in the user's path is not listed in the manpath.config
-file, manpath looks for the subdirectories man or MAN.  If they exist,
-they are added to the search path.
-.Pp
+echoing the result to the standard output.
+Warnings and errors are written to the standard error.
+If a directory in the user's path is not listed in the
+.Pa %manpath_config_file%
+file,
 .Nm
+looks for the subdirectories
+.Pa man
+or
+.Pa MAN .
+If they exist, they are added to the search path.
+.Pp
+.Nm Manpath
 is used by
-.Nm man
-to determine the search path, so user's normally don't need to set the
+.Xr man 1
+to determine the search path, so users normally don't need to set the
 .Ev MANPATH
 environment variable directly.
 .Pp
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width Fl
 .It Fl q
-Operate quietly.  Only echo the final manpath.
+Operate quietly.
+Only echo the final manpath.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width MANPATH -compact
@@ -50,7 +58,7 @@ Operate quietly.  Only echo the final manpath.
 If
 .Ev MANPATH
 is set,
-.Nm manpath
+.Nm
 echoes its value on the standard output and issues a warning on the
 standard error.
 .El