You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2019/07/12 01:30:20 UTC

svn commit: r1862942 - in /spamassassin/site: doap.rdf doc.html downloads.html gtube.html gtube/index.html index.html news.html

Author: sidney
Date: Fri Jul 12 01:30:20 2019
New Revision: 1862942

URL: http://svn.apache.org/viewvc?rev=1862942&view=rev
Log:
Bug 7717 - Change wiki URLs on web site to link to new cwiki

Modified:
    spamassassin/site/doap.rdf
    spamassassin/site/doc.html
    spamassassin/site/downloads.html
    spamassassin/site/gtube.html
    spamassassin/site/gtube/index.html
    spamassassin/site/index.html
    spamassassin/site/news.html

Modified: spamassassin/site/doap.rdf
URL: http://svn.apache.org/viewvc/spamassassin/site/doap.rdf?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/doap.rdf (original)
+++ spamassassin/site/doap.rdf Fri Jul 12 01:30:20 2019
@@ -6,7 +6,7 @@
     <doap:created>2001-04-20</doap:created>
     <doap:description xml:lang="en">Apache SpamAssassin is an extensible email filter which is used to identify spam. Using its rule base, it uses a wide range of advanced heuristic and statistical analysis tests on mail headers and body text to identify &quot;spam&quot;, also known as unsolicited bulk email. Once identified, the mail can then be optionally tagged as spam for later filtering. It provides a command line tool to perform filtering, a client-server system to filter large volumes of mail, and Mail::SpamAssassin, a set of Perl modules.</doap:description>
     <doap:shortdesc xml:lang="en">Apache SpamAssassin is an email filter used to identify spam</doap:shortdesc>
-    <doap:wiki rdf:resource="http://wiki.apache.org/spamassassin/"/>
+    <doap:wiki rdf:resource="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/"/>
     <doap:bug-database rdf:resource="https://bz.apache.org/SpamAssassin/"/>
     <doap:mailing-list rdf:resource="http://news.gmane.org/thread.php?group=gmane.mail.spam.spamassassin.general"/>
     <doap:programming-language>Perl</doap:programming-language>

Modified: spamassassin/site/doc.html
URL: http://svn.apache.org/viewvc/spamassassin/site/doc.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/doc.html (original)
+++ spamassassin/site/doc.html Fri Jul 12 01:30:20 2019
@@ -96,13 +96,13 @@
                     &nbsp;<a href="news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -111,7 +111,7 @@
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -167,16 +167,16 @@
           
         </li>
         <li>
-          <a href="http://wiki.apache.org/spamassassin/">Wiki, including Frequently Asked Questions</a>.
+          <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki, including Frequently Asked Questions</a>.
           
         </li>
         <li>
-          <a href="http://wiki.apache.org/spamassassin/BooksAboutSpamAssassin">Books that cover SpamAssassin</a>.
+          <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/BooksAboutSpamAssassin">Books that cover SpamAssassin</a>.
           
         </li>
         <li>
           <p>
-            Some <a href="http://wiki.apache.org/spamassassin/PresentationsAndPapers">presentations and papers</a> about SpamAssassin.
+            Some <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/PresentationsAndPapers">presentations and papers</a> about SpamAssassin.
             
           </p>
         </li>
@@ -263,7 +263,7 @@
                 &nbsp;<a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
               </td>
               <td class="navibar" valign="top" align="center">
-                &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+                &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
               </td>
             </tr>
           </table>

Modified: spamassassin/site/downloads.html
URL: http://svn.apache.org/viewvc/spamassassin/site/downloads.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/downloads.html (original)
+++ spamassassin/site/downloads.html Fri Jul 12 01:30:20 2019
@@ -101,13 +101,13 @@
                     &nbsp;<a href="news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -116,7 +116,7 @@
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -142,14 +142,14 @@
     </p>
         <div style="padding: 50px;">
       <a name="title" id="title"><h1>Downloads</h1></a> <a name="Upgrading_From_an_Older_Version" id="Upgrading_From_an_Older_Version"><h3>Upgrading From an Older Version?</h3></a><blockquote>
-        If so, please take the time to read <a href="http://wiki.apache.org/spamassassin/UpgradeNotes">Upgrade
+        If so, please take the time to read <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/UpgradeNotes">Upgrade
         Notes</a> while you're downloading.
         
       </blockquote>
       <a name="Product_Information" id="Product_Information"><h3>Product Information</h3></a><blockquote>
         The <strong>core distribution</strong> consists of command line tools to
         perform filtering along with Mail::SpamAssassin, a set of perl
