X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1bbf83c07d85edf5c20ba3f857fd63a8846535ea..98393ae2e2a7adc8b780a4583fc6742073de7f32:/rsync.yo

diff --git a/rsync.yo b/rsync.yo
index b8880f2e..1aed8997 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -226,7 +226,7 @@ verb(
  -R, --relative              use relative path names
  -b, --backup                make backups (default ~ suffix)
      --backup-dir            make backups into this directory
-     --suffix=SUFFIX         override backup suffix
+     --suffix=SUFFIX         define backup suffix
  -u, --update                update only (don't overwrite newer files)
  -l, --links                 copy symlinks as symlinks
  -L, --copy-links            copy the referent of symlinks
@@ -374,10 +374,15 @@ control the backup suffix using the --suffix option.
 
 dit(bf(--backup-dir=DIR)) In combination with the --backup option, this
 tells rsync to store all backups in the specified directory. This is
-very useful for incremental backups.
+very useful for incremental backups.  You can additionally
+specify a backup suffix using the --suffix option
+(otherwise the files backed up in the specified directory
+will keep their original filenames).
 
 dit(bf(--suffix=SUFFIX)) This option allows you to override the default
 backup suffix used with the -b option. The default is a ~.
+If --backup-dir and --suffix are both specified,
+the SUFFIX is appended to the filename even in the backup directory.
 
 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
@@ -510,6 +515,13 @@ remote shell program to use for communication between the local and
 remote copies of rsync. Typically, rsync is configured to use rsh by
 default, but you may prefer to use ssh because of its high security.
 
+Feel free to include options in the COMMAND.  For instance:
+
+quote(-e "ssh -1 -l joe")
+
+(Note that ssh users can alternately customize site-specific connect
+options in their .ssh/config file.)
+
 You can also choose the remote shell program using the RSYNC_RSH
 environment variable.