Merge branch 'master' into todd_prdr

Conflicts:
	doc/doc-txt/ChangeLog

diff --cc doc/doc-docbook/spec.xfpt
index 0567feb136a52a66defaa14843fd9b8e1df4a144,7126fb0ed3a276bfcec563b871941bc8f8910198..9c03523bb828dfe8b9c619843754aa62030f0475
--- 1/doc/doc-docbook/spec.xfpt
--- 2/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -19603,7 -19603,7 +19603,7 @@@ so on when debugging driver configurati
  option is not working properly, &%debug_print%& could be used to output the
  variables it references. A newline is added to the text if it does not end with
  one.
- The variables &$transport_name$ and &&$router_name$& contain the name of the
 -The variables &$transport_name$ and &$router_name$& contain the name of the
++The variables &$transport_name$& and &$router_name$& contain the name of the
  transport and the router that called it.
  
  

diff --cc doc/doc-txt/ChangeLog
index b8c30e9d9d3e2b9151c5eb66561bddb4c8395ae2,aa5adf1c8dc7d945c10192cda1961156d5a1233e..e8da78188061f596697d823826f80c2f94441934
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -150,18 -148,8 +148,20 @@@ PP/14 Fix OCSP reinitialisation in SNI 
        Would have resulted in OCSP responses post-SNI triggering an Exim
        NULL dereference and crash.
  
- JH/13 SMTP PRDR (http://www.eric-a-hall.com/specs/draft-hall-prdr-00.txt).
+ JH/13 Add $router_name and $transport_name variables.  Bugzilla 308.
+ 
++JH/14 SMTP PRDR (http://www.eric-a-hall.com/specs/draft-hall-prdr-00.txt).
 +      Server implementation by Todd Lyons, client by JH.
 +      Only enabled when compiled with EXPERIMENTAL_PRDR.  A new
 +      config variable "prdr_enable" controls whether the server
 +      advertises the facility.  If the client requests PRDR a new
 +      acl_data_smtp_prdr ACL is called once for each recipient, after
 +      the body content is received and before the acl_smtp_data ACL.
 +      The client is controlled by bolth of: a hosts_try_prdr option
 +      on the smtp transport, and the server advertisement.
 +      Default client logging of deliveries and rejections involving
 +      PRDR are flagged with the string "PRDR".
 +
  
  Exim version 4.80.1
  -------------------

diff --cc doc/doc-txt/NewStuff
index 96f6573caa1d1cb48406c077bb6e4feb4681711a,70890b1853feb3f8072fd0686955f32cdda8b2b5..47c5f6fecd086a7c2a880641d8adf57f55585da2
--- 1/doc/doc-txt/NewStuff
--- 2/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@@ -127,11 -126,7 +126,10 @@@ Version 4.8
      particularly for debug_print as -bt commandline option does not
      require privilege whereas -d does.
  
 +18. If built with EXPERIMENTAL_PRDR, per-recipient data responses per a
 +    proposed extension to SMTP from Eric Hall.
 +
  
- 
  Version 4.80
  ------------