Adjust clovevol option description

[netatalk.git] / config / afpd.conf.tmpl

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 0364b891871b779bc4532a2f6fbbe2b0677ec545..d3d380cfe625888b3686760981e8ab2c1ca89836 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -57,7 +57,7 @@
 #     -uampath <path>  Use this path to look for User Authentication Modules.
 #                     (default: :UAMS_PATH:)
 #     -uamlist <a,b,c> Comma-separated list of UAMs. (default:
-#                     uams_guest.so,uams_clrtxt.so,uams_dhx.so) 
+#                     uams_dhx.so,uams_dhx2.so) 
 #
 #                     some commonly available UAMs:
 #                      uams_guest.so: Allow guest logins
@@ -74,6 +74,10 @@
 #                                  Allow Diffie-Hellman eXchange
 #                                  (DHX) for authentication.
 #
+#                     uams_dhx2.so: (uams_dhx2_pam.so or uams_dhx2_passwd.so)
+#                                   Allow Diffie-Hellman eXchange 2
+#                                   (DHX2) for authentication.
+#
 #   Password Options:
 #     -[no]savepassword   [Don't] Allow clients to save password locally
 #     -passwdfile <path>  Use this path to store Randnum
@@ -97,9 +101,8 @@
 #                         :ETCDIR:/AppleVolumes.default
 #                         (same as -u on command line)
 #     -[no]uservol        [Don't] Read the user's volume file
-#     -closevol           After an AppleVolumes change, disconnect immediatly
-#                         removed volumes.
-#
+#     -closevol           Immediately unmount volumes removed from AppleVolumes
+#                         files on SIGHUP sent to the afp master process.
 #
 #   Miscellaneous:
 #     -authprintdir <path> Specifies the path to be used (per server) to 
@@ -134,26 +137,28 @@
 #     -volnamelen <number>
 #                         Max length of UTF8-MAC volume name for Mac OS X.
 #                         Note that Hangul is especially sensitive to this.
-#                           31:  conservative default
-#                           80:  limit for Mac OS X 10.5
 #                           255: limit of spec
-#                         Mac OS 9 and earlier are not influenced by this,
-#                         Maccharset volume name is always 27 limit.
+#                           80:  limit of generic Mac OS X (default)
+#                           73:  limit of Mac OS X 10.1, if >= 74
+#                                Finder crashed and restart repeatedly.
+#                         Mac OS 9 and earlier is not influenced by this,
+#                         Maccharset volume names are always limitted to 27.
 #     -[un]setuplog "<logtype> <loglevel> [<filename>]"
 #                         Specify that any message of a loglevel up to the given loglevel
 #                         should be logged to the given file. If the filename is ommited the
-#                         loglevel applies to messages passed to syslog. Latter -setuplog
-#                         settings will override earlier ones of the same logtype (file or
-#                         syslog).
-#               
+#                         loglevel applies to messages passed to syslog.
+#
 #                         By default (no explicit -setuplog and no buildtime configure flag
-#                         --with-logfile) all netatalk daemons log to syslog with a default
-#                         logging setup equivalent to "-setuplog default log_debug".
+#                         --with-logfile) afpd logs to syslog with a default
+#                         logging setup equivalent to "-setuplog default log_note".
 #               
-#                         If build with --with-logfile (default logfile
-#                         /var/log/netatalk.log) or --with-logfile=somefile all daemons
-#                         default to a setup that is equivalent to "-setuplog default
-#                         log_info [netatalk.log|somefile]"
+#                         If build with --with-logfile[=somefile] (default logfile
+#                         /var/log/netatalk.log) afpd defaults to a setup that is equivalent
+#                         to "-setuplog default log_note [netatalk.log|somefile]"
+#
+#                         logtypes:  Default, AFPDaemon, Logger, UAMSDaemon
+#                         loglevels: LOG_SEVERE, LOG_ERROR, LOG_WARN, LOG_NOTE, LOG_INFO, LOG_DEBUG,
+#                                    LOG_DEBUG6, LOG_DEBUG7, LOG_DEBUG8, LOG_DEBUG9, LOG_MAXDEBUG
 #
 #                Example: Useful default config
 #                         -setuplog "default log_info /var/log/afpd.log"
@@ -219,4 +224,4 @@
 #              "special" -notcp -defaultvol <path> -systemvol <path>
 #
 # default:
-# - -transall -uamlist uams_clrtxt.so,uams_dhx.so -nosavepassword
+# - -transall -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword