html/forward.wml: update example mbox / maildir .forward contents

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

diff --git a/html/forward.wml b/html/forward.wml
index bc21d00..ebdd786 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
@@ -58,12 +58,12 @@ relevant hosts yourself.
 The correct way to invoke procmail for extension addresses is "|/usr/bin/procmail [options]"
 Ignore the IFS=".." stuff in the procmail man page.
 
-<h2>MailBox formats</h2>
-Email can be saved to mailboxes or maildirs by using the correct lines in a
+<h2>Mailbox formats</h2>
+Email can be saved to mailboxes or maildirs by using appropriately formatted lines in a
 .forward file:
 <p>
-Mailbox format files "/debian/home/foo/Mbox"
-<br>Maildir format files "/debian/home/foo/MDir/"
+Mailbox format files "/home/foo/Mbox"
+<br>Maildir format files "/home/foo/MailDir/"
 
 <p>
 To deliver to /var/spool/mail/foo use a construct like '|/usr/bin/procmail
@@ -89,9 +89,6 @@ Instead, we invite you to configure your own spam handling.
 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.