You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/05 15:29:21 UTC

svn commit: r1860670 - in /tomcat/site/trunk: docs/ xdocs/ xdocs/stylesheets/

Author: markt
Date: Wed Jun  5 15:29:20 2019
New Revision: 1860670

URL: http://svn.apache.org/viewvc?rev=1860670&view=rev
Log:
Update wiki links to point to Confluence

Modified:
    tomcat/site/trunk/docs/bugreport.html
    tomcat/site/trunk/docs/ci.html
    tomcat/site/trunk/docs/conference.html
    tomcat/site/trunk/docs/contact.html
    tomcat/site/trunk/docs/download-70.html
    tomcat/site/trunk/docs/download-80.html
    tomcat/site/trunk/docs/download-90.html
    tomcat/site/trunk/docs/download-connectors.html
    tomcat/site/trunk/docs/download-native.html
    tomcat/site/trunk/docs/download-taglibs.html
    tomcat/site/trunk/docs/findhelp.html
    tomcat/site/trunk/docs/getinvolved.html
    tomcat/site/trunk/docs/heritage.html
    tomcat/site/trunk/docs/index.html
    tomcat/site/trunk/docs/irc.html
    tomcat/site/trunk/docs/legal.html
    tomcat/site/trunk/docs/lists.html
    tomcat/site/trunk/docs/maven-plugin.html
    tomcat/site/trunk/docs/migration-6.html
    tomcat/site/trunk/docs/migration-7.html
    tomcat/site/trunk/docs/migration-8.html
    tomcat/site/trunk/docs/migration-85.html
    tomcat/site/trunk/docs/migration-9.html
    tomcat/site/trunk/docs/migration.html
    tomcat/site/trunk/docs/oldnews-2010.html
    tomcat/site/trunk/docs/oldnews-2011.html
    tomcat/site/trunk/docs/oldnews-2012.html
    tomcat/site/trunk/docs/oldnews-2013.html
    tomcat/site/trunk/docs/oldnews-2014.html
    tomcat/site/trunk/docs/oldnews-2015.html
    tomcat/site/trunk/docs/oldnews-2016.html
    tomcat/site/trunk/docs/oldnews-2017.html
    tomcat/site/trunk/docs/oldnews-2018.html
    tomcat/site/trunk/docs/oldnews.html
    tomcat/site/trunk/docs/presentations.html
    tomcat/site/trunk/docs/resources.html
    tomcat/site/trunk/docs/security-3.html
    tomcat/site/trunk/docs/security-4.html
    tomcat/site/trunk/docs/security-5.html
    tomcat/site/trunk/docs/security-6.html
    tomcat/site/trunk/docs/security-7.html
    tomcat/site/trunk/docs/security-8.html
    tomcat/site/trunk/docs/security-9.html
    tomcat/site/trunk/docs/security-impact.html
    tomcat/site/trunk/docs/security-jk.html
    tomcat/site/trunk/docs/security-native.html
    tomcat/site/trunk/docs/security-taglibs.html
    tomcat/site/trunk/docs/security.html
    tomcat/site/trunk/docs/source.html
    tomcat/site/trunk/docs/taglibs.html
    tomcat/site/trunk/docs/tomcat-55-eol.html
    tomcat/site/trunk/docs/tomcat-60-eol.html
    tomcat/site/trunk/docs/tomcat-80-eol.html
    tomcat/site/trunk/docs/tools.html
    tomcat/site/trunk/docs/whichversion.html
    tomcat/site/trunk/docs/whoweare.html
    tomcat/site/trunk/xdocs/getinvolved.xml
    tomcat/site/trunk/xdocs/index.xml
    tomcat/site/trunk/xdocs/migration-7.xml
    tomcat/site/trunk/xdocs/migration-8.xml
    tomcat/site/trunk/xdocs/migration-9.xml
    tomcat/site/trunk/xdocs/oldnews-2014.xml
    tomcat/site/trunk/xdocs/resources.xml
    tomcat/site/trunk/xdocs/security-6.xml
    tomcat/site/trunk/xdocs/security-7.xml
    tomcat/site/trunk/xdocs/security-8.xml
    tomcat/site/trunk/xdocs/security-native.xml
    tomcat/site/trunk/xdocs/stylesheets/project.xml
    tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/bugreport.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/ci.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/conference.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/conference.html (original)
