Merge branch 'acl'

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

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index bd0628637dc8fc94a85ef2491c04963b5dbede33..a9c9abed8c4c66873267ede00eb0751cb27414b1 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -42,6 +42,17 @@ PP/08 Handle smtp transport tls_sni option forced-fail for OpenSSL.
 NM/01 Bugzilla 1197 - Spec typo
       Bugzilla 1196 - Spec examples corrections
 
+JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
+
+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..."
+
 Exim version 4.80
 -----------------