This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 782a2ba96778ce671937dc8704559e0895a52025
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 13 11:52:45 2020 +0000
Update more version references
---
webapps/docs/class-loader-howto.xml | 12 ++++++------
webapps/docs/index.xml | 6 +++---
webapps/docs/project.xml | 12 ++++++------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index eecbc01..b057de1 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -130,7 +130,7 @@ loaders as it is initialized:</p>
</ul>
<p>By default, this includes the following:</p>
<ul>
- <li><em>annotations-api.jar</em> — JavaEE annotations classes.</li>
+ <li><em>annotations-api.jar</em> — Jakarta Annotations 2.0
classes.</li>
<li><em>catalina.jar</em> — Implementation of the Catalina servlet
container portion of Tomcat.</li>
<li><em>catalina-ant.jar</em> — Tomcat Catalina Ant tasks.</li>
@@ -140,11 +140,11 @@ loaders as it is initialized:</p>
configuration files from current state</li>
<li><em>catalina-tribes.jar</em> — Group communication package.</li>
<li><em>ecj-*.jar</em> — Eclipse JDT Java compiler.</li>
- <li><em>el-api.jar</em> — EL 3.0 API.</li>
+ <li><em>el-api.jar</em> — EL 4.0 API.</li>
<li><em>jasper.jar</em> — Tomcat Jasper JSP Compiler and
Runtime.</li>
<li><em>jasper-el.jar</em> — Tomcat Jasper EL implementation.</li>
- <li><em>jsp-api.jar</em> — JSP 2.3 API.</li>
- <li><em>servlet-api.jar</em> — Servlet 4.0 API.</li>
+ <li><em>jsp-api.jar</em> — JSP 3.0 API.</li>
+ <li><em>servlet-api.jar</em> — Servlet 5.0 API.</li>
<li><em>tomcat-api.jar</em> — Several interfaces defined by
Tomcat.</li>
<li><em>tomcat-coyote.jar</em> — Tomcat connectors and utility
classes.</li>
<li><em>tomcat-dbcp.jar</em> — Database connection pool
@@ -159,8 +159,8 @@ loaders as it is initialized:</p>
<a href="jdbc-pool.html">documentation</a> for more details.</li>
<li><em>tomcat-util.jar</em> — Common classes used by various
components of
Apache Tomcat.</li>
- <li><em>tomcat-websocket.jar</em> — WebSocket 1.1 implementation</li>
- <li><em>websocket-api.jar</em> — WebSocket 1.1 API</li>
+ <li><em>tomcat-websocket.jar</em> — WebSocket 2.0 implementation</li>
+ <li><em>websocket-api.jar</em> — WebSocket 2.0 API</li>
</ul></li>
<li><p><strong>WebappX</strong> — A class loader is created for each web
application that is deployed in a single Tomcat instance. All unpacked
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index e72c8e8..e23bbf1 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -35,9 +35,9 @@
<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://www.jcp.org";>Java Community Process</a>, and includes many
+<version-major-minor/> implements the Servlet 5.0 and JavaServer Pages 3.0
+<a href="https://wiki.apache.org/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/project.xml b/webapps/docs/project.xml
index 2884849..9c6fde9 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -82,13 +82,13 @@
<item name="Release Notes" href="RELEASE-NOTES.txt"/>
<item name="Configuration" href="config/index.html"/>
<item name="Tomcat Javadocs" href="api/index.html"/>
- <item name="Servlet 4.0 Javadocs" href="servletapi/index.html"/>
- <item name="JSP 2.3 Javadocs" href="jspapi/index.html"/>
- <item name="EL 3.0 Javadocs" href="elapi/index.html"/>
- <item name="WebSocket 1.1 Javadocs"
+ <item name="Servlet 5.0 Javadocs" href="servletapi/index.html"/>
+ <item name="JSP 3.0 Javadocs" href="jspapi/index.html"/>
+ <item name="EL 4.0 Javadocs" href="elapi/index.html"/>
+ <item name="WebSocket 2.0 Javadocs"
href="websocketapi/index.html"/>
- <item name="JASPIC 1.1 Javadocs" href="jaspicapi/index.html"/>
- <item name="Common Annotations 1.3 Javadocs"
+ <item name="JASPIC 2.0 Javadocs" href="jaspicapi/index.html"/>
+ <item name="Annotations 2.0 Javadocs"
href="annotationapi/index.html"/>
<item name="JK 1.2 Documentation"
href="https://tomcat.apache.org/connectors-doc/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
