Merge remote branch 'sf/master'

[netatalk.git] / config / AppleVolumes.default.tmpl

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index 4a9ada5919b4bcc0980cf10cfbc28c34afa44d2c..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.
@@ -84,16 +85,20 @@
 #                        as the volume codepage
 #                        e.g. "UTF8", "UTF8-MAC", "ISO-8859-15"
 # maccharset          -> specifies the charset to be used
-#                        as the mac client codepage
+#                        as the legacy client (<=Mac OS 9) codepage
 #                        e.g. "MAC_ROMAN", "MAC_CYRILLIC"
 #
 # perm                -> default permission value
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # dperm               -> default permission value for directories
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # fperm               -> default permission value for files
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # umask               -> set perm mask
+#                        Use with options:upriv
 # dbpath:path         -> store the database stuff in the following path.
 # cnidserver:server[:port]
 #                     -> Query this servername or IP address
@@ -156,10 +161,6 @@
 # illegalseq          -> encode illegal sequence in filename asis,
 #                        ex "\217-", which is not a valid SHIFT-JIS char,
 #                        is encoded  as U\217 -
-# acls                -> Enable ACLs on this volume. Requires a NFSv4 ACLs
-#                        compatible filesystem (e.g. ZFS) and an ACL API
-#                        compatible to *Solaris. In other words: this requires
-#                        Solaris, Opensolaris or a derived distribution.
 # nocnidcache         -> Don't store and read CNID to/from AppleDouble file.
 #                        This should not be used as it also prevents a CNID
 #                        database rebuild with `dbd`!
@@ -175,8 +176,8 @@
 #                        cluster, ...
 #
 
-# The line below sets some DEFAULTS, starting with Netatalk 2.1.
-:DEFAULTS: options:upriv,usedots
+# The line below sets some DEFAULT, starting with Netatalk 2.1.
+:DEFAULT: options:upriv,usedots
 
 # The "~" below indicates that Home directories are visible by default.
 # If you do not wish to have people accessing their Home directories,