Author: markt
Date: Wed Jun 5 19:18:59 2019
New Revision: 1860679
URL: http://svn.apache.org/viewvc?rev=1860679&view=rev
Log:
More wiki changes
Modified:
tomcat/site/trunk/docs/bugreport.html
tomcat/site/trunk/docs/findhelp.html
tomcat/site/trunk/docs/lists.html
tomcat/site/trunk/xdocs/bugreport.xml
tomcat/site/trunk/xdocs/findhelp.xml
tomcat/site/trunk/xdocs/lists.xml
Modified: tomcat/site/trunk/docs/bugreport.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/docs/bugreport.html (original)
+++ tomcat/site/trunk/docs/bugreport.html Wed Jun 5 19:18:59 2019
@@ -360,12 +360,13 @@ problem you are having before reporting
<li>
<b>Wiki</b> – Search the
- <a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>.
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a>.
That is unofficial documentation to which everyone can contribute.
</li>
<li>
-<b>FAQ's</b> – Search the <a href="https://wiki.apache.org/tomcat/FAQ";>
+<b>FAQ's</b> – Search the
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>
Tomcat Frequently Asked Questions</a> that is part of the Wiki.</li>
</ul>
Modified: tomcat/site/trunk/docs/findhelp.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/findhelp.html?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/docs/findhelp.html (original)
+++ tomcat/site/trunk/docs/findhelp.html Wed Jun 5 19:18:59 2019
@@ -220,9 +220,10 @@ of help are presented in the same order
<p>The first resource to check is the documentation. In addition to the Tomcat
documentation (make sure you check the documentation for the version you are
using) you should also check the relevant Servlet and/or JSP
-<a href="https://wiki.apache.org/tomcat/Specifications";>Specification</a>
documents.
-Much of Tomcat's behaviour is determined by these specifications and the
information in
-them is not typically duplicated in the Tomcat documentation.</p>
+<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications";>Specification</a>
+documents. Much of Tomcat's behaviour is determined by these specifications and
+the information in them is not typically duplicated in the Tomcat
+documentation.</p>
<p>The documentation is searchable – see input box at the top of the
@@ -242,7 +243,7 @@ favourite search engine to try and find
<p>Answers to very common questions are documented on the
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>.</p>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a>.</p>
<p>The archives for the user mailing list are a rich source of useful
@@ -274,7 +275,8 @@ available from past Apache conferences a
<p>A list of organisations that provide support and training for Apache Tomcat
is maintained on the
-<a href="https://wiki.apache.org/tomcat/SupportAndTraining";>Tomcat
Wiki</a>.</p>
+<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/SupportAndTraining";>Tomcat
+Wiki</a>.</p>
</div>
Modified: tomcat/site/trunk/docs/lists.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/lists.html?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/docs/lists.html (original)
+++ tomcat/site/trunk/docs/lists.html Wed Jun 5 19:18:59 2019
@@ -349,9 +349,12 @@ Tomcat questions to Eric or Rick themsel
"Tomcat 8.0" or "Tomcat 7.0" to your query to refine your results. The
tomcat-users mailing list archives (links are below) are also
searchable.</li>
-<li>The <a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a> and
- <a href="https://wiki.apache.org/tomcat/HowTo";>How To</a> pages
- are available at the <a
href="https://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a>.</li>
+<li>The
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a> and
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/HowTo";>How To</a>
+ pages are available at the
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Tomcat
+ Wiki</a>.</li>
<li>Usage of these mailing lists is subject to the
<a href="http://www.apache.org/foundation/public-archives.html";>Public Forum
Archive Policy</a>.</li>
Modified: tomcat/site/trunk/xdocs/bugreport.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/bugreport.xml?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/bugreport.xml (original)
+++ tomcat/site/trunk/xdocs/bugreport.xml Wed Jun 5 19:18:59 2019
@@ -75,10 +75,11 @@ problem you are having before reporting
reached Tomcat and what was Tomcat's response to them.
</li>
<li><b>Wiki</b> – Search the
- <a href="https://wiki.apache.org/tomcat/FrontPage";>Wiki</a>.
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Wiki</a>.
That is unofficial documentation to which everyone can contribute.
</li>
- <li><b>FAQ's</b> – Search the <a
href="https://wiki.apache.org/tomcat/FAQ";>
+ <li><b>FAQ's</b> – Search the
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>
Tomcat Frequently Asked Questions</a> that is part of the Wiki.</li>
</ul>
</subsection>
Modified: tomcat/site/trunk/xdocs/findhelp.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/findhelp.xml?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/findhelp.xml (original)
+++ tomcat/site/trunk/xdocs/findhelp.xml Wed Jun 5 19:18:59 2019
@@ -17,9 +17,10 @@ of help are presented in the same order
<p>The first resource to check is the documentation. In addition to the Tomcat
documentation (make sure you check the documentation for the version you are
using) you should also check the relevant Servlet and/or JSP
-<a href="https://wiki.apache.org/tomcat/Specifications";>Specification</a>
documents.
-Much of Tomcat's behaviour is determined by these specifications and the
information in
-them is not typically duplicated in the Tomcat documentation.</p>
+<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Servlet+and+JSP+specifications";>Specification</a>
+documents. Much of Tomcat's behaviour is determined by these specifications and
+the information in them is not typically duplicated in the Tomcat
+documentation.</p>
<p>The documentation is searchable – see input box at the top of the
page. To limit results to a specific major version of Apache Tomcat you can
@@ -35,7 +36,7 @@ that your question has been asked and an
favourite search engine to try and find it.</p>
<p>Answers to very common questions are documented on the
-<a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a>.</p>
+<a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a>.</p>
<p>The archives for the user mailing list are a rich source of useful
information. Use the search features provided by one of them. A
@@ -61,7 +62,8 @@ available from past Apache conferences a
<p>A list of organisations that provide support and training for Apache Tomcat
is maintained on the
-<a href="https://wiki.apache.org/tomcat/SupportAndTraining";>Tomcat
Wiki</a>.</p>
+<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/SupportAndTraining";>Tomcat
+Wiki</a>.</p>
</section>
Modified: tomcat/site/trunk/xdocs/lists.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/lists.xml?rev=1860679&r1=1860678&r2=1860679&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/lists.xml (original)
+++ tomcat/site/trunk/xdocs/lists.xml Wed Jun 5 19:18:59 2019
@@ -89,9 +89,12 @@ Tomcat questions to Eric or Rick themsel
(see links and search box at the left). Add "Tomcat 9.0", "Tomcat 8.5",
"Tomcat 8.0" or "Tomcat 7.0" to your query to refine your results. The
tomcat-users mailing list archives (links are below) are also
searchable.</li>
- <li>The <a href="https://wiki.apache.org/tomcat/FAQ";>FAQ</a> and
- <a href="https://wiki.apache.org/tomcat/HowTo";>How To</a> pages
- are available at the <a
href="https://wiki.apache.org/tomcat/FrontPage";>Tomcat Wiki</a>.</li>
+ <li>The
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/FAQ";>FAQ</a> and
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT/HowTo";>How To</a>
+ pages are available at the
+ <a href="https://cwiki.apache.org/confluence/display/TOMCAT";>Tomcat
+ Wiki</a>.</li>
<li>Usage of these mailing lists is subject to the
<a href="http://www.apache.org/foundation/public-archives.html";>Public Forum
Archive Policy</a>.</li>
<li>To post a question, start a new thread by sending your mail
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
