Merge branch-2-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 3d56a87832eaba3e7328ff6633fcdd9eaed1319d..a4be989bdb22b21806b09aa9d00f4f18ad081df5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,12 +6,14 @@ Changes in 2.2
 * NEW: afpd: POSIX 1e ACL support
 * NEW: afpd: automagic Zeroconf registration with avahi, registering both
        the service _afpovertcp._tcp and TimeMachine volumes with _adisk._tcp.
-* UPD: Support for BerkeleyDB 5.0.
 
 Changes in 2.1.3
 ================
 
 * FIX: afpd: fix a serious error in networking IO code
+* FIX: afpd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO, use
+       non-blocking IO and select instead for writing/sending data.
+* UPD: Support for BerkeleyDB 5.0.
 
 Changes in 2.1.2
 ================