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

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