svn commit: rev 22826 - spamassassin/site

[fe...@apache.org]

Author: felicity
Date: Sun Jul 11 21:44:42 2004
New Revision: 22826

Modified:
   spamassassin/site/main.wmk
Log:
updated main page, added pointer to old.sa.org nightly devel files until cvs.apache.org starts doing the nightly snapshots

Modified: spamassassin/site/main.wmk
==============================================================================
--- spamassassin/site/main.wmk	(original)
+++ spamassassin/site/main.wmk	Sun Jul 11 21:44:42 2004
@@ -6,6 +6,10 @@
 <content name="relline">2.6x</content>
 <content name="docsline">3.0.x</content>
 
+<content name="devversion">3.0-dev</content>
+<content name="rawdevversion">3.0-dev</content>
+<content name="devline">3.0.x</content>
+
 <{perl
     # this should not be part of the mirrored data; it includes an entire
     # checkout of the source tree
@@ -151,16 +155,14 @@
 in <a href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>wide
 range of products</a>.
 
-SpamAssassin lives at http://spamassassin.org/ or in CPAN, and is distributed
-under Perl's Artistic license.  ('SpamAssassin' is a trademark of Network
-Associates, Inc.)
-
-This is changing, however.  SpamAssassin is now a top-level project at the <a
-href=http://www.apache.org/foundation/>Apache Software Foundation</a>.
-As a result, our license will be changing with SpamAssassin 3.0;
-from that version on we will be using the <a
-href=http://www.apache.org/foundation/licence-FAQ.html>Apache Software
-License</a>.
+SpamAssassin lives at http://www.spamassassin.org/ and in CPAN.
+Versions 3.0.0 and later are distributed under the <a
+href=http://www.apache.org/foundation/licence-FAQ.html>Apache
+Software License</a> version 2.  Versions 2.63 and earlier are
+distributed under a dual GNU Public License/Perl Artistic license.
+Please see the LICENSE file in the main directory for more information.
+'SpamAssassin' and 'Powered by SpamAssassin' are trademarks of the
+<a href=http://www.apache.org/foundation/>Apache Software Foundation</a>.
 
 Features
 ~~~~~~~~
@@ -170,7 +172,7 @@
     identify one aspect which they can craft their messages to work around.
 
   - **Free software**: it is distributed under the same terms and conditions as
-    Perl itself.
+    other popular open-source software packages such as the Apache httpd project.
 
   - **Easy to extend**: Rules, weights and user-visible text are stored in text
     configuration files as much as possible, which the user (or sysadmin) can
@@ -282,8 +284,6 @@
 
       ##emerge mail-filter/spamassassin##
 
-<br />
-
 Other stuff regarding released versions
 ~~~~~~~~~~~~~~
 
@@ -298,10 +298,35 @@
     SpamAssassin on OSX.
 
 Latest bleeding-edge code:
-~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Note**: these are built nightly from the SVN repository.  They may be unstable!
+
+**Note**: These are also links to a separate website; until the
+normal Apache nightly snapshots are setup.
 
+  - <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.gz>SpamAssassin in
+    tar.gz</a> format.
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.asc>GPG</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.md5>MD5</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.sha1>SHA1</a>
+
+  - <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2>SpamAssassin in
+    tar.bz2</a> format.
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.asc>GPG</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.md5>MD5</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.sha1>SHA1</a>
+    
+  - <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.zip>SpamAssassin in ZIP</a>
+    format.
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.zip.asc>GPG</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.zip.md5>MD5</a>
+    <a href=http://old.spamassassin.org/devel/Mail-SpamAssassin-${rawdevversion}.zip.sha1>SHA1</a>
+
+<!--
 Nightly snapshots of the latest SVN trunk code can be downloaded
 from <a href=http://cvs.apache.org/snapshots/spamassassin/>cvs.apache.org</a>.
+-->
 
 GPG Signing Key:
 ~~~~~~~~~~~~~~~~