[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  b547302 Mention -O is forced, not just implied.
      from  136c6c7 Fix double-fuzzy + link-dest issue. Fixes bug 11866.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b54730294339ae1b70c4c04c9450a5fd56345f81
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Oct 8 08:52:33 2017 -0700

    Mention -O is forced, not just implied.

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

Summary of changes:
 rsync.yo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/rsync.yo b/rsync.yo
index d56db43..fad7b2f 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -781,7 +781,7 @@ backup file goes and what (if any) suffix gets appended using the
 bf(--backup-dir) and bf(--suffix) options.
 
 Note that if you don't specify bf(--backup-dir), (1) the
-bf(--omit-dir-times) option will be implied, and (2) if bf(--delete) is
+bf(--omit-dir-times) option will be forced on, and (2) if bf(--delete) is
 also in effect (without bf(--delete-excluded)), rsync will add a "protect"
 filter-rule for the backup suffix to the end of all your existing excludes
 (e.g. bf(-f "P *~")).  This will prevent previously backed-up files from being


-- 
The rsync repository.