Merge from branch-2-1

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index 09b994793237a8c752b5fc949b2f03152fc134ff..0bf870b951bf4625b12f3a47bc08b59b78f262c3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,25 @@
 Changes in 2.2
 ==============
 
+* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
 * NEW: afpd: dynamic directoy cache
 * 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.
 
+Changes in 2.1.4
+================
+
+* FIX: afpd: Downstream fix for FreeBSD PR 148022
+
+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
 ================