svn commit: r483495 - in /spamassassin/trunk: sa-compile.raw sa-learn.raw

[jm...@apache.org]

Author: jm
Date: Thu Dec  7 07:33:47 2006
New Revision: 483495

URL: http://svn.apache.org/viewvc?view=rev&rev=483495
Log:
sa-learn used odd --debug-level switch instead of --debug as used everywhere else, and also didn't support debug channels like the other tools do, and as its doco suggests it did; fix, and dup fix in sa-compile too

Modified:
    spamassassin/trunk/sa-compile.raw
    spamassassin/trunk/sa-learn.raw

Modified: spamassassin/trunk/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-compile.raw?view=diff&rev=483495&r1=483494&r2=483495
==============================================================================
--- spamassassin/trunk/sa-compile.raw (original)
+++ spamassassin/trunk/sa-compile.raw Thu Dec  7 07:33:47 2006
@@ -76,7 +76,7 @@
   'prefspath|prefs-file|p=s'                => \$opt{'prefspath'},
   'siteconfigpath=s'                        => \$opt{'siteconfigpath'},
   'cf=s'                                    => \@{$opt{'cf'}},
-  'debug-level|D:s' => \$opt{'debug'},
+  'debug|D:s'       => \$opt{'debug'},
   'help|h|?'        => \$opt{'help'},
   'version|V'       => \$opt{'version'},
   )

Modified: spamassassin/trunk/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-learn.raw?view=diff&rev=483495&r1=483494&r2=483495
==============================================================================
--- spamassassin/trunk/sa-learn.raw (original)
+++ spamassassin/trunk/sa-learn.raw Thu Dec  7 07:33:47 2006
@@ -120,7 +120,7 @@
   'randseed=i'  => \$opt{'randseed'},
   'stopafter=i' => \$opt{'stopafter'},
 
-  'debug-level|D:s' => \$opt{'debug'},
+  'debug|debug-level|D:s' => \$opt{'debug'},
   'help|h|?'        => \$opt{'help'},
   'version|V'       => \$opt{'version'},
 
@@ -604,7 +604,7 @@
  -p prefs, --prefspath=file, --prefs-file=file    Set user preferences file
  --siteconfigpath=path             Path for site configs (def: /etc/mail/spamassassin)
  --cf='config line'                Additional line of configuration
- -D, --debug-level                 Print debugging messages
+ -D, --debug [area=n,...]          Print debugging messages
  -V, --version                     Print version
  -h, --help                        Print usage message
 
@@ -777,7 +777,7 @@
 where no valid terminal is found this option will behave very much like the
 --showdots option.
 
-=item B<-D>, B<--debug-level>
+=item B<-D> [I<area,...>], B<--debug> [I<area,...>]
 
 Produce debugging output. If no areas are listed, all debugging information is
 printed. Diagnostic output can also be enabled for each area individually;
@@ -785,6 +785,11 @@
 diagnostic output on bayes, learn, and dns, use:
 
         spamassassin -D bayes,learn,dns
+
+For more information about which areas (also known as channels) are available,
+please see the documentation at:
+
+        C<http://wiki.apache.org/spamassassin/DebugChannels>
 
 Higher priority informational messages that are suitable for logging in normal
 circumstances are available with an area of "info".