Blame SOURCES/autofs-5.0.8-make-autofs-5-consistent-with-auto-master-5.patch

6bbd11
autofs-5.0.8 - make autofs(5) consistent with auto.master(5)
6bbd11
6bbd11
From: Ian Kent <raven@themaw.net>
6bbd11
6bbd11
The presentation in autofs(5) isn't the same as that in auto.master(5).
6bbd11
---
6bbd11
 CHANGELOG            |    1 +
6bbd11
 man/auto.master.5.in |   18 +++++++++++-------
6bbd11
 man/autofs.5         |   41 +++++++++++++++++++++++++++--------------
6bbd11
 3 files changed, 39 insertions(+), 21 deletions(-)
6bbd11
6bbd11
--- autofs-5.0.7.orig/CHANGELOG
6bbd11
+++ autofs-5.0.7/CHANGELOG
6bbd11
@@ -93,6 +93,7 @@
6bbd11
 - change walk_tree() to take ap.
6bbd11
 - add negative cache lookup to hesiod lookup.
6bbd11
 - fix external env configure.
6bbd11
+- make autofs(5) consistent with auto.master(5).
6bbd11
 
6bbd11
 25/07/2012 autofs-5.0.7
6bbd11
 =======================
6bbd11
--- autofs-5.0.7.orig/man/auto.master.5.in
6bbd11
+++ autofs-5.0.7/man/auto.master.5.in
6bbd11
@@ -38,14 +38,14 @@ Access to mounts in maps is governed by
6bbd11
 .P
6bbd11
 For direct maps the mount point is always specified as:
6bbd11
 .P
6bbd11
-/-
6bbd11
+.BR /-
6bbd11
 .P
6bbd11
 and the key used within the direct map is the full path to the mount point. The direct map
6bbd11
 may have multiple entries in the master map.
6bbd11
 .P
6bbd11
 For indirect maps access is by using the path scheme:
6bbd11
 .P
6bbd11
-.RI / mount-point / key 
6bbd11
+.BR /mount-point/key
6bbd11
 .P
6bbd11
 where
6bbd11
 .I mount-point
