Typo & nit fixes.

JH has made more changes than he realised.  New second JH/11 to JH/13.

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 0567feb136a52a66defaa14843fd9b8e1df4a144..7126fb0ed3a276bfcec563b871941bc8f8910198 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -19603,7 +19603,7 @@ so on when debugging driver configurations. For example, if a &%headers_add%&
 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.
 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

 transport and the router that called it.
 
 
 transport and the router that called it.
 
 

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a8b2dfa12635bf451aa88c5b7ea429b693b88e3b..aa5adf1c8dc7d945c10192cda1961156d5a1233e 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -80,8 +80,6 @@ JH/09 Add $headers_added variable, with content from use of ACL modifier
 JH/10 Add 8bitmime log_selector, for 8bitmime status on the received line.
       Pulled from Bugzilla 817 by Wolfgang Breyha.
 
 JH/10 Add 8bitmime log_selector, for 8bitmime status on the received line.
       Pulled from Bugzilla 817 by Wolfgang Breyha.
 

-JH/11 Add $router_name and $transport_name variables.  Bugzilla 308.
-

 PP/11 SECURITY: protect DKIM DNS decoding from remote exploit.
       CVE-2012-5671
 
 PP/11 SECURITY: protect DKIM DNS decoding from remote exploit.
       CVE-2012-5671
 


@@ -150,6 +148,8 @@ PP/14 Fix OCSP reinitialisation in SNI handling for Exim/TLS as server.
       Would have resulted in OCSP responses post-SNI triggering an Exim
       NULL dereference and crash.
 
       Would have resulted in OCSP responses post-SNI triggering an Exim
       NULL dereference and crash.
 

+JH/13 Add $router_name and $transport_name variables.  Bugzilla 308.
+

 
 Exim version 4.80.1
 -------------------
 
 Exim version 4.80.1
 -------------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 7675e599a23aac3b7ed105303a4a7829bd80c760..70890b1853feb3f8072fd0686955f32cdda8b2b5 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -120,7 +120,6 @@ Version 4.82
 
 15. New 8bitmime status logging option for received messages.  Log field "M8S".
 
 
 15. New 8bitmime status logging option for received messages.  Log field "M8S".
 

-

 16. New authenticated_sender logging option, adding to log field "A".
 
 17. New expansion variables $router_name and $transport_name.  Useful
 16. New authenticated_sender logging option, adding to log field "A".
 
 17. New expansion variables $router_name and $transport_name.  Useful


@@ -128,7 +127,6 @@ Version 4.82
     require privilege whereas -d does.
 
 
     require privilege whereas -d does.
 
 

-

 Version 4.80
 ------------
 
 Version 4.80
 ------------