Merge branch 'fakereject'

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/ChangeLog
index d99370a7e8a3497e31d688c5270a95caf5141484,454d343119ab3d3ff8189c87ad404b175e078324..11b25f875bb4ee2667d6a68624cb0b3674ac4190
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -55,16 -55,9 +55,19 @@@ JH/13 Cutthrough: expand transport dkim
        empty is permissible (obviously it should depend only on data available
        when the cutthrough connection is made).
  
 -JH/14 Fakereject: previously logged as a norml message arrival "<="; now
 +JH/14 Fix logging of errors under PIPELINING.  Previously the log line giving
 +      the relevant preceding SMTP command did not note the pipelining mode.
 +
 +JH/15 Fix counting of empty lines in $body_linecount and $message_linecount.
 +      Previously they were not counted.
 +
 +JH/16 DANE: treat a TLSA lookup response having all non-TLSA RRs, the same
 +      as one having no matching records.  Previously we deferred the message
 +      that needed the lookup.
 +
++JH/17 Fakereject: previously logged as a norml message arrival "<="; now
+       distinguished as "(=".
+ 
  
  Exim version 4.87
  -----------------

diff --cc src/src/receive.c
Simple merge