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

diff --combined doc/doc-docbook/spec.xfpt
index 0d6ab9af6902a6086d2bacec5ed3cbc716c41027,59a6b5345e7804c90c07da8e2a32cb1518824064..31767bf5552e1c36857d8fd39938f068b7f3672c
--- 1/doc/doc-docbook/spec.xfpt
--- 2/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -8263,13 -8263,10 +8263,13 @@@ apply to temporary DNS errors, whose ha
  
  .cindex "&`+include_unknown`&"
  .cindex "&`+ignore_unknown`&"
 -By default, Exim behaves as if the host does not match the list. This may not
 -always be what you want to happen. To change Exim's behaviour, the special
 -items &`+include_unknown`& or &`+ignore_unknown`& may appear in the list (at
 -top level &-- they are not recognized in an indirected file).
 +Exim parses a host list from left to right. If it encounters a permanent
 +lookup failure in any item in the host list before it has found a match,
 +Exim treats it as a failure and the default behavior is as if the host
 +does not match the list. This may not always be what you want to happen.
 +To change Exim's behaviour, the special items &`+include_unknown`& or
 +&`+ignore_unknown`& may appear in the list (at top level &-- they are
 +not recognized in an indirected file).
  
  .ilist
  If any item that follows &`+include_unknown`& requires information that
@@@ -8297,37 -8294,6 +8297,37 @@@ Both &`+include_unknown`& and &`+ignore
  list. The effect of each one lasts until the next, or until the end of the
  list.
  
 +To explain the host/ip processing logic a different way for the same ACL:
 +
 +.ilist
 +If you have name lookups or wildcarded host names and
 +IP addresses in the same host list, you should normally put the IP
 +addresses first. For example, in an ACL you could have:
 +.code
 +accept hosts = 10.9.8.7 : *.friend.example
 +.endd
 +The reason you normally would order it this way lies in the
 +left-to-right way that Exim processes lists.  It can test IP addresses
 +without doing any DNS lookups, but when it reaches an item that requires
 +a host name, it fails if it cannot find a host name to compare with the
 +pattern. If the above list is given in the opposite order, the
 +&%accept%& statement fails for a host whose name cannot be found, even
 +if its IP address is 10.9.8.7.
 +
 +.next
 +If you really do want to do the name check first, and still recognize the IP
 +address, you can rewrite the ACL like this:
 +.code
 +accept hosts = *.friend.example
 +accept hosts = 10.9.8.7
 +.endd
 +If the first &%accept%& fails, Exim goes on to try the second one. See chapter
 +&<<CHAPACL>>& for details of ACLs. Alternatively, you can use
 +&`+ignore_unknown`&, which was discussed in depth in the first example in
 +this section.
 +.endlist
 +
 +
  
  .section "Temporary DNS errors when looking up host information" &&&
           "SECTtemdnserr"
@@@ -15376,6 -15342,13 +15376,13 @@@ live with
  
  . Allow this long option name to split; give it unsplit as a fifth argument
  . for the automatic .oindex that is generated by .option.
+ . We insert " &~&~" which is both pretty nasty visually and results in
+ . non-searchable text.  HowItWorks.txt mentions an option for inserting
+ . zero-width-space, which would be nicer visually and results in (at least)
+ . html that Firefox will split on when it's forced to reflow (rather than
+ . inserting a horizontal scrollbar).  However, the text is still not
+ . searchable.  NM changed this occurrence for bug 1197 to no longer allow
+ . the option name to split.
  
  .option "smtp_accept_max_per_connection" main integer 1000 &&&
           smtp_accept_max_per_connection
@@@ -15427,10 -15400,9 +15434,9 @@@ also &%queue_only%&, &%queue_only_load%
  various &%-od%&&'x'& command line options.
  
  
- . Allow this long option name to split; give it unsplit as a fifth argument
- . for the automatic .oindex that is generated by .option.
+ . See the comment on smtp_accept_max_per_connection
  
- .option "smtp_accept_queue_per_ &~&~connection" main integer 10 &&&
+ .option "smtp_accept_queue_per_connection" main integer 10 &&&
           smtp_accept_queue_per_connection
  .cindex "queueing incoming messages"
  .cindex "message" "queueing by message count"
@@@ -23604,7 -23576,7 +23610,7 @@@ In practice, almost all rules start wit
  part.
  
  .cindex "regular expressions" "in retry rules"
- &*Warning*&: If you use a regular expression in a routing rule pattern, it
+ &*Warning*&: If you use a regular expression in a retry rule pattern, it
  must match a complete address, not just a domain, because that is how regular
  expressions work in address lists.
  .display