svn commit: r888928 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Plugin/DKIM.pm Plugin/SPF.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Dec  9 19:29:19 2009
New Revision: 888928

URL: http://svn.apache.org/viewvc?rev=888928&view=rev
Log:
documentation (POD) change: get rid of the misleading
wording: "Use this to supplement the whitelist_from"
according to a ML topic "clarification on whitelist_from_rcvd"

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=888928&r1=888927&r2=888928&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Dec  9 19:29:19 2009
@@ -340,8 +340,9 @@
 
 =item whitelist_from_rcvd addr@lists.sourceforge.net sourceforge.net
 
-Use this to supplement the whitelist_from addresses with a check against the
-Received headers. The first parameter is the address to whitelist, and the
+Works similarly to whitelist_from, except that in addition to matching
+a sender address, a relay's rDNS name must match too for the whitelisting
+rule to fire. The first parameter is an address to whitelist, and the
 second is a string to match the relay's rDNS.
 
 This string is matched against the reverse DNS lookup used during the handover

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=888928&r1=888927&r2=888928&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Wed Dec  9 19:29:19 2009
@@ -171,10 +171,10 @@
 
 =item whitelist_from_dkim author@example.com [signing-domain]
 
-Use this to supplement the whitelist_from addresses with a check to make
-sure the message with a given From address (the author's address) carries
-a valid Domain Keys Identified Mail (DKIM) signature by a signing-domain
-(SDID, i.e. the d= tag) that is acceptable to us (i.e. to the verifier).
+Works similarly to whitelist_from, except that in addition to matching
+an author address (From) to the pattern in the first parameter, the message
+must also carry a Domain Keys Identified Mail (DKIM) signature made by a
+signing domain (SDID, i.e. the d= tag) that is acceptable to us.
 
 Only one whitelist entry is allowed per line, as in C<whitelist_from_rcvd>.
 Multiple C<whitelist_from_dkim> lines are allowed. File-glob style characters

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?rev=888928&r1=888927&r2=888928&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Wed Dec  9 19:29:19 2009
@@ -82,9 +82,10 @@
 
 =item whitelist_from_spf add@ress.com
 
-Use this to supplement the whitelist_from addresses with a check against the
-domain's SPF record. Aside from the name 'whitelist_from_spf', the syntax is
-exactly the same as the syntax for 'whitelist_from'.
+Works similarly to whitelist_from, except that in addition to matching
+a sender address, a check against the domain's SPF record must pass.
+The first parameter is an address to whitelist, and the second is a string
+to match the relay's rDNS.
 
 Just like whitelist_from, multiple addresses per line, separated by spaces,
 are OK. Multiple C<whitelist_from_spf> lines are also OK.