You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2014/02/11 15:09:04 UTC

svn commit: r1567136 [1/5] - in /spamassassin/site: ./ devel/ gtube/ old/ released/ tag/

Author: kmcgrail
Date: Tue Feb 11 14:09:03 2014
New Revision: 1567136

URL: http://svn.apache.org/r1567136
Log:
Adding version 3.4.0 to website

Added:
    spamassassin/site/old/main.wmk
      - copied unchanged from r1566947, spamassassin/site/main.wmk
Modified:
    spamassassin/site/.htaccess
    spamassassin/site/credits.html
    spamassassin/site/devel/index.html
    spamassassin/site/doc.html
    spamassassin/site/downloads.html
    spamassassin/site/faq.html
    spamassassin/site/gtube.html
    spamassassin/site/gtube/index.html
    spamassassin/site/hacking.html
    spamassassin/site/index.html
    spamassassin/site/lists.html
    spamassassin/site/main.wmk
    spamassassin/site/news.html
    spamassassin/site/presentations.html
    spamassassin/site/released/index.html
    spamassassin/site/sitewide.html
    spamassassin/site/tag/index.html
    spamassassin/site/tests.html
    spamassassin/site/users.html
    spamassassin/site/weblist.pl
    spamassassin/site/where.html

Modified: spamassassin/site/.htaccess
URL: http://svn.apache.org/viewvc/spamassassin/site/.htaccess?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/.htaccess (original)
+++ spamassassin/site/.htaccess Tue Feb 11 14:09:03 2014
@@ -2,9 +2,9 @@ Redirect /downloads.html http://spamassa
 Redirect /favicon.ico http://spamassassin.apache.org/images/favicon.ico
 RewriteEngine On
 RewriteBase /
-RewriteRule ^doc/(.*)$ http://spamassassin.apache.org/full/3.3.x/doc/$1 [R=permanent]
-RewriteRule ^doc.html/(.*)$ http://spamassassin.apache.org/full/3.3.x/doc/$1 [R=permanent]
-RewriteRule ^dist/(.*)$ http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.3.x/$1 [R=permanent]
-RewriteRule ^full/3.3.x/dist/doc/(.*)$ http://spamassassin.apache.org/full/3.3.x/doc/$1 [R=permanent]
-RewriteRule ^full/3.3.x/dist/(.*)$ http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.3.x/$1 [R=permanent]
-RewriteRule ^doc$ http://spamassassin.apache.org/full/3.3.x/doc/ [R=permanent]
\ No newline at end of file
+RewriteRule ^doc/(.*)$ http://spamassassin.apache.org/full/3.4.x/doc/$1 [R=permanent]
+RewriteRule ^doc.html/(.*)$ http://spamassassin.apache.org/full/3.4.x/doc/$1 [R=permanent]
+RewriteRule ^dist/(.*)$ http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.4.x/$1 [R=permanent]
+RewriteRule ^full/3.4.x/dist/doc/(.*)$ http://spamassassin.apache.org/full/3.4.x/doc/$1 [R=permanent]
+RewriteRule ^full/3.4.x/dist/(.*)$ http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.4.x/$1 [R=permanent]
+RewriteRule ^doc$ http://spamassassin.apache.org/full/3.4.x/doc/ [R=permanent]
\ No newline at end of file

Modified: spamassassin/site/credits.html
URL: http://svn.apache.org/viewvc/spamassassin/site/credits.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/credits.html (original)
+++ spamassassin/site/credits.html Tue Feb 11 14:09:03 2014
@@ -27,12 +27,12 @@
        H6 { font-size: xx-small; }
        A:link {
        font-weight: bold;
-       color: #004000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:visited {
        font-weight: normal;
-       color: #008000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:active {
@@ -41,7 +41,7 @@
        text-decoration: underline; 
        }
        table.navibar {
-       background-color: #C8C8C8;
+       background-color: #ddd;
        border-spacing: 3px;
        }
        td.navibar {
@@ -61,30 +61,30 @@
        }
     </style>
     <link rel="meta" title="DOAP" type="application/rdf+xml" href="doap.rdf" />
-    <meta name="generator" content="WebMake/2.2" />
+    <meta name="generator" content="WebMake/2.4" />
     
   </head>
   <body>
     <p>
+      <br />
       <table width="100%">
         <tr>
           <td valign="center">
-             <img align="center" src="images/arrowlogo.png" alt="SpamAssassin" width="334" height="148" />
+            <a href="index.html"><img align="left" src="images/spamassassin-logobar.png" alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" width="750" height="80" /></a>
           </td>
           <td valign="center">
-             <h1>The Apache SpamAssassin Project</h1><p>
-              <strong>The Powerful #1 Open-Source Spam Filter</strong>
+            <p>
+              <strong>The #1 Enterprise Open-Source Spam Filter</strong>
             </p>
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <font size="-1">
+          <td colspan="2" align="center">
+            <br />
+            <font size="+1">
               <table class="navibar" cellpadding="0" cellspacing="3" border="0">
                 <tr>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<b>SpamAssassin Home</b>&nbsp;
-                  </td>
+                  <!-- <td class="navibar" valign=top align=center>&nbsp;<b>SpamAssassin Home</b>&nbsp;</td> -->
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="index.html">Home</a>&nbsp;
                   </td>
@@ -95,25 +95,22 @@
                     &nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">Download</a>&nbsp;
