You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/08/05 03:24:07 UTC

svn commit: rev 35706 - in spamassassin/trunk: . build lib/Mail lib/Mail/SpamAssassin rules spamd

Author: quinlan
Date: Wed Aug  4 18:24:06 2004
New Revision: 35706

Modified:
   spamassassin/trunk/INSTALL
   spamassassin/trunk/README
   spamassassin/trunk/USAGE
   spamassassin/trunk/build/3.0.0_change_summary
   spamassassin/trunk/lib/Mail/SpamAssassin.pm
   spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
   spamassassin/trunk/rules/30_text_fr.cf
   spamassassin/trunk/rules/user_prefs.template
   spamassassin/trunk/spamassassin.raw
   spamassassin/trunk/spamassassin.spec
   spamassassin/trunk/spamd/README
   spamassassin/trunk/spamd/spamd.raw
Log:
update URLs in various places


Modified: spamassassin/trunk/INSTALL
==============================================================================
--- spamassassin/trunk/INSTALL	(original)
+++ spamassassin/trunk/INSTALL	Wed Aug  4 18:24:06 2004
@@ -18,7 +18,7 @@
 On Debian, you can apt-get it from unstable, thanks to Duncan Findlay.
 
 Alternatively download the tarfile, zipfile or Fedora Core RPM from
-http://spamassassin.org/ , and install that, like so:
+http://spamassassin.apache.org/ , and install that, like so:
 
 	[unzip/untar the archive]
 	cd Mail-SpamAssassin-*
@@ -125,7 +125,7 @@
 marked as spam.  GTUBE is located in the sample-spam.txt message
 distributed with SpamAssassin and also at:
 
-  http://www.spamassassin.org/gtube/
+  http://spamassassin.apache.org/gtube/
 
 If your test emails don't get through to you, immediately rename your
 .forward file until you figure out cause of the the problem, so you don't

Modified: spamassassin/trunk/README
==============================================================================
--- spamassassin/trunk/README	(original)
+++ spamassassin/trunk/README	Wed Aug  4 18:24:06 2004
@@ -43,8 +43,8 @@
 sure it's a bug after checking the Wiki), please file a report in our
 Bugzilla[4].
 
-	[2]: http://wiki.spamassassin.org/
-	[3]: http://www.spamassassin.org/lists.html
+	[2]: http://wiki.apache.org/spamassassin/
+	[3]: http://wiki.apache.org/spamassassin/MailingLists
 	[4]: http://bugzilla.spamassassin.org/
 
 Please also be sure to read the man pages.
@@ -224,8 +224,8 @@
 
 There's a mailing list for support or discussion of SpamAssassin.  It
 lives at <spamassassin-users /at/ incubator.apache.org>.  See
-http://spamassassin.org/lists.html for the sign-up address and a link to
-the archive of past messages.
+http://wiki.apache.org/spamassassin/MailingLists for the sign-up address
+and a link to the archive of past messages.
 
 Much more info is at http://wiki.apache.org/spamassassin/FrontPage
 

Modified: spamassassin/trunk/USAGE
==============================================================================
--- spamassassin/trunk/USAGE	(original)
+++ spamassassin/trunk/USAGE	Wed Aug  4 18:24:06 2004
@@ -82,9 +82,9 @@
 
 If you want to use SpamAssassin site-wide:
 
-  - take a look at the notes on the website, at
-    http://spamassassin.org/sitewide.html .  You will probably want to use
-    'spamd' (see below).
+  - take a look at the notes on the Wiki website, currently at
+    <http://wiki.apache.org/spamassassin/UsingSiteWide>.  You will probably
+    want to use 'spamd' (see below).
 
   - *PLEASE* let your users know you've installed it, and how to turn it
     off!   This is our #1 tech support query, and the users are usually
@@ -214,17 +214,6 @@
 
   - Scores and other user preferences can now be loaded from an SQL
     database; see the 'sql' subdirectory for more details.
-
-
-  - Edward Fang <edfang /at/ visi.net> has contributed the
-    'communigate.sh' script for CommunigatePro, available from
-    http://SpamAssassin.org/released/contrib/ .
-
-
-  - James Henstridge <james /at/ daa.com.au> has contributed an LMTP proxy
-    server (designed for Cyrus, but probably will work fine with others),
-    again it's in the contrib directory at
-    http://SpamAssassin.org/released/contrib/ .
 
 
   - Lots more ways to integrate SpamAssassin can be read at

Modified: spamassassin/trunk/build/3.0.0_change_summary
==============================================================================
--- spamassassin/trunk/build/3.0.0_change_summary	(original)
+++ spamassassin/trunk/build/3.0.0_change_summary	Wed Aug  4 18:24:06 2004
@@ -34,9 +34,9 @@
 
 Pick it up from:
 
-  http://SpamAssassin.org/released/Mail-SpamAssassin-3.0.0-pre1.tar.gz
-  http://SpamAssassin.org/released/Mail-SpamAssassin-3.0.0-pre1.tar.bz2
-  http://SpamAssassin.org/released/Mail-SpamAssassin-3.0.0-pre1.zip
+  http://spamassassin.apache.org/released/Mail-SpamAssassin-3.0.0-pre1.tar.gz
+  http://spamassassin.apache.org/released/Mail-SpamAssassin-3.0.0-pre1.tar.bz2
+  http://spamassassin.apache.org/released/Mail-SpamAssassin-3.0.0-pre1.zip
 
 md5sum:
 
@@ -53,7 +53,7 @@
 The release files also have a .asc accompanying them.  The file serves
 as an external GPG signature for the given release file.  The signing
 key is available via the wwwkeys.pgp.net key server, as well as