+++ tomcat/site/trunk/docs/conference.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/contact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/contact.html (original)
+++ tomcat/site/trunk/docs/contact.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-70.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-70.html (original)
+++ tomcat/site/trunk/docs/download-70.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-80.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-90.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-90.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-90.html (original)
+++ tomcat/site/trunk/docs/download-90.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-connectors.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-connectors.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-connectors.html (original)
+++ tomcat/site/trunk/docs/download-connectors.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-native.html (original)
+++ tomcat/site/trunk/docs/download-native.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/download-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-taglibs.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/download-taglibs.html (original)
+++ tomcat/site/trunk/docs/download-taglibs.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/findhelp.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/getinvolved.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/getinvolved.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/getinvolved.html (original)
+++ tomcat/site/trunk/docs/getinvolved.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -222,8 +222,10 @@ few areas ways in which you can help:</p
 <li>Answer questions posted to the <a href="lists.html">mailing lists</a>.
       </li>
   
-<li>Contribute to the <a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a> or
-      <a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>.</li>
+<li>Contribute to the
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
+      or
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>.</li>
   
 <li>Contribute other documentation patches, either for the website or for the
       Apache Tomcat user documentation.</li>

Modified: tomcat/site/trunk/docs/heritage.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/heritage.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/heritage.html (original)
+++ tomcat/site/trunk/docs/heritage.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/index.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Wed Jun  5 15:29:20 2019
@@ -101,7 +101,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -121,7 +121,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -234,7 +234,8 @@ development project.  To learn more abou
 <p>Apache Tomcat software powers numerous large-scale, mission-critical web
 applications across a diverse range of industries and organizations.  Some of
 these users and their stories are listed on the
-<a href="https://wiki.apache.org/tomcat/PoweredBy">PoweredBy</a> wiki page.</p>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/PoweredBy">PoweredBy</a>
+wiki page.</p>
 
 
 <p>Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat

Modified: tomcat/site/trunk/docs/irc.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/irc.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/irc.html (original)
+++ tomcat/site/trunk/docs/irc.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/legal.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/lists.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/maven-plugin.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/maven-plugin.html (original)
+++ tomcat/site/trunk/docs/maven-plugin.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/migration-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-6.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-6.html (original)
+++ tomcat/site/trunk/docs/migration-6.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/migration-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-7.html (original)
+++ tomcat/site/trunk/docs/migration-7.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -329,7 +329,7 @@ of Apache Tomcat.</p>
     
 <p>Apache Tomcat 7 supports Java Servlet 3.0, JavaServer Pages 2.2,
     Expression Language 2.2 and WebSocket 1.1
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/docs/migration-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-8.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-8.html (original)
+++ tomcat/site/trunk/docs/migration-8.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -314,7 +314,7 @@ of Apache Tomcat.</p>
     
 <p>Apache Tomcat 8 supports the Java Servlet 3.1, JavaServer Pages 2.3,
     Java Unified Expression Language 3.0 and Java API for WebSocket 1.1
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/docs/migration-85.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-85.html (original)
+++ tomcat/site/trunk/docs/migration-85.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/migration-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration-9.html (original)
+++ tomcat/site/trunk/docs/migration-9.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -330,7 +330,7 @@ of Apache Tomcat.</p>
     
 <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
     Java Unified Expression Language 3.1 and Java API for WebSocket 2.0
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/docs/migration.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/migration.html (original)
+++ tomcat/site/trunk/docs/migration.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2010.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2010.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2010.html (original)
+++ tomcat/site/trunk/docs/oldnews-2010.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2011.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2011.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2011.html (original)
+++ tomcat/site/trunk/docs/oldnews-2011.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2012.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2012.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2012.html (original)
+++ tomcat/site/trunk/docs/oldnews-2012.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2013.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2013.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2013.html (original)
+++ tomcat/site/trunk/docs/oldnews-2013.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2014.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2014.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2014.html (original)
+++ tomcat/site/trunk/docs/oldnews-2014.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -812,9 +812,7 @@ Tomcat Native. The notable changes since
 <ul>
   
 <li>Windows binaries are linked with OpenSSL 1.0.1g. This provides a fix
