Merge branch 'master' of git://git.exim.org/exim

diff --combined doc/doc-docbook/spec.xfpt
index 34518d3c490dd24c43802727da4c8397a13e2be0,632de6ab03faf11aacae1ff937dacc71c33c6c90..a57d29e232aaa696b335e1e394fb8faa29689a91
--- 1/doc/doc-docbook/spec.xfpt
--- 2/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -8791,12 -8791,12 +8791,12 @@@ arguments are assigned to the variable
  Any unused are made empty.  The variable &$acl_narg$& is set to the number of
  arguments.  The named ACL (see chapter &<<CHAPACL>>&) is called
  and may use the variables; if another acl expansion is used the values
 -are overwritten.  If the ACL sets
 +are restored after it returns.  If the ACL sets
  a value using a "message =" modifier and returns accept or deny, the value becomes
  the result of the expansion.
 -If no message was set and the ACL returned accept or deny
 -the value is an empty string.
 -If the ACL returned defer the result is a forced-fail.  Otherwise the expansion fails.
 +If no message is set and the ACL returns accept or deny
 +the expansion result is an empty string.
 +If the ACL returns defer the result is a forced-fail.  Otherwise the expansion fails.
  
  
  .vitem "&*${dlfunc{*&<&'file'&>&*}{*&<&'function'&>&*}{*&<&'arg'&>&*}&&&
@@@ -9923,12 -9923,12 +9923,12 @@@ dotted-nibble hexadecimal form.  In bot
  for DNS.  For example,
  .code
  ${reverse_ip:192.0.2.4}
- ${reverse_ip:2001:0db8:c42:9:1:abcd:192.0.2.3}
+ ${reverse_ip:2001:0db8:c42:9:1:abcd:192.0.2.127}
  .endd
  returns
  .code
  4.2.0.192
- 3.0.2.0.0.0.0.c.d.c.b.a.1.0.0.0.9.0.0.0.2.4.c.0.8.b.d.0.1.0.0.2
+ f.7.2.0.0.0.0.c.d.c.b.a.1.0.0.0.9.0.0.0.2.4.c.0.8.b.d.0.1.0.0.2
  .endd
  
  
@@@ -10107,7 -10107,7 +10107,7 @@@ arguments are assigned to the variable
  Any unused are made empty.  The variable &$acl_narg$& is set to the number of
  arguments.  The named ACL (see chapter &<<CHAPACL>>&) is called
  and may use the variables; if another acl expansion is used the values
 -are overwritten.  If the ACL sets
 +are restored after it returns.  If the ACL sets
  a value using a "message =" modifier the variable $value becomes
  the result of the expansion, otherwise it is empty.
  If the ACL returns accept the condition is true; if deny, false.
@@@ -26143,6 -26143,9 +26143,9 @@@ before or after the data) correctly &-
  and try again later, but that is their problem, though it does waste some of
  your resources.
  
+ The &%acl_smtp_data%& ACL is run after both the &%acl_smtp_dkim%& and
+ the &%acl_smtp_mime%& ACLs.
+ 
  
  .section "The SMTP DKIM ACL" "SECTDKIMACL"
  The &%acl_smtp_dkim%& ACL is available only when Exim is compiled with DKIM support
@@@ -26152,13 -26155,17 +26155,17 @@@ The ACL test specified by &%acl_smtp_dk
  received, and is executed for each DKIM signature found in a message.  If not
  otherwise specified, the default action is to accept.
  
- For details on the operation of DKIM, see chapter &<<CHID12>>&.
+ This ACL is evaluated before &%acl_smtp_mime%& and &%acl_smtp_data%&.
+ 
+ For details on the operation of DKIM, see chapter &<<CHAPdkim>>&.
  
  
  .section "The SMTP MIME ACL" "SECID194"
  The &%acl_smtp_mime%& option is available only when Exim is compiled with the
  content-scanning extension. For details, see chapter &<<CHAPexiscan>>&.
  
+ This ACL is evaluated after &%acl_smtp_dkim%& but before &%acl_smtp_data%&.
+ 
  
  .section "The QUIT ACL" "SECTQUITACL"
  .cindex "QUIT, ACL for"
@@@ -27105,7 -27112,7 +27112,7 @@@ contexts)
  .cindex "disable DKIM verify"
  .cindex "DKIM" "disable verify"
  This control turns off DKIM verification processing entirely.  For details on
- the operation and configuration of DKIM, see chapter &<<CHID12>>&.
+ the operation and configuration of DKIM, see chapter &<<CHAPdkim>>&.
  .wen
  
  
@@@ -27518,10 -27525,8 +27525,10 @@@ condition false. This means that furthe
  ceases, but processing of the ACL continues.
  
  If the argument is a named ACL, up to nine space-separated optional values
 -can be appended; they appear in $acl_arg1 to $acl_arg9, and $acl_narg is set
 -to the count of values.  The name and values are expanded separately.
 +can be appended; they appear within the called ACL in $acl_arg1 to $acl_arg9,
 +and $acl_narg is set to the count of values.
 +Previous values of these variables are restored after the call returns.
 +The name and values are expanded separately.
  
  If the nested &%acl%& returns &"drop"& and the outer condition denies access,
  the connection is dropped. If it returns &"discard"&, the verb must be
@@@ -35993,7 -35998,7 +36000,7 @@@ unqualified domain &'foundation'&
  . ////////////////////////////////////////////////////////////////////////////
  . ////////////////////////////////////////////////////////////////////////////
  
- .chapter "Support for DKIM (DomainKeys Identified Mail)" "CHID12" &&&
+ .chapter "Support for DKIM (DomainKeys Identified Mail)" "CHAPdkim" &&&
           "DKIM Support"
  .cindex "DKIM"