X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a61ec6b1688ea64fba7c03d69d6f75a7e0b24c61..c8fa85b23bfebc68f0ab2e0464937f5ee4a8bf69:/rsync.yo

diff --git a/rsync.yo b/rsync.yo
index 0e93d4ce..335f76d1 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -2671,10 +2671,14 @@ itemization(
   also disabled).
   it() You may also specify any of the modifiers for the "+" or "-" rules
   (above) in order to have the rules that are read in from the file
-  default to having that modifier set.  For instance, "merge,-/ .excl" would
+  default to having that modifier set (except for the bf(!) modifier, which
+  would not be useful).  For instance, "merge,-/ .excl" would
   treat the contents of .excl as absolute-path excludes,
   while "dir-merge,s .filt" and ":sC" would each make all their
-  per-directory rules apply only on the sending side.
+  per-directory rules apply only on the sending side.  If the merge rule
+  specifies sides to affect (via the bf(s) or bf(r) modifier or both),
+  then the rules in the file must not specify sides (via a modifier or
+  a rule prefix such as bf(hide)).
 )
 
 Per-directory rules are inherited in all subdirectories of the directory