X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/271220c5421b32dcbb7f699fca059d6a6bb0a852..f463e207536b74a6f6765490154e5342ac1176df:/NEWS

diff --git a/NEWS b/NEWS
index eab3bf37..c57c4ee0 100644
--- a/NEWS
+++ b/NEWS
@@ -47,10 +47,10 @@ Changes since 2.6.3:
     - Fixed a potential hang when verbosity is high, the client side is
       the sender, and the file-list is large.
 
-    - Fixed a potential protocol-corrupting bug where the generator
-      might accidentally merge a message from the receiver into the
-      middle of a multiplexed packet of data that is waiting for the
-      socket to allow it to flush.
+    - Fixed a potential protocol-corrupting bug where the generator could
+      merge a message from the receiver into the middle of a multiplexed
+      packet of data if only part of that data was written out to the
+      socket when we got the message from the generator.
 
     - We now check if the OS doesn't support using mknod() for creating
       FIFOs and sockets, and compile-in using mkfifo() and socket() when
@@ -126,7 +126,7 @@ Changes since 2.6.3:
       (the preserved) attributes from the version in the compare-dest DIR.
 
     - When rsync is copying files into a write-protected directory, fixed
-      the changed-report output for the directory so that we don't report
+      the change-report output for the directory so that we don't report
       an identical directory as changed.
 
   ENHANCEMENTS: