Fixed some failing hunks.

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

diff --git a/flags.diff b/flags.diff
index 629c6bd..cdbb2ea 100644 (file)
--- a/flags.diff
+++ b/flags.diff
@@ -181,7 +181,7 @@ Modified from a patch that was written by Rolf Grossmann:
    rprintf(F," -p, --perms                 preserve permissions\n");
 +  rprintf(F,"     --flags                 preserve file flags\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");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
 @@ -420,6 +427,8 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
@@ -320,7 +320,7 @@ Modified from a patch that was written by Rolf Grossmann:
   -p, --perms                 preserve permissions
 +     --flags                 preserve file flags
   -E, --executability         preserve executability
-      --chmod=CHMOD           change the permissions of transferred files
+      --chmod=CHMOD           affect file and/or directory permissions
   -o, --owner                 preserve owner (super-user only)
 @@ -503,7 +504,9 @@ specified, in which case bf(-r) is not i
  

diff --git a/xattrs.diff b/xattrs.diff
index 40ea16b..835bc41 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -475,7 +475,7 @@ TODO:
   -R, --relative              use relative path names
 @@ -323,6 +323,7 @@ to the detailed description below for a 
   -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]
 + -X, --xattrs                preserve extended attrs (implies -p) [n.s.]
   -o, --owner                 preserve owner (super-user only)