Add some of my merges.

diff --git a/NEWS b/NEWS
index 8d56d05dba6b88d4032a0f4a3cc457c5e5c09243..26f15702ccbae0fe5f3a27c0a8b652a3e6c0a555 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ Changes from 1.5.1
 
 * NEW: NetBSD support contributed by David Rankin and NetBSD contributors.
        This includes a new configure option --enable-netbsd.
+* NEW: -server_notif afpd flag has been added to control whether or not
+       you want the server to send notifications (this is the current way
+          of doing things).  If you do not specify this flag (default), the 
+          client will poll the server every 10 seconds for directory updates.
 * UPD: Use separate macro for AFS configure check.
 * UPD: Some Perl scripts are now (partially) auto-generated. This improves
        out-of-the-box usage of Netatalk.
@@ -11,6 +15,7 @@ Changes from 1.5.1
        fixes to the Kernel sources, too.
 * FIX: AFS compilation would fail due to a misnamed variable.
 * FIX: SLP configure check was wrong so SLP did not compile.
+* FIX: Fix the way quotas are handled under certain situations.
 * FIX: Do not enable debugging code if debugging option is not set.
 * FIX: Some problems with wrongly assigned DIDs were fixed.
 * FIX: Various bug fixes and code cleanups.