Mailing List Archive

Author: quinlan
Date: Mon Apr 11 13:21:47 2005
New Revision: 160944

URL: http://svn.apache.org/viewcvs?view=rev&rev=160944
Log:
attempt to alleviate problem of plugin configuration being non-obvious

Modified:
spamassassin/trunk/build/preprocessor
spamassassin/trunk/spamassassin.raw

Modified: spamassassin/trunk/build/preprocessor
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/build/preprocessor?view=diff&r1=160943&r2=160944
==============================================================================
--- spamassassin/trunk/build/preprocessor (original)
+++ spamassassin/trunk/build/preprocessor Mon Apr 11 13:21:47 2005
@@ -106,7 +106,7 @@

sub read_defs {
my ($in) = @_;
- open (DEFS, "<$in") or die "Connot open $in: $!";
+ open (DEFS, "<$in") or die "Cannot open $in: $!";
foreach (<DEFS>) {
$_ =~ s/^\s+|\s+$//g;
next if /^#/;
@@ -177,6 +177,18 @@
$perl_version = sprintf("%i.%03i%03i", $v[0] || 0, $v[1] || 0, $v[2] || 0);
}

+ # Grab active plugin list
+ my @plugin_pod = ();
+ if (open(INIT, "rules/init.pre")) {
+ while (<INIT>) {
+ if (/^loadplugin\s+(.*?)\s*$/) {
+ push(@plugin_pod, " $1\n");
+ }
+ }
+ close(INIT);
+ }
+ $defines{PLUGIN_POD} = join('', sort @plugin_pod);
+
my $l = 1;
while (<FOOIN>) {
$_ = pack("C0A*", $_); # turn off UTF8-ness
@@ -207,4 +219,3 @@
$l++;
}
}
-

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?view=diff&r1=160943&r2=160944
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Mon Apr 11 13:21:47 2005
@@ -488,24 +488,35 @@

=head1 SYNOPSIS

-For ease of access, the SpamAssassin manual has been split up into several
-sections:
+For ease of access, the SpamAssassin manual has been split up into
+several sections. If you're intending to read these straight through
+for the first time, the suggested order will tend to reduce the number
+of forward references.
+
+Extensive additional documentation for SpamAssassin is available,
+primarily on the SpamAssassin web site and wiki.
+
+You should be able to view SpamAssassin's documentation with your man(1)
+program or perldoc(1).
+
+=head2 OVERVIEW

spamassassin SpamAssassin overview (this section)
+
+=head2 CONFIGURATION
+
Mail::SpamAssassin::Conf SpamAssassin configuration files
+
+=head2 USAGE
+
spamassassin-run "spamassassin" front-end filtering script
sa-learn train SpamAssassin's Bayesian classifier
spamc client for spamd (faster than spamassassin)
spamd spamassassin server (needed by spamc)

-(If you're intending to read these straight through for the first time,
-the suggested order will tend to reduce the number of forward references.)
-
-Extensive additional documentation for SpamAssassin is available,
-primarily on the SpamAssassin web site and wiki.
+=head2 DEFAULT PLUGINS

-You should be able to view SpamAssassin's documentation with your man(1)
-program or perldoc(1).
+@@PLUGIN_POD@@

=head1 WEB SITES