Blame SOURCES/autofs-5.0.9-amd-lookup-update-man-page-autofs-config-description.patch

6bbd11
autofs-5.0.9 - update man page autofs config description
6bbd11
6bbd11
From: Ian Kent <ikent@redhat.com>
6bbd11
6bbd11
6bbd11
---
6bbd11
 man/auto.master.5.in |   43 ++++++++++++++++++++++++++++++++++++++-----
6bbd11
 1 file changed, 38 insertions(+), 5 deletions(-)
6bbd11
6bbd11
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
6bbd11
index eb31c93..59df04f 100644
6bbd11
--- a/man/auto.master.5.in
6bbd11
+++ b/man/auto.master.5.in
6bbd11
@@ -205,14 +205,47 @@ or in the configuration.
6bbd11
 Set the timeout for caching failed key lookups. This option can be
6bbd11
 used to override the global default given either on the command line
6bbd11
 or in the configuration.
6bbd11
-.SH GENERAL SYSTEM DEFAULTS CONFIGURATION
6bbd11
+.SH AUTOFS CONFIGURATION
6bbd11
 .P
6bbd11
-The default value of several general settings may be changed in the
6bbd11
-configuration file
6bbd11
+There are two files that amy contain configuration settings
6bbd11
 .nh
6bbd11
+.BR @@autofsmapdir@@/autofs.conf .
6bbd11
+.hy
6bbd11
+and
6bbd11
 .BR @@autofsconfdir@@/autofs .
6bbd11
 .hy
6bbd11
-They are:
6bbd11
+The former contains the bulk of configuration options while the later
6bbd11
+contains entries to be set in the environment for use by the init
6bbd11
+sub-system.
6bbd11
+.TP
6bbd11
+The only entry currently present in the init system configuration
6bbd11
+is OPTIONS which may be used to specify options to be used when
6bbd11
+starting
6bbd11
+.BR automount (8) .
6bbd11
+.TP
6bbd11
+Previously all configuration entries were located in the init system
6bbd11
+configuration file and their values were set in the environment for
6bbd11
+later use by autofs. Configuration entries that were set in the
6bbd11
+environment continue to be set in the environment at program startup
6bbd11
+and any setting already present in the environment takes precedence.
6bbd11
+.SH SYSTEM DEFAULTS CONFIGURATION
6bbd11
+.P
6bbd11
+The value of most settings may be set in the configuration file
6bbd11
+.nh
6bbd11
+.BR @@autofsmapdir@@/autofs.conf .
6bbd11
+.hy
6bbd11
+Configuration entries are "name = value" pairs and the name is case
6bbd11
+insensitive. Older configuration names had a DEFAULTS_ prefix which
6bbd11
+is appended to the configuration name when a value isn't found and
6bbd11
+the search repeated.
6bbd11
+.TP
6bbd11
+An optional section name
6bbd11
+.nh
6bbd11
+.BR [ autofs ]
6bbd11
+.hy
6bbd11
+may also be given.
6bbd11
+.TP
6bbd11
+The available configuration entries are:
6bbd11
 .TP
6bbd11
 .B timeout
6bbd11
 Sets the default mount timeout in seconds. The internal program
6bbd11
@@ -308,7 +341,7 @@ The object classes and attributes used for accessing automount maps in
6bbd11
 LDAP can be changed by setting entries in the autofs configuration
6bbd11
 located in
6bbd11
 .nh
6bbd11
-.BR @@autofsconfdir@@/autofs .
6bbd11
+.BR @@autofsmapdir@@/autofs.conf .
6bbd11
 .hy
6bbd11
 .TP
6bbd11
 .B NOTE: