Merge branch 'master' of git://git.exim.org/exim

[users/heiko/exim.git] / doc / doc-txt / ChangeLog

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4a2215956814a545d422b6cbfbf76c5262067dce..108f6051e28e2d5b692e1e97c59d2597c433631c 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -33,6 +33,8 @@ PP/07 Handle "exim -L <tag>" to indicate to use syslog with tag as the process
 
 TL/01 Bugzilla 1258 - Refactor MAIL FROM optional args processing.
 
 
 TL/01 Bugzilla 1258 - Refactor MAIL FROM optional args processing.
 

+TL/02 Add +smtp_confirmation as a default logging option.
+

 JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.
 
 JH/02 Support "G" suffix to numbers in ${if comparisons.
 JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.
 
 JH/02 Support "G" suffix to numbers in ${if comparisons.


@@ -44,7 +46,16 @@ NM/01 Bugzilla 1197 - Spec typo
 
 JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
 
 
 JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
 

-JH/04 Add expansion item ${acl {name}{argument}}
+PP/09 Add gnutls_enable_pkcs11 option.
+
+PP/10 Let Linux makefile inherit CFLAGS/CFLAGS_DYNAMIC.
+      Pulled from Debian 30_dontoverridecflags.dpatch by Andreas Metzler.
+
+JH/04 Add expansion item ${acl {name}{arg}...}, expansion condition
+      "acl {{name}{arg}...}", and optional args on acl condition
+      "acl = name arg..."
+
+JH/05 Permit multiple router/transport headers_add/remove lines.

 
 Exim version 4.80
 -----------------
 
 Exim version 4.80
 -----------------