+@@ -691,14 +692,23 @@ quote(itemize(
+ permissions, though the bf(--executability) option might change just
+ the execute permission for the file.
+ it() Each new file gets its permissions set based on the source file's
+- permissions, but masked by the receiving end's umask setting (including
++ permissions, but masked by the receiving end's destination-default
++ permissions (which is either based on the ACL of the destination
++ directory, if available, or the receiving end's umask setting) and
++ includes
+ the stripping of the three special permission bits).
++ Hint: Using bf(--chmod=ugo=rwX) without bf(--perms) will cause new
++ files to get all the destination-default permissions.
+ ))
+
+ Thus, when bf(--perms) and bf(--executability) are both disabled,
+ rsync's behavior is the same as that of other file-copy utilities,
+ such as bf(cp)(1) and bf(tar)(1).
+
++This version of rsync observes default ACLs; patched versions of rsync only
++applied the umask, and could thus set wrong permissions in the presence of
++default ACLs.
++
+ dit(bf(-E, --executability)) This option causes rsync to preserve the
+ executability (or non-executability) of regular files when bf(--perms) is
+ not enabled. A regular file is considered to be executable if at least one
+@@ -713,6 +723,10 @@ quote(itemize(
+
+ If bf(--perms) is enabled, this option is ignored.
+
++dit(bf(-A, --acls)) This option causes rsync to update the destination
++ACLs to be the same as the source ACLs. This nonstandard option only
++works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
++
+ dit(bf(--chmod)) This option tells rsync to apply one or more
+ comma-separated "chmod" strings to the permission of the files in the
+ transfer. The resulting value is treated as though it was the permissions
+--- orig/runtests.sh 2005-08-17 06:45:08
++++ runtests.sh 2006-01-23 21:24:53
+@@ -195,6 +195,9 @@ export scratchdir suitedir
+ prep_scratch() {
+ [ -d "$scratchdir" ] && rm -rf "$scratchdir"
+ mkdir "$scratchdir"
++ # Get rid of default ACLs and directory setgid because they confuse some tests.
++ setfacl -k "$scratchdir" || true
++ chmod g-s "$scratchdir"
+ return 0
+ }