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 2015/04/17 07:24:23 UTC

svn commit: r1674212 - in /spamassassin/site: ./ devel/ gtube/ images/ logo/ logo/2005-Christian_Rauh/ released/ tag/

Author: kmcgrail
Date: Fri Apr 17 05:24:21 2015
New Revision: 1674212

URL: http://svn.apache.org/r1674212
Log:
launching new logo, updating copyright and branding information and prepping for 3.4.1

Added:
    spamassassin/site/images/spamassassin-logobar.png   (with props)
    spamassassin/site/images/spamassassin-logobar.png.old
      - copied unchanged from r1674195, spamassassin/site/images/spamassassin-logobar.png
    spamassassin/site/logo/120x60-spamassassin.png   (with props)
    spamassassin/site/logo/125x125-spamassassin.png   (with props)
    spamassassin/site/logo/128-powered-by-spamassassin.png   (with props)
    spamassassin/site/logo/128-spamassassin.png   (with props)
    spamassassin/site/logo/2005-Christian_Rauh/
    spamassassin/site/logo/2005-Christian_Rauh/README.txt
      - copied, changed from r1674195, spamassassin/site/logo/README.txt
    spamassassin/site/logo/2005-Christian_Rauh/button-1-110x32.gif
      - copied unchanged from r1674195, spamassassin/site/logo/button-1-110x32.gif
    spamassassin/site/logo/2005-Christian_Rauh/button-2-110x32.gif
      - copied unchanged from r1674195, spamassassin/site/logo/button-2-110x32.gif
    spamassassin/site/logo/2005-Christian_Rauh/logo-2384x1014-transparent.png
      - copied unchanged from r1674195, spamassassin/site/logo/logo-2384x1014-transparent.png
    spamassassin/site/logo/2005-Christian_Rauh/logo-2384x1014.png
      - copied unchanged from r1674195, spamassassin/site/logo/logo-2384x1014.png
    spamassassin/site/logo/2005-Christian_Rauh/logo-320x136.png
      - copied unchanged from r1674195, spamassassin/site/logo/logo-320x136.png
    spamassassin/site/logo/2005-Christian_Rauh/logo-bar-753x78.png
      - copied unchanged from r1674195, spamassassin/site/logo/logo-bar-753x78.png
    spamassassin/site/logo/2005-Christian_Rauh/logo-source-illustrator-11_0.ps
      - copied unchanged from r1674195, spamassassin/site/logo/logo-source-illustrator-11_0.ps
    spamassassin/site/logo/2005-Christian_Rauh/logo-source-illustrator-legacy-version.ps
      - copied unchanged from r1674195, spamassassin/site/logo/logo-source-illustrator-legacy-version.ps
    spamassassin/site/logo/2005-Christian_Rauh/logo-source.svg
      - copied unchanged from r1674195, spamassassin/site/logo/logo-source.svg
    spamassassin/site/logo/256-powered-by-spamassassin.png   (with props)
    spamassassin/site/logo/256-spamassassin.png   (with props)
    spamassassin/site/logo/32-spamassassin.png   (with props)
    spamassassin/site/logo/48-spamassassin.png   (with props)
    spamassassin/site/logo/512-powered-by-spamassassin.png   (with props)
    spamassassin/site/logo/README.txt
    spamassassin/site/logo/powered_by_spamassassin.psd   (with props)
    spamassassin/site/logo/spamassassin-350.png   (with props)
    spamassassin/site/logo/spamassassin-512.png   (with props)
    spamassassin/site/logo/spamassassin-logobar.png   (with props)
    spamassassin/site/logo/spamassassin.eps   (with props)
Removed:
    spamassassin/site/logo/button-1-110x32.gif
    spamassassin/site/logo/button-2-110x32.gif
    spamassassin/site/logo/logo-2384x1014-transparent.png
    spamassassin/site/logo/logo-2384x1014.png
    spamassassin/site/logo/logo-320x136.png
    spamassassin/site/logo/logo-bar-753x78.png
    spamassassin/site/logo/logo-source-illustrator-11_0.ps
    spamassassin/site/logo/logo-source-illustrator-legacy-version.ps
    spamassassin/site/logo/logo-source.svg
Modified:
    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/where.html

Modified: spamassassin/site/credits.html
URL: http://svn.apache.org/viewvc/spamassassin/site/credits.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/credits.html (original)
+++ spamassassin/site/credits.html Fri Apr 17 05:24:21 2015
@@ -188,9 +188,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/devel/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/devel/index.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/devel/index.html (original)
+++ spamassassin/site/devel/index.html Fri Apr 17 05:24:21 2015
@@ -257,9 +257,9 @@
         <tr>
           <td align="center">
             
-            Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+            Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
             
-            Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+            Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
              
           </td>
         </tr>

Modified: spamassassin/site/doc.html
URL: http://svn.apache.org/viewvc/spamassassin/site/doc.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/doc.html (original)
+++ spamassassin/site/doc.html Fri Apr 17 05:24:21 2015
@@ -281,9 +281,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/downloads.html
URL: http://svn.apache.org/viewvc/spamassassin/site/downloads.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/downloads.html (original)
+++ spamassassin/site/downloads.html Fri Apr 17 05:24:21 2015
@@ -257,7 +257,11 @@
           
         </li>
       </ul>
-      <a name="Packages" id="Packages"><h3>Packages</h3></a><ul>
+      <a name="Packages" id="Packages"><h3>Packages</h3></a><p>
+        <--
+        
+      </p>
+      <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.
           
@@ -288,6 +292,9 @@
             </li>
           </ul>
         </li>
+      </ul>
+-->
+      <ul>
         <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>
@@ -295,39 +302,37 @@
           </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>
+<!--
+      Other stuff regarding released versions
+      <hr />
+      <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><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.
+      </li></ul>-->
+             <a name="Current_Pre_Release_Development_Version_preversion" id="Current_Pre_Release_Development_Version_preversion"><h3>Current Pre-Release Development Version (3.4.1-rc2)</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.
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz">SpamAssassin in tar.gz</a> format. (signatures:
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.gz.sha1">SHA1</a>)
           
         </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>
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2">SpamAssassin in tar.bz2</a> format. (signatures:
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.tar.bz2.sha1">SHA1</a>)
+          
+        </li>
+        <li>
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip">SpamAssassin in ZIP</a> format. (signatures:
+          <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.asc">GPG</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.md5">MD5</a> <a href="http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-3.4.1-rc2.zip.sha1">SHA1</a>)
+          
         </li>
       </ul>
-<!--
-      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>
+      <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>,
@@ -394,9 +399,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/faq.html
URL: http://svn.apache.org/viewvc/spamassassin/site/faq.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/faq.html (original)
+++ spamassassin/site/faq.html Fri Apr 17 05:24:21 2015
@@ -196,9 +196,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/gtube.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/gtube.html (original)
+++ spamassassin/site/gtube.html Fri Apr 17 05:24:21 2015
@@ -212,9 +212,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/gtube/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube/index.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/gtube/index.html (original)
+++ spamassassin/site/gtube/index.html Fri Apr 17 05:24:21 2015
@@ -212,9 +212,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/hacking.html
URL: http://svn.apache.org/viewvc/spamassassin/site/hacking.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/hacking.html (original)
+++ spamassassin/site/hacking.html Fri Apr 17 05:24:21 2015
@@ -185,9 +185,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Added: spamassassin/site/images/spamassassin-logobar.png
URL: http://svn.apache.org/viewvc/spamassassin/site/images/spamassassin-logobar.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/images/spamassassin-logobar.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: spamassassin/site/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/index.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/index.html (original)
+++ spamassassin/site/index.html Fri Apr 17 05:24:21 2015
@@ -149,144 +149,152 @@
         <h2>Welcome</h2>
       </p>
       <blockquote>
-        <p>
-          Welcome to the home page for the open-source Apache SpamAssassin Project.
+        Welcome to the home page for the open-source Apache SpamAssassin Project.<p>
           
-        </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 />
+          Apache SpamAssassin is the #1 Open Source anti-spam platform giving system administrators a filter to classify email and block spam (unsolicited bulk email).<p>
             
