From 3cd9c0464a2133c98cbc43855e2a12a52a575220 Mon Sep 17 00:00:00 2001
From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
Date: Mon, 21 Oct 2019 19:26:22 +0100
Subject: [PATCH] html/forward.wml: merge doc-mail-handling

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---
 html/forward.wml | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/html/forward.wml b/html/forward.wml
index 7f52acc..bc21d00 100644
--- a/html/forward.wml
+++ b/html/forward.wml
@@ -73,3 +73,43 @@ Exim.
 
 <p>
 Also, 'Exim Filter' files are deliberately turned off.
+
+<h2>Spam handling</h2>
+<p>
+Debian developers have a wide variety of loud and conflicting opinions
+about what constitutes correct handling of their mail, making it impossible for
+an admin to choose a single setup that fits all use cases.
+</p>
+
+<p>
+Instead, we invite you to configure your own spam handling.
+</p>
+
+<p>
+Some options available to you are:
+</p>
+<ul>
+  <li><b>bATVToken</b> (to be enabled before 1/1/2010, with any luck) BATV
+  private token for address rewriting.  Useful in combatting bounce forgery, but
+  requires configuration on your own mail relay(s).
+  <li><b>emailForward</b> Address to forward your mail to.  Setting this and
+  then rejecting mail from d.o machines is less than helpful.
+  <li><b>mailCallout</b> Whether or not to use Sender Address Verification.
+  <li><b>mailContentInspectionAction</b> One of reject, markup, or blackhole.
+  Applies to checks done on the content of message bodies, such as spam and
+  virus checks.  Reject is default, and will reject the mail if a match occurs.
+  Markup will add a header and then forward the mail to you anyway.  Blackhole
+  will accept the mail and silently discard it.
+  <li><b>mailDefaultOptions</b> Whether to enable the 'normal' set of
+  SMTP time checks that DSA decide are appropriate.  Currently includes greylisting
+  and some RBLs.  Defaults to true.
+  <li><b>mailGreylisting</b> Whether to enable greylisting.
+  <li><b>mailRBL</b> Set of RBLs to use.
+  <li><b>mailRHSBL</b> Set of RHSBLs to use.
+  <li><b>mailWhitelist</b> Sender envelopes to whitelist.
+  <li><b>mailDisableMessage</b> Absolute last resort measure - will disable
+  incoming mail from all machines not part of the Debian host list (see
+  /var/lib/misc/thishost/debianhosts on any d.o machine).  This makes it very
+  difficult for things like automated pings and mass mailings to all concerned
+  DDs about changes to happen, and is strongly discouraged.
+</ul>
-- 
2.20.1