svn commit: r149227 - in spamassassin/trunk: MANIFEST lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm rules/init.pre

[qu...@apache.org]

Author: quinlan
Date: Sun Jan 30 22:42:50 2005
New Revision: 149227

URL: http://svn.apache.org/viewcvs?view=rev&rev=149227
Log:
not sure this will always be default, change name (also a bit shorter!)
a bit of POD cleanup too

Added:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
      - copied, changed from r149226, spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm
Removed:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm
Modified:
    spamassassin/trunk/MANIFEST
    spamassassin/trunk/rules/init.pre

Modified: spamassassin/trunk/MANIFEST
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/MANIFEST?view=diff&r1=149226&r2=149227
==============================================================================
--- spamassassin/trunk/MANIFEST (original)
+++ spamassassin/trunk/MANIFEST Sun Jan 30 22:42:50 2005
@@ -56,6 +56,7 @@
 lib/Mail/SpamAssassin/PerMsgStatus.pm
 lib/Mail/SpamAssassin/PersistentAddrList.pm
 lib/Mail/SpamAssassin/Plugin.pm
+lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
 lib/Mail/SpamAssassin/Plugin/DCC.pm
 lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
 lib/Mail/SpamAssassin/Plugin/Hashcash.pm

Copied: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm (from r149226, spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm)
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm?view=diff&rev=149227&p1=spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm&r1=149226&p2=spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm&r2=149227
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DefaultAutoLearnDiscriminator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm Sun Jan 30 22:42:50 2005
@@ -1,12 +1,12 @@
 # <@LICENSE>
 # Copyright 2004 Apache Software Foundation
-#
+# 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-#
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
+# 
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,39 +16,39 @@
 
 =head1 NAME
 
-Mail::SpamAssassin::Plugin::DefaultAutoLearnDiscriminator - default discriminator for Bayes auto-learning
+Mail::SpamAssassin::Plugin::AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning
 
 =head1 SYNOPSIS
 
-  loadplugin     Mail::SpamAssassin::Plugin::DefaultAutoLearnDiscriminator
+  loadplugin     Mail::SpamAssassin::Plugin::AutoLearnThreshold
 
 =head1 DESCRIPTION
 
-This plugin implements SpamAssassin's default Bayes auto-learning
-discriminator.  Auto-learning is a mechanism whereby high-scoring mails
-(or low-scoring mails, for non-spam) are fed into its learning systems
-without user intervention, during scanning.
+This plugin implements the threshold-based auto-learning discriminator
+for SpamAssassin's Bayes subsystem.  Auto-learning is a mechanism
+whereby high-scoring mails (or low-scoring mails, for non-spam) are fed
+into its learning systems without user intervention, during scanning.
 
 Note that certain tests are ignored when determining whether a message
 should be trained upon:
 
-  - rules with tflags set to 'learn' (the Bayesian rules)
+=over 4
 
-  - rules with tflags set to 'userconf' (user white/black-listing rules, etc)
+=item * rules with tflags set to 'learn' (the Bayesian rules)
 
-  - rules with tflags set to 'noautolearn'
+=item * rules with tflags set to 'userconf' (user configuration)
 
-Also note that auto-learning occurs using scores from either scoreset
-0 or 1, depending on what scoreset is used during message check.  It is
-likely that the message check and auto-learn scores will be different.
+=item * rules with tflags set to 'noautolearn'
 
-The following configuration settings are used to control auto-learning:
+=back
 
-=over 4
+Also note that auto-learning occurs using scores from either scoreset 0
+or 1, depending on what scoreset is used during message check.  It is
+likely that the message check and auto-learn scores will be different.
 
 =cut
 
-package Mail::SpamAssassin::Plugin::DefaultAutoLearnDiscriminator;
+package Mail::SpamAssassin::Plugin::AutoLearnThreshold;
 
 # Make the main dbg() accessible in our package w/o an extra function
 *dbg=\&Mail::SpamAssassin::Plugin::dbg;
@@ -77,6 +77,10 @@
 sub set_config {
   my($self, $conf) = @_;
   my @cmds = ();
+
+=head1 USER OPTIONS
+
+The following configuration settings are used to control auto-learning:
 
 =item bayes_auto_learn_threshold_nonspam n.nn   (default: 0.1)
 

Modified: spamassassin/trunk/rules/init.pre
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/init.pre?view=diff&r1=149226&r2=149227
==============================================================================
--- spamassassin/trunk/rules/init.pre (original)
+++ spamassassin/trunk/rules/init.pre Sun Jan 30 22:42:50 2005
@@ -53,8 +53,7 @@
 #
 #loadplugin Mail::SpamAssassin::Plugin::MSExec
 
-# DefaultAutoLearnDiscriminator - default discriminator for
-# Bayes auto-learning
+# AutoLearnThreshold - threshold-based discriminator for Bayes auto-learning
 #
-loadplugin Mail::SpamAssassin::Plugin::DefaultAutoLearnDiscriminator
+loadplugin Mail::SpamAssassin::Plugin::AutoLearnDiscriminator