Merge remote branch 'origin/master' into branch-allea

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

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index d4453a70fac615573447571e95d5a41bfdd6d639..eeb20a859d7971a01c69d88581d5ef3a9a6aad9b 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -84,7 +84,7 @@
 #                        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
@@ -160,10 +160,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`!