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 2022/04/28 11:20:10 UTC
[tomcat] branch 9.0.x updated: Update wiki links to use new locations
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new fba7f39ddd Update wiki links to use new locations
fba7f39ddd is described below
commit fba7f39dddd2d47ecbd87494c8075e8f33e77cc2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 28 12:13:46 2022 +0100
Update wiki links to use new locations
---
README.md | 2 +-
webapps/ROOT/index.jsp | 10 +++++-----
webapps/docs/appdev/processes.xml | 2 +-
webapps/docs/appdev/project.xml | 2 +-
webapps/docs/appdev/source.xml | 2 +-
webapps/docs/architecture/project.xml | 2 +-
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/project.xml | 2 +-
webapps/docs/developers.xml | 2 +-
webapps/docs/index.xml | 2 +-
webapps/docs/introduction.xml | 6 +++---
webapps/docs/jasper-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 8 ++++----
webapps/docs/project.xml | 4 ++--
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/tribes/project.xml | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index e1e224a189..a838d90223 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ project. To learn more about getting involved,
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
-[PoweredBy wiki page](https://wiki.apache.org/tomcat/PoweredBy).
+[PoweredBy wiki page](https://cwiki.apache.org/confluence/display/tomcat/PoweredBy).
Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index 51495944ce..d394bbb8ec 100644
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -38,7 +38,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<span id="nav-hosts"><a href="${tomcatDocUrl}">Documentation</a></span>
<span id="nav-config"><a href="${tomcatDocUrl}config/">Configuration</a></span>
<span id="nav-examples"><a href="${tomcatExamplesUrl}">Examples</a></span>
- <span id="nav-wiki"><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></span>
+ <span id="nav-wiki"><a href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage">Wiki</a></span>
<span id="nav-lists"><a href="${tomcatUrl}lists.html">Mailing Lists</a></span>
<span id="nav-help"><a href="${tomcatUrl}findhelp.html">Find Help</a></span>
<br class="separator" />
@@ -93,8 +93,8 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
</div>
<div class="col25">
<div class="container">
- <p><a href="https://wiki.apache.org/tomcat/Specifications">Servlet Specifications</a></p>
- <p><a href="https://wiki.apache.org/tomcat/TomcatVersions">Tomcat Versions</a></p>
+ <p><a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet Specifications</a></p>
+ <p><a href="https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions">Tomcat Versions</a></p>
</div>
</div>
<br class="separator" />
@@ -120,7 +120,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<h3>Documentation</h3>
<h4><a href="${tomcatDocUrl}">Tomcat @VERSION_MAJOR_MINOR@ Documentation</a></h4>
<h4><a href="${tomcatDocUrl}config/">Tomcat @VERSION_MAJOR_MINOR@ Configuration</a></h4>
- <h4><a href="https://wiki.apache.org/tomcat/FrontPage">Tomcat Wiki</a></h4>
+ <h4><a href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage">Tomcat Wiki</a></h4>
<p>Find additional important configuration information in:</p>
<pre>$CATALINA_HOME/RUNNING.txt</pre>
<p>Developers may be interested in:</p>
@@ -184,7 +184,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
<li><a href="${tomcatUrl}getinvolved.html">Overview</a></li>
<li><a href="${tomcatUrl}source.html">Source Repositories</a></li>
<li><a href="${tomcatUrl}lists.html">Mailing Lists</a></li>
- <li><a href="https://wiki.apache.org/tomcat/FrontPage">Wiki</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/tomcat/FrontPage">Wiki</a></li>
</ul>
</div>
</div>
diff --git a/webapps/docs/appdev/processes.xml b/webapps/docs/appdev/processes.xml
index ef942466e4..97642151dc 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -151,7 +151,7 @@ cvs commit]]></source>
Note that this is only an example web.xml file. The full definition
of the deployment descriptor file is in the
-<a href="https://wiki.apache.org/tomcat/Specifications">Servlet Specification.</a>
+<a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet Specification.</a>
</subsection>
diff --git a/webapps/docs/appdev/project.xml b/webapps/docs/appdev/project.xml
index 08fe07ecbe..ae54e7bce1 100644
--- a/webapps/docs/appdev/project.xml
+++ b/webapps/docs/appdev/project.xml
@@ -30,7 +30,7 @@
<menu name="Links">
<item name="Docs Home" href="../index.html"/>
<item name="App Dev Guide Home" href="index.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="User Comments" href="#comments_section"/>
</menu>
diff --git a/webapps/docs/appdev/source.xml b/webapps/docs/appdev/source.xml
index fc97e033ec..63f27ace7b 100644
--- a/webapps/docs/appdev/source.xml
+++ b/webapps/docs/appdev/source.xml
@@ -85,7 +85,7 @@ is discussed below. All of these components exist under a top level
<li><strong>web/WEB-INF/</strong> - The special configuration files required
for your application, including the web application deployment descriptor
(<code>web.xml</code>, defined in the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet Specification</a>),
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet Specification</a>),
tag library descriptors for custom tag libraries
you have created, and other resource files you wish to include within
your web application. Even though this directory appears to be a
diff --git a/webapps/docs/architecture/project.xml b/webapps/docs/architecture/project.xml
index 7bf0c73cad..64cfadcb1f 100644
--- a/webapps/docs/architecture/project.xml
+++ b/webapps/docs/architecture/project.xml
@@ -30,7 +30,7 @@
<menu name="Links">
<item name="Docs Home" href="../index.html" />
<item name="Architecture Home" href="index.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="User Comments" href="#comments_section"/>
</menu>
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index cb1f33f684..076ef93e3a 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -695,7 +695,7 @@ should be completed:</p>
</section>
<section name="FAQ">
-<p>Please see <a href="https://wiki.apache.org/tomcat/FAQ/Clustering">the clustering section of the FAQ</a>.</p>
+<p>Please see <a href="https://cwiki.apache.org/confluence/display/tomcat/Clustering">the clustering section of the FAQ</a>.</p>
</section>
</body>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index d11819618b..8763f0931b 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -50,7 +50,7 @@
unpacked contents, as described in the Servlet Specification (version
2.2 or later). For more information about web application archives,
you can download the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification</a>, and review the Tomcat
<a href="../appdev/index.html">Application Developer's Guide</a>.</p>
diff --git a/webapps/docs/config/project.xml b/webapps/docs/config/project.xml
index 5ebcf050ee..a7dbd9fb5f 100644
--- a/webapps/docs/config/project.xml
+++ b/webapps/docs/config/project.xml
@@ -30,7 +30,7 @@
<menu name="Links">
<item name="Docs Home" href="../index.html"/>
<item name="Config Ref. Home" href="index.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="User Comments" href="#comments_section"/>
</menu>
diff --git a/webapps/docs/developers.xml b/webapps/docs/developers.xml
index 5234ae6408..a02c9fc278 100644
--- a/webapps/docs/developers.xml
+++ b/webapps/docs/developers.xml
@@ -40,7 +40,7 @@
tomcat-users mailing list instead, or one of the other support
resources; some organizations and individual consultants also offer
for pay Tomcat support, as listed on the
- <a href="https://wiki.apache.org/tomcat/SupportAndTraining">support and
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/SupportAndTraining">support and
training</a> page on the Tomcat Wiki).
</p>
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 90f810c6f0..9aff58c6fd 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -36,7 +36,7 @@
<p>This is the top-level entry point of the documentation bundle for the
<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
<version-major-minor/> implements the Servlet 4.0 and JavaServer Pages 2.3
-<a href="https://wiki.apache.org/tomcat/Specifications">specifications</a> from the
+<a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">specifications</a> from the
<a href="https://www.jcp.org">Java Community Process</a>, and includes many
additional features that make it a useful platform for developing and deploying
web applications and web services.</p>
diff --git a/webapps/docs/introduction.xml b/webapps/docs/introduction.xml
index ccf9835991..502b737a08 100644
--- a/webapps/docs/introduction.xml
+++ b/webapps/docs/introduction.xml
@@ -48,7 +48,7 @@ help.</p>
<p>In the course of reading these documents, you will run across a number of
terms; some specific to Tomcat, and others defined by the
-<a href="https://wiki.apache.org/tomcat/Specifications">Servlet and
+<a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet and
JSP specifications</a>.</p>
<ul>
@@ -273,8 +273,8 @@ only to earlier versions.</p>
to fully read the relevant documentation as it will save you much time
and effort. There's nothing like scouring the web only to find out that
the answer was right in front of you all along!</li>
-<li><a href="https://wiki.apache.org/tomcat/FAQ">Tomcat FAQ</a></li>
-<li><a href="https://wiki.apache.org/tomcat/">Tomcat WIKI</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/tomcat/FAQ">Tomcat FAQ</a></li>
+<li><a href="https://cwiki.apache.org/confluence/display/tomcat/">Tomcat WIKI</a></li>
<li>Tomcat FAQ at <a href="http://www.jguru.com/faq/home.jsp?topic=Tomcat">jGuru</a></li>
<li>Tomcat mailing list archives - numerous sites archive the Tomcat mailing
lists. Since the links change over time, clicking here will search
diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml
index 0a6d8ce813..c54fa52b36 100644
--- a/webapps/docs/jasper-howto.xml
+++ b/webapps/docs/jasper-howto.xml
@@ -37,7 +37,7 @@
<section name="Introduction">
<p>Tomcat <version-major-minor/> uses the Jasper 2 JSP Engine to implement
-the <a href="https://wiki.apache.org/tomcat/Specifications">JavaServer Pages 2.3</a>
+the <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">JavaServer Pages 2.3</a>
specification.</p>
<p>Jasper 2 has been redesigned to significantly improve performance over
diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml
index 3b4f070c1d..31b08f6159 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -290,7 +290,7 @@ public class MyBean {
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification</a> for details.</p>
<h5>3. Code Your Application's Use Of This Resource</h5>
@@ -752,7 +752,7 @@ create table user_roles (
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification</a> for details.</p>
<h5>2. Code Your Application's Use Of This Resource</h5>
@@ -921,7 +921,7 @@ Transport.send(message);]]></source>
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification</a> for details.</p>
<h5>3. Code Your Application's Use Of This Resource</h5>
@@ -1221,7 +1221,7 @@ public class MyBeanFactory implements ObjectFactory {
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+ <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification</a> for details.</p>
<h4>3. Code Your Application's Use Of This Resource</h4>
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index 2331d1ae1f..2cb6f67644 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -29,7 +29,7 @@
<menu name="Links">
<item name="Docs Home" href="index.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="User Comments" href="#comments_section"/>
</menu>
@@ -98,7 +98,7 @@
<menu name="Apache Tomcat Development">
<item name="Building" href="building.html"/>
<item name="Changelog" href="changelog.html"/>
- <item name="Status" href="https://wiki.apache.org/tomcat/TomcatVersions"/>
+ <item name="Status" href="https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions"/>
<item name="Developers" href="developers.html"/>
<item name="Architecture" href="architecture/index.html" />
<item name="Tribes" href="tribes/introduction.html"/>
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index 5c6864459f..f7ba1e1018 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -47,7 +47,7 @@ to authenticate themselves. If you are not utilizing these features, you can
safely skip this document.</p>
<p>For fundamental background information about container managed security,
-see the <a href="https://wiki.apache.org/tomcat/Specifications">Servlet
+see the <a href="https://cwiki.apache.org/confluence/display/tomcat/Specifications">Servlet
Specification (Version 2.4)</a>, Section 12.</p>
<p>For information about utilizing the <em>Single Sign On</em> feature of
diff --git a/webapps/docs/tribes/project.xml b/webapps/docs/tribes/project.xml
index 63bce26613..2812dec6d9 100644
--- a/webapps/docs/tribes/project.xml
+++ b/webapps/docs/tribes/project.xml
@@ -28,7 +28,7 @@
<menu name="Links">
<item name="Docs Home" href="../index.html"/>
<item name="Tribes Docs Home" href="introduction.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="User Comments" href="#comments_section"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org