Merge Debian doco patches 030, 033 and 040.

2 files changed, 28 insertions, 7 deletions

diff --git a/man/autofs.5 b/man/autofs.5
index 1744f349..f190b309 100644
--- a/man/autofs.5
+++ b/man/autofs.5
@@ -1,5 +1,5 @@
 .\" t
-.\" $Id: autofs.5,v 1.4 2003/12/11 15:22:50 raven Exp $
+.\" $Id: autofs.5,v 1.5 2003/12/31 15:44:13 raven Exp $
 .TH AUTOFS 5 "6 Apr 1998"
 .TH AUTOFS 5 "14 Jan 2000"
 .SH NAME
@@ -85,6 +85,23 @@ local ide drive.  The third makes a share exported from a Windows
 machine available for automounting.  The rest should be fairly
 self-explanatory. The last entry (the last three lines) is an example
 of a multi-map (see below).
+
+If you use the automounter for a filesystem without access permissions
+(like \fBvfat\fP), users usually can't write on such a filesystem
+because it is mounted as user \fBroot\fP.
+You can solve this problem by passing the option \fIgid=<gid>\fP,
+e. g. \fIgid=floppy\fP. The filesystem is then mounted as group
+\fBfloppy\fP instead of \fBroot\fP. Then you can add the users
+to this group, and they can write to the filesystem. Here's an
+example entry for an autofs map:
+.sp
+.RS +.2i
+.ta 1.0i 3.0i
+.nf
+floppy-vfat  -fstype=vfat,sync,gid=floppy,umask=002  :/dev/fd0
+.fi
+.RE
+.sp
 .SH FEATURES
 .SS Map Key Substitution
 An & character in the
@@ -126,7 +143,7 @@ OSVERS	Version of OS (uname -v)
 .fi
 .RE
 .sp
-Additional entries can be defined with the -Dvariable=Value option to
+Additional entries can be defined with the -Dvariable=Value map-option to
 .BR automount (8).
 .SS Executable Maps
 A map can be marked as executable.  The init script that parses the
diff --git a/man/automount.8 b/man/automount.8
index fb5bde4e..0a711cc8 100644
--- a/man/automount.8
+++ b/man/automount.8
@@ -6,7 +6,7 @@
 .\"
 .\" This is free documentation.
 .\"
-.\" $Id: automount.8,v 1.3 2003/09/29 08:22:35 raven Exp $
+.\" $Id: automount.8,v 1.4 2003/12/31 15:44:13 raven Exp $
 .\"
 .TH AUTOMOUNT 8 "14 Jan 2000"
 .SH NAME
@@ -22,9 +22,6 @@ within the base \fImount-point\fP when they are accessed in any way.
 The filesystems are then autounmounted after a period of inactivity.
 .SH OPTIONS
 .TP
-.I "\-Dvariable=value"
-Replace \fIvariable\fP with \fIvalue\fP in map substitutions.
-.TP
 .I "\-p, \-\-pid-file"
 Write the pid of the daemon to the specified file.
 .TP
@@ -82,7 +79,7 @@ the specified subtree, where the \fBcn\fP attribute is the key (the wildcard
 key is "/"), and the \fBautomountInformation\fP attribute contains the
 information used by the automounter.  Documentation on the schema
 used by this module is available online at
-\fIhttp://docs.iplanet.com/docs/manuals/directory/411ext/nis/mapping.htm\fP.
+\fIhttp://docs.sun.com/source/806-4251-10/mapping.htm\fP.
 .P
 RFC 2307 schema entries are \fBnisObject\fB objects and use the \fBcn\fB
 attribute as the key and the \fBnisMapEntry\fB contains information used
@@ -104,6 +101,13 @@ in the case for maps of type \fByp\fP, \fBnisplus\fP, or \fBhesiod\fP.
 Any remaining command line arguments without leading dashes (\-) are
 taken as options (\fI\-o\fP) to \fBmount\fP.  Arguments with leading
 dashes are considered options for the maps.
+.sp
+The \fBsun\fP format supports the following options:
+.RS
+.TP
+.I "\-Dvariable=value"
+Replace \fIvariable\fP with \fIvalue\fP in map substitutions.
+.RE
 .SH NOTES
 If the \fBautomount\fP daemon catches signal USR1, it will unmount all
 currently unused autofs-mounted filesystems and continue running