Fixed conflicts from merge

[netatalk.git] / NEWS

diff --git a/NEWS b/NEWS
index d00d61dbe67f30d7b16f9ac286f982c7b5a3931d..4dfbf1464ac844835b21d5a9db0a417cc1f415bd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Changes in 2.2
+==============
+
+* UPD: AppleTalk ist disabled by default at configuration time. If needed
+       use configure switch --enable-ddp.
+* NEW: ad utility: ad cp
+* NEW: ad utility: ad rm
+* NEW: ad utility: ad mv
+* NEW: afpd: dynamic directoy and CNID 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.
+* FIX: afpd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO/SO_RCVTIMEO,
+       use non-blocking IO and select instead.
+* FIX: cnid_dbd: Solaris 10 compatibilty fix: don't use SO_SNDTIMEO/SO_RCVTIMEO,
+       use non-blocking IO and select instead.
+* REM: afile/achfile/apple_cm/apple_mv/apple_rm: use ad
+
 Changes in 2.1.5
 ================
 * UPD: afpd: support newlines in -loginmesg with \n escaping syntax