X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f13cddcbddd84e4b8349da865230ac86becc4066..f413481de14352e6a8e07315459f01b45cac50e8:/doc/doc-txt/ChangeLog

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index ff5523efe..3d9be185f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,14 +1,34 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.532 2007/09/21 08:30:38 steve Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.536 2007/11/12 13:02:19 nm4 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
+Exim version 4.69
+-----------------
+
+TK/01 Add preliminary DKIM support. Currently requires a forked version of
+      ALT-N's libdkim that I have put here:
+      http://duncanthrax.net/exim-experimental/
+
+      Note to Michael Haardt: I had to rename some vars in sieve.c. They
+      were called 'true' and it seems that C99 defines that as a reserved
+      keyword to be used with 'bool' variable types. That means you could
+      not include C99-style headers which use bools without triggering
+      build errors in sieve.c.
+
 NM/01 Bugzilla 592: --help option is handled incorrectly if exim is invoked
       as mailq or other aliases.  Changed the --help handling significantly
       to do whats expected.  exim_usage() emits usage/help information.
 
 SC/01 Added the -bylocaldomain option to eximstats.
 
+NM/02 Bugzilla 619: Defended against bad data coming back from gethostbyaddr
+
+NM/03 Bugzilla 613: Documentation fix for acl_not_smtp
+
+NM/04 Bugzilla 628: PCRE update to 7.4 (work done by John Hall)
+
+
 Exim version 4.68
 -----------------