-          </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>
+            It uses a robust scoring framework and plug-ins to integrate a wide range of advanced heuristic and statistical analysis tests on email headers and body text including text analysis, Bayesian filtering, DNS blocklists, and collaborative filtering databases.<p>
+              
+            </blockquote>
+            <p>
+              Apache SpamAssassin is a project of the Apache Software Foundation (ASF).
+              
+            </p>
+            <blockquote>
+              <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" title="An Apache Project" border="0" width="124" height="35" /></a>
-            </div>
-          </p>
-        </td>
-        <td valign="top">
-          <p>
-            <div align="middle" class="noimgborder">
-              <script type="text/javascript" src="http://www.ohloh.net/projects/4543/widgets/project_partner_badge">
+             </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" title="An Apache Project" border="0" width="124" height="35" /></a>
+                  </div>
+                </p>
+              </td>
+              <td valign="top">
+                <p>
+                  <div align="middle" class="noimgborder">
+                    <script type="text/javascript" src="http://www.ohloh.net/projects/4543/widgets/project_partner_badge">
+                      
+                    </script>
+                  </div>
+                </p>
+              </td>
+              <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" title="Site Built with WebMake" /></a>
+                  </div>
+                </p>
+              </td>
+            </tr>
+          </table>
+          <table align="center" width="90%">
+            <tr>
+              <td align="center">
                 
-              </script>
-            </div>
-          </p>
-        </td>
-        <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" title="Site Built with WebMake" /></a>
-            </div>
-          </p>
-        </td>
-      </tr>
-    </table>
-    <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>
-    <br />
-    &nbsp;
-     <!-- some anti-spam trapping links -->
-    <font size="-6">
-      <a href="mailto:sa_website@incoming.spamassassin.org"></a>
-    </font>
-    <font size="-6">
-      <a href="mailto:abanspam@taint.org"></a>
-    </font>
-    <font size="-6">
-      <a href="mailto:zbanspam@taint.org"></a>
-    </font>
-    <font size="-6">
-      <a href="http://SpamAssassin.taint.org/moreinfo.whtml"></a>
-    </font>
+                Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
+                
+                Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
+                 
+              </td>
+            </tr>
+          </table>
+          <br />
+          &nbsp;
+           <!-- some anti-spam trapping links -->
+          <font size="-6">
+            <a href="mailto:sa_website@incoming.spamassassin.org"></a>
+          </font>
+          <font size="-6">
+            <a href="mailto:abanspam@taint.org"></a>
+          </font>
+          <font size="-6">
+            <a href="mailto:zbanspam@taint.org"></a>
+          </font>
+          <font size="-6">
+            <a href="http://SpamAssassin.taint.org/moreinfo.whtml"></a>
+          </font>
 <!-- analytics -->
-    <!--etsafe-->
-        <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-      
-    </script>
-    <script type="text/javascript">
-      
-      _uacct = "UA-2299573-1";
-      urchinTracker();
-      
-    </script>
+          <!--etsafe-->
+                    <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+            
+          </script>
+          <script type="text/javascript">
+            
+            _uacct = "UA-2299573-1";
+            urchinTracker();
+            
+          </script>
 <!--/etsafe-->
-    <!-- /analytics -->
-      </body>
-</html>
+          <!-- /analytics -->
+                  </body>
+      </html>

Modified: spamassassin/site/lists.html
URL: http://svn.apache.org/viewvc/spamassassin/site/lists.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/lists.html (original)
+++ spamassassin/site/lists.html Fri Apr 17 05:24:21 2015
@@ -185,9 +185,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Added: spamassassin/site/logo/120x60-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/120x60-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/120x60-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/125x125-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/125x125-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/125x125-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/128-powered-by-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/128-powered-by-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/128-powered-by-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/128-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/128-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/128-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: spamassassin/site/logo/2005-Christian_Rauh/README.txt (from r1674195, spamassassin/site/logo/README.txt)
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/2005-Christian_Rauh/README.txt?p2=spamassassin/site/logo/2005-Christian_Rauh/README.txt&p1=spamassassin/site/logo/README.txt&r1=1674195&r2=1674212&rev=1674212&view=diff
==============================================================================
--- spamassassin/site/logo/README.txt (original)
+++ spamassassin/site/logo/2005-Christian_Rauh/README.txt Fri Apr 17 05:24:21 2015
@@ -1,4 +1,4 @@
-See http://bugzilla.spamassassin.org/show_bug.cgi?id=3803 for discussion.
+See https://bz.apache.org/SpamAssassin/show_bug.cgi?id=3803 for discussion.
 
 These images are licensed under the same terms as the SpamAssassin software
 itself.

