Merge from branch-2-1

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

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index 5825039d76b68b4c6661f8c8420f7e4404231b7a..945672cc3d7880723e2781fbd397c3adb40bfc92 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -89,11 +89,15 @@
 #
 # 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 +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`!