X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8c57732324fb211bc6c3cb0cb5ea2ecb247c8ff2..f08ca43472b518b93230acd853532d79b7e8a3a5:/NEWS

diff --git a/NEWS b/NEWS
index 16b614fc..fc32bc4d 100644
--- a/NEWS
+++ b/NEWS
@@ -13,9 +13,20 @@ Changes since 2.6.3:
       being pushed (since the stats come from the sending side).
       (Requires protocol 29 for a pull.)
 
-    - The "%o" (operation) log format now has a third value (besides "send"
-      and "recv"):  "del." (with trailing dot to make it 4 chars).  This
-      changes the way deletions are logged in the daemon's log file.
+    - The "%o" (operation) log-format escape now has a third value (besides
+      "send" and "recv"):  "del." (with trailing dot to make it 4 chars).
+      This changes the way deletions are logged in the daemon's log file.
+
+    - When the --log-format option is combined with --verbose, rsync now
+      avoids outputting the name of the file twice in most circumstances.
+      As long as the --log-format item does not refer to any post-transfer
+      items (such as %b or %c), the --log-format message is output prior to
+      the transfer with --verbose being the equivalent of a --log-format of
+      '%n%L' (which outputs the name and any symlink info).  If the log
+      output must occur after the transfer to be complete, the only time
+      the name is also output prior to the transfer is when --progress was
+      specified (so that the name will precede the progress stats, and the
+      full --log-format output will come after).
   
   BUG FIXES:
 
@@ -72,7 +83,7 @@ Changes since 2.6.3:
     - Fixed a bug that would sometimes surface when using --compress and
       sending a file with a block-size larger than 64K (either manually
       specified, or computed due to the file being really large).  Prior
-      versions of rsync would sometimes fail to to decompress the data
+      versions of rsync would sometimes fail to decompress the data
       properly, and thus the transferred file would fail its verification.
 
     - If a daemon can't open the specified log file (i.e. syslog is not
@@ -94,10 +105,10 @@ Changes since 2.6.3:
       use /etc/popt and/or ~/.popt to create your own option aliases.
 
     - Added the --delete-during (--del) option which will delete files
-      from on the receiving side incrementally as each directory in the
+      from the receiving side incrementally as each directory in the
       transfer is being processed.  This makes it more efficient than the
       default, before-the-transfer behavior, which is now available as
-      --delete-before (that is still the default --delete-WHEN option that
+      --delete-before (and is still the default --delete-WHEN option that
       will be chosen if --delete or --delete-excluded is specified without
       a --delete-WHEN choice).  All the --del* options infer --delete, so
       an rsync daemon that refuses "delete" will still refuse to allow any
@@ -106,14 +117,12 @@ Changes since 2.6.3:
     - All the --delete-WHEN options are now more memory efficient:
       Previously an entire duplicate set of file-list objects was created
       on the receiving side for the entire destination hierarchy.  The new
-      algorithm only creates one directory of objects at a time.
+      algorithm only creates one directory of objects at a time (for files
+      inside the transfer).
 
-    - Added the --copy-dest option, which works like --link-dest except
-      that it includes copies of identical files.
-
-    - Added support for specifying multiple --compare-dest, --copy-dest, or
-      --link-dest options, but only of a single type. (Promoted from the
-      patches dir and enhanced.)
+    - Added support for specifying multiple --compare-dest or --link-dest
+      options, but only of a single type. (Promoted from the patches dir
+      and enhanced.)
 
     - Added the --max-size option. (Promoted from the patches dir.)
 
@@ -134,14 +143,13 @@ Changes since 2.6.3:
       file, we now flush any data in the write-cache before closing the
       partial file.
 
-    - The --inplace support was enhanced to work with --compare-dest,
-      --link-dest, and (the new) --copy-dest options. (Requires protocol
-      29.)
+    - The --inplace support was enhanced to work with --compare-dest and
+      --link-dest. (Requires protocol 29.)
 
     - Added the --dirs (-d) option for an easier way to copy directories
       without recursion.
 
-    - Added the --list-only option which is mainly a way for the client to
+    - Added the --list-only option, which is mainly a way for the client to
       put the server into listing mode without needing to resort to any
       internal option kluges (e.g. the age-old use of "-r --exclude="/*/*"
       for a non-recursive listing).  This option is used automatically
@@ -255,10 +263,10 @@ Changes since 2.6.3:
     - A 16-bit flag-word is transmitted after every file-list index.  This
       indicates what is changing between the sender and the receiver.  The
       generator now transmits an index and a flag-word to indicate when
-      dirs and symlinks have changed, which makes the outputting of the
-      information more consistent and less prone to screen corruption (it
-      resorts to the old-style outputting of generator-created change-
-      messages for older protocol versions).
+      dirs and symlinks have changed (instead of producing a message),
+      which makes the outputting of the information more consistent and
+      less prone to screen corruption (because either the receiver or the
+      sender is now outputting all the file-change info).
 
     - If --inplace is specified, the generator flags any transfer that is
       using an alternate basis file so that the sender can use the entire