Mailing List Archive

svn commit: r1869639 [1/2] - in /spamassassin: branches/3.4/ branches/3.4/lib/Mail/ branches/3.4/lib/Mail/SpamAssassin/ branches/3.4/lib/Mail/SpamAssassin/BayesStore/ branches/3.4/lib/Mail/SpamAssassin/Conf/ branches/3.4/lib/Mail/SpamAssassin/Logger/ b...
Author: kmcgrail
Date: Mon Nov 11 04:09:44 2019
New Revision: 1869639

URL: http://svn.apache.org/viewvc?rev=1869639&view=rev
Log:
Fixing misspellings noted in bz7772

Modified:
spamassassin/branches/3.4/INSTALL
spamassassin/branches/3.4/PACKAGING
spamassassin/branches/3.4/UPGRADE
spamassassin/branches/3.4/USAGE
spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/branches/3.4/sa-check_spamd.raw
spamassassin/branches/3.4/sa-compile.raw
spamassassin/branches/3.4/sa-update.raw
spamassassin/branches/3.4/spamassassin.raw
spamassassin/branches/3.4/spamc/README.qmail
spamassassin/branches/3.4/spamc/README.win
spamassassin/branches/3.4/spamc/spamc.pod
spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
spamassassin/branches/3.4/spamd/README
spamassassin/branches/3.4/spamd/netbsd-rc-script.sh
spamassassin/branches/3.4/spamd/spamd.raw
spamassassin/branches/3.4/spamd/suse-ancient-rc-script.sh
spamassassin/branches/3.4/sql/README.bayes
spamassassin/branches/3.4/t/SATest.pm
spamassassin/branches/3.4/t/spf.t
spamassassin/branches/3.4/t/whitelist_addrs.t
spamassassin/trunk/INSTALL
spamassassin/trunk/PACKAGING
spamassassin/trunk/UPGRADE
spamassassin/trunk/USAGE
spamassassin/trunk/lib/Mail/SpamAssassin.pm
spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DCC.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HashBL.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
spamassassin/trunk/lib/Mail/SpamAssassin/SpamdForkScaling.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/trunk/rules/regression_tests.cf
spamassassin/trunk/sa-check_spamd.raw
spamassassin/trunk/sa-compile.raw
spamassassin/trunk/sa-update.raw
spamassassin/trunk/spamassassin.raw
spamassassin/trunk/spamc/README.qmail
spamassassin/trunk/spamc/README.win
spamassassin/trunk/spamc/spamc.pod
spamassassin/trunk/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
spamassassin/trunk/spamd/README
spamassassin/trunk/spamd/netbsd-rc-script.sh
spamassassin/trunk/spamd/spamd.raw
spamassassin/trunk/spamd/suse-ancient-rc-script.sh
spamassassin/trunk/sql/README.bayes
spamassassin/trunk/t/SATest.pm
spamassassin/trunk/t/spf.t
spamassassin/trunk/t/whitelist_addrs.t

Modified: spamassassin/branches/3.4/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/INSTALL?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/INSTALL (original)
+++ spamassassin/branches/3.4/INSTALL Mon Nov 11 04:09:44 2019
@@ -79,7 +79,7 @@ http://wiki.apache.org/spamassassin/Sing
make install

Please see the file PACKAGING, sections "Changing paths in the Makefile"
- and "Setting further options on the command line" for more informations
+ and "Setting further options on the command line" for more information
on available command line variables.

4. Install the SpamAssassin ruleset using "sa-update":
@@ -397,7 +397,7 @@ version is too low for them to be used.
spamd (the --ssl option to spamd), you need to install this
module. (You will need the OpenSSL libraries and use the
ENABLE_SSL="yes" argument to Makefile.PL to build and run an SSL
- compatibile spamc.)
+ compatible spamc.)

Fedora: yum install perl-IO-Socket-SSL


Modified: spamassassin/branches/3.4/PACKAGING
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/PACKAGING?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/PACKAGING (original)
+++ spamassassin/branches/3.4/PACKAGING Mon Nov 11 04:09:44 2019
@@ -51,7 +51,7 @@ Perl Policy [DEBPERL]. But I've heard th
broken or not set on many other systems, especially Red Hat ones. Google
might help to find out more on this topic.

-The following ressources might help understanding this stuff:
+The following resources might help understanding this stuff:
[MANEUMM616], [MM00779], [P5P94113].



Modified: spamassassin/branches/3.4/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/UPGRADE?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/UPGRADE (original)
+++ spamassassin/branches/3.4/UPGRADE Mon Nov 11 04:09:44 2019
@@ -436,7 +436,7 @@ Note for Users Upgrading to SpamAssassin

- The "sa-learn --rebuild" command has been deprecated; please use
"sa-learn --sync" instead. The --rebuild option will remain temporarily
- for backward compatability.
+ for backward compatibility.