+                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="tests.html">Tests</a>&nbsp;
+                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs (Bugzilla</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs</a>&nbsp;
-                  </td>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits</a>&nbsp;
+                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;
                   </td>
                 </tr>
               </table>
@@ -124,37 +121,32 @@
     </p>
 <!-- yes, it's that Mozilla black-border code again ;) -->
     <!-- stolen from www.mozilla.org via rc3.org -->
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td bgcolor="#808080">
-          <table border="0" cellspacing="4" cellpadding="4" width="100%">
-            <tr>
-              <td bgcolor="#ffffff">
-                <table border="0" cellspacing="4" cellpadding="4" width="100%">
-                  <tr>
-                    <td>
-                      <a name="title" id="title"><h1>Contributors</h1></a><p>
-                        This page has been replaced by the
-                        <br />
-                        <a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">
-                        CREDITS file in the distribution</a>.
-                        
-                      </p>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <table width="98%">
+    <!--
+     <table border=0 cellpadding=0 cellspacing=0 width="100%">
+     <tr><td BGCOLOR="#808080">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td BGCOLOR="#ffffff">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td> -->
+        <div style="padding: 50px;">
+      <a name="title" id="title"><h1>Contributors</h1></a><p>
+        This page has been replaced by the
+        <br />
+        <a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">
+        CREDITS file in the distribution</a>.
+        
+      </p>
+<!--
+       </td></tr></table>
+       </td></tr></table>
+       </td></tr></table> -->
+          </div>
+    <table align="center" width="90%">
       <tr>
         <td valign="top">
           <p>
             <div align="left">
-               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" border="0" width="124" height="35" /></a>
+               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
             </div>
           </p>
         </td>
@@ -170,13 +162,13 @@
         <td valign="top">
           <p>
             <div align="right">
-               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
             </div>
           </p>
         </td>
       </tr>
     </table>
-    <table align="center">
+    <table align="center" width="90%">
       <tr>
         <td align="center">
           
@@ -187,8 +179,10 @@
         </td>
       </tr>
     </table>
-<!-- some anti-spam trapping links -->
-        <font size="-6">
+    <br />
+    &nbsp;
+     <!-- some anti-spam trapping links -->
+    <font size="-6">
       <a href="mailto:sa_website@incoming.spamassassin.org"></a>
     </font>
     <font size="-6">

Modified: spamassassin/site/devel/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/devel/index.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/devel/index.html (original)
+++ spamassassin/site/devel/index.html Tue Feb 11 14:09:03 2014
@@ -27,12 +27,12 @@
        H6 { font-size: xx-small; }
        A:link {
        font-weight: bold;
-       color: #004000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:visited {
        font-weight: normal;
-       color: #008000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:active {
@@ -41,7 +41,7 @@
        text-decoration: underline; 
        }
        table.navibar {
-       background-color: #C8C8C8;
+       background-color: #ddd;
        border-spacing: 3px;
        }
        td.navibar {
@@ -61,30 +61,30 @@
        }
     </style>
     <link rel="meta" title="DOAP" type="application/rdf+xml" href="../doap.rdf" />
-    <meta name="generator" content="WebMake/2.2" />
+    <meta name="generator" content="WebMake/2.4" />
     
   </head>
   <body>
     <p>
+      <br />
       <table width="100%">
         <tr>
           <td valign="center">
-             <img align="center" src="../images/arrowlogo.png" alt="SpamAssassin" width="334" height="148" />
+            <a href="../index.html"><img align="left" src="../images/spamassassin-logobar.png" alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" width="750" height="80" /></a>
           </td>
           <td valign="center">
-             <h1>The Apache SpamAssassin Project</h1><p>
-              <strong>The Powerful #1 Open-Source Spam Filter</strong>
+            <p>
+              <strong>The #1 Enterprise Open-Source Spam Filter</strong>
             </p>
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <font size="-1">
+          <td colspan="2" align="center">
+            <br />
+            <font size="+1">
               <table class="navibar" cellpadding="0" cellspacing="3" border="0">
                 <tr>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<b>SpamAssassin Home</b>&nbsp;
-                  </td>
+                  <!-- <td class="navibar" valign=top align=center>&nbsp;<b>SpamAssassin Home</b>&nbsp;</td> -->
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="../index.html">Home</a>&nbsp;
                   </td>
@@ -95,25 +95,22 @@
                     &nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">Download</a>&nbsp;
+                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="../doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="../tests.html">Tests</a>&nbsp;
+                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs (Bugzilla</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs</a>&nbsp;
-                  </td>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits</a>&nbsp;
+                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;
                   </td>
                 </tr>
               </table>
@@ -124,106 +121,85 @@
     </p>
 <!-- yes, it's that Mozilla black-border code again ;) -->
     <!-- stolen from www.mozilla.org via rc3.org -->
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td bgcolor="#808080">
-          <table border="0" cellspacing="4" cellpadding="4" width="100%">
+    <!--
+     <table border=0 cellpadding=0 cellspacing=0 width="100%">
+     <tr><td BGCOLOR="#808080">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td BGCOLOR="#ffffff">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td> -->
+        <div style="padding: 50px;">
+      <div align="center">
+        <!-- generator: a hacked up version of weblist.pl 0.4 by
+         Jan Krynicky <Je...@Krynicky.cz>, http://Jenda.Krynicky.cz -->
+        <body>
+           <h1 align="center">Index of /devel/</h1><table>
             <tr>
-              <td bgcolor="#ffffff">
-                <table border="0" cellspacing="4" cellpadding="4" width="100%">
-                  <tr>
-                    <td>
-                      <div align="center">
-                        <!-- generator: a hacked up version of weblist.pl 0.4 by
-                         Jan Krynicky <Je...@Krynicky.cz>, http://Jenda.Krynicky.cz -->
-                        <body>
-                           <h1 align="center">Index of /devel/</h1><table>
-                            <tr>
-                              <th align="left">
-                                Name
-                              </th>
-                              <th align="left">
-                                <nobr>
-                                  Last modified
-                                </nobr>
-                              </th>
-                              <th align="right">
-                                Size
-                              </th>
-                              <th>
-                                &nbsp; 
-                              </th>
-                            </tr>
-                            <tr>
-                              <td colspan="6">
-                                
-                              </td>
-                            </tr>
-                            <tr>
-                              <td>
-                                &nbsp;
-                                <a href="..">Parent Directory</a>
-                              </td>
-                              <td>
-                                <nobr>
-                                  &nbsp; 7-Feb-2014 08:52
-                                </nobr>
-                              </td>
-                              <td align="right">
-                                <nobr>
-                                  &nbsp; &nbsp; -
-                                </nobr>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td>
-                                &nbsp;
-                                <a href="3.4.0.txt">3.4.0.txt</a>
-                              </td>
-                              <td>
-                                <nobr>
-                                  &nbsp; 7-Feb-2014 08:49
-                                </nobr>
-                              </td>
-                              <td align="right">
-                                <nobr>
-                                  &nbsp; &nbsp; 19K
-                                </nobr>
-                              </td>
-                            </tr>
-                            <tr>
-                              <td>
-                                &nbsp;
-                                <a href="db-to-text.pl.txt">db-to-text.pl.txt</a>
-                              </td>
-                              <td>
-                                <nobr>
-                                  &nbsp; 25-Jan-2010 23:37
-                                </nobr>
-                              </td>
-                              <td align="right">
-                                <nobr>
-                                  &nbsp; &nbsp; 5K
-                                </nobr>
-                              </td>
-                            </tr>
-                          </table>
-                        </div>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <table width="98%">
+              <th align="left">
+                Name
+              </th>
+              <th align="left">
+                <nobr>
+                  Last modified
+                </nobr>
+              </th>
+              <th align="right">
+                Size
+              </th>
+              <th>
+                &nbsp; 
+              </th>
+            </tr>
+            <tr>
+              <td colspan="6">
+                
+              </td>
+            </tr>
+            <tr>
+              <td>
+                &nbsp;
+                <a href="3.4.0.txt">3.4.0.txt</a>
+              </td>
+              <td>
+                <nobr>
+                  &nbsp; 8-Feb-2014 06:15
+                </nobr>
+              </td>
+              <td align="right">
+                <nobr>
+                  &nbsp; &nbsp; 19K
+                </nobr>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                &nbsp;
+                <a href="db-to-text.pl.txt">db-to-text.pl.txt</a>
+              </td>
+              <td>
+                <nobr>
+                  &nbsp; 23-Jun-2011 17:32
+                </nobr>
+              </td>
+              <td align="right">
+                <nobr>
+                  &nbsp; &nbsp; 5K
+                </nobr>
+              </td>
+            </tr>
+          </table>
+        </div>
+<!--
+         </td></tr></table>
+         </td></tr></table>
+         </td></tr></table> -->
+              </div>
+      <table align="center" width="90%">
         <tr>
           <td valign="top">
             <p>
               <div align="left">
-                 <a href="http://www.apache.org/"> <img src="../images/apache-feather.png" alt="An Apache Project" border="0" width="124" height="35" /></a>
+                 <a href="http://www.apache.org/"> <img src="../images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
               </div>
             </p>
           </td>
@@ -239,13 +215,13 @@
           <td valign="top">
             <p>
               <div align="right">
-                 <a href="http://webmake.taint.org/"> <img src="../images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+                 <a href="http://webmake.taint.org/"> <img src="../images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
               </div>
             </p>
           </td>
         </tr>
       </table>
-      <table align="center">
+      <table align="center" width="90%">
         <tr>
           <td align="center">
             
@@ -256,8 +232,10 @@
           </td>
         </tr>
       </table>
-<!-- some anti-spam trapping links -->
-            <font size="-6">
+      <br />
+      &nbsp;
+       <!-- some anti-spam trapping links -->
+      <font size="-6">
         <a href="mailto:sa_website@incoming.spamassassin.org"></a>
       </font>
       <font size="-6">

Modified: spamassassin/site/doc.html
URL: http://svn.apache.org/viewvc/spamassassin/site/doc.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/doc.html (original)
+++ spamassassin/site/doc.html Tue Feb 11 14:09:03 2014
@@ -27,12 +27,12 @@
        H6 { font-size: xx-small; }
        A:link {
        font-weight: bold;
-       color: #004000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:visited {
        font-weight: normal;
-       color: #008000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:active {
@@ -41,7 +41,7 @@
        text-decoration: underline; 
        }
        table.navibar {
-       background-color: #C8C8C8;
+       background-color: #ddd;
        border-spacing: 3px;
        }
        td.navibar {
@@ -61,30 +61,30 @@
        }
     </style>
     <link rel="meta" title="DOAP" type="application/rdf+xml" href="doap.rdf" />
-    <meta name="generator" content="WebMake/2.2" />
+    <meta name="generator" content="WebMake/2.4" />
     
   </head>
   <body>
     <p>
+      <br />
       <table width="100%">
         <tr>
           <td valign="center">
-             <img align="center" src="images/arrowlogo.png" alt="SpamAssassin" width="334" height="148" />
+            <a href="index.html"><img align="left" src="images/spamassassin-logobar.png" alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" width="750" height="80" /></a>
           </td>
           <td valign="center">
-             <h1>The Apache SpamAssassin Project</h1><p>
-              <strong>The Powerful #1 Open-Source Spam Filter</strong>
+            <p>
+              <strong>The #1 Enterprise Open-Source Spam Filter</strong>
             </p>
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <font size="-1">
+          <td colspan="2" align="center">
+            <br />
+            <font size="+1">
               <table class="navibar" cellpadding="0" cellspacing="3" border="0">
                 <tr>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<b>SpamAssassin Home</b>&nbsp;
-                  </td>
+                  <!-- <td class="navibar" valign=top align=center>&nbsp;<b>SpamAssassin Home</b>&nbsp;</td> -->
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="index.html">Home</a>&nbsp;
                   </td>
@@ -95,25 +95,22 @@
                     &nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">Download</a>&nbsp;
+                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists</a>&nbsp;
-                  </td>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="tests.html">Tests</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs</a>&nbsp;
+                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs (Bugzilla</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits</a>&nbsp;
+                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;
                   </td>
                 </tr>
               </table>
@@ -124,136 +121,125 @@
     </p>
 <!-- yes, it's that Mozilla black-border code again ;) -->
     <!-- stolen from www.mozilla.org via rc3.org -->
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td bgcolor="#808080">
-          <table border="0" cellspacing="4" cellpadding="4" width="100%">
-            <tr>
-              <td bgcolor="#ffffff">
-                <table border="0" cellspacing="4" cellpadding="4" width="100%">
-                  <tr>
-                    <td>
-                      <a name="title" id="title"><h1>Documentation</h1></a><ul>
-                        <li>
-                          The <a href="tests.html">list of tests</a> SpamAssassin includes by default.
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/README">Top-level README file</a>.
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/INSTALL">Top-level INSTALL file</a>, for notes on how to install.
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/UPGRADE">Top-level UPGRADE file</a>, for notes on how to upgrade.
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/spamd/README">README for the 'spamd' daemon</a>.
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/sql/README">README for SQL user preferences</a>.
-                          
-                        </li>
-                        <li>
-                          <a href="http://wiki.apache.org/spamassassin/">Wiki, including Frequently Asked Questions</a>.
-                          
-                        </li>
-                        <li>
-                          <a href="http://wiki.apache.org/spamassassin/BooksAboutSpamAssassin">Books that cover SpamAssassin</a>.
-                          
-                        </li>
-                        <li>
-                          Some <a href="http://wiki.apache.org/spamassassin/PresentationsAndPapers">presentations and papers</a> about SpamAssassin.
-                          
-                        </li>
-                      </ul>
-                      <p>
-                        Michael Moncur has written a very good <a href="http://www.yrex.com/spam/spamconfig.php"> configuration tool </a> which
-                        will generate a local.cf or user_prefs file for you, once you fill out a few
-                        simple questions.
-                        
-                      </p>
-                      <p>
-                        The <a href="http://spamassassin.apache.org/doc/Mail_SpamAssassin_Conf.html">Mail::SpamAssassin::Conf</a>
-                        POD documentation describes the configuration commands that SpamAssassin
-                        accepts.
-                        
-                      </p>
-                      <a name="POD_Documentation" id="POD_Documentation"><h2>POD Documentation</h2></a><p>
-                        <p>
-                          
-                        </p>
-                        <ul>
-                          <li>
-                            <a href="full/2.6x/dist/doc">Version 2.6x</a> (old)
-                            
-                          </li>
-                          <li>
-                            <a href="full/3.0.x/dist/doc">Version 3.0.x</a> (old)
-                            
-                          </li>
-                          <li>
-                            <a href="full/3.1.x/doc">Version 3.1.x</a> (old)
-                            
-                          </li>
-                          <li>
-                            <a href="full/3.2.x/doc">Version 3.2.x</a> (old)
-                            
-                          </li>
-                          <li>
-                            <a href="full/3.3.x/doc">Version 3.3.x</a> (current)
-                            
-                          </li>
-                        </ul>
-                      </p>
-                      <a name="Walk_throughs_and_How_To_s" id="Walk_throughs_and_How_To_s"><h2>Walk-throughs and How-To's</h2></a><ul>
-                        <li>
-                          <a href="http://www.geekly.com/entries/archives/00000155.htm">http://www.geekly.com/entries/archives/00000155.htm</a> - Greg Webster's
-                          How-To on installing SpamAssassin with Postfix+procmail on a site-wide
-                          basis, with individual 'spam' mailboxes.
-                          
-                        </li>
-                        <li>
-                          <a href="http://advosys.ca/papers/postfix-filtering.html">http://advosys.ca/papers/postfix-filtering.html</a> - Advosys Consulting's
-                          step-by-step instructions on how to get Postfix to use both SpamAssassin
-                          and Anomy Sanitizer (a virus blocking system).
-                          
-                        </li>
-                        <li>
-                          <a href="http://www.peregrinehw.com/downloads/">http://www.peregrinehw.com/downloads/</a> - How-To's for setting up a stable
-                          Red Hat mail server with SpamAssassin.
-                          
-                        </li>
-                        <li>
-                          <p>
-                            <a href="http://codesorcery.net/old/docs/spamtricks.html">http://codesorcery.net/old/docs/spamtricks.html</a> - Some notes on using
-                            SpamAssassin with Mutt, by Justin R. Miller.
-                            
-                          </p>
-                        </li>
-                      </ul>
-                      <p>
-                        <span style="display:none"><a href="foojlist.php"></a></span>
-                      </p>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <table width="98%">
+    <!--
+     <table border=0 cellpadding=0 cellspacing=0 width="100%">
+     <tr><td BGCOLOR="#808080">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td BGCOLOR="#ffffff">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td> -->
+        <div style="padding: 50px;">
+      <a name="title" id="title"><h1>Documentation</h1></a><ul>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/README">Top-level README file</a>.
+          
+        </li>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/INSTALL">Top-level INSTALL file</a>, for notes on how to install.
+          
+        </li>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/UPGRADE">Top-level UPGRADE file</a>, for notes on how to upgrade.
+          
+        </li>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/spamd/README">README for the 'spamd' daemon</a>.
+          
+        </li>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/sql/README">README for SQL user preferences</a>.
+          
+        </li>
+        <li>
+          <a href="http://wiki.apache.org/spamassassin/">Wiki, including Frequently Asked Questions</a>.
+          
+        </li>
+        <li>
+          <a href="http://wiki.apache.org/spamassassin/BooksAboutSpamAssassin">Books that cover SpamAssassin</a>.
+          
+        </li>
+        <li>
+          <p>
+            Some <a href="http://wiki.apache.org/spamassassin/PresentationsAndPapers">presentations and papers</a> about SpamAssassin.
+            
+          </p>
+        </li>
+        <li>
+          The <a href="http://spamassassin.apache.org/doc/Mail_SpamAssassin_Conf.html">Mail::SpamAssassin::Conf</a> POD documentation describes the configuration commands that SpamAssassin accepts.
+          
+        </li>
+      </ul>
+      <a name="POD_Documentation" id="POD_Documentation"><h2>POD Documentation</h2></a><p>
+        <p>
+          
+        </p>
+        <ul>
+          <li>
+            <a href="full/2.6x/dist/doc">Version 2.6x</a> (old)
+            
+          </li>
+          <li>
+            <a href="full/3.0.x/dist/doc">Version 3.0.x</a> (old)
+            
+          </li>
+          <li>
+            <a href="full/3.1.x/doc">Version 3.1.x</a> (old)
+            
+          </li>
+          <li>
+            <a href="full/3.2.x/doc">Version 3.2.x</a> (old)
+            
+          </li>
+          <li>
+            <a href="full/3.3.x/doc">Version 3.3.x</a> (old)
+            
+          </li>
+          <li>
+            <a href="full/3.4.x/doc">Version 3.4.x</a> (current)
+            
+          </li>
+        </ul>
+      </p>
+      <a name="Walk_throughs_and_How_To_s" id="Walk_throughs_and_How_To_s"><h2>Walk-throughs and How-To's</h2></a><ul>
+        <li>
+          <a href="http://www.geekly.com/entries/archives/00000155.htm">http://www.geekly.com/entries/archives/00000155.htm</a> - Greg Webster's
+          How-To on installing SpamAssassin with Postfix+procmail on a site-wide
+          basis, with individual 'spam' mailboxes.
+          
+        </li>
+        <li>
+          <a href="http://advosys.ca/papers/postfix-filtering.html">http://advosys.ca/papers/postfix-filtering.html</a> - Advosys Consulting's
+          step-by-step instructions on how to get Postfix to use both SpamAssassin
+          and Anomy Sanitizer (a virus blocking system).
+          
+        </li>
+        <li>
+          <a href="http://www.pccc.com/downloads/SpamAssassin">http://www.pccc.com/downloads/SpamAssassin</a> - Notes for setting up a stable
+          RedHat/CentOS mail server with SpamAssassin.
+          
+        </li>
+        <li>
+          <p>
+            <a href="http://codesorcery.net/old/docs/spamtricks.html">http://codesorcery.net/old/docs/spamtricks.html</a> - Some notes on using
+            SpamAssassin with Mutt, by Justin R. Miller.
+            
+          </p>
+        </li>
+      </ul>
+      <p>
+        <span style="display:none"><a href="foojlist.php"></a></span>
+      </p>
+<!--
+       </td></tr></table>
+       </td></tr></table>
+       </td></tr></table> -->
+          </div>
+    <table align="center" width="90%">
       <tr>
         <td valign="top">
           <p>
             <div align="left">
-               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" border="0" width="124" height="35" /></a>
+               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
             </div>
           </p>
         </td>
@@ -269,13 +255,13 @@
         <td valign="top">
           <p>
             <div align="right">
-               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
             </div>
           </p>
         </td>
       </tr>
     </table>
-    <table align="center">
+    <table align="center" width="90%">
       <tr>
         <td align="center">
           
@@ -286,8 +272,10 @@
         </td>
       </tr>
     </table>
-<!-- some anti-spam trapping links -->
-        <font size="-6">
+    <br />
+    &nbsp;
+     <!-- some anti-spam trapping links -->
+    <font size="-6">
       <a href="mailto:sa_website@incoming.spamassassin.org"></a>
     </font>
     <font size="-6">

Modified: spamassassin/site/downloads.html
URL: http://svn.apache.org/viewvc/spamassassin/site/downloads.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/downloads.html (original)
+++ spamassassin/site/downloads.html Tue Feb 11 14:09:03 2014
@@ -27,12 +27,12 @@
        H6 { font-size: xx-small; }
        A:link {
        font-weight: bold;
-       color: #004000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:visited {
        font-weight: normal;
-       color: #008000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:active {
@@ -41,7 +41,7 @@
        text-decoration: underline; 
        }
        table.navibar {
-       background-color: #C8C8C8;
+       background-color: #ddd;
        border-spacing: 3px;
        }
        td.navibar {
@@ -61,30 +61,30 @@
        }
     </style>
     <link rel="meta" title="DOAP" type="application/rdf+xml" href="doap.rdf" />
-    <meta name="generator" content="WebMake/2.2" />
+    <meta name="generator" content="WebMake/2.4" />
     
   </head>
   <body>
     <p>
+      <br />
       <table width="100%">
         <tr>
           <td valign="center">
-             <img align="center" src="images/arrowlogo.png" alt="SpamAssassin" width="334" height="148" />
+            <a href="index.html"><img align="left" src="images/spamassassin-logobar.png" alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" width="750" height="80" /></a>
           </td>
           <td valign="center">
-             <h1>The Apache SpamAssassin Project</h1><p>
-              <strong>The Powerful #1 Open-Source Spam Filter</strong>
+            <p>
+              <strong>The #1 Enterprise Open-Source Spam Filter</strong>
             </p>
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <font size="-1">
+          <td colspan="2" align="center">
+            <br />
+            <font size="+1">
               <table class="navibar" cellpadding="0" cellspacing="3" border="0">
                 <tr>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<b>SpamAssassin Home</b>&nbsp;
-                  </td>
+                  <!-- <td class="navibar" valign=top align=center>&nbsp;<b>SpamAssassin Home</b>&nbsp;</td> -->
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="index.html">Home</a>&nbsp;
                   </td>
@@ -95,25 +95,22 @@
                     &nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">Download</a>&nbsp;
+                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="tests.html">Tests</a>&nbsp;
+                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs (Bugzilla</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs</a>&nbsp;
-                  </td>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits</a>&nbsp;
+                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;
                   </td>
                 </tr>
               </table>
@@ -124,249 +121,244 @@
     </p>
 <!-- yes, it's that Mozilla black-border code again ;) -->
     <!-- stolen from www.mozilla.org via rc3.org -->
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td bgcolor="#808080">
-          <table border="0" cellspacing="4" cellpadding="4" width="100%">
-            <tr>
-              <td bgcolor="#ffffff">
-                <table border="0" cellspacing="4" cellpadding="4" width="100%">
-                  <tr>
-                    <td>
-                      <a name="title" id="title"><h1>Downloads</h1></a> <a name="Upgrading_From_an_Older_Version" id="Upgrading_From_an_Older_Version"><h3>Upgrading From an Older Version?</h3></a><blockquote>
-                        If so, please take the time to read <a href="http://wiki.apache.org/spamassassin/UpgradeNotes">Upgrade
-                        Notes</a> while you're downloading.
-                        
-                      </blockquote>
-                      <a name="Product_Information" id="Product_Information"><h3>Product Information</h3></a><blockquote>
-                        The <strong>core distribution</strong> consists of command line tools to
-                        perform filtering along with Mail::SpamAssassin, a set of perl
-                        modules which allow SpamAssassin to be used in a <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">wide
-                        range of products</a>.
-                        
-                      </blockquote>
-                      <a name="System_Administrators" id="System_Administrators"><h3>System Administrators</h3></a><blockquote>
-                        Please create a local copy of the <em>report_template</em> text in a file named
-                        something like <code>/etc/mail/spamassassin/10_local_report.cf</code>, and modify it
-                        to provide your tech support desk's contact information, instead of the
-                        default. Otherwise your users will be confused, and some may ultimately
-                        contact the SpamAssassin development team, which is not appreciated; we
-                        cannot help them with whitelisting/blacklisting/customisation of settings at
-                        your site, after all. The default report text can be found in the file
-                        <code>rules/10_misc.cf</code>.
-                        
-                      </blockquote>
-                      <a name="Mirrors" id="Mirrors"><h3>Mirrors</h3></a><p>
-                        <!-- use etsafe tags because EtText eats the square-bracket stuff! -->
-                        <!--etsafe-->
-                        <p>
-                          [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" hspace="20" /></a>[end]
-                          The currently selected mirror is <b>[preferred]</b>. If you encounter a
-                          problem with this mirror, please select another mirror. If all mirrors are
-                          failing, there are <i>backup</i> mirrors (at the end of the mirrors list) that
-                          should be available.
-                        </p>
-                        <form action="[location]" method="get" id="SelectMirror">
-                          
-                          Other mirrors: <select name="Preferred">
-                            
-                            [if-any http]
-                             [for http]<option value="[http]">
-                              [http]
-                            </option>
+    <!--
+     <table border=0 cellpadding=0 cellspacing=0 width="100%">
+     <tr><td BGCOLOR="#808080">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td BGCOLOR="#ffffff">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td> -->
+        <div style="padding: 50px;">
+      <a name="title" id="title"><h1>Downloads</h1></a> <a name="Upgrading_From_an_Older_Version" id="Upgrading_From_an_Older_Version"><h3>Upgrading From an Older Version?</h3></a><blockquote>
+        If so, please take the time to read <a href="http://wiki.apache.org/spamassassin/UpgradeNotes">Upgrade
+        Notes</a> while you're downloading.
+        
+      </blockquote>
+      <a name="Product_Information" id="Product_Information"><h3>Product Information</h3></a><blockquote>
+        The <strong>core distribution</strong> consists of command line tools to
+        perform filtering along with Mail::SpamAssassin, a set of perl
+        modules which allow SpamAssassin to be used in a <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">wide
+        range of products</a>.
+        
+      </blockquote>
+      <a name="System_Administrators" id="System_Administrators"><h3>System Administrators</h3></a><blockquote>
+        Please create a local copy of the <em>report_template</em> text in a file named
+        something like <code>/etc/mail/spamassassin/10_local_report.cf</code>, and modify it
+        to provide your tech support desk's contact information, instead of the
+        default. Otherwise your users will be confused, and some may ultimately
+        contact the SpamAssassin development team, which is not appreciated; we
+        cannot help them with whitelisting/blacklisting/customisation of settings at
+        your site, after all. The default report text can be found in the file
+        <code>rules/10_misc.cf</code>.
+        
+      </blockquote>
+      <a name="Mirrors" id="Mirrors"><h3>Mirrors</h3></a><p>
+        <!-- use etsafe tags because EtText eats the square-bracket stuff! -->
+        <!--etsafe-->
+        <p>
+          [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0" hspace="20" /></a>[end]
+          The currently selected mirror is <b>[preferred]</b>. If you encounter a
+          problem with this mirror, please select another mirror. If all mirrors are
+          failing, there are <i>backup</i> mirrors (at the end of the mirrors list) that
+          should be available.
+        </p>
+        <form action="[location]" method="get" id="SelectMirror">
+          
+          Other mirrors: <select name="Preferred">
+            
+            [if-any http]
+             [for http]<option value="[http]">
+              [http]
+            </option>
 [end]
-                            [end] 
-                            [if-any ftp]
-                             [for ftp]<option value="[ftp]">
-                              [ftp]
-                            </option>
+            [end] 
+            [if-any ftp]
+             [for ftp]<option value="[ftp]">
+              [ftp]
+            </option>
 [end]
-                            [end]
-                            [if-any backup]
-                             [for backup]<option value="[backup]">
-                              [backup] (backup)
-                            </option>
+            [end]
+            [if-any backup]
+             [for backup]<option value="[backup]">
+              [backup] (backup)
+            </option>
 [end]
-                            [end]
-                            
-                          </select>
-                          <input type="submit" value="Change" />
-                          
-                        </form>
+            [end]
+            
+          </select>
+          <input type="submit" value="Change" />
+          
+        </form>
 <!--/etsafe-->
-                                              </p>
-                      <p>
-                        You may also consult the <a href="http://www.apache.org/mirrors/">complete
-                        list of mirrors</a>.
-                        
-                      </p>
-                      <a name="Released_version_relversion" id="Released_version_relversion"><h3>Released version, 3.3.2</h3></a><p>
-                        <!-- use "relhomehref" links for the signatures; that way if a mirror
-                        </p><blockquote>is compromised, the sigs are not and they will mismatch.
-                        -->
-                        
-                      </blockquote>
-                      <ul>
-                        <li>
-                          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz">SpamAssassin in tar.gz</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.sha1">SHA1</a>)
-                          
-                        </li>
-                        <li>
-                          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.sha1">SHA1</a>)
-                          
-                        </li>
-                        <li>
-                          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.zip">SpamAssassin in ZIP</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.sha1">SHA1</a>)
-                          
-                        </li>
-                        <li>
-                          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/build/announcements/3.3.2.txt">Change log summary</a>, <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.3/Changes">more detail</a>
-                        </li>
-                        <li>
-                          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz">SpamAssassin sa-update rules tarball</a>, for use if you cannot run sa-update to download these automatically after installing. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.3.2-r1104058.tgz.sha1">SHA1</a>)
-                          
-                        </li>
-                      </ul>
-                      <a name="Previous_Released_version_prevbranchrelversion" id="Previous_Released_version_prevbranchrelversion"><h3>Previous Released version, 3.2.5</h3></a><p>
-                        <em>NOTE: </em>This version is no longer supported. See <a href="http://wiki.apache.org/spamassassin/ReleaseGoal" target="_blank">http://wiki.apache.org/spamassassin/ReleaseGoals</a> for more information. <br />
-                        
-                      </p>
-                      <p>
-                        <!-- use "relhomehref" links for the signatures; that way if a mirror
-                        </p><p>is compromised, the sigs are not and they will mismatch.
-                        </p>-->
-                        <ul>
-                          <li>
-                            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.gz">SpamAssassin in tar.gz</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.gz.sha1">SHA1</a>)
-                            
-                          </li>
-                          <li>
-                            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.bz2.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.bz2.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.tar.bz2.sha1">SHA1</a>)
-                            
-                          </li>
-                          <li>
-                            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.2.5.zip">SpamAssassin in ZIP</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.zip.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.zip.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.2.5.zip.sha1">SHA1</a>)
-                            
-                          </li>
-                        </ul>
-                        <a name="Packages" id="Packages"><h3>Packages</h3></a><ul>
-                          <li>
-                            <strong>Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users</strong>: See <a href="http://www.spamtips.org/p/rpm-packages.html">SpamTips.org</a> for the latest upgrade directions.
-                            
-                          </li>
-                          <li>
-                            <strong>Debian users</strong>: install SpamAssassin using:
-                            <blockquote>
-                              <code>sudo apt-get install spamassassin</code>
-                            </blockquote>
-                          </li>
-                          <li>
-                            <strong>Gentoo Linux users</strong> install SpamAssassin using:
-                            <blockquote>
-                              <code>sudo emerge mail-filter/spamassassin</code>
-                            </blockquote>
-                          </li>
-                          <li>
-                            <strong>BSD users</strong>: SpamAssassin is available in BSD package systems under the following names:
-                            <ul>
-                              <li>
-                                FreeBSD: <code>mail/p5-Mail-SpamAssassin</code>
-                              </li>
-                              <li>
-                                NetBSD: <code>mail/spamassassin</code>
-                              </li>
-                              <li>
-                                OpenBSD: <code>mail/p5-Mail-SpamAssassin</code>
-                              </li>
-                            </ul>
-                          </li>
-                          <li>
-                            <strong>Everyone</strong>: SpamAssassin can be downloaded from <a href="http://www.cpan.org/">CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/"><code>Mail::SpamAssassin</code></a>:
-                            <blockquote>
-                              <code>sudo cpan Mail::SpamAssassin</code>
-                            </blockquote>
-                          </li>
-                        </ul>
-                        <a name="Other_stuff_regarding_released_versions" id="Other_stuff_regarding_released_versions"><h3>Other stuff regarding released versions</h3></a><ul>
-                          <li>
-                            Michael Moncur has written a very good <a href="http://www.yrex.com/spam/spamconfig.php">configuration
-                            tool</a> which will generate a local.cf or user_prefs file for you, once you fill
-                            out a few simple questions.
-                            
-                          </li>
-                          <li>
-                            <p>
-                              <strong>MacOS X users</strong>: 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. A possibly more up-to-date article is <a href="http://developer.apple.com/server/fighting_spam.html">'Fighting Spam on
-                              Mac OS X Server'</a> at Apple Developer Connection.
-                              
-                            </p>
-                          </li>
-                        </ul>
+              </p>
+      <p>
+        You may also consult the <a href="http://www.apache.org/mirrors/">complete
+        list of mirrors</a>.
+        
+      </p>
+      <a name="Released_version_relversion" id="Released_version_relversion"><h3>Released version, 3.4.0</h3></a><p>
+        <!-- use "relhomehref" links for the signatures; that way if a mirror
+        </p><blockquote>is compromised, the sigs are not and they will mismatch.
+        -->
+        
+      </blockquote>
+      <ul>
+        <li>
+          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.gz">SpamAssassin in tar.gz</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.gz.sha1">SHA1</a>)
+          
+        </li>
+        <li>
+          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.tar.bz2.sha1">SHA1</a>)
+          
+        </li>
+        <li>
+          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.4.0.zip">SpamAssassin in ZIP</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.zip.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.zip.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.4.0.zip.sha1">SHA1</a>)
+          
+        </li>
+        <li>
+          <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/build/announcements/3.4.0.txt">Change log summary</a>, <a href="http://svn.apache.org/repos/asf/spamassassin/branches/3.4/Changes">more detail</a>
+        </li>
+        <li>
+          <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-rules-3.4.0.r1565117..tar.gz">SpamAssassin sa-update rules tarball</a>, for use if you cannot run sa-update" to download these automatically after installing. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.4.0.r1565117..tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.4.0.r1565117..tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-rules-3.4.0.r1565117..tgz.sha1">SHA1</a>)
+          
+        </li>
+      </ul>
+      <a name="Previous_Released_version_prevbranchrelversion" id="Previous_Released_version_prevbranchrelversion"><h3>Previous Released version, 3.3.2</h3></a><p>
+        <em>NOTE: </em>This version is no longer supported. See <a href="http://wiki.apache.org/spamassassin/ReleaseGoal" target="_blank">http://wiki.apache.org/spamassassin/ReleaseGoals</a> for more information. <br />
+        
+      </p>
+      <p>
+        <!-- use "relhomehref" links for the signatures; that way if a mirror
+        </p><p>is compromised, the sigs are not and they will mismatch.
+        </p>-->
+        <ul>
+          <li>
+            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz">SpamAssassin in tar.gz</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.gz.sha1">SHA1</a>)
+            
+          </li>
+          <li>
+            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.tar.bz2.sha1">SHA1</a>)
+            
+          </li>
+          <li>
+            <a href="[preferred]/spamassassin/source/Mail-SpamAssassin-3.3.2.zip">SpamAssassin in ZIP</a> format. (signatures: <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.asc">GPG</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.md5">MD5</a> <a href="http://www.apache.org/dist/spamassassin/source/Mail-SpamAssassin-3.3.2.zip.sha1">SHA1</a>)
+            
+          </li>
+        </ul>
+        <a name="Packages" id="Packages"><h3>Packages</h3></a><ul>
+          <li>
+            <strong>Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users</strong>: See <a href="http://www.spamtips.org/p/rpm-packages.html">SpamTips.org</a> for the latest upgrade directions.
+            
+          </li>
+          <li>
+            <strong>Debian users</strong>: install SpamAssassin using:
+            <blockquote>
+              <code>sudo apt-get install spamassassin</code>
+            </blockquote>
+          </li>
+          <li>
+            <strong>Gentoo Linux users</strong> install SpamAssassin using:
+            <blockquote>
+              <code>sudo emerge mail-filter/spamassassin</code>
+            </blockquote>
+          </li>
+          <li>
+            <strong>BSD users</strong>: SpamAssassin is available in BSD package systems under the following names:
+            <ul>
+              <li>
+                FreeBSD: <code>mail/p5-Mail-SpamAssassin</code>
+              </li>
+              <li>
+                NetBSD: <code>mail/spamassassin</code>
+              </li>
+              <li>
+                OpenBSD: <code>mail/p5-Mail-SpamAssassin</code>
+              </li>
+            </ul>
+          </li>
+          <li>
+            <strong>Everyone</strong>: SpamAssassin can be downloaded from <a href="http://www.cpan.org/">CPAN</a>, as the module <a href="http://search.cpan.org/dist/Mail-SpamAssassin/"><code>Mail::SpamAssassin</code></a>:
+            <blockquote>
+              <code>sudo cpan Mail::SpamAssassin</code>
+            </blockquote>
+          </li>
+        </ul>
+        <a name="Other_stuff_regarding_released_versions" id="Other_stuff_regarding_released_versions"><h3>Other stuff regarding released versions</h3></a><ul>
+          <li>
+            Michael Moncur has written a very good <a href="http://www.yrex.com/spam/spamconfig.php">configuration
+            tool</a> which will generate a local.cf or user_prefs file for you, once you fill
+            out a few simple questions.
+            
+          </li>
+          <li>
+            <p>
+              <strong>MacOS X users</strong>: 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. A possibly more up-to-date article is <a href="http://developer.apple.com/server/fighting_spam.html">'Fighting Spam on
+              Mac OS X Server'</a> at Apple Developer Connection.
+              
+            </p>
+          </li>
+        </ul>
 <!--
