X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=doc%2Fdoc-txt%2FChangeLog;h=3d9be185ff3921d2c1a55b76110ee1299489ad3f;hp=087c67205cefe3601454dc1e8f47ed21cb00994a;hb=47db112512e23853b60b6ecea208056818e10907;hpb=19897d528de779d4d3804fd7d10c235e8b50a53e

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 087c67205..3d9be185f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,8 +1,34 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.529 2007/08/29 14:02:22 ph10 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
 -----------------
 
@@ -101,6 +127,10 @@ PH/22 Guard against possible overflow in moan_check_errorcopy().
 
 PH/23 POSIX allows open() to be a macro; guard against that.
 
+PH/24 If the recipient of an error message contained an @ in the local part
+      (suitably quoted, of course), incorrect values were put in $domain and
+      $local_part during the evaluation of errors_copy.
+
 
 Exim version 4.67
 -----------------