diff --git a/geode-book/config.yml b/geode-book/config.yml
index c156d7e965c2..a311be02b4bf 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -21,19 +21,19 @@ public_host: localhost
 sections:
 - repository:
     name: geode-docs
-  directory: docs/guide/115
+  directory: docs/guide/20
   subnav_template: geode-subnav
 
 template_variables:
   product_name_long: Apache Geode
   product_name: Geode
   product_name_lowercase: geode
-  product_version: '1.15'
-  product_version_nodot: '115'
-  product_version_old_minor: '1.14'
-  product_version_geode: '1.15'
-  min_java_version: '8'
-  min_java_update: '121'
+  product_version: '2.0'
+  product_version_nodot: '20'
+  product_version_old_minor: '1.15'
+  product_version_geode: '2.0'
+  min_java_version: '17'
+  min_java_update: '16'
   support_url: http://geode.apache.org/community
   product_url: http://geode.apache.org/
   book_title: Apache Geode Documentation
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index b4ba7467a4ce..f06a8914d460 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2147,26 +2147,6 @@ limitations under the License.
                             <li>
                                 <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/configuring_non_sticky_sessions.html">Configuring Non-Sticky Sessions</a>
                             </li>
-                            <li class="has_submenu">
-                                <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/session_mgmt_tcserver.html">HTTP Session Management Module for Pivotal tc Server</a>
-                                <ul>
-                                    <li>
-                                        <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_installing_the_module.html">Installing the HTTP Module for tc Server</a>
-                                    </li>
-                                    <li>
-                                        <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_setting_up_the_module.html">Setting Up the HTTP Module for tc Server</a>
-                                    </li>
-                                    <li class="has_submenu">
-                                        <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/tc_changing_gf_default_cfg.html">Changing the Default Geode Configuration in the tc Server Module</a>
-                                        <ul>
-                                            <li>
-                                                <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/interactive_mode_ref.html">Interactive Configuration Reference for the tc Server Module
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </li>
-                                </ul>
-                            </li>
                             <li class="has_submenu">
                                 <a href="/docs/guide/<%=vars.product_version_nodot%>/tools_modules/http_session_mgmt/session_mgmt_tomcat.html">HTTP Session Management Module for Tomcat</a>
                                 <ul>
diff --git a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
index 8ba79f390e30..f522a62372f2 100644
--- a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
+++ b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
@@ -58,7 +58,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 70919
     Uptime: 12 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/my_geode/locator1/locator1.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
     -Dgemfire.load-cluster-configuration-from-dir=false
@@ -84,7 +84,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5627
     Uptime: 2 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/my_geode/server1/server1.log
 
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -100,7 +100,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5634
     Uptime: 2 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/my_geode/server2/server2.log
 
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -117,7 +117,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5637
     Uptime: 2 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/my_geode/server3/server3.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
     -Dgemfire.start-dev-rest-api=false -Dgemfire.use-cluster-configuration=true
@@ -239,7 +239,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5749
     Uptime: 15 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/new_geode/locator2/locator2.log
 
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
@@ -276,7 +276,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5813
     Uptime: 4 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/new_geode/server4/server4.log
 
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335]
@@ -297,7 +297,7 @@ This section provides a walk-through example of configuring a simple <%=vars.pro
     Process ID: 5954
     Uptime: 2 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /Users/username/new_geode/server5/server5.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335] -Dgemfire.groups=group1
     -Dgemfire.start-dev-rest-api=false -Dgemfire.use-cluster-configuration=true
diff --git a/geode-docs/configuring/running/running_the_cacheserver.html.md.erb b/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
index fd21d6a537a9..b607ba57eed1 100644
--- a/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
+++ b/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
@@ -147,12 +147,11 @@ If successful, the output provides information as in this sample:
 % gfsh status server --dir=server4
 Server in /home/username/server4 on 192.0.2.0[40404] as server4 is currently online.
 Process ID: 49008
-Uptime: 2 minutes 4 seconds
-<%=vars.product_name %> Version: <%=vars.product_version %>
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
-Log File: /home/username/server4/server4.log
-JVM Arguments: 
-...
+Uptime: 2 seconds
+<%=vars.product_name%> Version: <%=vars.product_version%>
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
+Log File: /Users/username/my_geode/server1/server1.log
+JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
 ```
 
 ## <a id="running_the_cacheserver__section_0E4DDED6AB784B0CAFBAD538B227F487" class="no-quick-link"></a>Stop Server
diff --git a/geode-docs/configuring/running/running_the_locator.html.md.erb b/geode-docs/configuring/running/running_the_locator.html.md.erb
index dbd7328b4744..591da1635b21 100644
--- a/geode-docs/configuring/running/running_the_locator.html.md.erb
+++ b/geode-docs/configuring/running/running_the_locator.html.md.erb
@@ -203,7 +203,7 @@ Locator in /home/user/locator1 on ubuntu.local[10334] as locator1 is currently o
 Process ID: 2359
 Uptime: 17 minutes 3 seconds
 GemFire Version: 8.0.0
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Log File: /home/user/locator1/locator1.log
 JVM Arguments: -Dgemfire.enable-cluster-configuration=true -Dgemfire.load-cluster-configuration-from-dir=false
  -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
diff --git a/geode-docs/getting_started/15_minute_quickstart_gfsh.html.md.erb b/geode-docs/getting_started/15_minute_quickstart_gfsh.html.md.erb
index bcf3700a8441..6b30e0b8281e 100644
--- a/geode-docs/getting_started/15_minute_quickstart_gfsh.html.md.erb
+++ b/geode-docs/getting_started/15_minute_quickstart_gfsh.html.md.erb
@@ -54,12 +54,12 @@ The *locator* is a <%=vars.product_name%> process that tells new, connecting mem
     Process ID: 3529
     Uptime: 18 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /home/username/my_geode/locator1/locator1.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true -Dgemfire.load-cluster-configuration-from-dir=false
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-1.0.0.jar:
+    Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-2.0.0.jar:
     /home/username/Apache_Geode_Linux/lib/geode-dependencies.jar
 
     Successfully connected to: JMX Manager [host=10.118.33.169, port=1099]
@@ -413,12 +413,12 @@ In this step you restart the cache servers in parallel. Because the data is pers
     Process ID: 3402
     Uptime: 1 minute 46 seconds
     <%=vars.product_name%> Version: <%=vars.product_version%>
-    Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     Log File: /home/username/my_geode/server1/server1.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.use-cluster-configuration=true
     -XX:OnOutOfMemoryError=kill -KILL %p -Dgemfire.launcher.registerSignalHandlers=true
     -Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-1.0.0.jar:
+    Class-Path: /home/username/Apache_Geode_Linux/lib/geode-core-2.0.0.jar:
     /home/username/Apache_Geode_Linux/lib/geode-dependencies.jar
     ```
 
