Fixed some failing hunks.

[rsync/rsync-patches.git] / acls.diff

diff --git a/acls.diff b/acls.diff
index c0803b5..0337c0b 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -5595,7 +5595,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 @@ -304,6 +310,9 @@ void usage(enum logcode F)
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -E, --executability         preserve the file's executability\n");
-   rprintf(F,"     --chmod=CHMOD           change the permissions of transferred files\n");
+   rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
 +#ifdef SUPPORT_ACLS
 +  rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
 +#endif
@@ -5935,7 +5935,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -p, --perms                 preserve permissions
   -E, --executability         preserve executability
-      --chmod=CHMOD           change the permissions of transferred files
+      --chmod=CHMOD           affect file and/or directory permissions
 + -A, --acls                  preserve ACLs (implies -p) [non-standard]
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group