-                        Current Pre-Release Development Version (3.1.0-rc2)
-                        <hr />
-                        <ul><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.gz>SpamAssassin in tar.gz</a> format. (signatures:
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.gz.asc>GPG</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.gz.md5>MD5</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.gz.sha1>SHA1</a>)
-                        </li><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.bz2>SpamAssassin in tar.bz2</a> format. (signatures:
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.bz2.asc>GPG</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.bz2.md5>MD5</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.tar.bz2.sha1>SHA1</a>)
-                        </li><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.zip>SpamAssassin in ZIP</a> format. (signatures:
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.zip.asc>GPG</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.zip.md5>MD5</a>
-                        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.1.0-rc2.zip.sha1>SHA1</a>)
-                        </li></ul>-->
-                                                <p>
-                          <!--
-                          <em>jm: </em>not sure this note still applies (Aug 12 2005 jm) <br />
-                          </p><p><strong>Note</strong>: If you plan to build this into an RPM via <code>rpmbuild -tb</code>,
-                          please rename the tar archive and remove the -pre or -rc
-                          section first. The included spec file is written for the 3.1.0
-                          final release, and will not work with the filename including <code>-pre</code>
-                          or <code>-rc</code>.
-                          <br />-->
-                          
-                        </p>
-                        <a name="Latest_bleeding_edge_code" id="Latest_bleeding_edge_code"><h3>Latest bleeding-edge code</h3></a><p>
-                          The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="http://wiki.apache.org/spamassassin/DownloadFromSvn" target="_blank">http://wiki.apache.org/spamassassin/DownloadFromSvn</a> for more information.
-                          
-                        </p>
-                        <p>
-                          Nightly snapshots are no longer available.
-                          
-                        </p>
-                        <a name="GPG_Signing_Key" id="GPG_Signing_Key"><h3>GPG Signing Key</h3></a><p>
-                          <a name="gpgkey"></a>
-                          If you want to use GPG to verify the downloads listed above, please use
-                          the <a href="https://www.apache.org/dist/spamassassin/KEYS">SpamAssassin Release GPG Keys</a> to verify them.
-                          
-                        </p>
-                        <p>
-                          <em>Note: </em>GnuPG 1.4.0, and possibly 1.3.x versions, seem to have problems verifying certain signature files, including the type as used for SpamAssassin releases. If you are running an affected version, please verify the code using both MD5 and SHA1 sum values instead, or upgrade GPG. <br />
-                          
-                        </p>
-                        <a name="Old_releases" id="Old_releases"><h3>Old releases</h3></a><p>
-                          Old Apache-licensed versions (from version 3.0.0 on) can be <a href="http://archive.apache.org/dist/spamassassin/">downloaded from archive.apache.org</a>. Older, Perl-licensed versions can be found <a href="http://www.cpan.org/modules/by-module/Mail/">via CPAN</a>.
-                          
-                        </p>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <table width="98%">
+        Current Pre-Release Development Version (3.4.0-rc6)
+        <hr />
+        <ul><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.gz>SpamAssassin in tar.gz</a> format. (signatures:
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.gz.asc>GPG</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.gz.md5>MD5</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.gz.sha1>SHA1</a>)
+        </li><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.bz2>SpamAssassin in tar.bz2</a> format. (signatures:
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.bz2.asc>GPG</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.bz2.md5>MD5</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.tar.bz2.sha1>SHA1</a>)
+        </li><li><a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.zip>SpamAssassin in ZIP</a> format. (signatures:
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.zip.asc>GPG</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.zip.md5>MD5</a>
+        <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-3.4.0-rc6.zip.sha1>SHA1</a>)
+        </li></ul>-->
+                <p>
+          <!--
+          <em>jm: </em>not sure this note still applies (Aug 12 2005 jm) <br />
+          </p><p><strong>Note</strong>: If you plan to build this into an RPM via <code>rpmbuild -tb</code>,
+          please rename the tar archive and remove the -pre or -rc
+          section first. The included spec file is written for the 3.1.0
+          final release, and will not work with the filename including <code>-pre</code>
+          or <code>-rc</code>.
+          <br />-->
+          
+        </p>
+        <a name="Latest_bleeding_edge_code" id="Latest_bleeding_edge_code"><h3>Latest bleeding-edge code</h3></a><p>
+          The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="http://wiki.apache.org/spamassassin/DownloadFromSvn" target="_blank">http://wiki.apache.org/spamassassin/DownloadFromSvn</a> for more information.
+          
+        </p>
+        <p>
+          Nightly snapshots are no longer available.
+          
+        </p>
+        <a name="GPG_Signing_Key" id="GPG_Signing_Key"><h3>GPG Signing Key</h3></a><p>
+          <a name="gpgkey"></a>
+          If you want to use GPG to verify the downloads listed above, please use
+          the <a href="https://www.apache.org/dist/spamassassin/KEYS">SpamAssassin Release GPG Keys</a> to verify them.
+          
+        </p>
+        <p>
+          <em>Note: </em>GnuPG 1.4.0, and possibly 1.3.x versions, seem to have problems verifying certain signature files, including the type as used for SpamAssassin releases. If you are running an affected version, please verify the code using both MD5 and SHA1 sum values instead, or upgrade GPG. <br />
+          
+        </p>
+        <a name="Old_releases" id="Old_releases"><h3>Old releases</h3></a><p>
+          Old Apache-licensed versions (from version 3.0.0 on) can be <a href="http://archive.apache.org/dist/spamassassin/">downloaded from archive.apache.org</a>. Older, Perl-licensed versions can be found <a href="http://www.cpan.org/modules/by-module/Mail/">via CPAN</a>.
+          
+        </p>
+<!--
+         </td></tr></table>
+         </td></tr></table>
+         </td></tr></table> -->
+              </div>
+      <table align="center" width="90%">
         <tr>
           <td valign="top">
             <p>
               <div align="left">
