From: Wayne Davison <wayned@samba.org>
Date: Thu, 27 Mar 2008 00:04:29 +0000 (-0700)
Subject: Mention two more NEWS items.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/a165be754b0a07da0ab0bd6a4fcc07b2f2944c67

Mention two more NEWS items.
---

diff --git a/NEWS b/NEWS
index 157dbb6b..ac1994bc 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,9 @@ Changes since 3.0.0:
 
     - Fixed a hang when combining --dry-run with --remove-source-files.
 
+    - Fixed a bug with --iconv's handling of files that cannot be converted:
+      a failed name can no longer cause a transfer failure.
+
     - Fixed the building of the rounding.h file on systems that need custom
       CPPFLAGS to be used.  Also improved the error reporting if the building
       of rounding.h fails.
@@ -74,6 +77,8 @@ Changes since 3.0.0:
     - A daemon doesn't try to auto-refuse the "iconv" option if iconv-support
       wasn't compiled in to the daemon (avoiding a warning in the logs).
 
+    - Fixed the inclusion of per-dir merge files from implied dirs.
+
     - Fixed the support/rrsync script to work with the latest options that
       rsync sends (including its flag-specifying use of -e to the server).