Merge branch 'patch-3' of https://github.com/bes-internal/exim into master_dmarc_doc

diff --cc doc/doc-txt/experimental-spec.txt
index 3e8f5c549fcdc6a167af37833f2242d8353b68da,f9be19cf701841d6434fe84c6337ea3384b1c188..271ab0ba042cc5f0b4899f1a7a60e824863712ad
--- 1/doc/doc-txt/experimental-spec.txt
--- 2/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@@ -758,8 -760,8 +760,8 @@@ mean, refer to the DMARC website above
    o norecord    No policy section in the DMARC record for this
                  sender domain.
    o nofrom      Unable to determine the domain of the sender.
-   o none        There is no DMARC record for this sender domain.
-   o error       Library error or dns error.
+   o temperror   Library error or dns error.
 -  o off         The DMARC check was disable for this email.
++  o off         The DMARC check was disabled for this email.
  
  You can prefix each string with an exclamation mark to invert its
  meaning, for example "!accept" will match all results but