-                 <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" border="0" width="124" height="35" /></a>
+                 <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
               </div>
             </p>
           </td>
@@ -382,13 +374,13 @@
           <td valign="top">
             <p>
               <div align="right">
-                 <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+                 <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
               </div>
             </p>
           </td>
         </tr>
       </table>
-      <table align="center">
+      <table align="center" width="90%">
         <tr>
           <td align="center">
             
@@ -399,8 +391,10 @@
           </td>
         </tr>
       </table>
-<!-- some anti-spam trapping links -->
-            <font size="-6">
+      <br />
+      &nbsp;
+       <!-- some anti-spam trapping links -->
+      <font size="-6">
         <a href="mailto:sa_website@incoming.spamassassin.org"></a>
       </font>
       <font size="-6">

Modified: spamassassin/site/faq.html
URL: http://svn.apache.org/viewvc/spamassassin/site/faq.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/faq.html (original)
+++ spamassassin/site/faq.html Tue Feb 11 14:09:03 2014
@@ -27,12 +27,12 @@
        H6 { font-size: xx-small; }
        A:link {
        font-weight: bold;
-       color: #004000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:visited {
        font-weight: normal;
-       color: #008000;
+       color: #483417;
        text-decoration: underline; 
        }
        A:active {
@@ -41,7 +41,7 @@
        text-decoration: underline; 
        }
        table.navibar {
-       background-color: #C8C8C8;
+       background-color: #ddd;
        border-spacing: 3px;
        }
        td.navibar {
@@ -61,30 +61,30 @@
        }
     </style>
     <link rel="meta" title="DOAP" type="application/rdf+xml" href="doap.rdf" />
