html/forward.wml: fix formatting of example command

[mirror/userdir-ldap-cgi.git] / html / forward.wml

diff --git a/html/forward.wml b/html/forward.wml
index 7f52acc..778e15a 100644 (file)
--- a/html/forward.wml
+++ b/html/forward.wml
@@ -22,7 +22,7 @@ then <tt>foo-lists@debian.org</tt> also redirects to <tt>foo@example.com</tt>.
 <p>
 As a special-case, the forwarding address may be foo@master.debian.org,
 in which case the message is relayed to that system for processing by the
-user's .forward or .procmailrc files. Forwarding to master.debian.org uses
+user's .forward or .procmailrc files. Forwarding to master.debian.org preserves
 the extension part of the original address.
 
 <p>
@@ -44,8 +44,8 @@ echo "emailforward: foo@bar.com" | gpg --clearsign | mail changes@db.debian.org
 or by visiting <a href="https://db.debian.org/login.html">db.debian.org</a>
 
 <p>
-You can test the email routing by using the command <tt>/usr/sbin/exim -bt
-foo@debian.org</tt>
+You can test the email routing by using the command
+<tt>/usr/sbin/exim -bt foo@debian.org</tt>
 
 <h2>procmail</h2>
 If you use procmail for your main mailbox, PLEASE, erase your .forward
@@ -73,3 +73,40 @@ 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>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>