-        modules which allow SpamAssassin to be used in a <a href="http://wiki.apache.org/spamassassin/UsingSpamAssassin">wide
+        modules which allow SpamAssassin to be used in a <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/UsingSpamAssassin">wide
         range of products</a>.
         
       </blockquote>
@@ -236,7 +236,7 @@
         </li>
       </ul>
       <a name="Previously_Released_Branch_version_prevbranchrelversion" id="Previously_Released_Branch_version_prevbranchrelversion"><h3>Previously Released Branch version, 3.3.2</h3></a><p>
-        <em>NOTE: </em>This version is no longer supported. See <a href="https://wiki.apache.org/spamassassin/ReleaseGoals" target="_blank">https://wiki.apache.org/spamassassin/ReleaseGoals</a> for more information. <br />
+        <em>NOTE: </em>This version is no longer supported. See <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/ReleaseGoals" target="_blank">https://cwiki.apache.org/confluence/display/SPAMASSASSIN/ReleaseGoals</a> for more information. <br />
         
       </p>
       <ul>
@@ -278,7 +278,7 @@
         
       </p>
       <a name="Latest_bleeding_edge_code" id="Latest_bleeding_edge_code"><h3>Latest bleeding-edge code</h3></a><p>
-        The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="http://wiki.apache.org/spamassassin/DownloadFromSvn" target="_blank">http://wiki.apache.org/spamassassin/DownloadFromSvn</a> for more information.
+        The latest development version can be obtained at any given time from the SpamAssassin Subversion (SVN) repository. See <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/DownloadFromSvn" target="_blank">https://cwiki.apache.org/confluence/display/SPAMASSASSIN/DownloadFromSvn</a> for more information.
         
       </p>
       <p>
@@ -318,7 +318,7 @@
                 &nbsp;<a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
               </td>
               <td class="navibar" valign="top" align="center">
-                &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+                &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
               </td>
             </tr>
           </table>

Modified: spamassassin/site/gtube.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/gtube.html (original)
+++ spamassassin/site/gtube.html Fri Jul 12 01:30:20 2019
@@ -96,13 +96,13 @@
                     &nbsp;<a href="news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -111,7 +111,7 @@
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -201,7 +201,7 @@
                 &nbsp;<a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
               </td>
               <td class="navibar" valign="top" align="center">
-                &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+                &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
               </td>
             </tr>
           </table>

Modified: spamassassin/site/gtube/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/gtube/index.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/gtube/index.html (original)
+++ spamassassin/site/gtube/index.html Fri Jul 12 01:30:20 2019
@@ -96,13 +96,13 @@
                     &nbsp;<a href="../news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -111,7 +111,7 @@
                     &nbsp;<a href="../doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -201,7 +201,7 @@
                 &nbsp;<a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
               </td>
               <td class="navibar" valign="top" align="center">
-                &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+                &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
               </td>
             </tr>
           </table>

Modified: spamassassin/site/index.html
URL: http://svn.apache.org/viewvc/spamassassin/site/index.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/index.html (original)
+++ spamassassin/site/index.html Fri Jul 12 01:30:20 2019
@@ -102,13 +102,13 @@
                     &nbsp;<a href="news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="https://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="https://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="https://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -117,7 +117,7 @@
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="https://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -171,12 +171,12 @@
                 <p>
                   <ul>
                     <li>
-                      <a href="https://wiki.apache.org/spamassassin/StartUsing">Click here</a> to get started using SpamAssassin!
+                      <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/StartUsing">Click here</a> to get started using SpamAssassin!
                     </li>
                   </p>
                   <p>
                     <li>
-                      Looking for tips to improve your existing installation? <a href="https://wiki.apache.org/spamassassin/UsingSpamAssassin">Click here</a> for a variety of topics in our Wiki that might help.
+                      Looking for tips to improve your existing installation? <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/UsingSpamAssassin">Click here</a> for a variety of topics in our Wiki that might help.
                     </li>
                   </p>
                   <p>
@@ -232,7 +232,7 @@
                   </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="https://wiki.apache.org/spamassassin/UsingSpamAssassin">and many others</a>.
+                      <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="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/UsingSpamAssassin">and many others</a>.
                     </li>
                   </p>
                   <p>
@@ -267,7 +267,7 @@
                         &nbsp;<a target="_blank" href="https://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
                       </td>
                       <td class="navibar" valign="top" align="center">
