summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2014-11-16 17:47:50 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2014-11-18 23:55:23 +0000
commit2d75eab6bb3ddf9000613972cd6394c2580a1de7 (patch)
treee459ff8572d2189e6f1b2db421b7c88e125cfc6f /doc
parentf3d11401d1cf97be77dbaa3246e06d07809f48b5 (diff)
Make the multi_domain smtp transport option expanded
Diffstat (limited to 'doc')
-rw-r--r--doc/doc-docbook/spec.xfpt5
-rw-r--r--doc/doc-txt/ChangeLog2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 3bd98cd71..15eb56161 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -23237,7 +23237,7 @@ so can cause parallel connections to the same host if &%remote_max_parallel%&
permits this.
-.option multi_domain smtp boolean true
+.option multi_domain smtp boolean&!! true
.vindex "&$domain$&"
When this option is set, the &(smtp)& transport can handle a number of
addresses containing a mixture of different domains provided they all resolve
@@ -23246,6 +23246,9 @@ handling only one domain at a time. This is useful if you want to use
&$domain$& in an expansion for the transport, because it is set only when there
is a single domain involved in a remote delivery.
+It is expanded per-address and can depend on any of
+&$address_data$&, &$domain_data$&, &$local_part_data$&,
+&$host$&, &$host_address$& and &$host_port$&.
.option port smtp string&!! "see below"
.cindex "port" "sending TCP/IP"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 61e70f438..bc79829de 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -7,6 +7,8 @@ Exim version 4.86
JH/01 Bug 1545: The smtp transport option "retry_include_ip_address" is now
expanded.
+JH/02 The smtp transport option "multi_domain" is now expanded.
+
Exim version 4.85
-----------------