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 [2/5] - in /spamassassin/site: ./ devel/ gtube/ old/ released/ tag/

Modified: spamassassin/site/gtube.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/gtube.html (original)
+++ spamassassin/site/gtube.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,61 +121,56 @@
     </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>The GTUBE</h1></a><p>
-                        This is the GTUBE -- the <strong>Generic Test for Unsolicited Bulk Email</strong>.
-                        
-                      </p>
-                      <p>
-                        If your spam filter supports it, the GTUBE provides a test by which you can
-                        verify that the filter is installed correctly and is detecting incoming spam,
-                        in a similar fashion to <a href="http://www.eicar.org/anti_virus_test_file.htm">
-                        the EICAR anti-virus test file</a>.
-                        
-                      </p>
-                      <p>
-                        Spam filter developers should add a rule, where possible, to recognise
-                        the following 68-byte string in the message body, and trigger on it:
-                        
-                      </p>
-                      <p>
-                        <pre>
+    <!--
+     <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>The GTUBE</h1></a><p>
+        This is the GTUBE -- the <strong>Generic Test for Unsolicited Bulk Email</strong>.
+        
+      </p>
+      <p>
+        If your spam filter supports it, the GTUBE provides a test by which you can
+        verify that the filter is installed correctly and is detecting incoming spam,
+        in a similar fashion to <a href="http://www.eicar.org/anti_virus_test_file.htm">
+        the EICAR anti-virus test file</a>.
+        
+      </p>
+      <p>
+        Spam filter developers should add a rule, where possible, to recognise
+        the following 68-byte string in the message body, and trigger on it:
+        
+      </p>
+      <p>
+        <pre>
   XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X
 </pre>
-                      </p>
-                      <p>
-                        Note that this should be reproduced in one line, without whitespace or line
-                        breaks. A suitable mail message in RFC-822 format <a href="gtube/gtube.txt">can be downloaded here</a>.
-                        
-                      </p>
-                      <p>
-                        This string and mail can be reproduced freely, without attribution; they
-                        are hereby placed in the public domain.
-                        
-                      </p>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <table width="98%">
+      </p>
+      <p>
+        Note that this should be reproduced in one line, without whitespace or line
+        breaks. A suitable mail message in RFC-822 format <a href="gtube/gtube.txt">can be downloaded here</a>.
+        
+      </p>
+      <p>
+        This string and mail can be reproduced freely, without attribution; they
+        are hereby placed in the public domain.
+        
+      </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>
@@ -194,13 +186,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">
           
@@ -211,8 +203,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/gtube/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube/index.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/gtube/index.html (original)
+++ spamassassin/site/gtube/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,61 +121,56 @@
     </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>The GTUBE</h1></a><p>
-                        This is the GTUBE -- the <strong>Generic Test for Unsolicited Bulk Email</strong>.
-                        
-                      </p>
-                      <p>
-                        If your spam filter supports it, the GTUBE provides a test by which you can
-                        verify that the filter is installed correctly and is detecting incoming spam,
-                        in a similar fashion to <a href="http://www.eicar.org/anti_virus_test_file.htm">
-                        the EICAR anti-virus test file</a>.
-                        
-                      </p>
-                      <p>
-                        Spam filter developers should add a rule, where possible, to recognise
-                        the following 68-byte string in the message body, and trigger on it:
-                        
-                      </p>
-                      <p>
-                        <pre>
+    <!--
+     <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>The GTUBE</h1></a><p>
+        This is the GTUBE -- the <strong>Generic Test for Unsolicited Bulk Email</strong>.
+        
+      </p>
+      <p>
+        If your spam filter supports it, the GTUBE provides a test by which you can
+        verify that the filter is installed correctly and is detecting incoming spam,
+        in a similar fashion to <a href="http://www.eicar.org/anti_virus_test_file.htm">
+        the EICAR anti-virus test file</a>.
+        
+      </p>
+      <p>
+        Spam filter developers should add a rule, where possible, to recognise
+        the following 68-byte string in the message body, and trigger on it:
+        
+      </p>
+      <p>
+        <pre>
   XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X
 </pre>
-                      </p>
-                      <p>
-                        Note that this should be reproduced in one line, without whitespace or line
-                        breaks. A suitable mail message in RFC-822 format <a href="../gtube/gtube.txt">can be downloaded here</a>.
-                        
-                      </p>
-                      <p>
-                        This string and mail can be reproduced freely, without attribution; they
-                        are hereby placed in the public domain.
-                        
-                      </p>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <table width="98%">
+      </p>
+      <p>
+        Note that this should be reproduced in one line, without whitespace or line
+        breaks. A suitable mail message in RFC-822 format <a href="../gtube/gtube.txt">can be downloaded here</a>.
+        
+      </p>
+      <p>
+        This string and mail can be reproduced freely, without attribution; they
+        are hereby placed in the public domain.
+        
+      </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>
@@ -194,13 +186,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">
           
@@ -211,8 +203,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/hacking.html
URL: http://svn.apache.org/viewvc/spamassassin/site/hacking.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/hacking.html (original)
+++ spamassassin/site/hacking.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,34 +121,29 @@
     </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>Hacking On SpamAssassin</h1></a><p>