diff --git a/geode-docs/getting_started/installation/install_standalone.html.md.erb b/geode-docs/getting_started/installation/install_standalone.html.md.erb
index a6a3fc435827..3c9e71618d35 100644
--- a/geode-docs/getting_started/installation/install_standalone.html.md.erb
+++ b/geode-docs/getting_started/installation/install_standalone.html.md.erb
@@ -24,7 +24,7 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
 1.  Set the JAVA\_HOME environment variable.
 
     ``` pre
-    JAVA_HOME=/usr/java/jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    JAVA_HOME=/usr/java/jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     export JAVA_HOME
     ```
 
@@ -54,7 +54,7 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
 1.  Set the JAVA\_HOME environment variable. For example:
 
     ``` pre
-    $ set JAVA_HOME="C:\Program Files\Java\jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>" 
+    $ set JAVA_HOME="C:\Program Files\Java\jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>" 
     ```
 
 2.  Install Gradle, version 2.3 or a more recent version.
@@ -91,14 +91,14 @@ Build from source or use the TAR distribution to install <%=vars.product_name_lo
 3.  Set the JAVA\_HOME environment variable. On Linux/Unix platforms:
 
     ``` pre
-    JAVA_HOME=/usr/java/jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+    JAVA_HOME=/usr/java/jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>
     export JAVA_HOME
     ```
 
     On Windows platforms:
 
     ``` pre
-    set JAVA_HOME="C:\Program Files\Java\jdk1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>"
+    set JAVA_HOME="C:\Program Files\Java\jdk-<%=vars.min_java_version%>.0.<%=vars.min_java_update%>"
     ```
 
 4.  Add the <%=vars.product_name%> scripts to your PATH environment variable. On Linux/Unix platforms:
diff --git a/geode-docs/images/Apache_Tomcat_Homepage.png b/geode-docs/images/Apache_Tomcat_Homepage.png
index bca071c9038b..4a7d14584e97 100644
Binary files a/geode-docs/images/Apache_Tomcat_Homepage.png and b/geode-docs/images/Apache_Tomcat_Homepage.png differ
diff --git a/geode-docs/managing/management/jmx_manager_operations.html.md.erb b/geode-docs/managing/management/jmx_manager_operations.html.md.erb
index da8ca6a99b9d..5d578819b130 100644
--- a/geode-docs/managing/management/jmx_manager_operations.html.md.erb
+++ b/geode-docs/managing/management/jmx_manager_operations.html.md.erb
@@ -57,7 +57,7 @@ is currently online.
 Process ID: 27144
 Uptime: 5 seconds
 <%=vars.product_name%> Version: <%=vars.product_version%>
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Log File: /Users/username/apache-geode/locator1/locator1.log
 JVM Arguments: -Dgemfire.enable-cluster-configuration=true 
 -Dgemfire.load-cluster-configuration-from-dir=false 
diff --git a/geode-docs/tools_modules/gfsh/tour_of_gfsh.html.md.erb b/geode-docs/tools_modules/gfsh/tour_of_gfsh.html.md.erb
index 5e9dd5b79b58..98983f5f61ce 100644
--- a/geode-docs/tools_modules/gfsh/tour_of_gfsh.html.md.erb
+++ b/geode-docs/tools_modules/gfsh/tour_of_gfsh.html.md.erb
@@ -61,7 +61,7 @@ as locator1 is currently online.
 Process ID: 67666
 Uptime: 6 seconds
 <%=vars.product_name%> Version: <%=vars.product_version%>
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Log File: /home/username/gfsh_tutorial/locator1.log
 JVM Arguments: -Dgemfire.enable-cluster-configuration=true
  -Dgemfire.load-cluster-configuration-from-dir=false
@@ -180,16 +180,12 @@ Starting a <%=vars.product_name%> Server in /home/username/gfsh_tutorial/server1
 ...
 Server in /home/username/gfsh_tutorial/server1 on 192.0.2.0[40404] as server1
 is currently online.
-Process ID: 68375
-Uptime: 4 seconds
+Process ID: 49601
+Uptime: 2 seconds
 <%=vars.product_name%> Version: <%=vars.product_version%>
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
-Log File: /home/username//gfsh_tutorial/server1/server1.log
-JVM Arguments: -Dgemfire.locators=localhost[10334]
- -Dgemfire.use-cluster-configuration=true -Dgemfire.start-dev-rest-api=false
- -XX:OnOutOfMemoryError=kill -KILL %p
- -Dgemfire.launcher.registerSignalHandlers=true
- -Djava.awt.headless=true -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
+Log File: /home/username/gfsh_tutorial/server1/server1.log
+JVM Arguments: -Dgemfire.enable-cluster-configuration=true
 Class-Path: /home/username/geode/geode-assembly/build/install/apache-geode/lib
 /geode-core-1.2.0.jar:/home/username/geode/geode-assembly/build/install
 /apache-geode/lib/geode-dependencies.jar
