Update the documentation slightly. Make the locality detector not fail

gratuitously.

2 files changed, 28 insertions, 16 deletions

diff --git a/man/autofs.5 b/man/autofs.5
index d47b215..015e333 100644
--- a/man/autofs.5
+++ b/man/autofs.5
@@ -1,6 +1,6 @@
 .\" t
 .\" $Id$
-.TH AUTOFS 5 "29 Sep 1997"
+.TH AUTOFS 5 "6 Apr 1998"
 .SH NAME
 autofs \- Format of the automounter maps
 .SH "DESCRIPTION"
@@ -8,7 +8,10 @@ The automounter maps are files or NIS maps referred to by the master map of
 the automounter (see
 .BR auto.master (5)).
 The automounter maps describe how file systems below the mountpoint of the map
-(given in the auto.master file) are to be mounted.
+(given in the auto.master file) are to be mounted.  This describes the
+.B sun
+map format; if another map format is specified (e.g. \fBhesiod\fP),
+this documentation does not apply.
 
 Maps can be changed on the fly and the automouter will recognize those
 changes on the next operation it performs on that map.  This is not
@@ -30,8 +33,9 @@ name below the mountpoint.
 .SS options
 Options are optional.  Options can also be given in the 
 .B auto.master
-file in which case both values are cumulative (Difference vs. SunOS!).
-The options are a list of comma separated options as customary for the
+file in which case both values are cumulative (this is a difference
+from SunOS).  The options are a list of comma separated options as
+customary for the
 .BR mount (8)
 command. There is a special option
 .I -fstype=
@@ -111,7 +115,12 @@ OSVERS	Version of OS (uname -v)
 Additional entries can be defined with the -Dvariable=Value option to
 .BR automount (8).
 .SS Executable Maps
-A map can be marked as executable.  Those will be called as a script with the
+A map can be marked as executable.  The init script that parses the
+auto.master map will pass this as a
+.B program
+map to the automounter.  A
+.B program
+map will be called as a script with the
 key as an argument.  The script needs to return one line of a map or no
 output at all if the key cannot be matched.
 .P
@@ -124,13 +133,16 @@ A executable map can return an errorcode to indicate the failure in addition
 to no output at all.  All output sent to stderr is logged into the system
 logs.
 .SH UNSUPPORTED
-The automounter does not support SunOS style replicated Filesystem and
-direct maps.
+The automounter does not support direct maps or mount trees (more than
+one filesystem to be mounted under a specific automount point), and
+handles SunOS-style replicated filesystems only to the extent that
+.BR mount (8)
+does.
 .SH "SEE ALSO"
 .BR automount (8),
 .BR auto.master (5),
-.BR autofs(8),
-.BR mount(8).
+.BR autofs (8),
+.BR mount (8).
 .SH AUTHOR
 This manual page was written by Christoph Lameter <chris@waterf.org>,
 for the Debian GNU/Linux system.  Edited by H. Peter Anvin
diff --git a/man/automount.8 b/man/automount.8
index 86ab58e..23e566f 100644
--- a/man/automount.8
+++ b/man/automount.8
@@ -65,16 +65,16 @@ The map is a hesiod database whose
 entries are used for maps.
 .RE
 .TP
-\fBformat\fP
-Format of the map data; currently the only format
-recognized is \fBsun\fP, which is a subset of the Sun automounter map
-format.  The default format is technically map type dependent,
-although currently all map types default to \fBsun\fP format.
+\fBformat\fP Format of the map data; currently the only formats
+recognized are \fBsun\fP, which is a subset of the Sun automounter map
+format, and \fBhesiod\fP, for hesiod filesys entries If the format is
+left unspecified, it defaults to \fBsun\fP for all map types except
+\fBhesiod\fP.
 .TP
 \fBmap\fP
 Location of mapfile to use.  This is an absolute UNIX pathname in the case
-for maps of types \fBfile\fP and \fBprogram\fP, and the name of an NIS
-database in the case for maps of type \fByp\fP.
+for maps of types \fBfile\fP or \fBprogram\fP, and the name of a database
+in the case for maps of type \fByp\fP, \fBnisplus\fP, or \fBhesiod\fP.
 .TP
 \fBoptions\fP
 Any remaining command line arguments without leading dashes (\-) are