6bbd11
@@ -57,7 +57,9 @@ map given in the entry (See
6bbd11
 .P
6bbd11
 Additionally, a map may be included from its source as if it were itself
6bbd11
 present in the master map by including a line of the form:
6bbd11
-.BR +\ [ maptype , format :] map [ options ]
6bbd11
+.P
6bbd11
+.BR + [ maptype [, format ]:] map\  [ options ]
6bbd11
+.P
6bbd11
 and 
6bbd11
 .BR automount (8)
6bbd11
 will process the map according to the specification described below for
6bbd11
@@ -73,14 +75,14 @@ which contains options to be applied to
6bbd11
 .P
6bbd11
 The format of a master map entry is:
6bbd11
 .TP
6bbd11
-.IR mount-point\  [ map-type [, format ]:] map\  [ options ]
6bbd11
+.BR mount-point\  [ map-type [, format ]:] map\  [ options ]
6bbd11
 .TP
6bbd11
-\fBmount-point\fP
6bbd11
+.B mount-point
6bbd11
 Base location for the \fBautofs\fP filesystem to be mounted.  For
6bbd11
 indirect maps this directory will be created (as with \fBmkdir \-p\fP)
6bbd11
 and is removed when the \fBautofs\fP filesystem is umounted.
6bbd11
 .TP
6bbd11
-\fBmap-type\fP
6bbd11
+.B map-type
6bbd11
 Type of map used for this mount point.  The following are
6bbd11
 valid map types:
6bbd11
 .RS
6bbd11
@@ -133,7 +135,8 @@ for maps of types \fBfile\fP, \fBdir\fP,
6bbd11
 in the case for maps of type \fByp\fP, \fBnisplus\fP, or \fBhesiod\fP or
6bbd11
 the \fBdn\fP of an LDAP entry for maps of type \fBldap\fP.
6bbd11
 .TP
6bbd11
-\fBoptions\fP
6bbd11
+.B options
6bbd11
+.br
6bbd11
 Any remaining command line arguments without leading dashes (\-) are
6bbd11
 taken as options (\fI\-o\fP) to \fBmount\fP.  Arguments with leading
6bbd11
 dashes are considered options for the maps.
6bbd11
@@ -287,6 +290,7 @@ it will used for subsequent lookups.
6bbd11
 There are three common schemas in use:
6bbd11
 .TP
6bbd11
 .I nisMap
6bbd11
+.br
6bbd11
 Entries in the \fBnisMap\fP schema are \fBnisObject\fP objects in
6bbd11
 the specified subtree, where the \fBcn\fP attribute is the key
6bbd11
 (the wildcard key is "/"), and the \fBnisMapEntry\fP attribute
6bbd11
--- autofs-5.0.7.orig/man/autofs.5
6bbd11
+++ autofs-5.0.7/man/autofs.5
6bbd11
@@ -22,42 +22,56 @@ This is a description of the text file f
6bbd11
 these files may exist.  All empty lines or lines beginning with # are
6bbd11
 ignored. The basic format of one line in such maps is:
6bbd11
 .P
6bbd11
-.BI "key [" -options "] location"
6bbd11
-
6bbd11
-.SS key
6bbd11
+.BR key\  [ -options ]\  location
6bbd11
+.TP
6bbd11
+.B key
6bbd11
+.br
6bbd11
 For indirect mounts this is the part of the path name between the mount point
6bbd11
 and the path into the filesystem when it is mounted. Usually you can think about the
6bbd11
 key as a sub-directory name below the autofs managed mount point.
6bbd11
 
6bbd11
 For direct mounts this is the full path of each mount point. This map is always
6bbd11
 associated with the /- mount point in the master map. 
6bbd11
-
6bbd11
-.SS options
6bbd11
+.TP
6bbd11
+.B options
6bbd11
+.br
6bbd11
 Zero or more options may be given.  Options can also be given in the 
6bbd11
 .B auto.master
6bbd11
 file in which case both values are cumulative (this is a difference
6bbd11
 from SunOS).  The options are a list of comma separated options as
6bbd11
 customary for the
6bbd11
 .BR mount (8)
6bbd11
-command. There are two special options
6bbd11
-.I -fstype=
6bbd11
-used to specify a filesystem type if the filesystem is not of the default
6bbd11
+command.
6bbd11
+
6bbd11
+There are several special options
6bbd11
+.RS
6bbd11
+.TP
6bbd11
+.B -fstype=
6bbd11
+.br
6bbd11
+is used to specify a filesystem type if the filesystem is not of the default
6bbd11
 NFS type.  This option is processed by the automounter and not by the mount
6bbd11
 command.
6bbd11
-.I -strict
6bbd11
+.TP
6bbd11
+.B -strict
6bbd11
+.br
6bbd11
 is used to treat errors when mounting file systems as fatal. This is important when
6bbd11
 multiple file systems should be mounted (`multi-mounts'). If this option
6bbd11
 is given, no file system is mounted at all if at least one file system
6bbd11
 can't be mounted.
6bbd11
-.I -use-weight-only
6bbd11
+.TP
6bbd11
+.B -use-weight-only
6bbd11
+.br
6bbd11
 is used to make the weight the sole factor in selecting a server when multiple
6bbd11
 servers are present in a map entry.
6bbd11
 and
6bbd11
-.I -no-use-weight-only
6bbd11
+.TP
6bbd11
+.B -no-use-weight-only
6bbd11
+.br
6bbd11
 can be used to negate the option if it is present in the master map entry
6bbd11
 for the map but is not wanted for the given mount.
6bbd11
-
6bbd11
-.SS location
6bbd11
+.RE
6bbd11
+.TP
6bbd11
+.B location
6bbd11
 The location specifies from where the file system is to be mounted.  In the
6bbd11
 most cases this will be an NFS volume and the usual notation
6bbd11
 .I host:pathname
6bbd11
@@ -227,7 +241,6 @@ Anything else is questionable and unsupp
6bbd11
 <path> host1(3),host:/blah
6bbd11
 .fi
6bbd11
 .RE
6bbd11
-.sp
6bbd11
 .SH UNSUPPORTED
6bbd11
 This version of the automounter supports direct maps stored in FILE, NIS, NISPLUS
6bbd11
 and LDAP only.