Added: spamassassin/site/logo/256-powered-by-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/256-powered-by-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/256-powered-by-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/256-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/256-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/256-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/32-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/32-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/32-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/48-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/48-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/48-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/512-powered-by-spamassassin.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/512-powered-by-spamassassin.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/512-powered-by-spamassassin.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/README.txt
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/README.txt?rev=1674212&view=auto
==============================================================================
--- spamassassin/site/logo/README.txt (added)
+++ spamassassin/site/logo/README.txt Fri Apr 17 05:24:21 2015
@@ -0,0 +1,12 @@
+Thank you to James Thompson at cPanel, Inc. He drew and donated our newest
+logo for the project inspired by an American Indian "dream catcher".
+
+We are also providing the new powered by Apache SpamAssassin logo.  
+
+These images are licensed under the same terms as the Apache SpamAssassin 
+software itself.
+
+More information on usage of these logos is available at:
+  http://www.apache.org/foundation/press/kit/
+  http://www.apache.org/foundation/marks/
+

Added: spamassassin/site/logo/powered_by_spamassassin.psd
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/powered_by_spamassassin.psd?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/powered_by_spamassassin.psd
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/spamassassin-350.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/spamassassin-350.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/spamassassin-350.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/spamassassin-512.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/spamassassin-512.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/spamassassin-512.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/spamassassin-logobar.png
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/spamassassin-logobar.png?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/spamassassin-logobar.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: spamassassin/site/logo/spamassassin.eps
URL: http://svn.apache.org/viewvc/spamassassin/site/logo/spamassassin.eps?rev=1674212&view=auto
==============================================================================
Binary file - no diff available.

Propchange: spamassassin/site/logo/spamassassin.eps
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: spamassassin/site/main.wmk
URL: http://svn.apache.org/viewvc/spamassassin/site/main.wmk?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/main.wmk (original)
+++ spamassassin/site/main.wmk Fri Apr 17 05:24:21 2015
@@ -53,7 +53,7 @@
 <!-- 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.4.0-rc6</content>
+<content name="preversion">3.4.1-rc2</content>
 
 <content format="text/et" name="latest_news_snippet">
 
@@ -255,7 +255,14 @@ ${title}
 
 <h2>Welcome</h2>
 
-  Welcome to the home page for the open-source Apache SpamAssassin Project.
+  Welcome to the home page for the open-source Apache SpamAssassin Project.<p>
+
+  Apache SpamAssassin is the #1 Open Source anti-spam platform giving system administrators a filter to classify email and block "spam" (unsolicited bulk email).<p>
+
+  It uses a robust scoring framework and plug-ins to integrate a wide range of advanced heuristic and statistical analysis tests on email headers and body text including text analysis, Bayesian filtering, DNS blocklists, and collaborative filtering databases.<p>
+
+Apache SpamAssassin is a project of the Apache Software Foundation (ASF).
+
 
   <ul>
   <li><a href=http://wiki.apache.org/spamassassin/StartUsing>Click here</a> to get started using SpamAssassin!</li>
@@ -407,7 +414,7 @@ NOTE: This version is no longer supporte
 
 Packages
 ~~~~~~~~
-
+<--
   - **Fedora, Red Hat Enterprise Linux, CentOS, Scientific Linux users**: See <a href=http://www.spamtips.org/p/rpm-packages.html>SpamTips.org</a> for the latest upgrade directions.
 
   - **Debian users**: install SpamAssassin using:
@@ -425,11 +432,13 @@ Packages
       - NetBSD: ##mail/spamassassin##
 
       - OpenBSD: ##mail/p5-Mail-SpamAssassin##
+-->
 
   - **Everyone**: 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/">##Mail::SpamAssassin##</a>:
 
       ##sudo cpan Mail::SpamAssassin##
 
+<!--
 Other stuff regarding released versions
 ~~~~~~~~~~~~~~
 
@@ -443,27 +452,25 @@ Other stuff regarding released versions
     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.
+-->
 
-
-<!--
 Current Pre-Release Development Version (${preversion})
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz>SpamAssassin in tar.gz</a> format.  (signatures:
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.asc>GPG</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.md5>MD5</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.gz.sha1>SHA1</a>)
-
-  - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2>SpamAssassin in tar.bz2</a> format.  (signatures:
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.asc>GPG</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.md5>MD5</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.tar.bz2.sha1>SHA1</a>)
-
-  - <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip>SpamAssassin in ZIP</a> format.  (signatures:
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.asc>GPG</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.md5>MD5</a>
-    <a href=http://spamassassin.apache.org/released/Mail-SpamAssassin-${preversion}.zip.sha1>SHA1</a>)
--->
+  - <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.gz>SpamAssassin in tar.gz</a> format.  (signatures:
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.gz.asc>GPG</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.gz.md5>MD5</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.gz.sha1>SHA1</a>)
+
+  - <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.bz2>SpamAssassin in tar.bz2</a> format.  (signatures:
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.bz2.asc>GPG</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.bz2.md5>MD5</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.tar.bz2.sha1>SHA1</a>)
+
+  - <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.zip>SpamAssassin in ZIP</a> format.  (signatures:
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.zip.asc>GPG</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.zip.md5>MD5</a>
+    <a href=http://people.apache.org/~kmcgrail/devel/Mail-SpamAssassin-${preversion}.zip.sha1>SHA1</a>)
 
 <!--
 jm: not sure this note still applies (Aug 12 2005 jm)
@@ -854,8 +861,8 @@ Walk-throughs and How-To's
   <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.
+Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
+Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
     </td>
   </tr>
   </table><br>&nbsp;

Modified: spamassassin/site/news.html
URL: http://svn.apache.org/viewvc/spamassassin/site/news.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/news.html (original)
+++ spamassassin/site/news.html Fri Apr 17 05:24:21 2015
@@ -362,9 +362,9 @@
     <tr>
       <td align="center">
         
-        Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+        Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
         
-        Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+        Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
          
       </td>
     </tr>

Modified: spamassassin/site/presentations.html
URL: http://svn.apache.org/viewvc/spamassassin/site/presentations.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/presentations.html (original)
+++ spamassassin/site/presentations.html Fri Apr 17 05:24:21 2015
@@ -185,9 +185,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/released/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/released/index.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/released/index.html (original)
+++ spamassassin/site/released/index.html Fri Apr 17 05:24:21 2015
@@ -2913,9 +2913,9 @@
         <tr>
           <td align="center">
             
-            Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+            Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
             
-            Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+            Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
              
           </td>
         </tr>

Modified: spamassassin/site/sitewide.html
URL: http://svn.apache.org/viewvc/spamassassin/site/sitewide.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/sitewide.html (original)
+++ spamassassin/site/sitewide.html Fri Apr 17 05:24:21 2015
@@ -185,9 +185,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/tag/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/tag/index.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/tag/index.html (original)
+++ spamassassin/site/tag/index.html Fri Apr 17 05:24:21 2015
@@ -261,9 +261,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/tests.html
URL: http://svn.apache.org/viewvc/spamassassin/site/tests.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/tests.html (original)
+++ spamassassin/site/tests.html Fri Apr 17 05:24:21 2015
@@ -185,9 +185,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/users.html
URL: http://svn.apache.org/viewvc/spamassassin/site/users.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/users.html (original)
+++ spamassassin/site/users.html Fri Apr 17 05:24:21 2015
@@ -261,9 +261,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>

Modified: spamassassin/site/where.html
URL: http://svn.apache.org/viewvc/spamassassin/site/where.html?rev=1674212&r1=1674211&r2=1674212&view=diff
==============================================================================
--- spamassassin/site/where.html (original)
+++ spamassassin/site/where.html Fri Apr 17 05:24:21 2015
@@ -188,9 +188,9 @@
       <tr>
         <td align="center">
           
-          Copyright &copy; 2003-2014 The Apache Software Foundation. All rights reserved.<br />
+          Copyright &copy; 2003-2015 The Apache Software Foundation. All rights reserved.<br />
           
-          Apache SpamAssassin, SpamAssassin, and the SpamAssassin logo are trademarks of The Apache Software Foundation.
+          Apache, Apache SpamAssassin, and the Apache SpamAssassin logo are registered trademarks or trademarks of The Apache Software Foundation in the U.S. and/or other countries.
            
         </td>
       </tr>