-                        &nbsp;<a target="_blank" href="https://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+                        &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
                       </td>
                     </tr>
                   </table>

Modified: spamassassin/site/news.html
URL: http://svn.apache.org/viewvc/spamassassin/site/news.html?rev=1862942&r1=1862941&r2=1862942&view=diff
==============================================================================
--- spamassassin/site/news.html (original)
+++ spamassassin/site/news.html Fri Jul 12 01:30:20 2019
@@ -96,13 +96,13 @@
                     &nbsp;<a href="news.html">News</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/">Wiki</a>&nbsp;
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/">Wiki</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
                     &nbsp;<a href="http://spamassassin.apache.org/downloads.cgi?update=201809160000">Download</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/FrequentlyAskedQuestions">FAQ <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/FrequentlyAskedQuestions">FAQ <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -111,7 +111,7 @@
                     &nbsp;<a href="doc.html">Docs</a>&nbsp;
                   </td>
                   <td class="navibar" valign="top" align="center">
-                    &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/MailingLists">Mailing Lists <font size="-2">
+                    &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Mailing Lists <font size="-2">
                       (Wiki)
                     </font>
 </a>&nbsp;
@@ -189,13 +189,13 @@
           
         </p>
         <p>
-          Versions of the <a href="http://wiki.apache.org/spamassassin/Rules/FH_DATE_PAST_20XX">FH_DATE_PAST_20XX</a> rule released with versions of Apache SpamAssassin 3.2.0 thru 3.2.5 will trigger on most mail with a Date header that includes the year 2010 or later.&nbsp; The rule will add a score of up to 3.6 towards the spam classification of all email.&nbsp; You should take corrective action immediately; there are two easy ways to correct the problem:
+          Versions of the <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/Rules/FH_DATE_PAST_20XX">FH_DATE_PAST_20XX</a> rule released with versions of Apache SpamAssassin 3.2.0 thru 3.2.5 will trigger on most mail with a Date header that includes the year 2010 or later.&nbsp; The rule will add a score of up to 3.6 towards the spam classification of all email.&nbsp; You should take corrective action immediately; there are two easy ways to correct the problem:
           
         </p>
         <p>
           <ul>
             <li>
-              If your system is configured to use <a href="http://wiki.apache.org/spamassassin/RuleUpdates">sa-update</a> <b>run sa-update now</b>.&nbsp; An update is available that will correct the rule.&nbsp; No further action is necessary (other than restarting spamd or any service that uses SpamAssassin directly).
+              If your system is configured to use <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/RuleUpdates">sa-update</a> <b>run sa-update now</b>.&nbsp; An update is available that will correct the rule.&nbsp; No further action is necessary (other than restarting spamd or any service that uses SpamAssassin directly).
             </li>
           </ul>
         </p>
@@ -207,7 +207,7 @@
           </ul>
         </p>
         <p>
-          If you require help updating your rules to correct this issue you are encouraged to ask for assistance on the Apache SpamAssassin Users' list.&nbsp; <a href="http://wiki.apache.org/spamassassin/MailingLists">Users' mailing list info is here</a>.
+          If you require help updating your rules to correct this issue you are encouraged to ask for assistance on the Apache SpamAssassin Users' list.&nbsp; <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">Users' mailing list info is here</a>.
         </p>
         <p>
           On behalf of the Apache SpamAssassin project I apologize for this error and the grief it may have caused you.
@@ -340,7 +340,7 @@
       <h2>Subscribing</h2>
     </p>
     <blockquote>
-      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="http://mail-archives.apache.org/mod_mbox/spamassassin-announce/?format=atom">Atom feed</a>.
+      News about SpamAssassin, and new releases, can be received by mail by <a href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/MailingLists">subscribing to the "announce" mailing list</a>. There is also an <a href="http://mail-archives.apache.org/mod_mbox/spamassassin-announce/?format=atom">Atom feed</a>.
       
     </blockquote>
 <!--
@@ -368,7 +368,7 @@
               &nbsp;<a target="_blank" href="http://www.apache.org/foundation/thanks.html">Thanks</a>&nbsp;
             </td>
             <td class="navibar" valign="top" align="center">
-              &nbsp;<a target="_blank" href="http://wiki.apache.org/spamassassin/SecurityPolicy">Security</a>&nbsp;
+              &nbsp;<a target="_blank" href="https://cwiki.apache.org/confluence/display/SPAMASSASSIN/SecurityPolicy">Security</a>&nbsp;
             </td>
           </tr>
         </table>