From e202e3ffecc2c3c8a97a51ccfd7b18f89d20992a Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Wed, 19 Nov 2014 19:46:58 +0000
Subject: [PATCH] Make the auto_master(5) man page clearer on how auto_master
 and map files work together, and add example for smbfs.

Differential Revision:	https://reviews.freebsd.org/D1184
Reviewed by:	wblock@
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
---
 usr.sbin/autofs/auto_master.5 | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/autofs/auto_master.5 b/usr.sbin/autofs/auto_master.5
index 892ce325af0..f7f369d4d73 100644
--- a/usr.sbin/autofs/auto_master.5
+++ b/usr.sbin/autofs/auto_master.5
@@ -27,13 +27,17 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 17, 2014
+.Dd November 19, 2014
 .Dt AUTO_MASTER 5
 .Os
 .Sh NAME
 .Nm auto_master
 .Nd auto_master and map file format
 .Sh DESCRIPTION
+The automounter configuration consists of the
+.Nm
+configuration file, which assigns filesystem paths to map names,
+and maps, which contain actual mount information.
 The
 .Nm
 configuration file is used by the
@@ -132,8 +136,12 @@ The special option
 .Li fstype
 is used to specify filesystem type.
 It is not passed to the mount program as an option.
-Instead, it is passed as argument to
+Instead, it is passed as an argument to
 .Cm "mount -t".
+The default
+.Li fstype
+is
+.Ql nfs .
 The special option
 .Li nobrowse
 is used to disable creation of top-level directories for special
@@ -153,9 +161,11 @@ prefix it with colon.
 For example,
 .Li :/dev/cd0 .
 .Pp
-This example, when used with the
+This example, when put into
+.Pa /etc/auto_example ,
+and with
 .Nm
-example above, specifies that the NFS share
+referring to the map as described above, specifies that the NFS share
 .Li 192.168.1.1:/share/example/x
 will be mounted on
 .Pa /example/x/
@@ -163,11 +173,18 @@ when any process attempts to access that mountpoint, with
 .Li intr
 and
 .Li nfsv4
-mount options:
+mount options, described in
+.Xr mount_nfs 8 :
 .Bd -literal -offset indent
 .Li x -intr,nfsv4 192.168.1.1:/share/example/x
 .Ed
 .Pp
+Automatically mount an SMB share on access, as a guest user,
+without prompting for a password:
+.Bd -literal -offset indent
+.Li share -fstype=smbfs,-N ://@server/share
+.Ed
+.Pp
 Automatically mount the CD drive on access:
 .Bd -literal -offset indent
 .Li cd -fstype=cd9660 :/dev/cd0
@@ -224,6 +241,7 @@ and this in
 map file:
 .Bd -literal -offset indent
 .Li /example/x -intr,nfsv4 192.168.1.1:/share/example/x
+.Li /example/share -fstype=smbfs,-N ://@server/share
 .Li /example/cd -fstype=cd9660 :/dev/cd0
 .Ed
 .Sh DIRECTORY SERVICES