--- config/netatalk.conf.org	Sun Apr  1 07:26:37 2007
+++ config/netatalk.conf	Sun Apr  1 07:31:49 2007
@@ -1,4 +1,5 @@
-# Appletalk configuration
+# netatalk configuration
+# For details see man netatalk.conf
 # Change this to increase the maximum number of clients that can connect:
 AFPD_MAX_CLIENTS=50
 
@@ -8,17 +9,8 @@
 # NOTE: If Netatalk should register AppleTalk services in the standard zone
 #       then you need not to specify a zone name here.
 #
-#       If your zone has spaces in it, you're better off specifying
-#       it in afpd.conf if you realize that your distribution doesn't
-#       handle spaces correctly in the startup script. Remember to use
-#       quotes here if the zone name contains spaces.
-#
 #ATALK_ZONE="@some zone"
-ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
-
-# specify the Mac and unix charsets to be used
-ATALK_MAC_CHARSET='MAC_ROMAN'
-ATALK_UNIX_CHARSET='LOCALE'
+ATALK_NAME=`/bin/hostname -s`
 
 # specify this if you don't want guest, clrtxt, and dhx
 # available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so, 
@@ -27,18 +19,3 @@
 
 # Change this to set the id of the guest user
 AFPD_GUEST=nobody
-
-# Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
-PAPD_RUN=yes
-CNID_METAD_RUN=yes
-AFPD_RUN=yes
-TIMELORD_RUN=no
-A2BOOT_RUN=no
-
-# Control whether the daemons are started in the background
-ATALK_BGROUND=no
-
-# export the charsets, read form ENV by apps
-export ATALK_MAC_CHARSET
-export ATALK_UNIX_CHARSET