[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  db0443c Added "SORTED TRANSFER ORDER" manpage section.
       via  d5bff8f Cleanup some manpage & --help info.
      from  a7d7f52 Use "|| true" in our `xattr` test runs.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit db0443cf9064fc2feee303845a013ccf648a8f49
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Sep 13 15:58:25 2011 -0700

    Added "SORTED TRANSFER ORDER" manpage section.

commit d5bff8ffe214e64cb43259b8bd43f21d931c467f
Author: Wayne Davison <wayned at samba.org>
Date:   Tue Sep 13 15:25:19 2011 -0700

    Cleanup some manpage & --help info.

-----------------------------------------------------------------------

Summary of changes:
 options.c |    2 +-
 rsync.yo  |   19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/options.c b/options.c
index ec8f8d1..d32376f 100644
--- a/options.c
+++ b/options.c
@@ -729,7 +729,7 @@ void usage(enum logcode F)
   rprintf(F,"     --del                   an alias for --delete-during\n");
   rprintf(F,"     --delete                delete extraneous files from destination dirs\n");
   rprintf(F,"     --delete-before         receiver deletes before transfer, not during\n");
-  rprintf(F,"     --delete-during         receiver deletes during transfer (default)\n");
+  rprintf(F,"     --delete-during         receiver deletes during the transfer\n");
   rprintf(F,"     --delete-delay          find deletions during, delete after\n");
   rprintf(F,"     --delete-after          receiver deletes after transfer, not during\n");
   rprintf(F,"     --delete-excluded       also delete excluded files from destination dirs\n");
diff --git a/rsync.yo b/rsync.yo
index 7cf3a80..3c0bfc0 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -281,6 +281,19 @@ daemon (including stand-alone and inetd configurations).
 If you're using one of the remote-shell transports for the transfer, there is
 no need to manually start an rsync daemon.
 
+manpagesection(SORTED TRANSFER ORDER)
+
+Rsync always sorts the specified filenames into its internal transfer list.
+This handles the merging together of the contents of identically named
+directories, makes it easy to remove duplicate filenames, and may confuse
+someone when the files are transferred in a different order than what was
+given on the command-line.
+
+If you need a particular file to be transferred prior to another, either
+separate the files into different rsync calls, or consider using
+bf(--delay-updates) (which doesn't affect the sorted transfer order, but
+does make the final file-updating phase happen much more rapidly).
+
 manpagesection(EXAMPLES)
 
 Here are some examples of how I use rsync.
@@ -374,9 +387,9 @@ to the detailed description below for a complete description.  verb(
      --del                   an alias for --delete-during
      --delete                delete extraneous files from dest dirs
      --delete-before         receiver deletes before xfer, not during
-     --delete-during         receiver deletes during transfer (default)
+     --delete-during         receiver deletes during the transfer
      --delete-delay          find deletions during, delete after
-     --delete-after          receiver deletes after transfer, not before
+     --delete-after          receiver deletes after transfer, not during
      --delete-excluded       also delete excluded files from dest dirs
      --ignore-missing-args   ignore missing source args without error
      --delete-missing-args   delete missing source args from destination
@@ -551,7 +564,7 @@ so that you can see the stderr output on the daemon side.
 
 dit(bf(-q, --quiet)) This option decreases the amount of information you
 are given during the transfer, notably suppressing information messages
-from the remote server. This option name is useful when invoking rsync from
+from the remote server. This option is useful when invoking rsync from
 cron.
 
 dit(bf(--no-motd)) This option affects the information that is output


-- 
The rsync repository.