Say "rsync 2.6.4" instead of "protocol 29".

[rsync/rsync.git] / NEWS

diff --git a/NEWS b/NEWS
index 2952c35..85703be 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,10 @@ Changes since 2.6.3:
       relative path), the backup code was erroneously trying to backup a
       file that was put into the partial-dir.
 
+    - If a file gets resent in a single transfer and the --backup option is
+      enabled along with --inplace, rsync no longer performs a duplicate
+      backup (it used to overwrite the first backup with the failed file).
+
     - One call to flush_write_file() was not being checked for an error.
 
     - The --no-relative option was not being sent from the client to a
@@ -100,10 +104,11 @@ Changes since 2.6.3:
       output without overlapping it.  (Requires protocol 29.)
 
     - When --timeout is specified, lulls that occur in the transfer while
-      the generator is scanning the file system (either looking for files
-      to generate or files to delete) cause a new keep-alive packet to be
-      sent that should keep the transfer going (as long as the generator
-      continues to make progress).  (Requires protocol 29.)
+      the generator is doing work that does not generate socket traffic
+      (looking for changed files, deleting files, doing directory-time
+      touch-ups, etc.) will cause a new keep-alive packet to be sent that
+      should keep the transfer going as long as the generator continues to
+      make progress.  (Requires protocol 29.)
 
     - The stat size of a device is not added to the total file size of the
       items in the transfer since the size might be undefined on some OSes.
@@ -279,7 +284,7 @@ Changes since 2.6.3:
 
     - If --inplace is specified, the generator flags any transfer that is
       using an alternate basis file so that the sender can use the entire
-      file in the rsync algorithm (unlike a normal --inplace update).
+      basis file in the rsync algorithm (unlike a normal --inplace update).
 
     - The sending of exclude names is done using filter-rule syntax.  This
       means that all names have a prefixed rule indicator, even excludes
@@ -317,7 +322,7 @@ Changes since 2.6.3:
       --filter option instead of --exclude-from to capture any filter rules.
 
     - An index equal to the file-list count is sent as a keep-alive packet
-      from the generator to the sender, who then forwards it on to the
+      from the generator to the sender, which then forwards it on to the
       receiver.  This normally invalid index is only a valid keep-alive
       packet if the 16-bit flag-word that follows it contains a single bit
       (ITEM_IS_NEW, which is normally an illegal flag to appear alone).