svn commit: rev 22286 - spamassassin/site

[jm...@apache.org]

Author: jm
Date: Tue Jun 29 19:18:16 2004
New Revision: 22286

Modified:
   spamassassin/site/main.wmk
Log:
updating to support a split between two websites; one for GPL/PAL code, one for ASL releases

Modified: spamassassin/site/main.wmk
==============================================================================
--- spamassassin/site/main.wmk	(original)
+++ spamassassin/site/main.wmk	Tue Jun 29 19:18:16 2004
@@ -3,10 +3,6 @@
 <content name="relversion">2.63</content>
 <content name="relline">2.6x</content>
 
-<content name="devversion">3.0.0-cvs</content>
-<content name="rawdevversion">3.000000-cvs</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
@@ -21,9 +17,9 @@
 
 <content name=otherversionslist format=text/et>
 
-  - <a href=$(TOP/)full/2.4x/dist/doc/>Versions from 2.40 to 2.44</a>
-  - <a href=$(TOP/)full/2.5x/dist/doc/>Versions from 2.50 to 2.55</a>
-  - <a href=$(TOP/)full/2.6x/dist/doc/>Versions from 2.60 to 2.63</a>
+  - <a href=http://old.SpamAssassin.org/full/2.4x/dist/doc/>Versions from 2.40 to 2.44</a>
+  - <a href=http://old.SpamAssassin.org/full/2.5x/dist/doc/>Versions from 2.50 to 2.55</a>
+  - <a href=http://old.SpamAssassin.org/full/2.6x/dist/doc/>Versions from 2.60 to 2.63</a>
   - <a href=$(TOP/)full/3.0.x/dist/doc/>Development tree for 3.0.0</a>
 
 </content>
@@ -205,7 +201,7 @@
   distribution.  Packages downloaded here contain UNIX-oriented front-end
   scripts.  Versions for Windows, commercial versions, and other front-ends,
   are listed on <a
-  href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>this site</a>.
+  href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>the wiki</a>.
 
   If you were sent here because you received an e-mail message which was
   modified by SpamAssassin, please go to <a href=$(users)>this page</a>.**
@@ -227,12 +223,13 @@
     as <a href=http://www.mail-abuse.org>mail-abuse.org</a>, <a
     href=http://www.ordb.org>ordb.org</a> or others.
 
-  - **Razor**: <A href=http://razor.sf.net/>Vipul's Razor</a> is a
-    collaborative spam-tracking database, which works by taking a signature of
-    spam messages.  Since spam typically operates by sending an identical
-    message to hundreds of people, Razor short-circuits this by allowing the
-    first person to receive a spam to add it to the database -- at which point
-    everyone else will automatically block it.
+  - **distributed hash databases**: <A href=http://razor.sf.net/>Vipul's
+    Razor</a>, Pyzor and DCC are collaborative spam-tracking databases, which
+    work by taking a signature of spam messages.  Since spam typically operates
+    by sending an identical message to hundreds of people, these databases
+    short-circuit this by allowing the first person to receive a spam to add it
+    to the database -- at which point everyone else will automatically block
+    it.
 
 Once identified, the mail can then be optionally tagged as spam for later
 filtering using the user's own mail user-agent application.
@@ -394,45 +391,16 @@
     which will generate a local.cf or user_prefs file for you, once you fill
     out a few simple questions.
 
-  - some older <a
-    href=http://www.hughes-family.org/spamassassin/>RPMs</a>, courtesy
-    of Craig Hughes.
-
   - **MacOS X users**: Ben Trott of <a
     href=http://www.movabletype.org>MovableType</a> has written a <A
     href=http://rhumba.pair.com/ben/docs/sa.html>good how-to</a> on installing
     SpamAssassin on OSX.
 
-Latest bleeding-edge code, ${devversion}:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-NOTE: these are built nightly from the SVN repository.  They may be unstable!
-
-  - <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.gz>SpamAssassin in
-    tar.gz</a> format.
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.asc>GPG</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.md5>MD5</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.gz.sha1>SHA1</a>
-
-  - <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.gz>SpamAssassin in
-    tar.bz2</a> format.
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.asc>GPG</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.md5>MD5</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.tar.bz2.sha1>SHA1</a>
-
-  - <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.zip>SpamAssassin in ZIP</a>
-    format.
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.zip.asc>GPG</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.zip.md5>MD5</a>
-    <a href=$(TOP/)devel/Mail-SpamAssassin-${rawdevversion}.zip.sha1>SHA1</a>
+Latest bleeding-edge code:
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  - <a href=$(TOP/)full/${devline}/dist/README>The README file</a>.
-
-  - <a href=$(TOP/)full/${devline}/dist/INSTALL>The INSTALL file</a>.
-
-  - <a href=$(TOP/)full/${devline}/dist/USAGE>The USAGE file</a>.
-
-  - <a href=$(TOP/)full/${devline}/dist/>The unpacked distribution</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:
 ~~~~~~~~~~~~~~~~
@@ -446,6 +414,12 @@
 uid                            SpamAssassin Signing Key &lt;spamassassin-devel@lists.sourceforge.net&gt;
 </pre>
 
+Old releases:
+~~~~~~~~~~~~~
+
+Available <a href=http://old.SpamAssassin.org/released/>here</a>.
+
+
 </content>
 <content format="text/et" name="hacking.txt"><{set title="Hacking On SpamAssassin(tm)"}>
 
@@ -569,7 +543,7 @@
 ---------
 
 This page has been replaced by the
-<a href="$(TOP/)full/${devline}/dist/CREDITS">CREDITS file
+<a href="http://cvs.apache.org/viewcvs.cgi/*checkout*/spamassassin/trunk/CREDITS?rev=22197&root=Apache-SVN">CREDITS file
 in the main SA distribution</a>.
 
 </content>