-    <meta name="generator" content="WebMake/2.2" />
+    <meta name="generator" content="WebMake/2.4" />
     
   </head>
   <body>
     <p>
+      <br />
       <table width="100%">
         <tr>
           <td valign="center">
-             <img align="center" src="images/arrowlogo.png" alt="SpamAssassin" width="334" height="148" />
+            <a href="index.html"><img align="left" src="images/spamassassin-logobar.png" alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" width="750" height="80" /></a>
           </td>
           <td valign="center">
-             <h1>The Apache SpamAssassin Project</h1><p>
-              <strong>The Powerful #1 Open-Source Spam Filter</strong>
+            <p>
+              <strong>The #1 Enterprise Open-Source Spam Filter</strong>
             </p>
           </td>
         </tr>
         <tr>
-          <td colspan="2">
-            <font size="-1">
+          <td colspan="2" align="center">
+            <br />
+            <font size="+1">
               <table class="navibar" cellpadding="0" cellspacing="3" border="0">
                 <tr>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<b>SpamAssassin Home</b>&nbsp;
-                  </td>
+                  <!-- <td class="navibar" valign=top align=center>&nbsp;<b>SpamAssassin Home</b>&nbsp;</td> -->
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="index.html">Home</a>&nbsp;
                   </td>
@@ -95,25 +95,22 @@
                     &nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">Download</a>&nbsp;