@@ -299,7 +295,7 @@ server2 is currently online.
 Process ID: 68423
 Uptime: 4 seconds
 <%=vars.product_name%> Version: <%=vars.product_version%>
-Java Version: 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+Java Version: <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Log File: /home/username/gfsh_tutorial/server2/server2.log
 JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
  -Dgemfire.use-cluster-configuration=true -Dgemfire.start-dev-rest-api=false
diff --git a/geode-docs/tools_modules/http_session_mgmt/chapter_overview.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/chapter_overview.html.md.erb
index 04c099ca1e52..d0513b459f61 100644
--- a/geode-docs/tools_modules/http_session_mgmt/chapter_overview.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/chapter_overview.html.md.erb
@@ -21,7 +21,9 @@ limitations under the License.
 
 The <%=vars.product_name_long%> HTTP Session Management modules provide fast, scalable, and reliable session replication for HTTP servers without requiring application changes.
 
-<%=vars.product_name_long%> offers HTTP session management modules for tc Server, Tomcat, and AppServers.
+<%=vars.product_name_long%> offers HTTP session management modules for Tomcat and AppServers.
+
+**Note:** As of version 2.x, Geode only supports Tomcat 10.1 and later versions (Jakarta EE namespace). Support for Tomcat 7, 8, 9, and Pivotal tc Server has been discontinued.
 
 These modules are included with the <%=vars.product_name_long%> product distribution, and installation .zip files can be found in the `tools/Modules` directory of your product installation.
 
@@ -49,13 +51,9 @@ These modules are included with the <%=vars.product_name_long%> product distribu
 
     This section describes the configuration of non-sticky sessions.
 
--   **[HTTP Session Management Module for Pivotal tc Server](../../tools_modules/http_session_mgmt/session_mgmt_tcserver.html)**
-
-    This section describes how to set up and use the HTTP session management module with tc Server templates.
-
 -   **[HTTP Session Management Module for Tomcat](../../tools_modules/http_session_mgmt/session_mgmt_tomcat.html)**
 
-    You set up and use the module by modifying the Tomcat's `server.xml` and `context.xml` files.
+    You set up and use the module by modifying Tomcat's `server.xml` and `context.xml` files. Supports Tomcat 10.1 and later (Jakarta EE).
 
 -   **[HTTP Session Management Module for AppServers](../../tools_modules/http_session_mgmt/session_mgmt_weblogic.html)**
 
diff --git a/geode-docs/tools_modules/http_session_mgmt/common_gemfire_topologies.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/common_gemfire_topologies.html.md.erb
index e0bf3a93eeff..ebc217db5286 100644
--- a/geode-docs/tools_modules/http_session_mgmt/common_gemfire_topologies.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/common_gemfire_topologies.html.md.erb
@@ -33,4 +33,4 @@ In a peer-to-peer configuration, each instance within an application server cont
 
 <img src="../../images_svg/http_module_cs_with_locator.svg" id="common_gemfire_topologies__image_oss_zyw_rv" class="image" />
 
-In a client/server configuration, the Tomcat or tc Server instance operates as a <%=vars.product_name%> client, which must communicate with one or more <%=vars.product_name%> servers to acquire session data. The client maintains its own local cache and will communicate with the server to satisfy cache misses. A client/server configuration is useful when you want to separate the application server instance from the cached session data. In this configuration, you can reduce the memory consumption of the application server since session data is stored in separate <%=vars.product_name%> server processes.
+In a client/server configuration, the Tomcat instance operates as a <%=vars.product_name%> client, which must communicate with one or more <%=vars.product_name%> servers to acquire session data. The client maintains its own local cache and will communicate with the server to satisfy cache misses. A client/server configuration is useful when you want to separate the application server instance from the cached session data. In this configuration, you can reduce the memory consumption of the application server since session data is stored in separate <%=vars.product_name%> server processes.
diff --git a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
index fae1198d18f6..6d0b5bf3e1fe 100644
--- a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -22,10 +22,10 @@ limitations under the License.
 In this section you download, install, and set up the HTTP Session Management modules.
 
 Following the Apache Tomcat convention, this page assumes the CATALINA_HOME environment variable is set to the root directory of the "binary" Tomcat distribution.
-For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.62` then
+For example, if Apache Tomcat is installed in `/opt/apache-tomcat-10.1.30` then
 
 ```
