diff -urNad spamassassin~/INSTALL spamassassin/INSTALL

--- spamassassin~/INSTALL	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/INSTALL	2007-06-12 00:11:08.000000000 -0700

@@ -373,7 +373,7 @@

     perl interpreter.  Version 2.83 or later fixes this.

     If you do not plan to use this plugin, be sure to comment out

-    its loadplugin line in "/etc/mail/spamassassin/v310.pre".

+    its loadplugin line in "/etc/spamassassin/v310.pre".

 What Next?

diff -urNad spamassassin~/README spamassassin/README

--- spamassassin~/README	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/README	2007-06-12 00:09:48.000000000 -0700

@@ -111,13 +111,13 @@

         not modify these, as they are overwritten when you run

         "sa-update".

-  - /etc/mail/spamassassin/*.cf:

+  - /etc/spamassassin/*.cf:

   	Site config files, for system admins to create, modify, and

 	add local rules and scores to.  Modifications here will be

 	appended to the config loaded from the above directory.

-  - /etc/mail/spamassassin/*.pre:

+  - /etc/spamassassin/*.pre:

         Plugin control files, installed from the distribution. These are

         used to control what plugins are loaded.  Modifications here will

@@ -126,7 +126,7 @@

         You want to modify these files if you want to load additional

         plugins, or inhibit loading a plugin that is enabled by default.

-        If the files exist in /etc/mail/spamassassin, they will not

+        If the files exist in /etc/spamassassin, they will not

         be overwritten during future installs.

   - /usr/share/spamassassin/user_prefs.template:

@@ -134,14 +134,14 @@

 	Distributed default user preferences. Do not modify this, as it is

 	overwritten when you upgrade.

-  - /etc/mail/spamassassin/user_prefs.template:

+  - /etc/spamassassin/user_prefs.template:

 	Default user preferences, for system admins to create, modify, and

 	set defaults for users' preferences files.  Takes precedence over

 	the above prefs file, if it exists.

         Do not put system-wide settings in here; put them in a file in the

-        "/etc/mail/spamassassin" directory ending in ".cf". This file is

+        "/etc/spamassassin" directory ending in ".cf". This file is

         just a template, which will be copied to a user's home directory

         for them to change.

diff -urNad spamassassin~/UPGRADE spamassassin/UPGRADE

--- spamassassin~/UPGRADE	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/UPGRADE	2007-06-12 00:09:48.000000000 -0700

@@ -24,7 +24,7 @@

   perldoc Mail::SpamAssassin::Plugin::* (ie AWL, DCC, etc)

 - There are now multiple files read to enable plugins in the

-  /etc/mail/spamassassin directory; previously only one, "init.pre" was

+  /etc/spamassassin directory; previously only one, "init.pre" was

   read.  Now both "init.pre", "v310.pre", and any other files ending

   in ".pre" will be read.  As future releases are made, new plugins

   will be added to new files named according to the release they're

@@ -181,7 +181,7 @@

 - If you are using a UNIX machine with all database files on local disks,

   and no sharing of those databases across NFS filesystems, you can use a

   more efficient, but non-NFS-safe, locking mechanism.   Do this by adding

-  the line "lock_method flock" to the /etc/mail/spamassassin/local.cf

+  the line "lock_method flock" to the /etc/spamassassin/local.cf

   file. This is strongly recommended if you're not using NFS, as it is

   much faster than the NFS-safe locker.

diff -urNad spamassassin~/USAGE spamassassin/USAGE

--- spamassassin~/USAGE	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/USAGE	2007-06-12 00:09:48.000000000 -0700

@@ -117,7 +117,7 @@

     CPU-intensive task before they can send mail to you, so we give that

     some bonus points.  However, it requires that you list what addresses

     you expect to receive mail for, by adding 'hashcash_accept' lines to

-    your ~/.spamassassin/user_prefs or /etc/mail/spamassassin/local.cf

+    your ~/.spamassassin/user_prefs or /etc/spamassassin/local.cf

     files.  See the Mail::SpamAssassin::Plugin::Hashcash manual page for

     details on how to specify these.

@@ -129,14 +129,14 @@

   - You can create your own system-wide rules files in

-    /etc/mail/spamassassin; their filenames should end in ".cf".  Multiple

+    /etc/spamassassin; their filenames should end in ".cf".  Multiple

     files will be read, and SpamAssassin will not overwrite these files

     when installing a new version.

   - You should not modify the files in /usr/share/spamassassin; these

     will be overwritten when you upgrade.  Any changes you make in

-    files in the /etc/mail/spamassassin directory,  however, will

+    files in the /etc/spamassassin directory,  however, will

     override these files.

diff -urNad spamassassin~/ldap/README spamassassin/ldap/README

--- spamassassin~/ldap/README	2007-06-08 05:55:11.000000000 -0700

+++ spamassassin/ldap/README	2007-06-12 00:09:48.000000000 -0700

@@ -13,7 +13,7 @@

 database or LDAP server.

 SpamAssassin will check the global configuration file (ie. any file matching

-/etc/mail/spamassassin/*.cf) for the following settings:

+/etc/spamassassin/*.cf) for the following settings:

   user_scores_dsn ldap://host:port/dc=basedn,dc=de?attr?scope?uid=__USERNAME__

   user_scores_ldap_username	bind dn

diff -urNad spamassassin~/lib/Mail/SpamAssassin/Conf.pm spamassassin/lib/Mail/SpamAssassin/Conf.pm

--- spamassassin~/lib/Mail/SpamAssassin/Conf.pm	2007-06-08 05:55:30.000000000 -0700

+++ spamassassin/lib/Mail/SpamAssassin/Conf.pm	2007-06-12 00:09:48.000000000 -0700

@@ -40,7 +40,7 @@

 =head1 DESCRIPTION

 SpamAssassin is configured using traditional UNIX-style configuration files,

-loaded from the C</usr/share/spamassassin> and C</etc/mail/spamassassin>

+loaded from the C</usr/share/spamassassin> and C</etc/spamassassin>

 directories.

 The following web page lists the most important configuration settings

@@ -1759,7 +1759,7 @@

 These settings differ from the ones above, in that they are considered

 'privileged'.  Only users running C<spamassassin> from their procmailrc's or

-forward files, or sysadmins editing a file in C</etc/mail/spamassassin>, can

+forward files, or sysadmins editing a file in C</etc/spamassassin>, can

 use them.   C<spamd> users cannot use them in their C<user_prefs> files, for

 security and efficiency reasons, unless C<allow_user_rules> is enabled (and

 then, they may only add rules from below).

diff -urNad spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm

--- spamassassin~/lib/Mail/SpamAssassin/Plugin/Test.pm	2007-06-08 05:55:28.000000000 -0700

+++ spamassassin/lib/Mail/SpamAssassin/Plugin/Test.pm	2007-06-12 00:09:48.000000000 -0700

@@ -27,7 +27,7 @@

 =head1 DESCRIPTION

 To try this plugin, write the above two lines in the synopsis to

-C</etc/mail/spamassassin/plugintest.cf>.

+C</etc/spamassassin/plugintest.cf>.

 =cut

diff -urNad spamassassin~/lib/spamassassin-run.pod spamassassin/lib/spamassassin-run.pod

--- spamassassin~/lib/spamassassin-run.pod	2007-06-08 05:55:30.000000000 -0700

+++ spamassassin/lib/spamassassin-run.pod	2007-06-12 00:09:48.000000000 -0700

@@ -43,7 +43,7 @@

  -p prefs, --prefspath=file, --prefs-file=file

                                    Set user preferences file

  --siteconfigpath=path             Path for site configs

-                                   (def: /etc/mail/spamassassin)

+                                   (def: /etc/spamassassin)

  --cf='config line'                Additional line of configuration

  -x, --nocreate-prefs              Don't create user preferences file

  -e, --exit-code                   Exit with a non-zero exit code if the

@@ -241,7 +241,7 @@

 =item B<--siteconfigpath>=I<path>

 Use the specified path for locating site-specific configuration files.  Ignore

-the default directories (usually C</etc/mail/spamassassin> or similar).

+the default directories (usually C</etc/spamassassin> or similar).

 =item B<--cf='config line'>

diff -urNad spamassassin~/rules/user_prefs.template spamassassin/rules/user_prefs.template

--- spamassassin~/rules/user_prefs.template	2007-06-08 05:55:39.000000000 -0700

+++ spamassassin/rules/user_prefs.template	2007-06-12 00:09:48.000000000 -0700

@@ -5,7 +5,7 @@

 #* directory. At runtime, if a user has no preferences in their home directory

 #* already, it will be copied for them, allowing them to perform personalised

 #* customisation.  If you want to make changes to the site-wide defaults,

-#* create a file in /etc/spamassassin or /etc/mail/spamassassin instead.

+#* create a file in /etc/spamassassin instead.

 ###########################################################################

 # How many points before a mail is considered spam.

diff -urNad spamassassin~/sa-compile.raw spamassassin/sa-compile.raw

--- spamassassin~/sa-compile.raw	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/sa-compile.raw	2007-06-12 00:11:44.000000000 -0700

@@ -643,7 +643,7 @@

   -p prefs, --prefspath=file, --prefs-file=file

                                 Set user preferences file

   --siteconfigpath=path         Path for site configs

-                                (default: /etc/mail/spamassassin)

+                                (default: /etc/spamassassin)

   --updatedir=path              Directory to place updates

                       (default: /var/lib/spamassassin/compiled/<version>)

   --cf='config line'            Additional line of configuration

@@ -697,7 +697,7 @@

 =item B<--siteconfigpath>=I<path>

 Use the specified path for locating site-specific configuration files.  Ignore

-the default directories (usually C</etc/mail/spamassassin> or similar).

+the default directories (usually C</etc/spamassassin> or similar).

 =item B<--updatedir>

diff -urNad spamassassin~/sa-learn.raw spamassassin/sa-learn.raw

--- spamassassin~/sa-learn.raw	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/sa-learn.raw	2007-06-12 00:09:48.000000000 -0700

@@ -598,7 +598,7 @@

  -p prefs, --prefspath=file, --prefs-file=file

                        Set user preferences file

  --siteconfigpath=path Path for site configs

-                       (default: /etc/mail/spamassassin)

+                       (default: /etc/spamassassin)

  --cf='config line'    Additional line of configuration

  -D, --debug [area=n,...]  Print debugging messages

  -V, --version         Print version

@@ -755,7 +755,7 @@

 =item B<--siteconfigpath>=I<path>

 Use the specified path for locating site-specific configuration files.  Ignore

-the default directories (usually C</etc/mail/spamassassin> or similar).

+the default directories (usually C</etc/spamassassin> or similar).

 =item B<--cf='config line'>

diff -urNad spamassassin~/spamc/spamc.pod spamassassin/spamc/spamc.pod

--- spamassassin~/spamc/spamc.pod	2007-06-08 05:56:02.000000000 -0700

+++ spamassassin/spamc/spamc.pod	2007-06-12 00:09:48.000000000 -0700

@@ -255,8 +255,8 @@

 If the B<-F> switch is specified, that file will be used.  Otherwise,

 C<spamc> will attempt to load spamc.conf in C<SYSCONFDIR> (default:

-/etc/mail/spamassassin). If that file doesn't exist, and the B<-F>

-switch is not specified, no configuration file will be read.

+/etc/spamassassin). If that file doesn't exist, and the B<-F> switch

+is not specified, no configuration file will be read.

 Example:

diff -urNad spamassassin~/spamd/README spamassassin/spamd/README

--- spamassassin~/spamd/README	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/spamd/README	2007-06-12 00:09:48.000000000 -0700

@@ -105,7 +105,7 @@

 If you plan to use Bayesian classification (the BAYES rules) with spamd,

 you will need to either

-  1. modify /etc/mail/spamassassin/local.cf to use a shared database of

+  1. modify /etc/spamassassin/local.cf to use a shared database of

   tokens, by setting the 'bayes_path' setting to a path all users can read

   and write to.  You will also need to set the 'bayes_file_mode' setting

   to 0666 so that created files are shared, too.

diff -urNad spamassassin~/spamd/README.vpopmail spamassassin/spamd/README.vpopmail

--- spamassassin~/spamd/README.vpopmail	2007-06-08 05:56:25.000000000 -0700

+++ spamassassin/spamd/README.vpopmail	2007-06-12 00:09:48.000000000 -0700

@@ -43,7 +43,7 @@

 	/home/vpopmail/domains/somedomain.net/4/userid/.spamassassin/user_prefs

 5. One gotcha - cannot have personal AWL dbs - only a sitewide AWL will work.

-This is specified in your /etc/mail/spamassassin/local.cf file.  Perhaps a

+This is specified in your /etc/spamassassin/local.cf file.  Perhaps a

 future enhancement would be to add the capability to have personal AWL db.

 6. Of course vpopmail must have the seekable patch installed (see 

diff -urNad spamassassin~/spamd/spamd.raw spamassassin/spamd/spamd.raw

--- spamassassin~/spamd/spamd.raw	2007-06-08 06:01:53.000000000 -0700

+++ spamassassin/spamd/spamd.raw	2007-06-12 00:09:48.000000000 -0700

@@ -2695,7 +2695,7 @@

 =item B<--siteconfigpath>=I<path>

 Use the specified path for locating site-specific configuration files.  Ignore

-the default directories (usually C</etc/mail/spamassassin> or similar).

+the default directories (usually C</etc/spamassassin> or similar).

 =item B<--cf='config line'>

diff -urNad spamassassin~/sql/README spamassassin/sql/README

--- spamassassin~/sql/README	2007-06-08 05:55:59.000000000 -0700

+++ spamassassin/sql/README	2007-06-12 00:09:48.000000000 -0700

@@ -18,7 +18,7 @@

 SQL preferences.

 SpamAssassin will check the global configuration file (ie. any file matching

-/etc/mail/spamassassin/*.cf) for the following settings:

+/etc/spamassassin/*.cf) for the following settings:

   user_scores_dsn		DBI:driver:connection

   user_scores_sql_username	dbusername

diff -urNad spamassassin~/sql/README.awl spamassassin/sql/README.awl

--- spamassassin~/sql/README.awl	2007-06-08 05:55:59.000000000 -0700

+++ spamassassin/sql/README.awl	2007-06-12 00:09:48.000000000 -0700

@@ -15,7 +15,7 @@

 auto_whitelist_factory Mail::SpamAssassin::SQLBasedAddrList

 SpamAssassin will check the global configuration file (ie. any file

-matching /etc/mail/spamassassin/*.cf) for the following settings:

+matching /etc/spamassassin/*.cf) for the following settings:

 user_awl_dsn                 DBI:driver:database:hostname[:port]

 user_awl_sql_username        dbusername

diff -urNad spamassassin~/t/data/testplugin.pm spamassassin/t/data/testplugin.pm

--- spamassassin~/t/data/testplugin.pm	2007-06-08 05:56:24.000000000 -0700

+++ spamassassin/t/data/testplugin.pm	2007-06-12 00:09:48.000000000 -0700

@@ -1,6 +1,6 @@

 =head1 

-To try this out, write these lines to /etc/mail/spamassassin/plugintest.cf:

+To try this out, write these lines to /etc/spamassassin/plugintest.cf:

   loadplugin     myTestPlugin

   header         MY_TEST_PLUGIN eval:check_test_plugin()