diff --git a/spam/help/white_from.html b/spam/help/white_from.html
index 4085c2b73..d68e8e9dc 100644
--- a/spam/help/white_from.html
+++ b/spam/help/white_from.html
@@ -1,10 +1,13 @@
-<header>Senders to never classify as spam (whitelist_from)</header>
+<header>Senders to never classify as spam</header>
 
-Used to whitelist sender addresses which send mail that is often tagged (incorrectly) as spam. <p>
+The <tt>whitelist_from</tt> option is used to whitelist sender addresses which
+send mail that is often tagged (incorrectly) as spam. <p>
 
-Use of this setting is not recommended, since it blindly trusts the message, which is routinely and easily forged by spammers and phish senders. <p>
+Use of this setting is not recommended, since it blindly trusts the message,
+which is routinely and easily forged by spammers and phish senders. <p>
 
-The recommended solution is to instead use whitelist_auth or other authenticated whitelisting methods, or whitelist_from_rcvd. <p>
+The recommended solution is to instead use whitelist_auth or other authenticated
+whitelisting methods, or <tt>whitelist_from_rcvd</tt>. <p>
 
 <footer>
 
diff --git a/spam/help/white_rcvd2.html b/spam/help/white_rcvd2.html
index 8b25e071d..e2f357662 100644
--- a/spam/help/white_rcvd2.html
+++ b/spam/help/white_rcvd2.html
@@ -1,5 +1,8 @@
-<header>Sender to never classify as spam (whitelist_from_rcvd)</header>
+<header>Sender to never classify as spam</header>
 
-Use this to supplement the allowed sender addresses with a check against the Received headers. The first parameter is the address to whitelist, and the second is a string to match the relay's rDNS. <p>
+The <tt>whitelist_from_rcvd</tt> option is used to supplement the allowed
+sender addresses with a check against the received headers. The first parameter
+is the address to whitelist, and the second is a string to match the relay's
+rDNS. <p>
 
 <footer>
diff --git a/spam/help/white_unfrom.html b/spam/help/white_unfrom.html
index 11e417d90..35542d858 100644
--- a/spam/help/white_unfrom.html
+++ b/spam/help/white_unfrom.html
@@ -1,6 +1,7 @@
-<header>Exceptions for senders to never classify as spam (unwhitelist_from)</header>
+<header>Exceptions for senders to never classify as spam</header>
 
-Used to override an sender to never classify as spam, for example to be more
-specific or to block an address that is allowed globally. <p>
+The <tt>unwhitelist_from</tt> option is used to override a sender to never
+classify as spam, for example to be more specific or to block an address that is
+allowed globally. <p>
 
 <footer>