Merge remote branch 'sf/master'

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index eeb20a859d7971a01c69d88581d5ef3a9a6aad9b..d402389540b05354f2aa4b9a50675faf7a1e5702 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -1,3 +1,4 @@
+# Netatalk 2.x afp volume cofiguration
 # This file looks empty when viewed with "vi".  In fact, there is one
 # '~', so users with no AppleVolumes file in their home directory get
 # their home directory by default.

diff --git a/config/AppleVolumes.system b/config/AppleVolumes.system
index d75e4c9426d7684e56f77dea3f82ee5d353dea65..ee79b9cfe3d503439bab0df24ae4407b2f83928c 100644 (file)
--- a/config/AppleVolumes.system
+++ b/config/AppleVolumes.system
@@ -1,4 +1,4 @@
-# ($Id)
+# Netatalk 2.x afp volume configuration
 ###
 ### Delete a '#' character at the head of line if you need.
 ### If clients are Mac OS X only, it is not especially necessary.

diff --git a/config/afp_ldap.conf b/config/afp_ldap.conf
index dff15686949a7a3521496370dc8d01151a2251ef..f1700c01fc27f5e2487dfc325970105cc79d0049 100644 (file)
--- a/config/afp_ldap.conf
+++ b/config/afp_ldap.conf
@@ -1,3 +1,5 @@
+# Netatalk 2.x LDAP configuration
+
 # ldap_server      = localhost
 # ldap_auth_method = simple
 # ldap_auth_dn     = cn=admin,dc=domain,dc=org

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 71f2d50b49280e6158c1344dcd1c654d7353bb87..325ce6a6f3d1ed23c847a33ab33944037dfec679 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -1,5 +1,5 @@
 #
-# CONFIGURATION FOR AFPD
+# CONFIGURATION FOR AFPD (Netatalk 2.x)
 #
 # Each single line defines a virtual server that should be available.
 # Though, using "\" character, newline escaping is supported.

diff --git a/config/netatalk.conf b/config/netatalk.conf
index cb873a3ee9f39a72a1442b95b055fed748187af1..a050460f59f99b297cf01572f0207a30863aa8d4 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,4 +1,4 @@
-# Netatalk configuration
+# Netatalk 2.x configuration
 
 #########################################################################
 # Global configuration