- The Bayesian storage modules have been completely re-written and now
include Berkeley DB (DBM) storage as well as SQL based storage (see

Modified: spamassassin/branches/3.4/USAGE
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/USAGE?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/USAGE (original)
+++ spamassassin/branches/3.4/USAGE Mon Nov 11 04:09:44 2019
@@ -95,7 +95,7 @@ If you want to use SpamAssassin site-wid
- *PLEASE* consider setting it up as "off by default" for most accounts,
and let users opt-in to using it. Quite a few folks prefer not to
have their mail filtered, presumably because they don't use their
- email address publically and do not get much spam.
+ email address publicly and do not get much spam.

- Note that procmail users adding spamc to /etc/procmailrc should
add the line 'DROPPRIVS=yes' at the top of the file.

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin.pm Mon Nov 11 04:09:44 2019
@@ -1167,7 +1167,7 @@ sub remove_spamassassin_markup {
$hdrs =~ s/^\n//;

###########################################################################
- # Backward Compatibilty, pre 3.0.x.
+ # Backward Compatibility, pre 3.0.x.

# deal with rewritten headers w/out X-Spam-Prev- versions ...
$self->init(1);
@@ -1274,7 +1274,7 @@ sub read_scoreonly_config {

=item $f->load_scoreonly_sql ($username)

-Read configuration paramaters from SQL database and parse scores from it. This
+Read configuration parameters from SQL database and parse scores from it. This
will only take effect if the perl C<DBI> module is installed, and the
configuration parameters C<user_scores_dsn>, C<user_scores_sql_username>, and
C<user_scores_sql_password> are set correctly.
@@ -1300,7 +1300,7 @@ sub load_scoreonly_sql {

=item $f->load_scoreonly_ldap ($username)

-Read configuration paramaters from an LDAP server and parse scores from it.
+Read configuration parameters from an LDAP server and parse scores from it.
This will only take effect if the perl C<Net::LDAP> and C<URI> modules are
installed, and the configuration parameters C<user_scores_dsn>,
C<user_scores_ldap_username>, and C<user_scores_ldap_password> are set
@@ -1349,7 +1349,7 @@ plan to fork() or start a new perl inter
this is suboptimal, as each process/thread will have to perform these actions.

Call this function in the master thread or process to perform the actions
-straightaway, so that the sub-processes will not have to.
+straight away, so that the sub-processes will not have to.

If C<$use_user_prefs> is 0, this will initialise the SpamAssassin
configuration without reading the per-user configuration file and it will

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/AsyncLoop.pm Mon Nov 11 04:09:44 2019
@@ -598,7 +598,7 @@ Register a "response packet" for a given
query, and must match the C<id> supplied in C<start_lookup()>. C<$pkt> is the
packet object for the response. A parameter C<$key> identifies an entry in a
hash %{$self->{pending_lookups}} where the object which spawned this query can
-be found, and through which futher information about the query is accessible.
+be found, and through which further information about the query is accessible.

C<$pkt> may be undef, indicating that no response packet is available, but a
query has completed (e.g. was aborted or dismissed) and is no longer "pending".

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore.pm Mon Nov 11 04:09:44 2019
@@ -650,7 +650,7 @@ public instance (Integer, Integer, Time)

Description:
This method retrieves the specified token (C<$token>) from storage and returns
-it's spam count, ham acount and last access time.
+it's spam count, ham count and last access time.

=cut


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/BDB.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::BDB - Be

=head1 DESCRIPTION

-This module implementes a BDB based bayesian storage module.
+This module implements a BDB based bayesian storage module.

=cut

@@ -220,7 +220,7 @@ sub _open_db {
or die "Couldn't put record: $BerkeleyDB::Error";
dbg("bayes: new db, set db version %s and 0 tokens",$self->{db_version});
} else {
- warn("bayes: vars.db not intialized: $BerkeleyDB::Error");
+ warn("bayes: vars.db not initialized: $BerkeleyDB::Error");
$self->untie_db;
return 0;
}
@@ -765,7 +765,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns its spam_count, ham_count and last access time.

=cut
@@ -783,7 +783,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and
-returns an array ref of arrays spam count, ham acount and last access time.
+returns an array ref of arrays spam count, ham count and last access time.

=cut

@@ -1011,7 +1011,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/DBM.pm Mon Nov 11 04:09:44 2019
@@ -1671,7 +1671,7 @@ sub restore_database {
my $num_ham;
my $error_p = 0;
my $newest_token_age = 0;
- # Kinda wierd I know, but we need a nice big value and we know there will be
+ # Kinda weird I know, but we need a nice big value and we know there will be
# no tokens > time() since we reset atime if > time(), so use that with a
# little buffer just in case.
my $oldest_token_age = time() + 100000;

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/MySQL.pm Mon Nov 11 04:09:44 2019
@@ -525,7 +525,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm Mon Nov 11 04:09:44 2019
@@ -349,7 +349,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns it's spam_count, ham_count and last access time.

=cut
@@ -398,7 +398,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and returns
-an array ref of arrays spam count, ham acount and last access time.
+an array ref of arrays spam count, ham count and last access time.

=cut

@@ -800,7 +800,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/Redis.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::Redis -

=head1 DESCRIPTION

-This module implementes a Redis based bayesian storage module.
+This module implements a Redis based bayesian storage module.

Apache SpamAssassin v3.4.0 introduces support for keeping
a Bayes database on a Redis server, either running locally, or accessed
@@ -638,7 +638,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns its spam_count, ham_count and last access time.

=cut
@@ -924,7 +924,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/BayesStore/SQL.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::SQL - SQ

=head1 DESCRIPTION

-This module implementes a SQL based bayesian storage module.
+This module implements a SQL based bayesian storage module.

=cut

@@ -800,7 +800,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns it's spam_count, ham_count and last access time.

=cut
@@ -846,7 +846,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and returns
-an array ref of arrays spam count, ham acount and last access time.
+an array ref of arrays spam count, ham count and last access time.

=cut

@@ -1167,7 +1167,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf.pm Mon Nov 11 04:09:44 2019
@@ -659,7 +659,7 @@ The named list can then be consulted thr
eval rule implemented by the WLBLEval plugin, which takes the list name as
an argument. Parenthesis around a list name are literal - a required syntax.

-Host names may optionally be prefixed by an exclamantion mark '!', which
+Host names may optionally be prefixed by an exclamation mark '!', which
produces false as a result if this entry matches. This makes it easier
to exclude some subdomains when their superdomain is listed, for example:

@@ -850,7 +850,7 @@ By default, suspected spam messages will
C<From> or C<To> lines tagged to indicate spam. By setting this option,
the header will be tagged with C<STRING> to indicate that a message is
spam. For the From or To headers, this will take the form of an RFC 2822
-comment following the address in parantheses. For the Subject header,
+comment following the address in parentheses. For the Subject header,
this will be prepended to the original subject. Note that you should
only use the _REQD_ and _SCORE_ tags when rewriting the Subject header
if C<report_safe> is 0. Otherwise, you may not be able to remove
@@ -1312,7 +1312,7 @@ length) subnet is later specified in the
a wider network to be exempt. In case of specifying overlapping subnets,
specify more specific subnets first (tighter matching, i.e. with a longer
netmask length), followed by less specific (shorter netmask length) subnets
-to get predictable results regarless of the search algorithm used - when
+to get predictable results regardless of the search algorithm used - when
Net::Patricia module is installed the search finds the tightest matching
entry in the list, while a sequential search as used in absence of the
module Net::Patricia will find the first matching entry in the list.
@@ -3297,7 +3297,7 @@ Special function that will expand to lis
used anywhere in expressions. Argument supports glob style rulename
matching (* = anything, ? = one character). Matching is case-sensitive.

-For example, this will hit if atleast two __FOO_* rule hits:
+For example, this will hit if at least two __FOO_* rule hits:

body __FOO_1 /xxx/
body __FOO_2 /yyy/

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/LDAP.pm Mon Nov 11 04:09:44 2019
@@ -81,7 +81,7 @@ sub load_modules { # static

=item $f->load ($username)

-Read configuration paramaters from LDAP server and parse scores from it.
+Read configuration parameters from LDAP server and parse scores from it.

=back


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Conf/SQL.pm Mon Nov 11 04:09:44 2019
@@ -79,7 +79,7 @@ sub load_modules { # static

=item $f->load ($username)

-Read configuration paramaters from SQL database and parse scores from it.
+Read configuration parameters from SQL database and parse scores from it.

=back


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Constants.pm Mon Nov 11 04:09:44 2019
@@ -154,7 +154,7 @@ use constant IP_PRIVATE => qr{^(?:
# 0000 in third up to (including) seventh omitted
(?:0{1,4}:){2}(?::0{1,4}){0,4}: 0{0,3}1
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:0{1,4}:){3}(?::0{1,4}){0,3}: 0{0,3}1
|
# 0000 in fifth up to (including) seventh omitted
@@ -232,7 +232,7 @@ use constant LOCALHOST => qr/
# 0000 in third up to (including) seventh omitted
(?:0{1,4}:){2}(?::0{1,4}){0,4}: 0{0,3}1
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:0{1,4}:){3}(?::0{1,4}){0,3}: 0{0,3}1
|
# 0000 in fifth up to (including) seventh omitted
@@ -324,7 +324,7 @@ use constant IP_ADDRESS => qr/
# 0000 in third up to (including) seventh omitted
(?:[a-f0-9]{1,4}:){2}(?::[a-f0-9]{1,4}){1,5}
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:[a-f0-9]{1,4}:){3}(?::[a-f0-9]{1,4}){1,4}
|
# 0000 in fifth up to (including) seventh omitted

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm Mon Nov 11 04:09:44 2019
@@ -292,7 +292,7 @@ sub pick_random_available_port {
Mail::SpamAssassin::Conf::set_ports_range(\$ports_bitset, 0, 0, 0);
$conf->{dns_available_ports_bitset} = $ports_bitset;
}
- # prepare auxilliary data structure to speed up further free-port lookups;
+ # prepare auxiliary data structure to speed up further free-port lookups;
# 256 buckets, each accounting for 256 ports: 8+8 = 16 bit port numbers;
# each bucket holds a count of available ports in its range
my @bucket_counts = (0) x 256;

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/HTML.pm Mon Nov 11 04:09:44 2019
@@ -240,7 +240,7 @@ sub parse {

# # (outdated claim) HTML::Parser converts &nbsp; into a question mark ("?")
# # for some reason, so convert them to spaces. Confirmed in 3.31, at least.
- # ... Actually it doesn't, it is correctly coverted into Unicode NBSP,
+ # ... Actually it doesn't, it is correctly converted into Unicode NBSP,
# nevertheless it does not hurt to treat it as a space.
$text =~ s/&nbsp;/ /g;


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Locales.pm Mon Nov 11 04:09:44 2019
@@ -35,7 +35,7 @@ use re 'taint';
our %charsets_for_locale = (

# Japanese: Peter Evans writes: iso-2022-jp = rfc approved, rfc 1468, created
- # by Jun Murai in 1993 back when he didnt have white hair! rfc approved.
+ # by Jun Murai in 1993 back when he didn't have white hair! rfc approved.
# (rfc 2237) <-- by M$.
'ja' => 'EUCJP JISX020119760 JISX020819830 JISX020819900 JISX020819970 '.
'JISX021219900 JISX021320001 JISX021320002 SHIFT_JIS SHIFTJIS '.

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger/Syslog.pm Mon Nov 11 04:09:44 2019
@@ -221,7 +221,7 @@ sub check_syslog_sigpipe {
syslog('debug', "%s", "syslog reopened");
syslog('info', "%s", $msg);

- # now report what happend
+ # now report what happened
$msg = "SIGPIPE received, reopening log socket";
dbg("log: $msg");
syslog('info', "%s", $msg);

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message.pm Mon Nov 11 04:09:44 2019
@@ -220,7 +220,7 @@ sub new {
# Pull off mbox and mbx separators
if ($message[0] =~ /^From\s+(?!:)/) {
# careful not to confuse with obsolete syntax which allowed WSP before ':'
- # mbox formated mailbox
+ # mbox formatted mailbox
$self->{'mbox_sep'} = shift @message;
} elsif ($message[0] =~ MBX_SEPARATOR) {
$_ = shift @message;

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Message/Metadata/Received.pm Mon Nov 11 04:09:44 2019
@@ -1201,7 +1201,7 @@ sub parse_received_line {

# Local unix socket handover from Cyrus, tested with v2.3.14
# Received: from testintranator.net.vm ([unix socket])_ by testintranator.net.vm (Cyrus v2.3.14) with LMTPA;_ Tue, 21 Jul 2009 14:34:14 +0200
- # Attention: Actually the received header is parsed as "testintranator.net.vm ([unix socket]) by testintranator.net.vm (Cyrus v2.3.14) with LMTPA", "from" is ommited.
+ # Attention: Actually the received header is parsed as "testintranator.net.vm ([unix socket]) by testintranator.net.vm (Cyrus v2.3.14) with LMTPA", "from" is omited.
if (/^\S+ \(\[unix socket\]\) by \S+ \(Cyrus v[0-9]*?\.[0-9]*?\.[0-9]*?\) with LMTPA/) { return 0; }

# HANDOVERS WE KNOW WE CAN'T DEAL WITH: TCP transmission, but to MTAs that

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Nov 11 04:09:44 2019
@@ -621,7 +621,7 @@ sub _get_autolearn_points {
$self->{autolearn_points} = 0;

# This function needs to use use sum($score[scoreset % 2]) not just {score}.
- # otherwise we shift what we autolearn on and it gets really wierd. - tvd
+ # otherwise we shift what we autolearn on and it gets really weird. - tvd
my $orig_scoreset = $self->{conf}->get_score_set();
my $new_scoreset = $orig_scoreset;
my $scores = $self->{conf}->{scores};
@@ -2364,7 +2364,7 @@ sub _process_text_uri_list {
my $rawuri = $1||$2||$3;
my $schost = $4;
my $rawtype = defined $1 ? 'scheme' : defined $2 ? 'mail' : 'schemeless';
- $rawuri =~ s/(^[^(]*)\).*$/$1/; # as per ThunderBird, ) is an end delimiter if there is no ( preceeding it
+ $rawuri =~ s/(^[^(]*)\).*$/$1/; # as per ThunderBird, ) is an end delimiter if there is no ( preceding it
$rawuri =~ s/[-~!@#^&*()_+=:;\'?,.]*$//; # remove trailing string of punctuations that TBird ignores

next if exists $seen{$rawuri};

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mon Nov 11 04:09:44 2019
@@ -484,7 +484,7 @@ OUTER:
push(@{$pms->{askdns_map_dnskey_to_rules}{$dnskey}},
[$query_type, $answer_types_ref, $rules] );
}
- # lauch a new DNS query for $query_type and $query_domain
+ # launch a new DNS query for $query_type and $query_domain
my $ent = $pms->{async}->bgsend_and_start_lookup(
$query_domain, $query_type, undef,
{ key => $dnskey, zone => $query_domain },

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm Mon Nov 11 04:09:44 2019
@@ -192,7 +192,7 @@ sub autolearn_discriminator {
if ($force_autolearn) {
$required_body_points = -99;
$required_head_points = -99;
- dbg("learn: auto-learn: autolearn_force flagged for a rule. Removing seperate body and head point threshold. Body Only Points: $body_only_points ($required_body_points req'd) / Head Only Points: $head_only_points ($required_head_points req'd)");
+ dbg("learn: auto-learn: autolearn_force flagged for a rule. Removing separate body and head point threshold. Body Only Points: $body_only_points ($required_body_points req'd) / Head Only Points: $head_only_points ($required_head_points req'd)");
dbg("learn: auto-learn: autolearn_force flagged because of rule(s): $force_autolearn_names");
} else {
dbg("learn: auto-learn: autolearn_force not flagged for a rule. Body Only Points: $body_only_points ($required_body_points req'd) / Head Only Points: $head_only_points ($required_head_points req'd)");

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DCC.pm Mon Nov 11 04:09:44 2019
@@ -443,7 +443,7 @@ sub find_dcc_home {
my $conf = $self->{main}->{conf};


- # Get the DCC software version for talking to dccifd and formating the
+ # Get the DCC software version for talking to dccifd and formatting the
# dccifd options and the built-in DCC homedir. Use -q to prevent delays.
my $cdcc_home;
my $cdcc = $self->dcc_pgm_path('cdcc');

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/DNSEval.pm Mon Nov 11 04:09:44 2019
@@ -255,7 +255,7 @@ sub check_rbl_backend {
push (@fullexternal, @fullips); # add untrusted set too

# Make sure a header significantly improves results before adding here
- # X-Sender-Ip: could be worth using (very low occurance for me)
+ # X-Sender-Ip: could be worth using (very low occurence for me)
# X-Sender: has a very low bang-for-buck for me
my $IP_ADDRESS = IP_ADDRESS;
my @originating;

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FreeMail.pm Mon Nov 11 04:09:44 2019
@@ -50,7 +50,7 @@ freemail_domains domain ...

freemail_whitelist email/domain ...

- Emails or domains listed here are ignored (pretend they arent
+ Emails or domains listed here are ignored (pretend they aren't
freemail). No wildcards!

freemail_import_whitelist_auth 1/0

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HTMLEval.pm Mon Nov 11 04:09:44 2019
@@ -128,7 +128,7 @@ sub html_eval {
return 0 if $rawexpr !~ /^([\<\>\=\!\-\+ 0-9]+)$/;
my $expr = untaint_var($1);

- # workaround bug 3320: wierd perl bug where additional, very explicit
+ # workaround bug 3320: weird perl bug where additional, very explicit
# untainting into a new var is required.
my $tainted = $pms->{html}{$test};
return 0 unless defined($tainted);

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/HashBL.pm Mon Nov 11 04:09:44 2019
@@ -54,7 +54,7 @@ OPTS refers to multiple generic options:
Multiple options can be separated with slash or other non-word character.
If OPTS is empty ('') or missing, default is used.

-HEADERS referes to slash separated list of Headers to process:
+HEADERS refers to slash separated list of Headers to process:

ALL all headers
ALLFROM all From headers as returned by $pms->all_from_addrs()

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/OLEVBMacro.pm Mon Nov 11 04:09:44 2019
@@ -701,7 +701,7 @@ sub _get_part_details {

sub _open_zip_handle {
my ($data) = @_;
- # open our archive from raw datas
+ # open our archive from raw data
my $SH = IO::String->new($data);

Archive::Zip::setErrorHandler( \&_zip_error_handler );

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/SPF.pm Mon Nov 11 04:09:44 2019
@@ -812,7 +812,7 @@ sub _check_spf_whitelist {
$self->_get_sender($scanner) unless $scanner->{sender_got};

unless ($scanner->{sender}) {
- dbg("spf: spf_whitelist_from: could not find useable envelope sender");
+ dbg("spf: spf_whitelist_from: could not find usable envelope sender");
return;
}

@@ -850,7 +850,7 @@ sub _check_def_spf_whitelist {
$self->_get_sender($scanner) unless $scanner->{sender_got};

unless ($scanner->{sender}) {
- dbg("spf: def_spf_whitelist_from: could not find useable envelope sender");
+ dbg("spf: def_spf_whitelist_from: could not find usable envelope sender");
return;
}


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/Shortcircuit.pm Mon Nov 11 04:09:44 2019
@@ -33,7 +33,7 @@ This plugin implements simple, test-base
test will force all other pending rules to be skipped, if that test is hit.
In addition, a symbolic rule, C<SHORTCIRCUIT>, will fire.

-Recomended usage is to use C<priority> to set rules with strong S/O values (ie.
+Recommended usage is to use C<priority> to set rules with strong S/O values (ie.
1.0) to be run first, and make instant spam or ham classification based on
that.

@@ -81,7 +81,7 @@ The following configuration settings are
Shortcircuiting a test will force all other pending rules to be skipped, if
that test is hit.

-Recomended usage is to use C<priority> to set rules with strong S/O values (ie.
+Recommended usage is to use C<priority> to set rules with strong S/O values (ie.
1.0) to be run first, and make instant spam or ham classification based on
that.


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm Mon Nov 11 04:09:44 2019
@@ -681,7 +681,7 @@ the same authorized identity, and will n
Note: at domains that define the useless SPF +all (pass all), no IP would be
ever associated with the email address, and all addresses (incl. the froged
ones) would be treated as coming from the authorized source. However, such
-domains are hopefuly rare, and ask for this kind of treatment anyway.
+domains are hopefully rare, and ask for this kind of treatment anyway.

=back

@@ -1163,7 +1163,7 @@ DKIM signing domain or the tag 'spf' aft
When a message contains both a DKIM signature and an SPF pass, the DKIM
signature takes the priority, so the record bound to the 'spf' tag won't
be checked. Only email addresses and domains can be bound to DKIM or SPF.
-Records of IP adresses and HELO names are always without DKIM/SPF.
+Records of IP addresses and HELO names are always without DKIM/SPF.

In case of dual storage, the black/whitelisting is performed only in the
default storage.
@@ -1194,7 +1194,7 @@ sub remove_address {my $self=shift; r
5. No IP checking at signed emails (signature authenticates the email
instead of the IP address)

-6. No IP checking at SPF pass (we assume the domain owner is responsable
+6. No IP checking at SPF pass (we assume the domain owner is responsible
for all IP's he authorizes to send from, hence we use the same identity
for all of them)

@@ -1590,7 +1590,7 @@ sub remove_score {
if ($self->{entry}->{msgcount} > 2)
{$self->{entry}->{msgcount} -= 2;}
else {$self->{entry}->{msgcount} = 0;}
- # substract 2, and add a score; hence decrementing by 1
+ # subtract 2, and add a score; hence decrementing by 1
$self->{checker}->add_score($self->{entry}, -1*$score);
}

@@ -1949,7 +1949,7 @@ MEMORY engine stores the entire table in
performance similar to Redis. You would need to care about the replication
of the RAM table to disk through a cronjob, to avoid loss of data at reboot.
The InnoDB engine is used by default, offering high scalability (database
-size and concurence of accesses). In conjunction with a high value of
+size and concurrence of accesses). In conjunction with a high value of
innodb_buffer_pool or with the memcached plugin (MySQL v5.6+) it can also
offer performance comparable to Redis.


Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/SpamdForkScaling.pm Mon Nov 11 04:09:44 2019
@@ -295,7 +295,7 @@ sub main_server_poll {
{
# this happens if the process is signalled during the select(),
# for example if someone sends SIGHUP to reload the configuration.
- # just return inmmediately
+ # just return immediately
dbg("prefork: select returned err $selerr, probably signalled");
return;
}

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Mon Nov 11 04:09:44 2019
@@ -359,7 +359,7 @@ sub is_fqdn_valid {
# validate dot separated components/labels
my @labels = split(/\./, lc $host);
my $cnt = scalar @labels;
- return unless $cnt > 1; # atleast two labels required
+ return unless $cnt > 1; # at least two labels required
foreach my $label (@labels) {
# length of 1-63
return if length($label) < 1;
@@ -1395,7 +1395,7 @@ sub uri_list_canonicalize {
push(@nuris, $nuri);
}

- # deal with wierd hostname parts, remove user/pass, etc.
+ # deal with weird hostname parts, remove user/pass, etc.
if ($nuri =~ m{^(https?://)([^\@/?#]*\@)?([^/?#:]+)((?::(\d*))?.*)$}i) {
my($proto, $host, $rest) = ($1,$3,$4);
my $auth = defined $2 ? $2 : '';
@@ -1483,7 +1483,7 @@ sub uri_list_canonicalize {

# bug 3186: If in a sentence, we might pick up odd characters ...
# ie: "visit http://example.biz." or "visit http://example.biz!!!"
- # the host portion should end in some form of alpha-numeric, strip off
+ # the host portion should end in some form of alphanumeric, strip off
# the rest.
if ($host =~ s/[^0-9A-Za-z]+$//) {
push(@nuris, join ('', $proto, $host, $rest));
@@ -1725,7 +1725,7 @@ sub helper_app_pipe_open_unix {
setuid_to_euid();
info("util: setuid: ruid=$< euid=$> rgid=$( egid=$) ");

- # now set up the fds. due to some wierdness, we may have to ensure that
+ # now set up the fds. due to some weirdness, we may have to ensure that
# we *really* close the correct fd number, since some other code may have
# redirected the meaning of STDOUT/STDIN/STDERR it seems... (bug 3649).
# use POSIX::close() for that. it's safe to call close() and POSIX::close()

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Mon Nov 11 04:09:44 2019
@@ -198,7 +198,7 @@ our @OPTIONAL_MODULES = (
spamd (the --ssl option to spamd), you need to install this
module. (You will need the OpenSSL libraries and use the
ENABLE_SSL="yes" argument to Makefile.PL to build and run an SSL
- compatibile spamc.)',
+ compatible spamc.)',
},
{
module => 'Compress::Zlib',

Modified: spamassassin/branches/3.4/sa-check_spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-check_spamd.raw?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-check_spamd.raw (original)
+++ spamassassin/branches/3.4/sa-check_spamd.raw Mon Nov 11 04:09:44 2019
@@ -260,7 +260,7 @@ if ($response == 1) {
}

# otherwise we got a timely ping response
- printf("SPAMD OK: %.3f second ping repsonse time\n", $elapsed);
+ printf("SPAMD OK: %.3f second ping response time\n", $elapsed);
exit EX_OK;
}

@@ -408,7 +408,7 @@ Display version info on STDOUT.
Warning ping response threshold in seconds. If a spamd ping response takes
longer than the value specified (in seconds), and does not exceed the
B<critical> threshold value, the program will exit with a value of 1 to
-indicate the warning staus.
+indicate the warning status.

This value must be no longer than the value specified for B<critical> and
less than the value specified for B<timeout>.

Modified: spamassassin/branches/3.4/sa-compile.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-compile.raw?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-compile.raw (original)
+++ spamassassin/branches/3.4/sa-compile.raw Mon Nov 11 04:09:44 2019
@@ -795,7 +795,7 @@ Mail::SpamAssassin(3)
spamassassin(1)
spamd(1)

-=head1 PREREQUESITES
+=head1 PREREQUISITES

C<Mail::SpamAssassin>
C<re2c>

Modified: spamassassin/branches/3.4/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sa-update.raw?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/sa-update.raw (original)
+++ spamassassin/branches/3.4/sa-update.raw Mon Nov 11 04:09:44 2019
@@ -1247,7 +1247,7 @@ elsif (!$channel_failures) {
$exit = $channel_successes ? 0 : 1;
}
else { # at least some failures
- # 3: some failures, but at least one channel suceeded
+ # 3: some failures, but at least one channel succeeded
# 4 or higher means all channels failed
$exit = $channel_successes ? 3 : 4;
}
@@ -2197,7 +2197,7 @@ spamassassin(1)
spamd(1)
<http://wiki.apache.org/spamassassin/RuleUpdates>

-=head1 PREREQUESITES
+=head1 PREREQUISITES

C<Mail::SpamAssassin>


Modified: spamassassin/branches/3.4/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamassassin.raw?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamassassin.raw (original)
+++ spamassassin/branches/3.4/spamassassin.raw Mon Nov 11 04:09:44 2019
@@ -792,7 +792,7 @@ SpamAssassin was run.

=item X-Spam-Level: header

-A series of "*" charactes where each one represents a full score point.
+A series of "*" characters where each one represents a full score point.

=item X-Spam-Status: header


Modified: spamassassin/branches/3.4/spamc/README.qmail
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamc/README.qmail?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamc/README.qmail (original)
+++ spamassassin/branches/3.4/spamc/README.qmail Mon Nov 11 04:09:44 2019
@@ -35,7 +35,7 @@ variables. These options are supported (
-u <username> | SPAMDUSER = <username>

Example: In order to use the Unix domain sockets feature of spamc/spamd, you
-need to set an additional enviroment variable (in a top level script):
+need to set an additional environment variable (in a top level script):

export SPAMDSOCK='/path/to/spamd.sock'


Modified: spamassassin/branches/3.4/spamc/README.win
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamc/README.win?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamc/README.win (original)
+++ spamassassin/branches/3.4/spamc/README.win Mon Nov 11 04:09:44 2019
@@ -4,7 +4,7 @@ Building spamd/spamc under Windows
Spamd currently does not run under Windows, but spamc does.

With SpamAssassin 3.4.2, spamd has been made available for Windows. Note
-that this is still experimental. In terms of stability and perfomance it
+that this is still experimental. In terms of stability and performance it
heavily depends on which Perl distribution and/or module versions you
are using. So do not use it in a production environment. Alternatively,
spamd also works when built and run in the Cygwin Unix emulation

Modified: spamassassin/branches/3.4/spamc/spamc.pod
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamc/spamc.pod?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamc/spamc.pod (original)
+++ spamassassin/branches/3.4/spamc/spamc.pod Mon Nov 11 04:09:44 2019
@@ -306,7 +306,7 @@ Example:

By default, spamc will use the 'safe fallback' error recovery method. That
means, it will always exit with an exit code of C<0>, even if an error was
-encountered. If any error occurrs, it will simply pass through the unaltered
+encountered. If any error occurs, it will simply pass through the unaltered
message.

The B<-c> and B<-E> options modify this; instead, spamc will use an exit code

Modified: spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm (original)
+++ spamassassin/branches/3.4/spamd-apache2/lib/Mail/SpamAssassin/Spamd.pm Mon Nov 11 04:09:44 2019
@@ -262,7 +262,7 @@ sub parse_msgids {

=item C<service_timeout('error message')>

-Send appropiate status line to the client and log the error.
+Send appropriate status line to the client and log the error.

=cut


Modified: spamassassin/branches/3.4/spamd/README
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd/README?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd/README (original)
+++ spamassassin/branches/3.4/spamd/README Mon Nov 11 04:09:44 2019
@@ -16,7 +16,7 @@ process messages. By default, spamd lis
specifiable on the command line.

/*
- * FIXME: The following paragraph(s) have to be updated as childs are now
+ * FIXME: The following paragraph(s) have to be updated as children are now
* pre-spawned
*/
When spamd receives a connection, it spawns a child to handle the request.
@@ -144,7 +144,7 @@ configuration: Mysql
can users connect? yes no yes no
| | / |
| | / |
- unsafe | / root prefered
+ unsafe | / root preferred
| /
safe as non-root
|

Modified: spamassassin/branches/3.4/spamd/netbsd-rc-script.sh
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd/netbsd-rc-script.sh?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd/netbsd-rc-script.sh (original)
+++ spamassassin/branches/3.4/spamd/netbsd-rc-script.sh Mon Nov 11 04:09:44 2019
@@ -49,7 +49,7 @@ OPSYS=@OPSYS@
INTERPRETER_SUPPORT=@INTERPRETER_SUPPORT@

# A default limit of 64 on NetBSD may be too low for many
-# people (eg with addional RBL rules)
+# people (e.g. with additional RBL rules)
SOFT_FDLIMIT=`ulimit -S -n`
HARD_FDLIMIT=`ulimit -H -n`


Modified: spamassassin/branches/3.4/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd/spamd.raw?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd/spamd.raw (original)
+++ spamassassin/branches/3.4/spamd/spamd.raw Mon Nov 11 04:09:44 2019
@@ -1506,7 +1506,7 @@ sub accept_from_any_server_socket {

if ($sockets_access_lock_fh) {
dbg("spamd: acquiring a lock over select+accept");
- # with multipe sockets a lock across select+accept is needed, Bug 6996
+ # with multiple sockets a lock across select+accept is needed, Bug 6996
flock($sockets_access_lock_fh, LOCK_EX)
or die "Can't acquire lock access to sockets: $!";
$locked = 1;
@@ -1526,7 +1526,7 @@ sub accept_from_any_server_socket {
die "no fd ready, fd bit field $sel_mask_str";
}

- my(@ready_fd) = # list of file desciptors ready for read
+ my(@ready_fd) = # list of file descriptors ready for read
grep(defined $_->{fd} && vec($fdvec, $_->{fd}, 1), @listen_sockets);
if (!@ready_fd) {
die "no file descriptors matching a bit field " . unpack('b*',$fdvec);
@@ -3335,7 +3335,7 @@ updated.

Note that spamd always trusts the username passed in (unless
B<--auth-ident> is used) so clients could maliciously learn messages
-for other users. (This is not ususally a concern with an SQL Bayes
+for other users. (This is not usually a concern with an SQL Bayes
store as users will typically have read-write access directly to the
database, and can also use C<sa-learn> with the B<-u> option to
achieve the same result.)

Modified: spamassassin/branches/3.4/spamd/suse-ancient-rc-script.sh
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamd/suse-ancient-rc-script.sh?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamd/suse-ancient-rc-script.sh (original)
+++ spamassassin/branches/3.4/spamd/suse-ancient-rc-script.sh Mon Nov 11 04:09:44 2019
@@ -104,7 +104,7 @@ function my_getpid()
# a process running with that pid.
# returns:
# 0 spamd running at the printed pid
-# 1 some unspecified error occured
+# 1 some unspecified error occurred
# 4 couldn't access a file
# 10 found a pid but no process running there
# 11 found a pid but it wasn't spamd running there

Modified: spamassassin/branches/3.4/sql/README.bayes
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/sql/README.bayes?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/sql/README.bayes (original)
+++ spamassassin/branches/3.4/sql/README.bayes Mon Nov 11 04:09:44 2019
@@ -102,7 +102,7 @@ upgrade to at least v1.31.

In addition, there appears to be a quote bug in some versions of PostgreSQL.
It's unclear when the bug was fixed. 7.4.2 seems to work just fine, however
-some have reported problems with 7.3.6. Your milage may vary with versions
+some have reported problems with 7.3.6. Your mileage may vary with versions
less than 7.4.2. If you happen to know when the specific bug was fixed please
feel free to notify the dev team so they can update this documentation.


Modified: spamassassin/branches/3.4/t/SATest.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/SATest.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/SATest.pm (original)
+++ spamassassin/branches/3.4/t/SATest.pm Mon Nov 11 04:09:44 2019
@@ -59,7 +59,7 @@ BEGIN {

# Clean PATH so taint doesn't complain
$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin';
- # Remove tainted envs, atleast ENV used in FreeBSD
+ # Remove tainted envs, at least ENV used in FreeBSD
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
}

@@ -884,7 +884,7 @@ sub read_config {
my $v = shift @ARGV;

# Override only allows setting one variable. Some xt tests need to set more
- # config variables. Adding : as a delimeter for config variable and value
+ # config variables. Adding : as a delimiter for config variable and value
# parameters

@k = split (/:/,$k);

Modified: spamassassin/branches/3.4/t/spf.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/spf.t?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/spf.t (original)
+++ spamassassin/branches/3.4/t/spf.t Mon Nov 11 04:09:44 2019
@@ -358,7 +358,7 @@ for $disable_an_spf_module ('do_not_use_
ok_all_patterns();


- # 41-44: same as test 1-2 with some spf whitelist entires that don't match
+ # 41-44: same as test 1-2 with some spf whitelist entries that don't match

tstprefs("
whitelist_from_spf *\@example.com

Modified: spamassassin/branches/3.4/t/whitelist_addrs.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/whitelist_addrs.t?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/whitelist_addrs.t (original)
+++ spamassassin/branches/3.4/t/whitelist_addrs.t Mon Nov 11 04:09:44 2019
@@ -72,7 +72,7 @@ ok(sarun ("--remove-addr-from-whitelist
# "print" commands that are present in the command line interface are not being printed
# when you call the methods directly. This is why we are manipulating STDOUT.

-open my $oldout, ">&STDOUT" || die "Cannnot dup STDOUT";
+open my $oldout, ">&STDOUT" || die "Cannot dup STDOUT";

my $fh = IO::File->new_tmpfile();
ok($fh);

Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Mon Nov 11 04:09:44 2019
@@ -79,7 +79,7 @@ http://wiki.apache.org/spamassassin/Sing
make install

Please see the file PACKAGING, sections "Changing paths in the Makefile"
- and "Setting further options on the command line" for more informations
+ and "Setting further options on the command line" for more information
on available command line variables.

4. Install the SpamAssassin ruleset using "sa-update":
@@ -374,7 +374,7 @@ version is too low for them to be used.
spamd (the --ssl option to spamd), you need to install this
module. (You will need the OpenSSL libraries and use the
ENABLE_SSL="yes" argument to Makefile.PL to build and run an SSL
- compatibile spamc.)
+ compatible spamc.)

Fedora: yum install perl-IO-Socket-SSL


Modified: spamassassin/trunk/PACKAGING
URL: http://svn.apache.org/viewvc/spamassassin/trunk/PACKAGING?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/PACKAGING (original)
+++ spamassassin/trunk/PACKAGING Mon Nov 11 04:09:44 2019
@@ -51,7 +51,7 @@ Perl Policy [DEBPERL]. But I've heard th
broken or not set on many other systems, especially Red Hat ones. Google
might help to find out more on this topic.

-The following ressources might help understanding this stuff:
+The following resources might help understanding this stuff:
[MANEUMM616], [MM00779], [P5P94113].



Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Mon Nov 11 04:09:44 2019
@@ -516,7 +516,7 @@ Note for Users Upgrading to SpamAssassin

- The "sa-learn --rebuild" command has been deprecated; please use
"sa-learn --sync" instead. The --rebuild option will remain temporarily
- for backward compatability.
+ for backward compatibility.

- The Bayesian storage modules have been completely re-written and now
include Berkeley DB (DBM) storage as well as SQL based storage (see

Modified: spamassassin/trunk/USAGE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/USAGE?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/USAGE (original)
+++ spamassassin/trunk/USAGE Mon Nov 11 04:09:44 2019
@@ -95,7 +95,7 @@ If you want to use SpamAssassin site-wid
- *PLEASE* consider setting it up as "off by default" for most accounts,
and let users opt-in to using it. Quite a few folks prefer not to
have their mail filtered, presumably because they don't use their
- email address publically and do not get much spam.
+ email address publicly and do not get much spam.

- Note that procmail users adding spamc to /etc/procmailrc should
add the line 'DROPPRIVS=yes' at the top of the file.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Mon Nov 11 04:09:44 2019
@@ -1166,7 +1166,7 @@ sub remove_spamassassin_markup {
$hdrs =~ s/^\n//;

###########################################################################
- # Backward Compatibilty, pre 3.0.x.
+ # Backward Compatibility, pre 3.0.x.

# deal with rewritten headers w/out X-Spam-Prev- versions ...
$self->init(1);
@@ -1273,7 +1273,7 @@ sub read_scoreonly_config {

=item $f->load_scoreonly_sql ($username)

-Read configuration paramaters from SQL database and parse scores from it. This
+Read configuration parameters from SQL database and parse scores from it. This
will only take effect if the perl C<DBI> module is installed, and the
configuration parameters C<user_scores_dsn>, C<user_scores_sql_username>, and
C<user_scores_sql_password> are set correctly.
@@ -1299,7 +1299,7 @@ sub load_scoreonly_sql {

=item $f->load_scoreonly_ldap ($username)

-Read configuration paramaters from an LDAP server and parse scores from it.
+Read configuration parameters from an LDAP server and parse scores from it.
This will only take effect if the perl C<Net::LDAP> and C<URI> modules are
installed, and the configuration parameters C<user_scores_dsn>,
C<user_scores_ldap_username>, and C<user_scores_ldap_password> are set
@@ -1348,7 +1348,7 @@ plan to fork() or start a new perl inter
this is suboptimal, as each process/thread will have to perform these actions.

Call this function in the master thread or process to perform the actions
-straightaway, so that the sub-processes will not have to.
+straight away, so that the sub-processes will not have to.

If C<$use_user_prefs> is 0, this will initialise the SpamAssassin
configuration without reading the per-user configuration file and it will

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm Mon Nov 11 04:09:44 2019
@@ -730,7 +730,7 @@ Register a "response packet" for a given
query, and must match the C<id> supplied in C<start_lookup()>. C<$pkt> is the
packet object for the response. A parameter C<$key> identifies an entry in a
hash %{$self->{pending_lookups}} where the object which spawned this query can
-be found, and through which futher information about the query is accessible.
+be found, and through which further information about the query is accessible.

C<$pkt> may be undef, indicating that no response packet is available, but a
query has completed (e.g. was aborted or dismissed) and is no longer "pending".

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore.pm Mon Nov 11 04:09:44 2019
@@ -650,7 +650,7 @@ public instance (Integer, Integer, Time)

Description:
This method retrieves the specified token (C<$token>) from storage and returns
-it's spam count, ham acount and last access time.
+it's spam count, ham count and last access time.

=cut


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/BDB.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::BDB - Be

=head1 DESCRIPTION

-This module implementes a BDB based bayesian storage module.
+This module implements a BDB based bayesian storage module.

=cut

@@ -218,7 +218,7 @@ sub _open_db {
or die "Couldn't put record: $BerkeleyDB::Error";
dbg("bayes: new db, set db version %s and 0 tokens",$self->{db_version});
} else {
- warn("bayes: vars.db not intialized: $BerkeleyDB::Error");
+ warn("bayes: vars.db not initialized: $BerkeleyDB::Error");
$self->untie_db;
return 0;
}
@@ -771,7 +771,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns its spam_count, ham_count and last access time.

=cut
@@ -789,7 +789,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and
-returns an array ref of arrays spam count, ham acount and last access time.
+returns an array ref of arrays spam count, ham count and last access time.

=cut

@@ -1017,7 +1017,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/DBM.pm Mon Nov 11 04:09:44 2019
@@ -1675,7 +1675,7 @@ sub restore_database {
my $num_ham;
my $error_p = 0;
my $newest_token_age = 0;
- # Kinda wierd I know, but we need a nice big value and we know there will be
+ # Kinda weird I know, but we need a nice big value and we know there will be
# no tokens > time() since we reset atime if > time(), so use that with a
# little buffer just in case.
my $oldest_token_age = time() + 100000;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/MySQL.pm Mon Nov 11 04:09:44 2019
@@ -525,7 +525,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/PgSQL.pm Mon Nov 11 04:09:44 2019
@@ -349,7 +349,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns it's spam_count, ham_count and last access time.

=cut
@@ -398,7 +398,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and returns
-an array ref of arrays spam count, ham acount and last access time.
+an array ref of arrays spam count, ham count and last access time.

=cut

@@ -800,7 +800,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::Redis -

=head1 DESCRIPTION

-This module implementes a Redis based bayesian storage module.
+This module implements a Redis based bayesian storage module.

Apache SpamAssassin v3.4.0 introduces support for keeping
a Bayes database on a Redis server, either running locally, or accessed
@@ -634,7 +634,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns its spam_count, ham_count and last access time.

=cut
@@ -920,7 +920,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/SQL.pm Mon Nov 11 04:09:44 2019
@@ -21,7 +21,7 @@ Mail::SpamAssassin::BayesStore::SQL - SQ

=head1 DESCRIPTION

-This module implementes a SQL based bayesian storage module.
+This module implements a SQL based bayesian storage module.

=cut

@@ -796,7 +796,7 @@ sub remove_running_expire_tok {
public instance (Integer, Integer, Integer) tok_get (String $token)

Description:
-This method retrieves a specificed token (C<$token>) from the database
+This method retrieves a specified token (C<$token>) from the database
and returns it's spam_count, ham_count and last access time.

=cut
@@ -842,7 +842,7 @@ public instance (\@) tok_get (@ $tokens)

Description:
This method retrieves the specified tokens (C<$tokens>) from storage and returns
-an array ref of arrays spam count, ham acount and last access time.
+an array ref of arrays spam count, ham count and last access time.

=cut

@@ -1163,7 +1163,7 @@ sub tok_touch_all {
public instance (Boolean) cleanup ()

Description:
-This method perfoms any cleanup necessary before moving onto the next
+This method performs any cleanup necessary before moving onto the next
operation.

=cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Mon Nov 11 04:09:44 2019
@@ -658,7 +658,7 @@ The named list can then be consulted thr
eval rule implemented by the WLBLEval plugin, which takes the list name as
an argument. Parenthesis around a list name are literal - a required syntax.

-Host names may optionally be prefixed by an exclamantion mark '!', which
+Host names may optionally be prefixed by an exclamation mark '!', which
produces false as a result if this entry matches. This makes it easier
to exclude some subdomains when their superdomain is listed, for example:

@@ -849,7 +849,7 @@ By default, suspected spam messages will
C<From> or C<To> lines tagged to indicate spam. By setting this option,
the header will be tagged with C<STRING> to indicate that a message is
spam. For the From or To headers, this will take the form of an RFC 2822
-comment following the address in parantheses. For the Subject header,
+comment following the address in parentheses. For the Subject header,
this will be prepended to the original subject. Note that you should
only use the _REQD_ and _SCORE_ tags when rewriting the Subject header
if C<report_safe> is 0. Otherwise, you may not be able to remove
@@ -1308,7 +1308,7 @@ length) subnet is later specified in the
a wider network to be exempt. In case of specifying overlapping subnets,
specify more specific subnets first (tighter matching, i.e. with a longer
netmask length), followed by less specific (shorter netmask length) subnets
-to get predictable results regarless of the search algorithm used - when
+to get predictable results regardless of the search algorithm used - when
Net::Patricia module is installed the search finds the tightest matching
entry in the list, while a sequential search as used in absence of the
module Net::Patricia will find the first matching entry in the list.
@@ -3349,7 +3349,7 @@ Special function that will expand to lis
used anywhere in expressions. Argument supports glob style rulename
matching (* = anything, ? = one character). Matching is case-sensitive.

-For example, this will hit if atleast two __FOO_* rule hits:
+For example, this will hit if at least two __FOO_* rule hits:

body __FOO_1 /xxx/
body __FOO_2 /yyy/

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/LDAP.pm Mon Nov 11 04:09:44 2019
@@ -81,7 +81,7 @@ sub load_modules { # static

=item $f->load ($username)

-Read configuration paramaters from LDAP server and parse scores from it.
+Read configuration parameters from LDAP server and parse scores from it.

=back


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm Mon Nov 11 04:09:44 2019
@@ -79,7 +79,7 @@ sub load_modules { # static

=item $f->load ($username)

-Read configuration paramaters from SQL database and parse scores from it.
+Read configuration parameters from SQL database and parse scores from it.

=back


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Constants.pm Mon Nov 11 04:09:44 2019
@@ -155,7 +155,7 @@ use constant IP_PRIVATE => qr{^(?:
# 0000 in third up to (including) seventh omitted
(?:0{1,4}:){2}(?::0{1,4}){0,4}: 0{0,3}1
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:0{1,4}:){3}(?::0{1,4}){0,3}: 0{0,3}1
|
# 0000 in fifth up to (including) seventh omitted
@@ -236,7 +236,7 @@ use constant LOCALHOST => qr/
# 0000 in third up to (including) seventh omitted
(?:0{1,4}:){2}(?::0{1,4}){0,4}: 0{0,3}1
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:0{1,4}:){3}(?::0{1,4}){0,3}: 0{0,3}1
|
# 0000 in fifth up to (including) seventh omitted
@@ -333,7 +333,7 @@ use constant IP_ADDRESS => qr/
# 0000 in third up to (including) seventh omitted
(?:[a-f0-9]{1,4}:){2}(?::[a-f0-9]{1,4}){1,5}
|
- # 0000 in fouth up to (including) seventh omitted
+ # 0000 in fourth up to (including) seventh omitted
(?:[a-f0-9]{1,4}:){3}(?::[a-f0-9]{1,4}){1,4}
|
# 0000 in fifth up to (including) seventh omitted

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm Mon Nov 11 04:09:44 2019
@@ -292,7 +292,7 @@ sub pick_random_available_port {
Mail::SpamAssassin::Conf::set_ports_range(\$ports_bitset, 0, 0, 0);
$conf->{dns_available_ports_bitset} = $ports_bitset;
}
- # prepare auxilliary data structure to speed up further free-port lookups;
+ # prepare auxiliary data structure to speed up further free-port lookups;
# 256 buckets, each accounting for 256 ports: 8+8 = 16 bit port numbers;
# each bucket holds a count of available ports in its range
my @bucket_counts = (0) x 256;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/HTML.pm Mon Nov 11 04:09:44 2019
@@ -240,7 +240,7 @@ sub parse {

# # (outdated claim) HTML::Parser converts &nbsp; into a question mark ("?")
# # for some reason, so convert them to spaces. Confirmed in 3.31, at least.
- # ... Actually it doesn't, it is correctly coverted into Unicode NBSP,
+ # ... Actually it doesn't, it is correctly converted into Unicode NBSP,
# nevertheless it does not hurt to treat it as a space.
$text =~ s/&nbsp;/ /g;


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Locales.pm Mon Nov 11 04:09:44 2019
@@ -35,7 +35,7 @@ use re 'taint';
our %charsets_for_locale = (

# Japanese: Peter Evans writes: iso-2022-jp = rfc approved, rfc 1468, created
- # by Jun Murai in 1993 back when he didnt have white hair! rfc approved.
+ # by Jun Murai in 1993 back when he didn't have white hair! rfc approved.
# (rfc 2237) <-- by M$.
'ja' => 'EUCJP JISX020119760 JISX020819830 JISX020819900 JISX020819970 '.
'JISX021219900 JISX021320001 JISX021320002 SHIFT_JIS SHIFTJIS '.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger/Syslog.pm Mon Nov 11 04:09:44 2019
@@ -232,7 +232,7 @@ sub check_syslog_sigpipe {
syslog('debug', "%s", "syslog reopened");
syslog('info', "%s", $msg);

- # now report what happend
+ # now report what happened
$msg = "SIGPIPE received, reopening log socket";
dbg("log: $msg");
syslog('info', "%s", $msg);

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm?rev=1869639&r1=1869638&r2=1869639&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message.pm Mon Nov 11 04:09:44 2019
@@ -217,7 +217,7 @@ sub new {
# Pull off mbox and mbx separators
if ($message[0] =~ /^From\s+(?!:)/) {
# careful not to confuse with obsolete syntax which allowed WSP before ':'
- # mbox formated mailbox
+ # mbox formatted mailbox
$self->{'mbox_sep'} = shift @message;
} elsif ($message[0] =~ MBX_SEPARATOR) {
$_ = shift @message;