--- a/ChangeLog	Tue Jun 13 07:41:08 2000 +0100
+++ b/ChangeLog	Tue Jun 13 07:44:21 2000 +0100
@@ -2,15 +2,50 @@
 NOFFLE ChangeLog
 -------------------------------------------------------------------------------
 
+Tue Jun 13 07:27:21 BST 2000 Jim Hague <jim.hague@acm.org>
+
+  * src/configfile.h, src/configfile.c, src/database.c: Redo config
+    expires routines to remove enumerator and replace with routine to
+    obtain expire time for specified group.
+  * src/configfile.h, src/configfile.c, src/server.c, noffle.conf.example,
+    docs/noffle.conf.5: Change 'auto-subscribe-mode' to
+    'default-auto-subscribe-mode' and add
+    'auto-subscribe-mode <grp pattern> <mode>'. For the moment,
+    spot old usage of 'auto-subscribe-mode' and interpret it as
+    'default-auto-subscribe-mode'.
+  * src/client.c: Rename variable to remove compiler warning.
+	
+Sat Jun 11 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+
+ * Prepare for version 1.0pre6
+ * configure.in: Removed warning options for warnings that are
+   unavoidable with libgdbm
+
 Mon Jun  5 09:46:30 BST 2000 Jim Hague <jim.hague@acm.org>
 
  * src/client.c, src/fetch.c, src/group.c, src/group.h, src/noffle.c:
-  Don't track remote message number read unless subscribed to a group.
-  This stops 'Missing articles' pseudos being generated when you join
-  a group some time after doing the 'noffle --query groups' that first
-  found the group, or if you resubscribe a while after unsubscribing.
-  They will still be generated if articles are missed when a group is
-  subscribed, in which case the pseudo message is entirely applicable.
+   Don't track remote message number read unless subscribed to a group.
+   This stops 'Missing articles' pseudos being generated when you join
+   a group some time after doing the 'noffle --query groups' that first
+   found the group, or if you resubscribe a while after unsubscribing.
+   They will still be generated if articles are missed when a group is
+   subscribed, in which case the pseudo message is entirely applicable.
+	
+Sat Jun 03 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+
+ * docs/NOTES: removed the whole section about the mail2news gateway.
+   It doesn't really work, because procmail forks for each mail and
+   changing the posting allowed status is not atomic.
+
+Thu Jun 01 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+
+ * docs/NOTES: Added section about "replace-messageid" option in
+   the Mail-News-Gateway chapter.
+
+Mon May 29 19:12:47 BST 2000 Jim Hague <jim.hague@acm.org>
+
+ * src/client.c: Fix spelling mistake in comment.
+ * docs/noffle.1: Add a little bit more to the description of --online.
 	
 Mon May 29 18:28:25 CEST 2000 Uwe Hermann <uh1763@bingo-ev.de>
 
@@ -21,6 +56,11 @@
 
  * NEWS: Update.
 
+Fri May 26 11:38:27 BST 2000 Jim Hague <jim.hague@acm.org>
+
+ * docs/NOTES: Added notes on knode.
+ * src/client.c: Corrected comment.
+	
 Thu May 25 22:03:56 BST 2000 Jim Hague <jim.hague@acm.org>
 
  * src/post.c: Fixed stupid bug in article checking code where a
@@ -40,6 +80,9 @@
  * src/client.c: Closer perusal of Son Of RFC1036 reveals that
    Supersedes: can have multiple message IDs. Do this.
 	
+Sat May 20 2000 Markus Enzenberger <markus.enzenberger@t-online.de>
+ * src/noffle.c: always enable generation of core files.
+
 Fri May 19 14:02:44 BST 2000 Jim Hague <jim.hague@acm.org>
 
  * src/util.h, src/util.c, src/database.c, src/pseudo.c, src/post.c: