This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9e56489042 Update links to use Confluence's preferred case for TOMCAT
part of URI
9e56489042 is described below
commit 9e56489042b22510108fc85a5437e30396a84c6e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue May 17 09:01:24 2022 +0100
Update links to use Confluence's preferred case for TOMCAT part of URI
---
README.md | 2 +-
webapps/ROOT/index.jsp | 8 ++++----
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 | 2 +-
webapps/docs/realm-howto.xml | 2 +-
webapps/docs/tribes/project.xml | 2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index a838d90223..839a36719c 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://cwiki.apache.org/confluence/display/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 d394bbb8ec..6d846c2b18 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://cwiki.apache.org/confluence/display/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,7 +93,7 @@ request.setAttribute("tomcatExamplesUrl", "/examples/");
</div>
<div class="col25">
<div class="container">
- <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/Specifications";>Servlet
Specifications</a></p>
<p><a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Tomcat+Versions";>Tomcat
Versions</a></p>
</div>
</div>
@@ -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://cwiki.apache.org/confluence/display/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://cwiki.apache.org/confluence/display/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 97642151dc..9ee5112554 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://cwiki.apache.org/confluence/display/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 ae54e7bce1..45a84ce28f 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://cwiki.apache.org/confluence/display/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 63f27ace7b..5ccdf3b127 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://cwiki.apache.org/confluence/display/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 63e39bc5bb..6b77dc9d87 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://cwiki.apache.org/confluence/display/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 2edaf71d35..e89cdb616f 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -699,7 +699,7 @@ should be completed:</p>
</section>
<section name="FAQ">
-<p>Please see <a
href="https://cwiki.apache.org/confluence/display/tomcat/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 06bb714bce..78e75b20d8 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://cwiki.apache.org/confluence/display/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 aa10667d11..e9a2ba5ad0 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://cwiki.apache.org/confluence/display/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 a02c9fc278..f7582462c6 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://cwiki.apache.org/confluence/display/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 fc38dd7153..835097d5e6 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 6.0 and JavaServer Pages 3.1
-<a
href="https://cwiki.apache.org/confluence/display/tomcat/Specifications";>specifications</a>
from
+<a
href="https://cwiki.apache.org/confluence/display/TOMCAT/Specifications";>specifications</a>
from
<a href="https://jakarta.ee/";>Jakarta EE</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 502b737a08..5b06ffcf79 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://cwiki.apache.org/confluence/display/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://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><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 a8024bca5b..92c01d0097 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://cwiki.apache.org/confluence/display/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 b701915d70..3ea9e747a3 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -289,7 +289,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://cwiki.apache.org/confluence/display/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>
@@ -669,7 +669,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://cwiki.apache.org/confluence/display/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>
@@ -838,7 +838,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://cwiki.apache.org/confluence/display/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>
@@ -1138,7 +1138,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://cwiki.apache.org/confluence/display/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 7a60ea00ea..00aa8135ca 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://cwiki.apache.org/confluence/display/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/realm-howto.xml b/webapps/docs/realm-howto.xml
index cc2288190d..cbc60efda6 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://cwiki.apache.org/confluence/display/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 2812dec6d9..e3c427a6d7 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://cwiki.apache.org/confluence/display/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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