-                        (Page moved to <a href="http://wiki.apache.org/spamassassin/DevelopmentStuff">http://wiki.apache.org/spamassassin/DevelopmentStuff</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>Hacking On SpamAssassin</h1></a><p>
+        (Page moved to <a href="http://wiki.apache.org/spamassassin/DevelopmentStuff">http://wiki.apache.org/spamassassin/DevelopmentStuff</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>
@@ -167,13 +159,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">
           
@@ -184,8 +176,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/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/index.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/index.html (original)
+++ spamassassin/site/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;
-                  </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,133 +121,97 @@
     </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>
-                      <p>
-                        <!-- START BLOCK -->
-                        <div align="right" style="float: right; width: 200px; margin: 10px;">
-                           <a href="http://www.infoworld.com/archives/t.jsp?N=s&V=91650"><img src="images/BOSSIElogo.gif" border="0" width="150" height="111" alt="InfoWorld BOSSIE Award 2007" /></a><br clear="all" />
-                          <p>
-                            
-                          </p>
-                          <br clear="all" />
-                           <a href="http://www.linuxnewmedia.com/Press/Press_Releases/Awards_2006"><img align="right" src="images/LNM_LW_Award2006.jpg" border="0" width="125" height="106" alt="Linux New Media Award 2006" /></a><br clear="all" />
-                          <p>
-                            
-                          </p>
-                          <br clear="all" />
-                           <a href="http://itmanagement.earthweb.com/article.php/3586381"><img align="right" src="images/dtmpoy06.gif" border="0" width="200" height="41" alt="Datamation's Product of the Year 2006" </a /><br clear="all" />
-                          <p>
-                            
-                          </p>
-                          <br clear="all" />
-                           <a href="http://itmanagement.earthweb.com/secu/article.php/3481971"><img align="right" src="images/Datamation2005.gif" border="0" width="155" height="86" alt="Datamation's Product of the Year 2005" /></a><br clear="all" />
-                          <p>
-                            
-                          </p>
-                          <br clear="all" />
-                           <a href="http://osdir.com/Article198.phtml"><img align="right" src="images/2003osdirwinnerbadge.gif" border="0" width="125" height="65" alt="OSDir.com Editor's Choice 2003" /></a><br clear="all" />
-                          <p>
-                            
-                          </p>
-                          <br clear="all" />
-                          
-                        </div>
-<!-- END BLOCK -->
-                                              </p>
-                      <p>
-                        <h2>Note</h2>
-                      </p>
-                      <blockquote>
-                        <p>
-                          This is the home page for the open-source Apache SpamAssassin
-                          Project. There are also numerous prepackaged <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">versions
-                          for Windows, commercial versions, and specialized front-ends</a>.
-                          
-                        </p>
-                        <p>
-                          If you were sent here because you received an e-mail message which was
-                          modified by SpamAssassin, please read <a href="users.html">this page</a>.
-                          
-                        </p>
-                      </blockquote>
-                      <p>
-                        <h2>Latest News</h2>
-                      </p>
-                      <blockquote>
-                        <p>
-                          <p>
-                            <em>2011-06-16: </em>SpamAssassin 3.3.2 has been released, a minor new release primarily to support perl-5.12 and later. Visit <a href="http://spamassassin.apache.org/downloads.cgi?update=201106220000">the downloads page</a> to pick it up, and for more info. <br />
-                            
-                          </p>
-                        </p>
-                        <p>
-                          <em>(Older news items can be read at <a href="news.html">the News and Announcements
-                          page</a>. <a href="http://mail-archives.apache.org/mod_mbox/spamassassin-announce/?format=atom">Atom feed <img src="images/feed.png" border="0" width="14" height="14" /></a>)</em>
-                        </p>
-                      </blockquote>
-                      <p>
-                        <h2>Features</h2>
-                      </p>
-                      <ul>
-                        <li>
-                          <strong>Wide-spectrum</strong>: SpamAssassin uses a wide variety of local and network
-                          tests to identify spam signatures. This makes it harder for spammers to
-                          identify one aspect which they can craft their messages to work around.
-                          
-                        </li>
-                        <li>
-                          <strong>Free software</strong>: it is distributed under the same terms and conditions
-                          as other popular open-source software packages such as the Apache web
-                          server.
-                          
-                        </li>
-                        <li>
-                          <strong>Easy to extend</strong>: Anti-spam tests and configuration are stored
-                          in plain text, making it easy to configure and add new rules.
-                          
-                        </li>
-                        <li>
-                          <strong>Flexible</strong>: SpamAssassin encapsulates its logic in a well-designed,
-                          abstract API so it can be integrated anywhere in the email stream.
-                          The <a href="doc/Mail_SpamAssassin.html">Mail::SpamAssassin classes</a> can
-                          be used on a wide variety of email systems including <strong>procmail</strong>,
-                          <strong>sendmail</strong>, <strong>Postfix</strong>, <strong>qmail</strong>,
-                          <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">and many others</a>.
-                          
-                        </li>
-                        <li>
-                          <strong>Easy Configuration</strong>: SpamAssassin requires very little configuration;
-                          you do not need to continually update it with details of your mail
-                          accounts, mailing list memberships, etc. Once classified, site and
-                          user-specific policies can then be applied against spam. Policies can be
-                          applied on both mail servers and later using the user's own mail
-                          user-agent application.
-                          
-                        </li>
-                      </ul>
-                    </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;">
+      <p>
+        <h2>Welcome</h2>
+      </p>
+      <blockquote>
+        <p>
+          Welcome to the home page for the open-source Apache SpamAssassin Project.
+          
+        </p>
+        <p>
+          <ul>
+            <li>
+              <a href="http://wiki.apache.org/spamassassin/StartUsing">Click here</a> to get started using SpamAssassin!
+            </li>
+          </p>
+          <p>
+            <li>
+              Looking for tips to improve your existing installation? <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">Click here</a> for a variety of topics in our Wiki that might help.
+            </li>
+          </p>
+          <p>
+            <li>
+              Sent here because you received an e-mail message which was modified by SpamAssassin? Please read <a href="users.html">this end-user notice</a>.
+            </li>
+          </ul>
+        </p>
+      </blockquote>
+      <p>
+        <h2>Latest News</h2>
+      </p>
+      <blockquote>
+        <p>
+          <p>
+            <em>2014-02-11: </em>SpamAssassin 3.4.0 has been released adding native support for IPv6, improved DNS Blocklist technology and support for massively-scalable Bayesian filtering using the Redis backend. Visit <a href="http://spamassassin.apache.org/downloads.cgi?update=201402111327">the downloads page</a> to pick it up, and for more info. <br />
+            
+          </p>
+        </p>
+        <blockquote>
+          <a href="news.html">News Archive page</a>. <a href="http://mail-archives.apache.org/mod_mbox/spamassassin-announce/?format=atom">Atom feed <img src="images/feed.png" border="0" width="14" height="14" /></a>
+        </blockquote>
+      </blockquote>
+      <p>
+        <h2>Features</h2>
+      </p>
+      <blockquote>
+        <p>
+          <ul>
+            <li>
+               <strong>Wide-spectrum</strong>: SpamAssassin uses a wide variety of local and network tests to identify spam signatures. This makes it harder for spammers to identify one aspect which they can craft their messages to work around.
+            </li>
+          </p>
+          <p>
+            <li>
+              <strong>Free software</strong>: it is distributed under the same terms and conditions as other popular open-source software packages such as the Apache web server.
+            </li>
+          </p>
+          <p>
+            <li>
+              <strong>Easy to extend</strong>: Anti-spam tests and configuration are stored in plain text, making it easy to configure and add new rules.
+            </li>
+          </p>
+          <p>
+            <li>
+              <strong>Flexible</strong>: SpamAssassin encapsulates its logic in a well-designed, abstract API so it can be integrated anywhere in the email stream. The <a href="doc/Mail_SpamAssassin.html">Mail::SpamAssassin classes</a> can be used on a wide variety of email systems including <strong>procmail</strong>, <strong>sendmail</strong>, <strong>Postfix</strong>, <strong>qmail</strong>, <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">and many others</a>.
+            </li>
+          </p>
+          <p>
+            <li>
+              <strong>Easy Configuration</strong>: SpamAssassin requires very little configuration; you do not need to continually update it with details of your mail accounts, mailing list memberships, etc. Once classified, site and user-specific policies can then be applied against spam. Policies can be applied on both mail servers and later using the user's own mail user-agent application.
+            </li>
+          </ul>
+        </p>
+      </blockquote>
+<!--
+       </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>
@@ -266,13 +227,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">
           
@@ -283,8 +244,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/lists.html
URL: http://svn.apache.org/viewvc/spamassassin/site/lists.html?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/lists.html (original)
+++ spamassassin/site/lists.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,34 +121,29 @@
     </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>Mailing Lists</h1></a><p>
-                        (Page moved to <a href="http://wiki.apache.org/spamassassin/MailingLists">http://wiki.apache.org/spamassassin/MailingLists</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>Mailing Lists</h1></a><p>
+        (Page moved to <a href="http://wiki.apache.org/spamassassin/MailingLists">http://wiki.apache.org/spamassassin/MailingLists</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>
@@ -167,13 +159,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">
           
@@ -184,8 +176,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/main.wmk
URL: http://svn.apache.org/viewvc/spamassassin/site/main.wmk?rev=1567136&r1=1567135&r2=1567136&view=diff
==============================================================================
--- spamassassin/site/main.wmk (original)
+++ spamassassin/site/main.wmk Tue Feb 11 14:09:03 2014
@@ -25,9 +25,9 @@
      Doing a new release? you'll need to change one or more of these! -->
 
 <!-- Change this to the current release version -->
-<content name="relversion">3.3.2</content>
-<content name="relrulesversion">3.3.2-r1104058</content>
-<content name="prevbranchrelversion">3.2.5</content>
+<content name="relversion">3.4.0</content>
+<content name="relrulesversion">3.4.0.r1565117.</content>
+<content name="prevbranchrelversion">3.3.2</content>
 
 <!-- this is the href to use to refer to the downloads page.
   it will use the ASF mirror infrastructure and ensures the mirror
@@ -39,25 +39,25 @@
   format, in the *WET timezone*, not UTC! This command will provide it:
   TZ=WET date +%Y%m%d%H%M
   -->
-<content name="mirrordl">http://spamassassin.apache.org/downloads.cgi?update=201106220000</content>
+<content name="mirrordl">http://spamassassin.apache.org/downloads.cgi?update=201402111327</content>
 
 <!-- If you've started a new "release line" (3.0.x, 3.1.x, etc.), change this -->
-<content name="relline">3.3.x</content>
+<content name="relline">3.4.x</content>
 
 <!-- The "release line" that documentation should be displayed for -->
-<content name="docsline">3.3.x</content>
+<content name="docsline">3.4.x</content>
 
 <!-- The URL of the "release line"'s branch in SVN -->
-<content name="relsvnhref">http://svn.apache.org/repos/asf/spamassassin/branches/3.3</content>
+<content name="relsvnhref">http://svn.apache.org/repos/asf/spamassassin/branches/3.4</content>
 
 <!-- If you want the "current pre-release" block to be available in
      downloads.html, change this AND search for 'preversion' in the HTML
      blocks below, and uncomment the HTML appropriately! -->
-<content name="preversion">3.1.0-rc2</content>
+<content name="preversion">3.4.0-rc6</content>
 
 <content format="text/et" name="latest_news_snippet">
 
-2011-06-16: SpamAssassin 3.3.2 has been released, a minor new release primarily to support perl-5.12 and later.  Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
+2014-02-11: SpamAssassin 3.4.0 has been released adding native support for IPv6, improved DNS Blocklist technology and support for massively-scalable Bayesian filtering using the Redis backend.  Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
 
 </content>
 <!-- when updating, move the old "latest" snippet to the content block
@@ -69,12 +69,12 @@ marked by OLDNEWS, below; we keep an arc
 <!-- OLDNEWS -->
 <content format="text/et" name="news.txt"><{set title="News and Announcements"}>
 
-${badges_block}
-
-<a href="${feed_url}"><img src="$(TOP/)images/feed.png" border=0 alt="Atom feed" align=right width=14 height=14 /></a><h2>News and Announcements</h2>
+<h2>News and Announcements <a href="${feed_url}"><img src="$(TOP/)images/feed.png" border=0 alt="Atom feed" title="Atom feed" width=14 height=14 /></a></h2>
 
   ${latest_news_snippet}
 
+  2011-06-16: SpamAssassin 3.3.2 has been released, a minor new release primarily to support perl-5.12 and later.  Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
+
   2010-03-19: SpamAssassin 3.3.1 has been released, a minor new release which adds some new rules.  Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
 
   2010-01-27: SpamAssassin 3.3.0 has been released, a major new release!  Visit <a href="${mirrordl}">the downloads page</a> to pick it up, and for more info.
@@ -147,10 +147,7 @@ ${badges_block}
   2006-03-11: SpamAssassin 3.1.1 released!
   (<a href="http://mail-archives.apache.org/mod_mbox/spamassassin-users/200603.mbox/%3c20060312011649.GW18463@kluge.net%3e">The release announcement</a>)
 
-  2006-02-21: Receiving three times as many votes as the closest
-  contender, SpamAssassin took top honors in the <a
-  href=http://itmanagement.earthweb.com/article.php/3586381>Anti-Spam
-  category of Datamation's Product of the Year 2006</a>.
+  2006-02-21: Receiving three times as many votes as the closest contender, SpamAssassin took top honors in the <a href=http://itmanagement.earthweb.com/article.php/3586381>Anti-Spam category of Datamation's Product of the Year 2006</a>.
 
   2005-09-14: SpamAssassin 3.1.0 released!
   (<a href="http://mail-archives.apache.org/mod_mbox/spamassassin-announce/200509.mbox/%3c20050914235232.814A45900BA@radish.jmason.org%3e">The release announcement</a>)
@@ -162,9 +159,7 @@ ${badges_block}
 
 <h2>Subscribing</h2>
 
-News about SpamAssassin, and new releases, can be received by mail
-by <a href='http://wiki.apache.org/spamassassin/MailingLists'>subscribing
-to the ''announce'' mailing list</a>. There is also an <a href="${feed_url}">Atom feed</a>.
+  News about SpamAssassin, and new releases, can be received by mail by <a href='http://wiki.apache.org/spamassassin/MailingLists'>subscribing to the ''announce'' mailing list</a>. There is also an <a href="${feed_url}">Atom feed</a>.
 
 </content>
 
@@ -212,22 +207,25 @@ to the ''announce'' mailing list</a>. Th
 
 <!-- START BLOCK -->
 <div align=right style="float: right; width: 200px; margin: 10px;">
-<a href="http://www.infoworld.com/archives/t.jsp?N=s&V=91650"><img
-src="$(TOP/)images/BOSSIElogo.gif" border="0" width=150 height=111
-alt="InfoWorld BOSSIE Award 2007"></a>
+<a href="http://www.infoworld.com/archives/t.jsp?N=s&V=91650"><img src="$(TOP/)images/BOSSIElogo.gif" border="0" width=150 height=111 alt="InfoWorld BOSSIE Award 2007"></a>
+
 <br clear=all /><p></p><br clear=all />
-<a href="http://www.linuxnewmedia.com/Press/Press_Releases/Awards_2006"><img
-align=right src="$(TOP/)images/LNM_LW_Award2006.jpg"
-border="0" width="125" height="106" alt="Linux New Media Award 2006"></a>
+
+<a href="http://www.linuxnewmedia.com/Press/Press_Releases/Awards_2006"><img align=right src="$(TOP/)images/LNM_LW_Award2006.jpg" border="0" width="125" height="106" alt="Linux New Media Award 2006"></a>
+
 <br clear=all /><p></p><br clear=all />
-<a href="http://itmanagement.earthweb.com/article.php/3586381"><img
-align=right src="$(TOP/)images/dtmpoy06.gif" border=0 width=200 height=41
-alt="Datamation&#039;s Product of the Year 2006"</a>
+
+<a href="http://itmanagement.earthweb.com/article.php/3586381"><img align=right src="$(TOP/)images/dtmpoy06.gif" border=0 width=200 height=41 alt="Datamation&#039;s Product of the Year 2006"</a>
+
 <br clear=all /><p></p><br clear=all />
+
 <a href="http://itmanagement.earthweb.com/secu/article.php/3481971"><img align=right src="$(TOP/)images/Datamation2005.gif" border="0" width="155" height="86" alt="Datamation&#039;s Product of the Year 2005"></a>
+
 <br clear=all /><p></p><br clear=all />
+
 <a href="http://osdir.com/Article198.phtml"><img align=right src="$(TOP/)images/2003osdirwinnerbadge.gif" border="0" width="125" height="65" alt="OSDir.com Editor&#039;s Choice 2003"></a>
-<br clear=all /><p></p><br clear=all />
+
+ <br clear=all /><p></p><br clear=all />
 </div><!-- END BLOCK -->
 
 </content>
@@ -238,188 +236,66 @@ alt="Datamation&#039;s Product of the Ye
   - <a href=$(TOP/)full/3.0.x/dist/doc/>Version 3.0.x</a> (old)
   - <a href=$(TOP/)full/3.1.x/doc/>Version 3.1.x</a> (old)
   - <a href=$(TOP/)full/3.2.x/doc/>Version 3.2.x</a> (old)
-  - <a href=$(TOP/)full/3.3.x/doc/>Version 3.3.x</a> (current)
+  - <a href=$(TOP/)full/3.3.x/doc/>Version 3.3.x</a> (old)
+  - <a href=$(TOP/)full/3.4.x/doc/>Version 3.4.x</a> (current)
 
 </content>
-<content name="testsbyversion" format=text/et>
-
-  - <a href=$(TOP/)tests_2_6x.html>Version 2.6x</a> (old)
-  - <a href=$(TOP/)tests_3_0_x.html>Version 3.0.x</a> (old)
-  - <a href=$(TOP/)tests_3_1_x.html>Version 3.1.x</a> (old)
-  - <a href=$(TOP/)tests_3_2_x.html>Version 3.2.x</a> (old)
-  - <a href=$(TOP/)tests_3_3_x.html>Version 3.3.x</a> (current)
 
-</content>
+<content format="text/et" name="sitewide.txt">
+<{set title="Using SpamAssassin For An Entire Site"}>
 
-<content name="tests_2_6x.txt" format=text/et>
-<{set title="Tests Performed: v2.6x"}>
-${testsheader}
-<!--etsafe--> <{perl
-    # calls out to a script in the spamassassin build dir
-    `cd $SITE_SRC_DIR/versions/b2_6_0; ./build/cf_to_html rules/*.cf`
-}> <!--/etsafe-->
-</table>
-</content>
+${title}
+---------
 
-<content name="tests_3_0_x.txt" format=text/et>
-<{set title="Tests Performed: v3.0.x"}>
-${testsheader}
-<!--etsafe--> <{perl
-    # calls out to a script in the spamassassin build dir
-    `cd $SITE_SRC_DIR/versions/3.0; ./build/cf_to_html rules/*.cf`
-}> <!--/etsafe-->
-</table>
+(Page moved to http://wiki.apache.org/spamassassin/UsingSiteWide)
 </content>
 
-<content name="tests_3_1_x.txt" format=text/et>
-<{set title="Tests Performed: v3.1.x"}>
-${testsheader}
-<!--etsafe--> <{perl
-    # calls out to a script in the spamassassin build dir
-    `cd $SITE_SRC_DIR/versions/3.1; ./build/cf_to_html rules/*.cf`
-}> <!--/etsafe-->
-</table>
-</content>
+<content format="text/et" name="index.txt"><{set title="Welcome to SpamAssassin"}>
 
-<content name="tests_3_2_x.txt" format=text/et>
-<{set title="Tests Performed: v3.2.x"}>
-${testsheader}
-<!--etsafe--> <{perl
-    # calls out to a script in the spamassassin build dir
-    `cd $SITE_SRC_DIR/versions/3.2; ./build/cf_to_html rules/*.cf`
-}> <!--/etsafe-->
-</table>
-</content>
+<h2>Welcome</h2>
 
-<content name="tests_3_3_x.txt" format=text/et>
-<{set title="Tests Performed: v3.3.x"}>
-${testsheader}
-<!--etsafe--> <{perl
-    # calls out to a script in the spamassassin build dir
-    `cd $SITE_SRC_DIR/versions/3.3; ./build/cf_to_html rules/*.cf`
-}> <!--/etsafe-->
-</table>
-</content>
+  Welcome to the home page for the open-source Apache SpamAssassin Project.
 
-<{perl
+  <ul>
+  <li><a href=http://wiki.apache.org/spamassassin/StartUsing>Click here</a> to get started using SpamAssassin!</li>
 
-    # backwards compat: we still have a /dist and a /doc subdir
-    # containing the "current version's" doco to avoid 404s.
-    # In particular, the freshmeat record points to /dist/CHANGES
-    # if I recall correctly.
-
-    # my $docsline = get_content ("docsline");
-    # system ("rm -rf dist");
-    # system ("mkdir -p dist");
-    # system ("cp -r full/${docsline}/dist/* dist/");
-    '';
-}>
+  <li>Looking for tips to improve your existing installation?  <a href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>Click here</a> for a variety of topics in our Wiki that might help.</li>
 
-<content name="testsheader" format=text/et>
-${title}
----------
+  <li>Sent here because you received an e-mail message which was modified by SpamAssassin? Please read <a href=$(users)>this end-user notice</a>.</li></ul>
 
-This is the current list of tests SpamAssassin performs on mail messages to
-determine if they're spam or not.  If you wish to <b>change the score</b> from the
-default, add a line like this to your ##~/.spamassassin/user_prefs##:
-
-	##score NAME_OF_TEST 3.0##
-
-Where ##3.0## is the hits you wish that test to incur, and ##NAME_OF_TEST## is
-the test name from the **TEST NAME** column below.  
-
-If you wish to <B>disable a test</B>, set the score to 0 by adding a line like
-this to your ##~/.spamassassin/user_prefs##:
-
-  	##score NAME_OF_TEST 0##
-
-Note that these are the scores for the current stable release of SpamAssassin;
-they may be different from the ones you're running on your servers, if SpamAssassin
-is installed there.
-
-The 'More Info' links, if present, lead to a section of our Wiki for collaborative
-documentation of rules; some of the rules include additional user-contributed
-documentation there.  If you feel like adding a page describing a rule in
-further detail, feel free to create a page at that link, using the <a href='http://wiki.apache.org/spamassassin/RuleDescriptionTemplate'>RuleDescriptionTemplate</a> format.
-
-<table>
-<tr bgcolor=#99ff99>
-<th>AREA&nbsp;TESTED</th>
-<th>LOCALE</th>
-<th>DESCRIPTION OF TEST</th>
-<th>TEST NAME</th>
-<th>DEFAULT SCORES<br /><i>(local, net, with bayes, with bayes+net)</i></th>
-<th>MORE INFO<br /><i>(additional wiki docs)</th>
-</tr>
-</content>
+<h2>Latest News</h2>
 
-<content format="text/et" name="sitewide.txt">
-<{set title="Using SpamAssassin For An Entire Site"}>
+  ${latest_news_snippet}
 
-${title}
----------
+  <blockquote><a href=$(news)>News Archive page</a>. <a href="${feed_url}">Atom feed <img src="$(TOP/)images/feed.png" border=0 width=14 height=14 /></a></blockquote>
 
-(Page moved to http://wiki.apache.org/spamassassin/UsingSiteWide)
-</content>
+<h2>Features</h2>
 
-<content name="tests.txt" format=text/et>
-<{set title="Tests Performed"}>
+  <ul><li> **Wide-spectrum**: SpamAssassin uses a wide variety of local and network tests to identify spam signatures.  This makes it harder for spammers to identify one aspect which they can craft their messages to work around.</li>
 
-${title}
----------
+  <li>**Free software**: it is distributed under the same terms and conditions as other popular open-source software packages such as the Apache web server.</li>
 
-${testsbyversion}
-</content>
-<content format="text/et" name="index.txt"><{set title="Welcome to SpamAssassin"}>
+  <li>**Easy to extend**: Anti-spam tests and configuration are stored in plain text, making it easy to configure and add new rules.</li>
 
-${badges_block}
+  <li>**Flexible**: SpamAssassin encapsulates its logic in a well-designed, abstract API so it can be integrated anywhere in the email stream.  The <a href=$(TOP/)doc/Mail_SpamAssassin.html>Mail::SpamAssassin classes</a> can be used on a wide variety of email systems including **procmail**, **sendmail**, **Postfix**, **qmail**, <a href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>and many others</a>.</li>
 
-<h2>Note</h2>
+  <li>**Easy Configuration**: SpamAssassin requires very little configuration; you do not need to continually update it with details of your mail accounts, mailing list memberships, etc. Once classified, site and user-specific policies can then be applied against spam.  Policies can be applied on both mail servers and later using the user's own mail user-agent application.</li></ul>
 
-  This is the home page for the open-source Apache SpamAssassin
-  Project.  There are also numerous prepackaged <a
-  href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>versions
-  for Windows, commercial versions, and specialized front-ends</a>.
+</content>
 
-  If you were sent here because you received an e-mail message which was
-  modified by SpamAssassin, please read <a href=$(users)>this page</a>.
 
-<h2>Latest News</h2>
+<!-- Tests - No longer done as of 3.4.0 release - left old test files for legacy -->
+<content name="tests.txt" format=text/et>
+<{set title="Tests Performed"}>
 
-  ${latest_news_snippet}
+${title}
+---------
 
-  <em>(Older news items can be read at <a href=$(news)>the News and Announcements
-  page</a>. <a href="${feed_url}">Atom feed <img src="$(TOP/)images/feed.png" border=0 width=14 height=14 /></a>)</em>
+This page is no longer updated as the tests are now published nightly.
 
-<h2>Features</h2>
+</content>
 
-  - **Wide-spectrum**: SpamAssassin uses a wide variety of local and network
-    tests to identify spam signatures.  This makes it harder for spammers to
-    identify one aspect which they can craft their messages to work around.
-
-  - **Free software**: it is distributed under the same terms and conditions
-    as other popular open-source software packages such as the Apache web
-    server.
-
-  - **Easy to extend**: Anti-spam tests and configuration are stored
-    in plain text, making it easy to configure and add new rules.
-
-  - **Flexible**: SpamAssassin encapsulates its logic in a well-designed,
-    abstract API so it can be integrated anywhere in the email stream.
-    The <A
-    href=$(TOP/)doc/Mail_SpamAssassin.html>Mail::SpamAssassin classes</a> can
-    be used on a wide variety of email systems including **procmail**,
-    **sendmail**, **Postfix**, **qmail**,
-    <a href=http://wiki.apache.org/spamassassin/UsingSpamAssassin>and many others</a>.
-
-  - **Easy Configuration**: SpamAssassin requires very little configuration;
-    you do not need to continually update it with details of your mail
-    accounts, mailing list memberships, etc. Once classified, site and
-    user-specific policies can then be applied against spam.  Policies can be
-    applied on both mail servers and later using the user's own mail
-    user-agent application.
 
-</content>
 <content name="faq.txt" format=text/et>
 <{set title="FAQ has moved"}>
 
@@ -515,7 +391,7 @@ Released version, ${relversion}
 
   - <a href=${mirrorhref}/Mail-SpamAssassin-${relversion}.zip>SpamAssassin in ZIP</a> format.  (signatures: <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-${relversion}.zip.sha1>SHA1</a>)
   - <a href=${relsvnhref}/build/announcements/${relversion}.txt>Change log summary</a>, <a href=${relsvnhref}/Changes>more detail</a>
-  - <a href=${mirrorhref}/Mail-SpamAssassin-rules-${relrulesversion}.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=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz.sha1>SHA1</a>)
+  - <a href=${mirrorhref}/Mail-SpamAssassin-rules-${relrulesversion}.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=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tar.gz.asc>GPG</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tar.gz.md5>MD5</a> <a href=${relhomehref}/Mail-SpamAssassin-rules-${relrulesversion}.tgz.sha1>SHA1</a>)
 
 Previous Released version, ${prevbranchrelversion}
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -632,6 +508,8 @@ ${title}
 
 (Page moved to http://wiki.apache.org/spamassassin/DevelopmentStuff)
 </content>
+
+<!-- PRESENTATIONS -->
 <content name="presentations.txt" format=text/et><{set title="SpamAssassin Presentations"}>
 
 ${title}
@@ -639,6 +517,8 @@ ${title}
 
 (Page moved to http://wiki.apache.org/spamassassin/PresentationsAndPapers)
 </content>
+
+<!-- CONTRIBUTORS -->
 <content format="text/et" name="credits.txt"><{set title="Contributors"}>
 
 ${title}
@@ -648,125 +528,72 @@ This page has been replaced by the
 <a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">
 CREDITS file in the distribution</a>.
 </content>
+
+<!-- END USERS -->
 <content name="users.txt" format=text/et>
 <{set title="Information For End-Users"}>
 
 ${title}
 --------
 
-  **If you have received a mail modified by something called 'SpamAssassin',
-  PLEASE READ THIS PAGE IN FULL.**
+  **PLEASE READ THIS PAGE IN FULL.**
+
+  You may have received a mail modified by something called 'SpamAssassin'.
 
-  **In most cases when this happens, it means that the company who set up your
-  web site has installed the software on their servers.  They should have told
-  you, but they didn't.  If you contact them, they can disable it.**
-
-  **Nobody in the SpamAssassin development team can do this, ONLY your ISP or
-  web hosting company can -- we have no access to their mail systems to change
-  whether your mail is filtered.**
+  Apache SpamAssassin is a software to help block spam, also known as unsolicited commercial e-mail.  
+
+  If you need help with this software, nobody in the SpamAssassin development team can do this, ONLY your ISP, system administrator or web hosting company can help. 
 
 
 Why Are You Spamming Me?
 ========================
 
-If you are seeing SpamAssassin data in the mail message, then this
-indicates that __somebody__ at your ISP, your web hosting company, your
-employers, etc. has set up a mail filter which detects spam and adds
-these markings so that you can filter it more easily, should you wish to.
+  We are not.  SpamAssassin is a software to help block spam.  Please see above.
 
 Why was the e-mail altered?
 ===========================
 
-Your system administrator or ISP has implemented a policy to block ''spam''
-(also known as unsolicited commercial e-mail).  Each incoming e-mail is scanned
-for signs that it may be ''spam'', and if it is determined that it's likely to
-be spam, it is altered to clearly reflect this, so that you can decide
-whether to delete or keep it.
+  SpamAssassin is a software to help block spam which your ISP, system administrator or web hosting company configured to help you.
+
+  With SpamAssassin, each incoming e-mail is scanned for signs that it may be ''spam'', and if it is determined that it's likely to be spam, it is altered to clearly reflect this to help reduce your work.
 
-If you have concerns about the scanning policy, please talk to your system
-administrator or ISP support desk.
+  If you have concerns how SpamAssassin is implemented, nobody in the SpamAssassin development team can do this, ONLY your ISP, system administrator or web hosting company can help.
 
 Who are you and what are you doing to my mail?
 ==============================================
 
-We are the writers of this software -- we did not install it on your system.
-As a result, you need to talk to your system administrator or ISP, not us.
+  We are the writers of the Apache SpamAssassin software.  
 
-Although we wrote the program, it is your system administrator who chose to use
-it, and we have __absolutely no control__ over the filtering rules set up by
-the administrator.
-
-We strongly urge ISPs installing the product to notify their users when
-it's installed, and to not enable it by default -- but many seem to ignore
-this advice.   We agree, that's totally unprofessional. :(
-
-This Is The First I've Heard About It!
-======================================
-
-**You should have been informed that this was going to happen.**  We plaster
-this message all over our installation manuals, website, etc.  However, we
-__still__ receive reports from people whose first contact with SpamAssassin is
-when it suddenly appears in their mail -- which indicates that whoever
-installed it on their mail systems __never bothered__ to tell them about it.
-Unsurprisingly, we think this is a little unprofessional.
-
-Typically the person to contact is your ISP's tech support department,
-your web hosting company's tech support department, or your systems
-administrator.
-
-My ISP Says They Know Nothing About It!
-=======================================
-
-Recently, we've noticed a lot of companies who host websites, set up
-SpamAssassin on those accounts.   This means that all mail traffic
-sent to addresses at that website are filtered.
+  Although we wrote the program, it is your system administrator who chose to use it, and we have __absolutely no control__ over the installation.
 
-Even though the ISP that you connect to the internet through, does not know
-anything about it, the __website hosting ISP__ is another possibility.
+  Again, nobody in the SpamAssassin development team can do this, ONLY your ISP, system administrator or web hosting company can help.
 
 But The Message Was Not Spam!
 =============================
 
-Sometimes SpamAssassin will get a ''false positive'', resulting in tagged
-mails which are not actually spam at all.   Since spammers don't usually
-highlight the fact that their mail is unwanted, unsolicited ads, SpamAssassin
-has to try to work it out -- and it's not always easy to do.
+  Apache SpamAssassin can have a ''false positive'', where mail is incorrectly classified as spam.
 
-But I Don't Get Much Spam!
-==========================
-
-Count yourself lucky, then!  The longer your email address stays valid,
-the more spam you will get.
-
-It may not be a problem for you -- yet -- but others find it very frustrating.
-Some recent research has indicated that several ISPs find their incoming mail
-is between 40% and 80% spam, overall; and quite a few old-timers who've used
-the same address for years, get over 30 spams a day.
-
-If you don't get much spam, you probably find SpamAssassin more annoying than
-useful.  In this case, see __How Can I Turn It Off?__, below.
+  Typically, unless you are a programmer, your only recourse is to contact your ISP, system administrator or web hosting company for help.
 
 How Can I Turn It Off?
 ======================
 
-You have two options.  Firstly, SpamAssassin can be made a lot less sensitive.
-To do this, ask your systems administrator or ISP's helpdesk to ''increase the
-SpamAssassin threshold''.
-
-Alternatively, if you just want all your mail, unfiltered, ask your systems
-administrator or ISP's helpdesk to ''add your address to the whitelist_to
-list''.
+  You have two options:
+
+  Option 1 is to ask your system administrator to ''increase the SpamAssassin threshold'' for you.
+
+  Option 2, if you just want all your mail, unfiltered, ask your systems administrator to ''add your mail address to the whitelist_to list''.
 
 What is SpamAssassin, After All That?
-=====================
+=====================================
 
-SpamAssassin is a mail filter which scans, and attempts to block, spam.
-More information <a href=$(TOP/)>here</a>.
+  SpamAssassin is a mail filter which scans that classifies e-mail to help tag/block unwanted email.  More information <a href=$(TOP/)>here</a>.
 
-__(thanks to <a href=http://www.roaringpenguin.com/mimedefang/enduser.html>
-Roaring Penguin's enduser page</a> for large chunks of this text.)__
+__(thanks to <a href=http://www.roaringpenguin.com/mimedefang/enduser.html>Roaring Penguin's enduser page</a> for the original version of this text.)__
 
 </content>
+
+<!-- GTUBE -->
 <content name="gtube.txt" format=text/et>
 <{set title="The GTUBE"}>
 
@@ -808,6 +635,7 @@ Please read
 the relevant pages on the SpamAssassin wiki</a> instead.
 </content>
 
+<!-- Mailing Lists -->
 <content format="text/et" name="lists.txt"><{set title="Mailing Lists"}>
 
 ${title}
@@ -816,13 +644,12 @@ ${title}
 (Page moved to http://wiki.apache.org/spamassassin/MailingLists)
 </content>
 
+<!-- Documentation -->
 <content format="text/et" name="doc.txt"><{set title="Documentation"}>
 
 ${title}
 --------
 
-  - The <a href=$(tests)>list of tests</a> SpamAssassin includes by default.
-
   - <a href=${relsvnhref}/README>Top-level README file</a>.
 
   - <a href=${relsvnhref}/INSTALL>Top-level INSTALL file</a>, for notes on how to install.
@@ -839,11 +666,6 @@ ${title}
 
   - Some <a href="http://wiki.apache.org/spamassassin/PresentationsAndPapers">presentations and papers</a> about SpamAssassin.
 
-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.
-
 <{!--
   The POD documentation:
 
@@ -856,9 +678,7 @@ simple questions.
   }><!--/etsafe--></ul>
 --}>
 
-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.
+  - 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.
 
 POD Documentation
 ==================
@@ -876,8 +696,8 @@ Walk-throughs and How-To's
     step-by-step instructions on how to get Postfix to use both SpamAssassin
     and Anomy Sanitizer (a virus blocking system).
 
-  - http://www.peregrinehw.com/downloads/ - How-To's for setting up a stable
-    Red Hat mail server with SpamAssassin.
+  - http://www.pccc.com/downloads/SpamAssassin - Notes for setting up a stable
+    RedHat/CentOS mail server with SpamAssassin.
 
   - http://codesorcery.net/old/docs/spamtricks.html - Some notes on using
     SpamAssassin with Mutt, by Justin R. Miller.
@@ -931,13 +751,13 @@ Walk-throughs and How-To's
 
   A:link {
     font-weight: bold;
-    color: #004000;
+    color: #483417;
     text-decoration: underline; 
   }
 
   A:visited {
     font-weight: normal;
-    color: #008000;
+    color: #483417;
     text-decoration: underline; 
   }
 
@@ -948,7 +768,7 @@ Walk-throughs and How-To's
   }
 
   table.navibar {
-    background-color: #C8C8C8;
+    background-color: #ddd;
     border-spacing: 3px;
   }
   td.navibar {
@@ -987,26 +807,32 @@ Walk-throughs and How-To's
 
   <!-- 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>
+  <tr><td> -->
+
+  <div style="padding: 50px;">
 
 </content>
 
-<content format="text/html" name="footer">  </td></tr></table>
+<content format="text/html" name="footer">  
+<!--
   </td></tr></table>
   </td></tr></table>
+  </td></tr></table> -->
+  </div>
 
-  <table width="98%"><tr>
+  <table align=center width="90%"><tr>
 
   <td valign=top>
   <p><div align=left>
   <a href="http://www.apache.org/">
-    <img src=$(TOP/)images/apache-feather.png ${IMGSIZE}
-        alt="An Apache Project" border=0 /></a>
+    <img src=$(TOP/)images/apache-feather.png ${IMGSIZE} alt="An Apache Project" title="An Apache Project" border=0 /></a>
   </div></p>
   </td>
 
@@ -1020,20 +846,20 @@ Walk-throughs and How-To's
   <p><div align=right>
   <a href="http://webmake.taint.org/">
   <img src="$(TOP/)images/BuiltWithWebMake.png" 
-  width="88" height="31" border="0" alt="Site Built With WebMake" /></a>
+  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>
 Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
 Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
     </td>
   </tr>
-  </table>
+  </table><br>&nbsp;
 
 
   <!-- some anti-spam trapping links -->
@@ -1060,34 +886,30 @@ urchinTracker();
 <!-- -------------------------------------------------------------------- -->
 
 <content format="text/html" name="navbar">
-
+<br>
 <table width=100%>
   <tr>
-  <td valign=center>
-  <img align=center src=$(TOP/)images/arrowlogo.png ${IMGSIZE} 
-  alt="SpamAssassin" />
+  <td valign=center><a href=$(index)><img align=left src=$(TOP/)images/spamassassin-logobar.png ${IMGSIZE} alt="The Apache SpamAssassin Project Logo Banner" title="The Apache SpamAssassin Project Logo Banner" /></a>
   </td>
   <td valign=center>
-  <h1>The Apache SpamAssassin Project</h1>
-  <p><strong>The Powerful #1 Open-Source Spam Filter</strong></p>
+  <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)">Home</a>&nbsp;</td>
     <td class="navibar" valign=top align=center>&nbsp;<a href="$(news)">News</a>&nbsp;</td>
     <td class="navibar" valign=top align=center>&nbsp;<a href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;</td>
     <td class="navibar" valign=top align=center>&nbsp;<a href="${mirrordl}">Download</a>&nbsp;</td>
-    <td class="navibar" valign=top align=center>&nbsp;<a href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ</a>&nbsp;</td>
+    <td class="navibar" valign=top align=center>&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)">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)">Tests</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;</td>
+    <td class="navibar" valign=top align=center>&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 (Bugzilla</a>&nbsp;</td>
+    <td class="navibar" valign=top align=center>&nbsp;<a href="http://svn.apache.org/repos/asf/spamassassin/trunk/CREDITS">Credits (SVN)</a>&nbsp;</td>
     </tr>
   </table>
   </font>