-CATALINA_HOME=/usr/bin/apache-tomcat-9.0.62
+CATALINA_HOME=/opt/apache-tomcat-10.1.30
 ```
 
 ## <a id="quick_start__section_6A4A00B6DA404E10A5C29E5E31101445" class="no-quick-link"></a>Quick Start Instructions
@@ -34,61 +34,46 @@ CATALINA_HOME=/usr/bin/apache-tomcat-9.0.62
 
     | Supported Application Server | Version | Download Location       |
     |------------------------------|---------|-------------------------|
-    | tc Server                    | 3.2     | [https://network.pivotal.io/products/pivotal-tcserver](https://network.pivotal.io/products/pivotal-tcserver) |
-    | Tomcat                       | 8.5     | [Tomcat 8 Software Downloads](https://tomcat.apache.org/download-80.cgi)                                     |
-    | Tomcat                       | 9.0     | [Tomcat 9 Software Downloads](https://tomcat.apache.org/download-90.cgi)                                     |
+    | Tomcat                       | 10.1+   | [Tomcat 10 Software Downloads](https://tomcat.apache.org/download-10.cgi)                                     |
+    | Tomcat                       | 11.x    | [Tomcat 11 Software Downloads](https://tomcat.apache.org/download-11.cgi)                                     |
 
-    The generic HTTP Session Management Module for AppServers is implemented as a servlet filter and should work on any application server platform that supports the Java Servlet 3.1 specification.
+    **Note:** Support for Tomcat 7, 8, 9, and Pivotal tc Server has been discontinued. Tomcat 10.1+ requires Jakarta EE (jakarta.servlet.* namespace).
+
+    The generic HTTP Session Management Module for AppServers is implemented as a servlet filter and should work on any application server platform that supports the Java Servlet 6.0 specification (Jakarta EE).
 
 2.  The HTTP Session Management Modules installation .zip files are located in the `tools/Modules` directory of the product installation directory. Locate the .zip file for the HTTP Session Management Module that you wish to install. Unzip the appropriate HTTP Session Management Module into the specified directory for your application server:
 
     | Supported Application Server | Version  | Module                                               | Target Location for Module       |
     |------------------------------|----------|------------------------------------------------------|----------------------------------|
-    | tc Server                    | 2.9      | Apache_Geode_Modules-SERVER-VERSION-tcServer.zip     | `<tc Server root dir>/templates` |
-    | tc Server                    | 3.2      | Apache_Geode_Modules-SERVER-VERSION-tcServer30.zip   | `<tc Server root dir>/templates` |
-    | Tomcat                       | 8.5, 9.0 | Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip       | `$CATALINA_HOME`                 |
+    | Tomcat                       | 10.1, 11 | Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip       | `$CATALINA_HOME`                 |
+
+    **Note:** Support for Pivotal tc Server has been removed. Users should migrate to Tomcat 10.1 or later.
 
 3.  Complete the appropriate set up instructions for your application server described in the following sections:
-    -   [Additional Quick Start Instructions for tc Server Module](quick_start.html#quick_start__section_EE60463F524A46B7B83CE74C1C3E8E0E)
     -   [Additional Quick Start Instructions for Tomcat Module](quick_start.html#quick_start__section_4689A4FA609A4F4FB091F03E9BECA4DB)
     -   [Additional Instructions for AppServers Module](quick_start.html#quick_start__section_1587C3E55F06406EBD4AB13014A406D4)
 
-## <a id="quick_start__section_EE60463F524A46B7B83CE74C1C3E8E0E" class="no-quick-link"></a>Additional Quick Start Instructions for tc Server Module
-
-These steps provide a basic starting point for using the tc Server module. For more configuration options, see [HTTP Session Management Module for Pivotal tc Server](session_mgmt_tcserver.html). As a prerequisite, module set up requires a JAVA\_HOME environment variable set to the java installation.
-
-1.  Navigate to the root directory of tc Server.
-2.  Create a <%=vars.product_name%> instance using one of the provided templates and start the instance after starting up a locator. For example:
-
-    ``` pre
-    $ gfsh start locator --name=locator1
-    $ ./tcruntime-instance.sh create my_instance_name --template geode-p2p
-    $ ./tcruntime-ctl.sh my_instance_name start
-    ```
-
-    This will create and run a <%=vars.product_name%> instance using the peer-to-peer topology and default configuration values. Another <%=vars.product_name%> instance on another system can be created and started in the same way.
-
-    If you need to pin your tc Server instance to a specific tc Server runtime version, use the `--version` option when creating the instance.
-
 ## <a id="quick_start__section_4689A4FA609A4F4FB091F03E9BECA4DB" class="no-quick-link"></a>Additional Quick Start Instructions for Tomcat Module
 
 These steps provide a basic starting point for using the Tomcat module. For more configuration options, see [HTTP Session Management Module for Tomcat](session_mgmt_tomcat.html).
 
-1.  Modify Tomcat's `server.xml` and `context.xml` files. Configuration is slightly different depending on the topology you are setting up and the version of Tomcat you are using.
+1.  Modify Tomcat's `server.xml` and `context.xml` files. Configuration is slightly different depending on the topology you are setting up.
 
-    For example, in a peer-to-peer configuration using Tomcat 9, you would add the following entry within the `<server>` element of server.xml:
+    For example, in a peer-to-peer configuration using Tomcat 10.1+, you would add the following entry within the `<server>` element of server.xml:
 
     ``` pre
     <Listener className="org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener"
-        locator="localhost[10334]" />
+        locators="localhost[10334]" />
     ```
 
     and the following entry within the `<context>` tag in the context.xml file:
 
     ``` pre
