Merge branch 'lists'

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
index bd0628637dc8fc94a85ef2491c04963b5dbede33,1bf2cd06b36eb5f18cb55991d365cb6e7c823dee..34521098e3dbfde4bf6153a35f947dedd951e7c4
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -39,9 -39,9 +39,11 @@@ JH/02 Support "G" suffix to numbers in 
  
  PP/08 Handle smtp transport tls_sni option forced-fail for OpenSSL.
  
 -JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
 +NM/01 Bugzilla 1197 - Spec typo
 +      Bugzilla 1196 - Spec examples corrections
  
++JH/03 Add expansion operators ${listnamed:name} and ${listcount:string}
+ 
  Exim version 4.80
  -----------------