Fixed a comment.

[rsync/rsync.git] / rsync.yo

diff --git a/rsync.yo b/rsync.yo
index 775bb68..f0d0325 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -469,6 +469,13 @@ dit(bf(-u, --update)) This forces rsync to skip any files for which the
 destination file already exists and has a date later than the source
 file.
 
 destination file already exists and has a date later than the source
 file.
 

+In the currently implementation, a difference of file format is always
+considered to be important enough for an update, no matter what date
+is on the objects.  In other words, if the source has a directory or a
+symlink where the destination has a file, the transfer would occur
+regardless of the timestamps.  This might change in the future (feel
+free to comment on this on the mailing list if you have an opinion).
+

 dit(bf(-l, --links)) When symlinks are encountered, recreate the
 symlink on the destination.
 
 dit(bf(-l, --links)) When symlinks are encountered, recreate the
 symlink on the destination.
 


@@ -644,16 +651,8 @@ then files listed in a $HOME/.cvsignore are added to the list and any
 files listed in the CVSIGNORE environment variable (all cvsignore names
 are delimited by whitespace).
 
 files listed in the CVSIGNORE environment variable (all cvsignore names
 are delimited by whitespace).
 

-Note that these cvs-exclude rules are inserted into the the user's list
-of excludes at the point the -C/--cvs-excludes option is mentioned, so
-any other include/exclude rules that precede the option override these
-rules, and any options that are specified afterwards are overridden by
-these rules.
-

 Finally, any file is ignored if it is in the same directory as a
 .cvsignore file and matches one of the patterns listed therein.
 Finally, any file is ignored if it is in the same directory as a
 .cvsignore file and matches one of the patterns listed therein.

-There is not currently a way to override an exclude rule read from
-a local .cvsignore file.

 See the bf(cvs(1)) manual for more information.
 
 dit(bf(--exclude=PATTERN)) This option allows you to selectively exclude
 See the bf(cvs(1)) manual for more information.
 
 dit(bf(--exclude=PATTERN)) This option allows you to selectively exclude