-http://www.spamassassin.org/released/GPG-SIGNING-KEY
+http://spamassassin.apache.org/released/GPG-SIGNING-KEY
 
 The key information is:
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm	Wed Aug  4 18:24:06 2004
@@ -115,7 +115,7 @@
 
 sub Version { $VERSION=~/^(\d+)\.(\d\d\d)(\d\d\d)$/; join('-', sprintf("%d.%d.%d",$1,$2,$3), @EXTRA_VERSION) }
 
-$HOME_URL = "http://spamassassin.org/";
+$HOME_URL = "http://spamassassin.apache.org/";
 
 # note that the CWD takes priority.  This is required in case a user
 # is testing a new version of SpamAssassin on a machine with an older
@@ -1805,7 +1805,8 @@
 
 =head1 MORE DOCUMENTATION
 
-See also E<lt>http://spamassassin.org/E<gt> for more information.
+See also E<lt>http://spamassassin.apache.org/E<gt> and
+E<lt>http://wiki.apache.org/spamassassin/E<gt> for more information.
 
 =head1 SEE ALSO
 
@@ -1831,6 +1832,6 @@
 The latest version of this library is likely to be available from CPAN
 as well as:
 
-  http://spamassassin.org/
+  E<lt>http://spamassassin.apache.org/E<gt>
 
 =cut

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Wed Aug  4 18:24:06 2004
@@ -1603,8 +1603,8 @@
 # a combination of the URIs found in the rendered body and the
 # URIs found when parsing the HTML in the message.  The array will
 # include the "raw" URI as well as "slightly cooked" versions --
-# ie: 'http://%77&#00119;%77.spamassassin.org/' will get turned into:
-# ( 'http://%77&#00119;%77.spamassassin.org/', 'http://www.spamassassin.org/' )
+# ie: 'http://%77&#00119;%77.example.com/' will get turned into:
+# ( 'http://%77&#00119;%77.example.com/', 'http://www.example.com/' )
 # -- this lets us run rules against both the original and "correct"
 # versions easily.
 #

Modified: spamassassin/trunk/rules/30_text_fr.cf
==============================================================================
--- spamassassin/trunk/rules/30_text_fr.cf	(original)
+++ spamassassin/trunk/rules/30_text_fr.cf	Wed Aug  4 18:24:06 2004
@@ -45,7 +45,7 @@
 lang fr report destin�, ou pour toute question, veuillez contacter l'administrateur
 lang fr report du syst�me par e-mail � _CONTACTADDRESS_ .
 lang fr report
-lang fr report Voir http://spamassassin.org/tag/ pour plus de d�tails (en anglais).
+lang fr report Voir http://spamassassin.apache.org/tag/ pour plus de d�tails (en anglais).
 lang fr report
 lang fr report D�tails de l'analyse du message:   (_SCORE_ points, _REQD_ requis)
 lang fr report _SUMMARY_

Modified: spamassassin/trunk/rules/user_prefs.template
==============================================================================
--- spamassassin/trunk/rules/user_prefs.template	(original)
+++ spamassassin/trunk/rules/user_prefs.template	Wed Aug  4 18:24:06 2004
@@ -18,7 +18,7 @@
 # Add your own customised scores for some tests below.  The default scores are
 # read from the installed spamassassin rules files, but you can override them
 # here.  To see the list of tests and their default scores, go to
-# http://spamassassin.org/tests.html .
+# http://spamassassin.apache.org/tests.html .
 #
 # score SYMBOLIC_TEST_NAME n.nn
 

Modified: spamassassin/trunk/spamassassin.raw
==============================================================================
--- spamassassin/trunk/spamassassin.raw	(original)
+++ spamassassin/trunk/spamassassin.raw	Wed Aug  4 18:24:06 2004
@@ -832,5 +832,10 @@
 
 The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
 
+=head1 COPYRIGHT
+
+SpamAssassin is distributed under the Apache Software License, as described
+in the file C<LICENSE> included with the distribution.
+
 =cut
 

Modified: spamassassin/trunk/spamassassin.spec
==============================================================================
--- spamassassin/trunk/spamassassin.spec	(original)
+++ spamassassin/trunk/spamassassin.spec	Wed Aug  4 18:24:06 2004
@@ -42,9 +42,9 @@
 Name: %{name}
 Version: %{version}
 Release: %{release}
-License: Apache Software License
-URL: http://spamassassin.org/
-Source: http://spamassassin.org/released/Mail-SpamAssassin-%{real_version}.tar%{srcext}
+License: Apache License 2.0
+URL: http://spamassassin.apache.org/
+Source: http://spamassassin.apache.org/released/Mail-SpamAssassin-%{real_version}.tar%{srcext}
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
 Prereq: /sbin/chkconfig

Modified: spamassassin/trunk/spamd/README
==============================================================================
--- spamassassin/trunk/spamd/README	(original)
+++ spamassassin/trunk/spamd/README	Wed Aug  4 18:24:06 2004
@@ -269,7 +269,7 @@
 
 This mail is probably spam.  The original message has been attached
 along with this report, so you can recognize or block similar unwanted
-mail in future.  See http://spamassassin.org/tag/ for more details.
+mail in future.  See http://spamassassin.apache.org/tag/ for more details.
 [....]
 
 

Modified: spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw	(original)
+++ spamassassin/trunk/spamd/spamd.raw	Wed Aug  4 18:24:06 2004
@@ -2258,5 +2258,10 @@
 
 The SpamAssassin(tm) Project <http://spamassassin.apache.org/>
 
+=head1 COPYRIGHT
+
+SpamAssassin is distributed under the Apache Software License, as described
+in the file C<LICENSE> included with the distribution.
+
 =cut