X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ac1541f4b780037a726ffc3f09db108fb970f194..7d5acf1d4472af7a2f80c3b217e1cb8bdffc312d:/NEWS

diff --git a/NEWS b/NEWS
index 4897db3b..a9f3414b 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ Changes since 2.6.3:
       was only treating it as a special token in an rsync include/exclude
       file).
 
+    - Avoid a mkdir warning when removing a directory in the destination
+      that already exists in the --backup-dir.
+
     - An OS that has a binary mode for its files (such as cygwin0 needed
       setmode(fd, O_BINARY) called on the temp-file we opened with
       mkstemp().
@@ -16,8 +19,15 @@ Changes since 2.6.3:
       FIFOs and sockets, and compile-in using mkfifo() and socket() when
       necessary.
 
+    - Fixed an off-by-one error in the handling of --max-delete=N.
+
   ENHANCEMENTS:
 
+    - The daemon-mode options were separated from the normal rsync options
+      so that they can't be mixed together.  This makes it impossible for a
+      user to start a daemon that had improper default option values that
+      could cause problems (a hang or an exit) when a client connects.
+
     - In _exit_cleanup(): when we are exiting with a partially-received
       file, we now flush any data in the write-cache before closing the
       partial file.