+                    &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists</a>&nbsp;
+                    &nbsp;<a href="http://wiki.apache.org/spamassassin/MailingLists">Lists (Wiki)</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="tests.html">Tests</a>&nbsp;
+                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs (Bugzilla</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://issues.apache.org/SpamAssassin/">Bugs</a>&nbsp;
-                  </td>
-                  <td class="navibar" valign="top" align="center">
-                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits</a>&nbsp;
+                    &nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;
                   </td>
                 </tr>
               </table>
@@ -124,45 +121,40 @@
     </p>
 <!-- yes, it's that Mozilla black-border code again ;) -->
     <!-- stolen from www.mozilla.org via rc3.org -->
-        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td bgcolor="#808080">
-          <table border="0" cellspacing="4" cellpadding="4" width="100%">
-            <tr>
-              <td bgcolor="#ffffff">
-                <table border="0" cellspacing="4" cellpadding="4" width="100%">
-                  <tr>
-                    <td>
-                      <a name="title" id="title"><h1>FAQ has moved</h1></a><p>
-                        If you've received a mail from SpamAssassin, and you want to know how and why,
-                        please visit <a href="users.html">this page</a>.
-                        
-                      </p>
-                      <blockquote>
-                        <strong>The key point is that the most probable situation is that your ISP has set
-                        this up on your mail account, and to switch it off, you MUST contact their
-                        Tech Support desk. Nobody in the SpamAssassin development team can do this,
-                        ONLY your ISP can.</strong>
-                      </blockquote>
-                      <p>
-                        Otherwise, please visit the new SpamAssassin FAQ Wiki <a href="http://wiki.apache.org/spamassassin/">here</a>.
-                        
-                      </p>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <table width="98%">
+    <!--
+     <table border=0 cellpadding=0 cellspacing=0 width="100%">
+     <tr><td BGCOLOR="#808080">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td BGCOLOR="#ffffff">
+     <table border=0 cellspacing=4 cellpadding=4 width="100%">
+     <tr><td> -->
+        <div style="padding: 50px;">
+      <a name="title" id="title"><h1>FAQ has moved</h1></a><p>
+        If you've received a mail from SpamAssassin, and you want to know how and why,
+        please visit <a href="users.html">this page</a>.
+        
+      </p>
+      <blockquote>
+        <strong>The key point is that the most probable situation is that your ISP has set
+        this up on your mail account, and to switch it off, you MUST contact their
+        Tech Support desk. Nobody in the SpamAssassin development team can do this,
+        ONLY your ISP can.</strong>
+      </blockquote>
+      <p>
+        Otherwise, please visit the new SpamAssassin FAQ Wiki <a href="http://wiki.apache.org/spamassassin/">here</a>.
+        
+      </p>
+<!--
+       </td></tr></table>
+       </td></tr></table>
+       </td></tr></table> -->
+          </div>
+    <table align="center" width="90%">
       <tr>
         <td valign="top">
           <p>
             <div align="left">
-               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" border="0" width="124" height="35" /></a>
+               <a href="http://www.apache.org/"> <img src="images/apache-feather.png" alt="An Apache Project" title="An Apache Project" border="0" width="124" height="35" /></a>
             </div>
           </p>
         </td>
@@ -178,13 +170,13 @@
         <td valign="top">
           <p>
             <div align="right">
-               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+               <a href="http://webmake.taint.org/"> <img src="images/BuiltWithWebMake.png" width="88" height="31" border="0" alt="Site Built With WebMake" title="Site Built with WebMake" /></a>
             </div>
           </p>
         </td>
       </tr>
     </table>
-    <table align="center">
+    <table align="center" width="90%">
       <tr>
         <td align="center">
           
@@ -195,8 +187,10 @@
         </td>
       </tr>
     </table>
-<!-- some anti-spam trapping links -->
-        <font size="-6">
+    <br />
+    &nbsp;
+     <!-- some anti-spam trapping links -->
+    <font size="-6">
       <a href="mailto:sa_website@incoming.spamassassin.org"></a>
     </font>
     <font size="-6">