You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2006/12/11 19:38:36 UTC
svn commit: r485799 - in /spamassassin/branches/3.1: sa-learn.raw
sa-update.raw spamd/spamd.raw
Author: dos
Date: Mon Dec 11 10:38:35 2006
New Revision: 485799
URL: http://svn.apache.org/viewvc?view=rev&rev=485799
Log:
bug 4539: man page summaries for executables exceed 80 cols, fix
Modified:
spamassassin/branches/3.1/sa-learn.raw
spamassassin/branches/3.1/sa-update.raw
spamassassin/branches/3.1/spamd/spamd.raw
Modified: spamassassin/branches/3.1/sa-learn.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-learn.raw?view=diff&rev=485799&r1=485798&r2=485799
==============================================================================
--- spamassassin/branches/3.1/sa-learn.raw (original)
+++ spamassassin/branches/3.1/sa-learn.raw Mon Dec 11 10:38:35 2006
@@ -545,41 +545,45 @@
Options:
- --ham Learn messages as ham (non-spam)
- --spam Learn messages as spam
- --forget Forget a message
- --use-ignores Use bayes_ignore_from and bayes_ignore_to
- --sync Syncronize the database and the journal if needed
- --force-expire Force a database sync and expiry run
- --dbpath <path> Allows commandline override (in bayes_path form)
- for where to read the Bayes DB from
- --dump [all|data|magic] Display the contents of the Bayes database
- Takes optional argument for what to display
- --regexp <re> For dump only, specifies which tokens to
- dump based on a regular expression.
- -f file, --folders=file Read list of files/directories from file
- --dir Ignored; historical compatibility
- --file Ignored; historical compatibility
- --mbox Input sources are in mbox format
- --mbx Input sources are in mbx format
- --showdots Show progress using dots
- --progress Show progress using progress bar
- --no-sync Skip synchronizing the database and journal
- after learning
- -L, --local Operate locally, no network accesses
- --import Migrate data from older version/non DB_File
- based databases
- --clear Wipe out existing database
- --backup Backup, to STDOUT, existing database
- --restore <filename> Restore a database from filename
-
- -u username, --username=username Override username taken from the runtime environment
- -C path, --configpath=path, --config-file=path Path to standard configuration dir
- -p prefs, --prefspath=file, --prefs-file=file Set user preferences file
- --siteconfigpath=path Path for site configs (def: /etc/mail/spamassassin)
- -D, --debug-level Print debugging messages
- -V, --version Print version
- -h, --help Print usage message
+ --ham Learn messages as ham (non-spam)
+ --spam Learn messages as spam
+ --forget Forget a message
+ --use-ignores Use bayes_ignore_from and bayes_ignore_to
+ --sync Syncronize the database and the journal if needed
+ --force-expire Force a database sync and expiry run
+ --dbpath <path> Allows commandline override (in bayes_path form)
+ for where to read the Bayes DB from
+ --dump [all|data|magic] Display the contents of the Bayes database
+ Takes optional argument for what to display
+ --regexp <re> For dump only, specifies which tokens to dump
+ based on a regular expression.
+ -f file, --folders=file Read list of files/directories from file
+ --dir Ignored; historical compatibility
+ --file Ignored; historical compatibility
+ --mbox Input sources are in mbox format
+ --mbx Input sources are in mbx format
+ --showdots Show progress using dots
+ --progress Show progress using progress bar
+ --no-sync Skip synchronizing the database and journal after
+ learning
+ -L, --local Operate locally, no network accesses
+ --import Migrate data from older version/non DB_File based
+ databases
+ --clear Wipe out existing database
+ --backup Backup, to STDOUT, existing database
+ --restore <filename> Restore a database from filename
+ -u username, --username=username
+ Override username taken from the runtime
+ environment
+ -C path, --configpath=path, --config-file=path
+ Path to standard configuration dir
+ -p prefs, --prefspath=file, --prefs-file=file
+ Set user preferences file
+ --siteconfigpath=path Path for site configs
+ (default: /etc/mail/spamassassin)
+ -D, --debug-level Print debugging messages
+ -V, --version Print version
+ -h, --help Print usage message
=head1 DESCRIPTION
Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?view=diff&rev=485799&r1=485798&r2=485799
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Mon Dec 11 10:38:35 2006
@@ -1233,25 +1233,25 @@
Options:
- --updatedir path Directory to place updates, defaults to the
- SpamAssassin site rules directory (def:
- /var/lib/spamassassin/<version>)
- --channel channel Retrieve updates from this channel
- Use multiple times for multiple channels
- --channelfile file Retrieve updates from the channels in the file
- --checkonly Check for update availability, do not install
- --gpgkey key Trust the key id to sign releases
- Use multiple times for multiple keys
- --gpgkeyfile file Trust the key ids in the file to sign releases
- --gpghomedir path Store the GPG keyring in this directory
- --gpg and --nogpg Use (or do not use) GPG to verify updates
- (--gpg is assumed by use of the above
- --gpgkey and --gpgkeyfile options)
- --import file Import GPG key(s) from file into sa-update's
- keyring. Use multiple times for multiple files
- -D, --debug [area=n,...] Print debugging messages
- -V, --version Print version
- -h, --help Print usage message
+ --updatedir path Directory to place updates, defaults to the
+ SpamAssassin site rules directory
+ (default: /var/lib/spamassassin/<version>)
+ --channel channel Retrieve updates from this channel
+ Use multiple times for multiple channels
+ --channelfile file Retrieve updates from the channels in the file
+ --checkonly Check for update availability, do not install
+ --gpgkey key Trust the key id to sign releases
+ Use multiple times for multiple keys
+ --gpgkeyfile file Trust the key ids in the file to sign releases
+ --gpghomedir path Store the GPG keyring in this directory
+ --gpg and --nogpg Use (or do not use) GPG to verify updates
+ (--gpg is assumed by use of the above
+ --gpgkey and --gpgkeyfile options)
+ --import file Import GPG key(s) from file into sa-update's
+ keyring. Use multiple times for multiple files
+ -D, --debug [area=n,...] Print debugging messages
+ -V, --version Print version
+ -h, --help Print usage message
=head1 DESCRIPTION
Modified: spamassassin/branches/3.1/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/spamd/spamd.raw?view=diff&rev=485799&r1=485798&r2=485799
==============================================================================
--- spamassassin/branches/3.1/spamd/spamd.raw (original)
+++ spamassassin/branches/3.1/spamd/spamd.raw Mon Dec 11 10:38:35 2006
@@ -2184,52 +2184,52 @@
Options:
- -l, --allow-tell Allow learning/reporting
- -c, --create-prefs Create user preferences files
- -C path, --configpath=path Path for default config files
- --siteconfigpath=path Path for site configs
- -d, --daemonize Daemonize
- -h, --help Print usage message.
- -i [ipaddr], --listen-ip=ipaddr Listen on the IP ipaddr
- -p port, --port=port Listen on specified port
- -m num, --max-children=num Allow maximum num children
- --min-children=num Allow minimum num children
- --min-spare=num Lower limit for number of spare children
- --max-spare=num Upper limit for number of spare children
- --max-conn-per-child=num Maximum connections accepted by child
- before it is respawned
- --round-robin Use traditional prefork algorithm
- --timeout-tcp=secs Connection timeout for client headers
- --timeout-child=secs Connection timeout for message checks
- -q, --sql-config Enable SQL config (only useful with -x)
- -Q, --setuid-with-sql Enable SQL config (only useful with -x,
- enables use of -H)
- --ldap-config Enable LDAP config (only useful with -x)
- --setuid-with-ldap Enable LDAP config (only useful with -x,
- enables use of -H)
- --virtual-config-dir=dir Enable pattern based Virtual configs
- (needs -x)
- -r pidfile, --pidfile Write the process id to pidfile
- -s facility, --syslog=facility Specify the syslog facility
- --syslog-socket=type How to connect to syslogd
- -u username, --username=username Run as username
- -g groupname, --groupname=groupname Run as groupname
- -v, --vpopmail Enable vpopmail config
- -x, --nouser-config Disable user config files
- --auth-ident Use ident to authenticate spamc user
- --ident-timeout=timeout Timeout for ident connections
- -A host,..., --allowed-ips=..,.. Limit ip addresses which can connect
- -D, --debug[=areas] Print debugging messages (for areas)
- -L, --local Use local tests only (no DNS)
- -P, --paranoid Die upon user errors
+ -l, --allow-tell Allow learning/reporting
+ -c, --create-prefs Create user preferences files
+ -C path, --configpath=path Path for default config files
+ --siteconfigpath=path Path for site configs
+ -d, --daemonize Daemonize
+ -h, --help Print usage message.
+ -i [ipaddr], --listen-ip=ipaddr Listen on the IP ipaddr
+ -p port, --port=port Listen on specified port
+ -m num, --max-children=num Allow maximum num children
+ --min-children=num Allow minimum num children
+ --min-spare=num Lower limit for number of spare children
+ --max-spare=num Upper limit for number of spare children
+ --max-conn-per-child=num Maximum connections accepted by child
+ before it is respawned
+ --round-robin Use traditional prefork algorithm
+ --timeout-tcp=secs Connection timeout for client headers
+ --timeout-child=secs Connection timeout for message checks
+ -q, --sql-config Enable SQL config (needs -x)
+ -Q, --setuid-with-sql Enable SQL config (needs -x,
+ enables use of -H)
+ --ldap-config Enable LDAP config (needs -x)
+ --setuid-with-ldap Enable LDAP config (needs -x,
+ enables use of -H)
+ --virtual-config-dir=dir Enable pattern based Virtual configs
+ (needs -x)
+ -r pidfile, --pidfile Write the process id to pidfile
+ -s facility, --syslog=facility Specify the syslog facility
+ --syslog-socket=type How to connect to syslogd
+ -u username, --username=username Run as username
+ -g groupname, --groupname=groupname Run as groupname
+ -v, --vpopmail Enable vpopmail config
+ -x, --nouser-config Disable user config files
+ --auth-ident Use ident to authenticate spamc user
+ --ident-timeout=timeout Timeout for ident connections
+ -A host,..., --allowed-ips=..,.. Limit ip addresses which can connect
+ -D, --debug[=areas] Print debugging messages (for areas)
+ -L, --local Use local tests only (no DNS)
+ -P, --paranoid Die upon user errors
-H [dir], --helper-home-dir[=dir] Specify a different HOME directory
- --ssl Run an SSL server
- --server-key keyfile Specify an SSL keyfile
- --server-cert certfile Specify an SSL certificate
- --socketpath=path Listen on given UNIX domain socket
- --socketowner=name Set UNIX domain socket file's owner
- --socketgroup=name Set UNIX domain socket file's group
- --socketmode=mode Set UNIX domain socket file's mode
+ --ssl Run an SSL server
+ --server-key keyfile Specify an SSL keyfile
+ --server-cert certfile Specify an SSL certificate
+ --socketpath=path Listen on given UNIX domain socket
+ --socketowner=name Set UNIX domain socket file's owner
+ --socketgroup=name Set UNIX domain socket file's group
+ --socketmode=mode Set UNIX domain socket file's mode
=head1 DESCRIPTION