Docs: remove claim that -Mg causes specific wording in bounce. Bug 3026

While investigating, ensure EXPERIMENTAL_DSN_INFO matches

18 files changed, 34 insertions, 0 deletions

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 7065137b8..b37b412ee 100644
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -36,6 +36,7 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@mxt1.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; lowest numbered MX record points to local host
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index c0348c457..0ac821a59 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -42,14 +42,17 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 Action: failed
 Final-Recipient: rfc822;abcd@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 Action: failed
 Final-Recipient: rfc822;usery@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index b51ae1bc6..e966d88b5 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -92,6 +92,7 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@badbad.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; unrouteable mail domain "badbad.ex" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -204,6 +205,7 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@domain2.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; unrouteable mail domain "domain2.ex" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index 6c1d4b8c1..fc117ebda 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -87,6 +87,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;":fail: fail message"@special
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; fail message
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 0a0f10801..b97fc6221 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -38,6 +38,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; Address unknown (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -96,6 +97,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; Address unknown (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/rfc822-headers
diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index ad62b017a..c63bcb0b1 100644
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -33,6 +33,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@non-local.example
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; unrouteable mail domain "non-local.example" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index 087962bf1..3f4667a8b 100644
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -33,6 +33,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; subject was "fail this" (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index 5f03e6221..594155c7d 100644
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure@myhost.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; this message is a failure (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index 422549f62..05dc46130 100644
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -34,6 +34,9 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure1@myhost.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; This message is being failed and there's a long and
+ tortuous
+ explanation about is that is being sent back to the user.
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -86,6 +89,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure2@myhost.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; delivery cancelled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone
index 67e5f59f5..d3d91c279 100644
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;list1@lists.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; list1@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -85,6 +86,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;nonlist@lists.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; nonlist@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index 67e5f59f5..d3d91c279 100644
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;list1@lists.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; list1@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -85,6 +86,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;nonlist@lists.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; nonlist@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index c4f2a9509..36157c835 100644
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -87,6 +88,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -144,6 +146,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -229,6 +232,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/rfc822-headers
diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 530518192..825cd3f01 100644
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -33,6 +33,8 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; all hosts for 'test.ex' have been failing for a long
+ time (and retry time not reached)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -139,6 +141,8 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; all hosts for 'test.ex' have been failing for a long
+ time (and retry time not reached)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 80b2afb55..32bb774c0 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;user22@test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; 590 5.4.3 Main and extended code
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index 48d3e98c6..0c164167f 100644
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -38,6 +38,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;remote_user@remote.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; account disabled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/4620.fred[ b/test/mail/4620.fred[
index 9635c7dc6..9e53c20b1 100644
--- a/test/mail/4620.fred[
+++ b/test/mail/4620.fred[
@@ -38,6 +38,7 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;remote_user@remote.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; account disabled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index dd40c616e..e0f8cc8b3 100644
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -52,6 +52,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;jack@myhost.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; LMTP error after end of data: 550 Number 2 fails
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -108,6 +109,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;jack@myhost.test.ex
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; LMTP error after end of data: 550 Number 2 fails
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index c1c378181..cb050b122 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -33,6 +33,7 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;"FAIL cannot route this one (FAIL)"@some.host
 Status: 5.0.0
+X-Exim-Diagnostic: X-str; cannot route this one (FAIL)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822