-    <Manager className="org.apache.geode.modules.session.catalina.Tomcat9DeltaSessionManager"/> 
+    <Manager className="org.apache.geode.modules.session.catalina.Tomcat10DeltaSessionManager"/> 
     ```
 
+    **Note:** For Tomcat 10.1+, use `Tomcat10DeltaSessionManager`. Support for Tomcat 7, 8, and 9 has been discontinued.
+
     See [Setting Up the HTTP Module for Tomcat](tomcat_setting_up_the_module.html) for additional instructions.
 
 2.  Start the Tomcat application server.
diff --git a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tcserver.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tcserver.html.md.erb
index 8af8a039afd7..f9d01d4e9e98 100644
--- a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tcserver.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tcserver.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  HTTP Session Management Module for Pivotal tc Server
+title:  DEPRECATED - Pivotal tc Server Support Removed
 ---
 
 <!--
diff --git a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tomcat.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tomcat.html.md.erb
index e8c9d5a723d6..d31244f7a223 100644
--- a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tomcat.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_tomcat.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You set up and use the module by modifying the Tomcat's `server.xml` and `context.xml` files.
+You set up and use the module by modifying Tomcat's `server.xml` and `context.xml` files.
 
-For instructions specific to SpringSource tc Server templates, refer to [HTTP Session Management Module for Pivotal tc Server](session_mgmt_tcserver.html).
+**Note:** Geode only supports Tomcat 10.1 and later versions (Jakarta EE). Support for Tomcat 7, 8, 9, and Pivotal tc Server has been discontinued. For tc Server users, migration to Tomcat 10.1 or later is required.
 
 -   **[Installing the HTTP Module for Tomcat](../../tools_modules/http_session_mgmt/tomcat_installing_the_module.html)**
 
diff --git a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_weblogic.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_weblogic.html.md.erb
index 0ef18684ba71..a8bc272a2703 100644
--- a/geode-docs/tools_modules/http_session_mgmt/session_mgmt_weblogic.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/session_mgmt_weblogic.html.md.erb
@@ -21,7 +21,7 @@ limitations under the License.
 
 You implement session caching with the HTTP Session Management Module for AppServers with a special filter, defined in the `web.xml`, which is configured to intercept and wrap all requests.
 
-You can use this HTTP module with a variety of application servers. Wrapping each request allows the interception of `getSession()` calls to be handled by <%=vars.product_name%> instead of the native container. This approach is a generic solution, which is supported by any container that implements the Servlet 3.1 specification.
+You can use this HTTP module with a variety of application servers. Wrapping each request allows the interception of `getSession()` calls to be handled by <%=vars.product_name%> instead of the native container. This approach is a generic solution, which is supported by any container that implements the Jakarta Servlet 6.0 specification (Jakarta EE 10).
 
 -   **[Setting Up the HTTP Module for AppServers](../../tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html)**
 
diff --git a/geode-docs/tools_modules/http_session_mgmt/tc_additional_info.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tc_additional_info.html.md.erb
index 43bf40357732..47cf2ce74c86 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tc_additional_info.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tc_additional_info.html.md.erb
@@ -45,7 +45,7 @@ To acquire <%=vars.product_name%> module version information, look in the web se
 ``` pre
 INFO: Initializing <%=vars.product_name%> Modules
 Java version:   1.0.0 user1 041216 2016-11-12 11:18:37 -0700
-          javac 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+          javac <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Native version: native code unavailable
 Source revision: 857bb75916640a066eb832b43b3c805f0dd7ed0b
 Source repository: develop
diff --git a/geode-docs/tools_modules/http_session_mgmt/tc_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tc_setting_up_the_module.html.md.erb
index 68802881d350..4757397cad29 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tc_setting_up_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tc_setting_up_the_module.html.md.erb
@@ -71,8 +71,8 @@ With a similar environment to this example that is for a client/server set up,
 ``` pre
 TC_VER=tomcat-8.0.30.C.RELEASE
 INSTANCE=geode-cs
-CLASSPATH=$PWD/$INSTANCE/lib/geode-modules-1.0.0.jar:\
-$PWD/$INSTANCE/lib/geode-modules-tomcat8-1.0.0.jar:\
+CLASSPATH=$PWD/$INSTANCE/lib/geode-modules-2.0.0.jar:\
+$PWD/$INSTANCE/lib/geode-modules-tomcat8-2.0.0.jar:\
 $PWD/$TC_VER/lib/servlet-api.jar:\
 $PWD/$TC_VER/lib/catalina.jar:\
 $PWD/$TC_VER/lib/tomcat-util.jar:\
@@ -111,7 +111,7 @@ lifecycleEvent
 INFO: Initializing <%=vars.product_name%> Modules
 Modules version: 1.0.0
 Java version:   1.0.0 user1 032916 2016-11-29 07:49:26 -0700
-javac 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+javac <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Native version: native code unavailable
 Source revision: c36591b73243c7ee3a0186710338453d12efe364
 Source repository: develop
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_changing_gf_default_cfg.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_changing_gf_default_cfg.html.md.erb
index 418671d82894..633e4f335b96 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_changing_gf_default_cfg.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_changing_gf_default_cfg.html.md.erb
@@ -82,7 +82,7 @@ To edit <%=vars.product_name%> cache properties such as the name and the charact
 
 ``` pre
 <Manager 
-  className="org.apache.geode.modules.session.catalina.Tomcat9DeltaSessionManager"
+  className="org.apache.geode.modules.session.catalina.Tomcat10DeltaSessionManager"
   property-name="property-value" 
   property-name="property-value" 
   ...
@@ -93,12 +93,14 @@ For example, this entry creates a partitioned region by the name of "my\_region"
 
 ``` pre
 <Manager className="org.apache.geode.modules.session.catalina.
-      Tomcat9DeltaSessionManager" 
+      Tomcat10DeltaSessionManager" 
   regionAttributesId="PARTITION_REDUNDANT" 
   regionName="my_region" 
 /> 
 ```
 
+**Note:** For Tomcat 10.1 and later, use `Tomcat10DeltaSessionManager`. Support for Tomcat 7, 8, and 9 has been discontinued.
+
 The following parameters are the cache configuration parameters that can be added to Tomcat's `context.xml` file.
 
 <dt>**CommitSessionValve**</dt>
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
index 9590dff4ba5d..79ef6bcea6b6 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_installing_the_module.html.md.erb
@@ -21,12 +21,12 @@ limitations under the License.
 
 This topic describes how to install the HTTP session management module for Tomcat.
 
