diff options
author | Wayne Davison <wayned@samba.org> | 2011-09-13 15:27:55 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2011-09-13 15:41:26 -0700 |
commit | 675f864c6d718f49be976d1aab4ea20b6cc5c104 (patch) | |
tree | ea74c2207eaf0ecd7e5d0d4591c2c6b5448744a5 | |
parent | dbd58bb2d01b28df2ba8a3bd0fc0bed69bbd24df (diff) | |
download | rsync-675f864c6d718f49be976d1aab4ea20b6cc5c104.tar.gz |
Cleanup some manpage & --help info.
-rw-r--r-- | options.c | 2 | ||||
-rw-r--r-- | rsync.yo | 18 |
2 files changed, 15 insertions, 5 deletions
@@ -369,7 +369,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"); @@ -367,10 +367,10 @@ to the detailed description below for a complete description. verb( --remove-source-files sender removes synchronized files (non-dir) --del an alias for --delete-during --delete delete extraneous files from dest dirs - --delete-before receiver deletes before transfer (default) - --delete-during receiver deletes during xfer, not before + --delete-before receiver deletes before xfer, not during + --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-errors delete even if there are I/O errors --force force deletion of dirs even if not empty @@ -997,7 +997,7 @@ used by bf(--fake-super)) unless you repeat the option (e.g. -XX). This "copy all xattrs" mode cannot be used with bf(--fake-super). dit(bf(--chmod)) This option tells rsync to apply one or more -comma-separated "chmod" strings to the permission of the files in the +comma-separated "chmod" modes to the permission of the files in the transfer. The resulting value is treated as though it were the permissions that the sending side supplied for the file, which means that this option can seem to have no effect on existing files if bf(--perms) is not enabled. @@ -1180,6 +1180,16 @@ dit(bf(--remove-source-files)) This tells rsync to remove from the sending side the files (meaning non-directories) that are a part of the transfer and have been successfully duplicated on the receiving side. +Note that you should only use this option on source files that are quiescent. +If you are using this to move files that show up in a particular directory over +to another host, make sure that the finished files get renamed into the source +directory, not directly written into it, so that rsync can't possibly transfer +a file that is not yet fully written. If you can't first write the files into +a different directory, you should use a naming idiom that lets rsync avoid +transferring files that are not yet finished (e.g. name the file "foo.new" when +it is written, rename it to "foo" when it is done, and then use the option +bf(--exclude='*.new') for the rsync transfer). + dit(bf(--delete)) This tells rsync to delete extraneous files from the receiving side (ones that aren't on the sending side), but only for the directories that are being synchronized. You must have asked rsync to |