X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2df20057e34db58c8caa37def9321e33acfa56fd..6437b817c0023cf54f4054e25b7f7947084a1048:/rsync.yo

diff --git a/rsync.yo b/rsync.yo
index 1eb827db..4333f903 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -370,8 +370,8 @@ 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 transfer (default)
      --delete-delay          find deletions during, delete after
      --delete-after          receiver deletes after transfer, not before
      --delete-excluded       also delete excluded files from dest dirs
@@ -2163,7 +2163,8 @@ order to use bf(--info=progress2).)
 
 dit(bf(--password-file)) This option allows you to provide a password in a
 file for accessing an rsync daemon.  The file must not be world readable.
-It should contain just the password as a single line.
+It should contain just the password as the first line of the file (all
+other lines are ignored).
 
 This option does not supply a password to a remote shell transport such as
 ssh; to learn how to do that, consult the remote shell's documentation.