-1.  If you have not already installed Tomcat, download the desired version from the [Apache Website](http://tomcat.apache.org/) and install it.
+1.  If you have not already installed Tomcat, download version 10.1 or later from the [Apache Website](http://tomcat.apache.org/) and install it. **Note:** Geode only supports Tomcat 10.1 and later versions (Jakarta EE). Support for Tomcat 7, 8, and 9 has been discontinued.
 2.  Following the Apache Tomcat convention, this page assumes the CATALINA_HOME environment variable is set to the root directory of the "binary" Tomcat distribution.
-  For example, if Apache Tomcat is installed in `/usr/bin/apache-tomcat-9.0.62` then
+  For example, if Apache Tomcat is installed in `/opt/apache-tomcat-10.1.30` then
 
     ```
-    CATALINA_HOME=/usr/bin/apache-tomcat-9.0.62
+    CATALINA_HOME=/opt/apache-tomcat-10.1.30
     ```
     Define $CATALINA_HOME if it is not already defined.
   
@@ -48,12 +48,15 @@ This adds jar files to the `lib` subdirectory and XML files to the `conf` subdir
     unzip $GEODE_HOME/tools/Modules/Apache_Geode_Modules-SERVER-VERSION-Tomcat.zip
     ```
 
-
-6.  Copy all of the jar files from the <%=vars.product_name%> `lib` subdirectory to the `lib` subdirectory of your Tomcat server (`$CATALINA_HOME/lib`):
+6.  **CRITICAL:** Copy all of the jar files from the <%=vars.product_name%> `lib` subdirectory to the `lib` subdirectory of your Tomcat server (`$CATALINA_HOME/lib`). 
+    
+    **The module zip file alone does not contain all required dependencies.** You must copy all Geode libraries including `geode-core`, `geode-common`, Jakarta Transaction API, and other runtime dependencies:
 
     ```
     cd $CATALINA_HOME/lib
     cp $GEODE_HOME/lib/*.jar .
     ```
+    
+    **Note:** Without these libraries, Tomcat will fail to start with `ClassNotFoundException` errors for Geode classes. The Geode session management module requires the complete Geode runtime, not just the module JARs included in the zip file.
 
 Proceed to [Setting Up the HTTP Module for Tomcat](./tomcat_setting_up_the_module.html) to complete your Tomcat configuration.
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
index 1698795c3edb..0524c37c7514 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
@@ -27,32 +27,37 @@ Configuration is slightly different depending on the topology you are setting up
 
 <img src="../../images_svg/http_module_p2p_with_locator.svg" id="tomcat_setting_up_the_module__image_bsm_2gf_sv" class="image" />
 
-To run <%=vars.product_name%> in a peer-to-peer configuration, add the following line to Tomcat's `$CATALINA_HOME$/conf/server.xml` within the `<Server>` tag:
+To run <%=vars.product_name%> in a peer-to-peer configuration, you must first start a <%=vars.product_name%> locator, then configure Tomcat to join the cluster as a peer member.
+
+### Starting the Locator
+
+Start a <%=vars.product_name%> locator using `gfsh`:
 
 ``` pre
-<Listener className="org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener"
-        locators="localhost[10334]" />
+$ gfsh start locator --name=locator1 --port=10334
 ```
 
-Depending on the version of Tomcat you are using, add one of the following lines to `$CATALINA_HOME$/conf/context.xml` within the `<Context>` tag:
+The locator coordinates membership in the peer-to-peer cache.
 
-For Tomcat 7.0:
+### Configuring Tomcat
 
-``` pre
-<Manager className="org.apache.geode.modules.session.Tomcat7DeltaSessionManager"/> 
-```
-For Tomcat 8.0 and 8.5:
+Add the following line to Tomcat's `$CATALINA_HOME$/conf/server.xml` within the `<Server>` tag:
 
 ``` pre
-<Manager className="org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager"/> 
+<Listener className="org.apache.geode.modules.session.catalina.PeerToPeerCacheLifecycleListener"
+        locators="localhost[10334]" />
 ```
 
-For Tomcat 9.0:
+Add the following line to `$CATALINA_HOME$/conf/context.xml` within the `<Context>` tag:
+
+For Tomcat 10.1 and later (Jakarta EE 10):
 
 ``` pre
-<Manager className="org.apache.geode.modules.session.catalina.Tomcat9DeltaSessionManager"/> 
+<Manager className="org.apache.geode.modules.session.catalina.Tomcat10DeltaSessionManager"/> 
 ```
 
+**Note:** Tomcat 10.1+ implements Jakarta EE 10 with Servlet 6.0 specification and uses the Jakarta EE namespace (`jakarta.servlet.*`) instead of the legacy `javax.servlet.*` namespace. Ensure your application has been migrated to Jakarta EE 10 before using this module. Support for Tomcat 7, 8, and 9 has been discontinued.
+
 ## <a id="tomcat_setting_up_the_module_cs" class="no-quick-link"></a>Client/Server Setup
 
 <img src="../../images_svg/http_module_cs_with_locator.svg" id="tomcat_setting_up_the_module__image_aqn_jjf_sv" class="image" />
@@ -63,41 +68,37 @@ To run <%=vars.product_name%> in a client/server configuration, the application
 <Listener className="org.apache.geode.modules.session.catalina.ClientServerCacheLifecycleListener"/>
 ```
 
-Depending on the version of Tomcat you are using, add one of the following lines to `$CATALINA_HOME$/conf/context.xml` within the `<Context>` tag:
+Add the following line to `$CATALINA_HOME$/conf/context.xml` within the `<Context>` tag:
 
-For Tomcat 7.0:
+For Tomcat 10.1 and later (Jakarta EE 10):
 
 ``` pre
-<Manager className="org.apache.geode.modules.session.catalina.Tomcat7DeltaSessionManager"/> 
+<Manager className="org.apache.geode.modules.session.catalina.Tomcat10DeltaSessionManager"/> 
 ```
 
-For Tomcat 8.0 and 8.5:
+**Note:** Tomcat 10.1+ implements Jakarta EE 10 with Servlet 6.0 specification and uses the Jakarta EE namespace (`jakarta.servlet.*`) instead of the legacy `javax.servlet.*` namespace. Ensure your application has been migrated to Jakarta EE 10 before using this module. Support for Tomcat 7, 8, and 9 has been discontinued.
 
-``` pre
-<Manager className="org.apache.geode.modules.session.catalina.Tomcat8DeltaSessionManager"/> 
-```
+The application server operates as a <%=vars.product_name%> client in this configuration.
 
-For Tomcat 9.0:
+### Setting the CLASSPATH
+
+Set the CLASSPATH environment variable to include Tomcat and <%=vars.product_name%> module libraries. This CLASSPATH is required when starting the locator and server.
+
+For a client/server setup using Apache Tomcat v10.1+ and Geode v2.x, the CLASSPATH should include:
 
 ``` pre
-<Manager className="org.apache.geode.modules.session.catalina.Tomcat9DeltaSessionManager"/> 
+export CLASSPATH=$CATALINA_HOME/lib/servlet-api.jar:$CATALINA_HOME/lib/catalina.jar:$CATALINA_HOME/bin/tomcat-juli.jar:$GEODE_HOME/lib/geode-modules-2.x.x.jar:$GEODE_HOME/lib/geode-modules-tomcat10-2.x.x.jar
 ```
 
-The application server operates as a <%=vars.product_name%> client in this configuration.
-
-Set the CLASSPATH environment variable. For a client/server set up using Apache Tomcat v9 and Geode v1.13,
-the CLASSPATH setting should be similar to the following. Adjust filenames and version numbers as needed for your implementation.
+Example with explicit paths:
 
 ``` pre
-CLASSPATH="$CATALINA_HOME/lib/geode-modules-1.13.3.jar:\
-$CATALINA_HOME/lib/geode-modules-tomcat9-1.13.3.jar:\
-$CATALINA_HOME/lib/servlet-api.jar:\
-$CATALINA_HOME/lib/catalina.jar:\
-$CATALINA_HOME/lib/tomcat-util.jar:\
-$CATALINA_HOME/bin/tomcat-juli.jar"
+CLASSPATH=/opt/apache-tomcat-10.1.x/lib/servlet-api.jar:/opt/apache-tomcat-10.1.x/lib/catalina.jar:/opt/apache-tomcat-10.1.x/bin/tomcat-juli.jar:/opt/geode-2.x/lib/geode-modules-2.x.x.jar:/opt/geode-2.x/lib/geode-modules-tomcat10-2.x.x.jar
 ```
 
-Start the locator and server using `gfsh`:
+### Starting the Locator and Server
+
+Start the locator and server using `gfsh` with the configured CLASSPATH:
 
 ``` pre
 $ gfsh start locator --name=locator1 --classpath=$CLASSPATH
@@ -107,7 +108,7 @@ $ gfsh start server --name=server1 --locators=localhost[10334] --server-port=0 \
 
 ## <a id="tomcat_setting_up_the_module__section_2B97047AB30A4C549D91AD258657FBA6" class="no-quick-link"></a>Starting the Application Server
 
-Once you've updated the configuration, you are now ready to start your tc Server or Tomcat instance. Refer to your application server documentation for starting the application server. Once started, <%=vars.product_name%> will automatically launch within the application server process.
+Once you've updated the XML configuration files, you are now ready to start your Tomcat instance. Refer to your application server documentation for starting the application server. Once started, <%=vars.product_name%> will automatically launch within the application server process.
 
 **Note:**
 <%=vars.product_name%> session state management provides its own clustering functionality. If you are using <%=vars.product_name%>, you should NOT turn on Tomcat clustering as well.
@@ -117,8 +118,65 @@ Once you've updated the configuration, you are now ready to start your tc Server
 You can verify that <%=vars.product_name%> has successfully started by inspecting the Tomcat log file. For example:
 
 ``` pre
-15-Jul-2021 10:25:11.483 INFO [main] org.apache.catalina.startup.HostConfig.deployDirectory Deployment of web application directory [/Users/user/workspace/apache-tomcat-9.0.62/webapps/host-manager] has finished in [1,688] ms
-15-Jul-2021 10:25:11.486 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
-15-Jul-2021 10:25:11.493 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [11682] milliseconds
+15-Jul-2025 10:25:11.483 INFO [main] org.apache.catalina.startup.HostConfig.deployDirectory Deployment of web application directory [/Users/user/workspace/apache-tomcat-10.1.x/webapps/host-manager] has finished in [1,688] ms
+15-Jul-2025 10:25:11.486 INFO [main] org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler ["http-nio-8080"]
+15-Jul-2025 10:25:11.493 INFO [main] org.apache.catalina.startup.Catalina.start Server startup in [11682] milliseconds
+```
+
+### Verifying Cluster Topology
+
+You can verify the cluster configuration by using `gfsh` to list cluster members.
+
+**For Peer-to-Peer Configuration:**
+
+``` pre
+$ gfsh -e "connect --locator=localhost[10334]" -e "list members"
+```
+
+You should see two members: the locator and the Tomcat server. The Tomcat server appears as a full member of the <%=vars.product_name%> distributed system.
+
+``` pre
+Member Count : 2
+
+   Name     | Id
+----------- | -------------------------------------
+locator1    | 192.168.1.100(locator1:12345:locator)
+TomcatNode  | 192.168.1.100(67890)
+```
+
+**For Client/Server Configuration:**
+
+``` pre
+$ gfsh -e "connect --locator=localhost[10334]" -e "list members"
+```
+
+You should see two members: the locator and the cache server. The Tomcat server does NOT appear in the member list because it operates as a lightweight client.
+
+``` pre
+Member Count : 2
+
+   Name     | Id
+----------- | -------------------------------------
+locator1    | 192.168.1.100(locator1:12345:locator)
+server1     | 192.168.1.100(server1:67890)
 ```
 
+## <a id="tomcat_setting_up_the_module__section_troubleshooting" class="no-quick-link"></a>Troubleshooting
+
+**Problem:** Tomcat logs show `ClassNotFoundException: org.apache.geode.modules.util.BootstrappingFunction` (client/server only)
+
+**Solution:** Ensure you started the locator and server with the `--classpath` option as shown in the client/server configuration. The <%=vars.product_name%> server must have access to the session module classes.
+
+---
+
+**Problem:** Tomcat fails with "Connection refused" when connecting to locator (peer-to-peer only)
+
+**Solution:** Ensure the <%=vars.product_name%> locator is running before starting Tomcat. Use `gfsh list members` or `lsof -i :10334` to verify the locator is listening on the configured port.
+
+---
+
+**Problem:** Web applications fail to deploy with session manager errors
+
+**Solution:** Check that you completed all installation steps, including copying all JAR files from `$GEODE_HOME/lib` to `$CATALINA_HOME/lib` as described in [Installing the HTTP Module for Tomcat](./tomcat_installing_the_module.html).
+
+
diff --git a/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb
index 084db231743b..237ce158d361 100644
--- a/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/weblogic_setting_up_the_module.html.md.erb
@@ -73,7 +73,7 @@ To modify your war or ear file manually, make the following updates:
     -   geode-serialization jar
     -   geode-membership jar
     -   geode-tcp-server jar
-    -   javax.transaction-api jar
+    -   jakarta.transaction-api jar
     -   jgroups jar
     -   log4j-api jar
     -   log4j-core jar
@@ -89,28 +89,28 @@ If you are deploying an ear file:
     ``` pre
     Manifest-Version: 1.0
     Built-By: joe
-    Build-Jdk: 1.8.0_77
+    Build-Jdk: 17.0.16
     Created-By: Apache Maven
     Archiver-Version: Plexus Archiver
-    Class-Path: lib/geode-modules-1.0.0.jar
-    lib/geode-modules-session-internal-1.0.0.jar
-    lib/geode-modules-session-1.0.0.jar
-    lib/slf4j-api-1.7.7.jar
-    lib/slf4j-jdk14-1.7.7.jar
+    Class-Path: lib/geode-modules-2.0.0.jar
+    lib/geode-modules-session-internal-2.0.0.jar
+    lib/geode-modules-session-2.0.0.jar
+    lib/slf4j-api-2.0.17.jar
+    lib/slf4j-jdk14-2.0.17.jar
     lib/antlr-2.7.7.jar
-    lib/geode-membership.1.0.0.jar
-    lib/geode-tcp.1.0.0.jar
-    lib/fastutil-7.0.2.jar
-    lib/geode-core-1.0.0.jar
-    lib/geode-common.1.0.0.jar
-    lib/geode-management.1.0.0.jar
-    lib/geode-logging.1.0.0.jar
-    lib/geode-serialization.1.0.0.jar
-    lib/javax.transaction-api-1.3.jar
-    lib/jgroups-3.6.8.Final.jar
-    lib/log4j-api-2.5.jar
-    lib/log4j-core-2.5.jar
-    lib/log4j-jul-2.5.jar
+    lib/geode-membership-2.0.0.jar
+    lib/geode-tcp-server-2.0.0.jar
+    lib/fastutil-8.5.8.jar
+    lib/geode-core-2.0.0.jar
+    lib/geode-common-2.0.0.jar
+    lib/geode-management-2.0.0.jar
+    lib/geode-logging-2.0.0.jar
+    lib/geode-serialization-2.0.0.jar
+    lib/jakarta.transaction-api-2.0.1.jar
+    lib/jgroups-3.6.20.Final.jar
+    lib/log4j-api-2.17.2.jar
+    lib/log4j-core-2.17.2.jar
+    lib/log4j-jul-2.17.2.jar
     ```
 
 ## <a id="weblogic_setting_up_the_module__section_20294A39368D4402AEFB3D074E8D5887" class="no-quick-link"></a>Peer-to-Peer Setup
@@ -182,8 +182,8 @@ $ gfsh start server \
     --name=server1 \
     --server-port=0 \
     --locators=localhost[10334] \
-    --classpath=<moduleDir>/lib/geode-modules-1.0.0.jar:\
-<moduleDir>/lib/geode-modules-session-internal-1.0.0.jar
+    --classpath=<moduleDir>/lib/geode-modules-2.0.0.jar:\
+<moduleDir>/lib/geode-modules-session-internal-2.0.0.jar
 ```
 
 Once the application server is started, the <%=vars.product_name%> client will automatically launch within the application server process.
@@ -193,10 +193,10 @@ Once the application server is started, the <%=vars.product_name%> client will a
 You can verify that <%=vars.product_name%> has successfully started by inspecting the application server log file. For example:
 
 ``` pre
-info 2016/04/18 10:04:18.685 PDT <localhost-startStop-2> tid=0x1a]
+info 2025/04/18 10:04:18.685 PDT <localhost-startStop-2> tid=0x1a]
 Initializing <%=vars.product_name%> Modules
-Java version:   1.0.0 user1 041816 2016-11-18 08:46:17 -0700
-javac 1.<%=vars.min_java_version%>.0_<%=vars.min_java_update%>
+Java version:   2.0.0 user1 041816 2025-11-18 08:46:17 -0700
+javac <%=vars.min_java_version%>.0.<%=vars.min_java_update%>
 Native version: native code unavailable
 Source revision: 19dd8eb1907e0beb2aa3e0a17d5f12c6cbec6968
 Source repository: develop