-   for <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0160" rel="nofollow">CVE-2014-0160</a>
-   (<a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>)
-   SSL vulnerability.</li>
+   for <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0160" rel="nofollow">CVE-2014-0160</a> SSL vulnerability.</li>
   
 <li>Add support for ECDHE ciphers. (<a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=55915">55915</a>)</li>
 

Modified: tomcat/site/trunk/docs/oldnews-2015.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2015.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2015.html (original)
+++ tomcat/site/trunk/docs/oldnews-2015.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2016.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2016.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2016.html (original)
+++ tomcat/site/trunk/docs/oldnews-2016.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2017.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2017.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2017.html (original)
+++ tomcat/site/trunk/docs/oldnews-2017.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews-2018.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews-2018.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews-2018.html (original)
+++ tomcat/site/trunk/docs/oldnews-2018.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/oldnews.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/oldnews.html (original)
+++ tomcat/site/trunk/docs/oldnews.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/presentations.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/presentations.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/presentations.html (original)
+++ tomcat/site/trunk/docs/presentations.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/resources.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/resources.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/resources.html (original)
+++ tomcat/site/trunk/docs/resources.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -212,12 +212,12 @@
 <div class="text">
 
   
-<p>A <a href="https://wiki.apache.org/tomcat/AddOns">list of third party
-  tools and add-ons</a> (most of them free) is maintained on the
-  <a href="https://wiki.apache.org/tomcat/FrontPage">Apache Tomcat wiki</a>.
-  Please note that the Apache Tomcat project doesn't endorse any of the products
-  listed. If you use or develop a tool or add-on for Apache Tomcat please feel
-  free to add it to the list on the wiki.</p>
+<p>A <a href="https://cwiki.apache.org/confluence/display/TOMCAT/AddOns">list
+  of third party tools and add-ons</a> (most of them free) is maintained on the
+  <a href="https://cwiki.apache.org/confluence/display/TOMCAT">Apache Tomcat
+  wiki</a>. Please note that the Apache Tomcat project doesn't endorse any of
+  the products listed. If you use or develop a tool or add-on for Apache Tomcat
+  please feel free to add it to the list on the wiki.</p>
 
 
 </div>
@@ -238,7 +238,8 @@
       Apache Web Server (httpd) or Microsoft IIS and Apache Tomcat. Some of
       these documents are more up to date than others. Links to some of the more
       useful documents are listed on the Apache Tomcat wiki's
-      <a href="https://wiki.apache.org/tomcat/UsefulLinks">useful links</a> page.
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT/UsefulLinks">useful
+      links</a> page.
     </li>
     
 <li>

Modified: tomcat/site/trunk/docs/security-3.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-3.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-3.html (original)
+++ tomcat/site/trunk/docs/security-3.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-4.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-5.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-6.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -2586,12 +2586,6 @@
         ship with patched versions of OpenSSL.</p>
 
     
-<p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
-    
 <p>This issue was first announced on 7 April 2014.</p>
 
     

Modified: tomcat/site/trunk/docs/security-7.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -2955,12 +2955,6 @@
         ship with patched versions of OpenSSL.</p>
 
     
-<p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
-    
 <p>This issue was first announced on 7 April 2014.</p>
 
     

Modified: tomcat/site/trunk/docs/security-8.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-8.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-8.html (original)
+++ tomcat/site/trunk/docs/security-8.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -2426,12 +2426,6 @@
         ship with patched versions of OpenSSL.</p>
 
     
-<p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
-    
 <p>This issue was first announced on 7 April 2014.</p>
 
     

Modified: tomcat/site/trunk/docs/security-9.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-9.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-9.html (original)
+++ tomcat/site/trunk/docs/security-9.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-impact.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-impact.html (original)
+++ tomcat/site/trunk/docs/security-impact.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-jk.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-jk.html (original)
+++ tomcat/site/trunk/docs/security-jk.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security-native.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-native.html (original)
+++ tomcat/site/trunk/docs/security-native.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -379,12 +379,6 @@
         ship with patched versions of OpenSSL.</p>
 
     
-<p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
-    
 <p>This issue was first announced on 7 April 2014.</p>
 
     

Modified: tomcat/site/trunk/docs/security-taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-taglibs.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-taglibs.html (original)
+++ tomcat/site/trunk/docs/security-taglibs.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/security.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security.html (original)
+++ tomcat/site/trunk/docs/security.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/source.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/source.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/source.html (original)
+++ tomcat/site/trunk/docs/source.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/taglibs.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/taglibs.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/taglibs.html (original)
+++ tomcat/site/trunk/docs/taglibs.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/tomcat-55-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-55-eol.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-55-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-55-eol.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/tomcat-60-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-60-eol.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-60-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-60-eol.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/tomcat-80-eol.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-80-eol.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tomcat-80-eol.html (original)
+++ tomcat/site/trunk/docs/tomcat-80-eol.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/tools.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tools.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/tools.html (original)
+++ tomcat/site/trunk/docs/tools.html Wed Jun  5 15:29:20 2019
@@ -100,7 +100,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -120,7 +120,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/docs/whichversion.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Wed Jun  5 15:29:20 2019
@@ -102,7 +102,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -122,7 +122,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>
@@ -216,8 +216,9 @@
 <p>Apache Tomcat<sup>&reg;</sup> is an open source software implementation of the Java Servlet
 and JavaServer Pages technologies. Different versions of Apache Tomcat are
 available for different versions of the Servlet and JSP specifications. The
-mapping between <a href="https://wiki.apache.org/tomcat/Specifications">the specifications</a>
-and the respective Apache Tomcat versions is:
+mapping between
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">the
+specifications</a> and the respective Apache Tomcat versions is:
 </p>
 
 

Modified: tomcat/site/trunk/docs/whoweare.html
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whoweare.html?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/docs/whoweare.html (original)
+++ tomcat/site/trunk/docs/whoweare.html Wed Jun  5 15:29:20 2019
@@ -99,7 +99,7 @@
 <a href="./native-doc/">Tomcat Native</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>
 </li>
 <li>
 <a href="./migration.html">Migration Guide</a>
@@ -119,7 +119,7 @@
 <a href="./findhelp.html">Find help</a>
 </li>
 <li>
-<a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
 </li>
 <li>
 <a href="./lists.html">Mailing Lists</a>

Modified: tomcat/site/trunk/xdocs/getinvolved.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/getinvolved.xml (original)
+++ tomcat/site/trunk/xdocs/getinvolved.xml Wed Jun  5 15:29:20 2019
@@ -17,8 +17,10 @@ few areas ways in which you can help:</p
 <ul>
   <li>Answer questions posted to the <a href="lists.html">mailing lists</a>.
       </li>
-  <li>Contribute to the <a href="https://wiki.apache.org/tomcat/FAQ">FAQ</a> or
-      <a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a>.</li>
+  <li>Contribute to the
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ">FAQ</a>
+      or
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT">Wiki</a>.</li>
   <li>Contribute other documentation patches, either for the website or for the
       Apache Tomcat user documentation.</li>
   <li><a href="https://bz.apache.org/bugzilla/">Investigate bugs</a> that have

Modified: tomcat/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Wed Jun  5 15:29:20 2019
@@ -32,7 +32,8 @@ development project.  To learn more abou
 <p>Apache Tomcat software powers numerous large-scale, mission-critical web
 applications across a diverse range of industries and organizations.  Some of
 these users and their stories are listed on the
-<a href="https://wiki.apache.org/tomcat/PoweredBy">PoweredBy</a> wiki page.</p>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/PoweredBy">PoweredBy</a>
+wiki page.</p>
 
 <p>Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.</p>

Modified: tomcat/site/trunk/xdocs/migration-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-7.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-7.xml (original)
+++ tomcat/site/trunk/xdocs/migration-7.xml Wed Jun  5 15:29:20 2019
@@ -36,7 +36,7 @@ of Apache Tomcat.</p>
 
     <p>Apache Tomcat 7 supports Java Servlet 3.0, JavaServer Pages 2.2,
     Expression Language 2.2 and WebSocket 1.1
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/xdocs/migration-8.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-8.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-8.xml (original)
+++ tomcat/site/trunk/xdocs/migration-8.xml Wed Jun  5 15:29:20 2019
@@ -36,7 +36,7 @@ of Apache Tomcat.</p>
 
     <p>Apache Tomcat 8 supports the Java Servlet 3.1, JavaServer Pages 2.3,
     Java Unified Expression Language 3.0 and Java API for WebSocket 1.1
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/xdocs/migration-9.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/migration-9.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/migration-9.xml (original)
+++ tomcat/site/trunk/xdocs/migration-9.xml Wed Jun  5 15:29:20 2019
@@ -37,7 +37,7 @@ of Apache Tomcat.</p>
 
     <p>Apache Tomcat 9 supports the Java Servlet 4.0, JavaServer Pages 2.4,
     Java Unified Expression Language 3.1 and Java API for WebSocket 2.0
-    <a href="https://wiki.apache.org/tomcat/Specifications">specifications</a>.
+    <a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">specifications</a>.
     The changes between versions of specifications may be found in the
     <em>Changes</em> appendix in each of specification documents.
     </p>

Modified: tomcat/site/trunk/xdocs/oldnews-2014.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/oldnews-2014.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/oldnews-2014.xml (original)
+++ tomcat/site/trunk/xdocs/oldnews-2014.xml Wed Jun  5 15:29:20 2019
@@ -397,9 +397,7 @@ Tomcat Native. The notable changes since
 </p>
 <ul>
   <li>Windows binaries are linked with OpenSSL 1.0.1g. This provides a fix
-   for <cve>CVE-2014-0160</cve>
-   (<a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>)
-   SSL vulnerability.</li>
+   for <cve>CVE-2014-0160</cve> SSL vulnerability.</li>
   <li>Add support for ECDHE ciphers. (<bug>55915</bug>)</li>
 </ul>
 <p style="text-align: center;">

Modified: tomcat/site/trunk/xdocs/resources.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/resources.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/resources.xml (original)
+++ tomcat/site/trunk/xdocs/resources.xml Wed Jun  5 15:29:20 2019
@@ -10,12 +10,12 @@
 
 <section name="Third party tools and add-ons">
 
-  <p>A <a href="https://wiki.apache.org/tomcat/AddOns">list of third party
-  tools and add-ons</a> (most of them free) is maintained on the
-  <a href="https://wiki.apache.org/tomcat/FrontPage">Apache Tomcat wiki</a>.
-  Please note that the Apache Tomcat project doesn't endorse any of the products
-  listed. If you use or develop a tool or add-on for Apache Tomcat please feel
-  free to add it to the list on the wiki.</p>
+  <p>A <a href="https://cwiki.apache.org/confluence/display/TOMCAT/AddOns">list
+  of third party tools and add-ons</a> (most of them free) is maintained on the
+  <a href="https://cwiki.apache.org/confluence/display/TOMCAT">Apache Tomcat
+  wiki</a>. Please note that the Apache Tomcat project doesn't endorse any of
+  the products listed. If you use or develop a tool or add-on for Apache Tomcat
+  please feel free to add it to the list on the wiki.</p>
 
 </section>
 
@@ -31,7 +31,8 @@
       Apache Web Server (httpd) or Microsoft IIS and Apache Tomcat. Some of
       these documents are more up to date than others. Links to some of the more
       useful documents are listed on the Apache Tomcat wiki&apos;s
-      <a href="https://wiki.apache.org/tomcat/UsefulLinks">useful links</a> page.
+      <a href="https://cwiki.apache.org/confluence/display/TOMCAT/UsefulLinks">useful
+      links</a> page.
     </li>
     <li>
       <b><a href="articles/performance.pdf">Tomcat Performance</a></b>, 

Modified: tomcat/site/trunk/xdocs/security-6.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Wed Jun  5 15:29:20 2019
@@ -1623,11 +1623,6 @@
         include this vulnerable version of OpenSSL. tcnative 1.1.30 and later
         ship with patched versions of OpenSSL.</p>
 
-    <p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
     <p>This issue was first announced on 7 April 2014.</p>
 
     <p>Affects: OpenSSL 1.0.1-1.0.1f, tcnative 1.1.24-1.1.29</p>

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Wed Jun  5 15:29:20 2019
@@ -1860,11 +1860,6 @@
         include this vulnerable version of OpenSSL. tcnative 1.1.30 and later
         ship with patched versions of OpenSSL.</p>
 
-    <p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
     <p>This issue was first announced on 7 April 2014.</p>
 
     <p>Affects: OpenSSL 1.0.1-1.0.1f, tcnative 1.1.24-1.1.29</p>

Modified: tomcat/site/trunk/xdocs/security-8.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-8.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-8.xml (original)
+++ tomcat/site/trunk/xdocs/security-8.xml Wed Jun  5 15:29:20 2019
@@ -1507,11 +1507,6 @@
         include this vulnerable version of OpenSSL. tcnative 1.1.30 and later
         ship with patched versions of OpenSSL.</p>
 
-    <p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
     <p>This issue was first announced on 7 April 2014.</p>
 
     <p>Affects: OpenSSL 1.0.1-1.0.1f, tcnative 1.1.24-1.1.29</p>

Modified: tomcat/site/trunk/xdocs/security-native.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-native.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-native.xml (original)
+++ tomcat/site/trunk/xdocs/security-native.xml Wed Jun  5 15:29:20 2019
@@ -122,11 +122,6 @@
         include this vulnerable version of OpenSSL. tcnative 1.1.30 and later
         ship with patched versions of OpenSSL.</p>
 
-    <p>An explanation of how to deterine whether you are vulnerable and what
-        steps to take, see the Tomcat Wiki's
-        <a href="https://wiki.apache.org/tomcat/Security/Heartbleed">Heartbleed</a>
-        page.</p>
-
     <p>This issue was first announced on 7 April 2014.</p>
 
     <p>Affects: OpenSSL 1.0.1-1.0.1f, tcnative 1.1.24-1.1.29</p>

Modified: tomcat/site/trunk/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/project.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/stylesheets/project.xml (original)
+++ tomcat/site/trunk/xdocs/stylesheets/project.xml Wed Jun  5 15:29:20 2019
@@ -33,7 +33,7 @@
         <item name="Tomcat 7.0"               href="/tomcat-7.0-doc/index.html"/>
         <item name="Tomcat Connectors"        href="/connectors-doc/"/>
         <item name="Tomcat Native"            href="/native-doc/"/>
-        <item name="Wiki"                     href="https://wiki.apache.org/tomcat/FrontPage"/>
+        <item name="Wiki"                     href="https://cwiki.apache.org/confluence/display/TOMCAT"/>
         <item name="Migration Guide"          href="/migration.html"/>
         <item name="Presentations"            href="/presentations.html"/>
     </menu>
@@ -41,7 +41,7 @@
     <menu name="Problems?">
         <item name="Security Reports"         href="/security.html"/>
         <item name="Find help"                href="/findhelp.html"/>
-        <item name="FAQ"                      href="https://wiki.apache.org/tomcat/FAQ"/>
+        <item name="FAQ"                      href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ"/>
         <item name="Mailing Lists"            href="/lists.html"/>
         <item name="Bug Database"             href="/bugreport.html"/>
         <item name="IRC"                      href="/irc.html"/>

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1860670&r1=1860669&r2=1860670&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Wed Jun  5 15:29:20 2019
@@ -14,8 +14,9 @@
 <p>Apache Tomcat<sup>&#174;</sup> is an open source software implementation of the Java Servlet
 and JavaServer Pages technologies. Different versions of Apache Tomcat are
 available for different versions of the Servlet and JSP specifications. The
-mapping between <a href="https://wiki.apache.org/tomcat/Specifications">the specifications</a>
-and the respective Apache Tomcat versions is:
+mapping between
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications">the
+specifications</a> and the respective Apache Tomcat versions is:
 </p>
 
 <table class="detail-table">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org