diff -up autofs-5.0.1/man/auto.master.5.in.doc-append_options autofs-5.0.1/man/auto.master.5.in
--- autofs-5.0.1/man/auto.master.5.in.doc-append_options	2007-10-18 14:19:39.000000000 +0800
+++ autofs-5.0.1/man/auto.master.5.in	2007-10-18 14:20:05.000000000 +0800
@@ -139,7 +139,6 @@ Treat errors when mounting file systems 
 multiple file systems should be mounted (`multimounts'). If this option
 is given, no file system is mounted at all if at least one file system
 can't be mounted.
-<<<<<<< master
 .SH GENERAL SYSTEM DEFAULTS CONFIGURATION
 .P
 The default value of several general settings may be changed in the
@@ -155,24 +154,10 @@ sets the default mount timeout (program 
 .B DEFAULT_BROWSE_MODE
 Maps are browsable by default (program default "yes").
 .TP
-.B DEFAULT_LOGGING
-set default log level "none", "verbose" or "debug" (program default "none").
-=======
-.SH GENERAL SYSTEM DEFAULTS CONFIGURATION
-.P
-The default value of several general settings may be changed in the
-configuration file
-.nh
-.BR @@autofsconfdir@@/autofs .
-.hy
-.P
-They are:
-.TP
-.B DEFAULT_TIMEOUT
-sets the default mount timeout (program default 600).
-.TP
-.B DEFAULT_BROWSE_MODE
-Maps are browsable by default (program default "yes").
+.B APPEND_OPTIONS
+Determine whether global options, given on the command line or per mount
+in the master map, are appended to map entry options or if the map entry
+options replace the global options (program default "yes", append options).
 .TP
 .B DEFAULT_LOGGING
 set default log level "none", "verbose" or "debug" (program default "none").