small clean up, use of_ad when we can

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

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 11c127c1e72cb1d8323c671801bb7606be14d862..2680b24c94402b712b153a03e89b8aab9a9f21e5 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -12,12 +12,12 @@
 #
 # The following options are available:
 #   Transport Protocols:
-#     -[no]tcp       Make AFP-over-TCP [not] available
-#     -[no]ddp       Make AFP over AppleTalk [not] available. if you
-#                    have -proxy specified, specify -uamlist "" to 
+#     -[no]tcp       Make "AFP over TCP" [not] available
+#     -[no]ddp       Make "AFP over AppleTalk" [not] available.
+#                    If you have -proxy specified, specify -uamlist "" to 
 #                    prevent ddp connections from working.
 #
-#     -transall      Make both available (default)
+#     -transall      Make both available
 #
 #   Transport Options:
 #     -ipaddr <w.x.y.z>   Specifies the IP address the server should respond
@@ -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 
@@ -220,5 +223,6 @@
 #              "User Volume" -uamlist uams_clrtxt.so -port 12000
 #              "special" -notcp -defaultvol <path> -systemvol <path>
 #
+
 # default:
-# - -transall -uamlist uams_clrtxt.so,uams_dhx.so -nosavepassword
+# - -tcp -noddp -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword