Issue #23739 Updated links, synced preface.adoc, replaced Java EE to Jakarta EE
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
index 97937bd..2e50a73 100644
--- a/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
+++ b/docs/add-on-component-development-guide/src/main/jbake/content/preface.adoc
@@ -3,31 +3,19 @@
 title=Preface
 next=introduction.html
 prev=title.html
+~~~~~~
 
 Preface
 =======
 
-[[sthref2]][[preface]]
-
+[[sthref2]]
+[[preface]]
 Preface
 -------
 
-[NOTE]
-====
-This documentation is part of the Java Enterprise Edition contribution
-to the Eclipse Foundation and is not intended for use in relation to
-Java Enterprise Edition or Orace GlassFish. The documentation is in the
-process of being revised to reflect the new Jakarta EE branding.
-Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
-Enterprise Edition should be considered references to Jakarta EE.
-
-Please see the Title page for additional license information.
-====
-
-This document explains how to use published interfaces of GlassFish
-Server Open Source Edition to develop add-on components for GlassFish
-Server.
+This document explains how to use published interfaces of
+GlassFish Server Open Source Edition to develop add-on components
+for GlassFish Server.
 This document explains how to perform only those tasks that
 ensure that the add-on component is suitable for GlassFish Server.
 
@@ -39,19 +27,16 @@
 program in the Java language.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `http://glassfish.java.net/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server.
-The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -61,10 +46,8 @@
 * link:#fquvc[Symbol Conventions]
 * link:#ghpfg[Default Paths and File Names]
 
-
 [[GSACG00079]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -110,9 +93,9 @@
 about deployment descriptors.
 
 |link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
-|Explains how to create and implement Java Platform, Enterprise Edition (Java EE platform)
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
 applications that are intended to run on the GlassFish Server.
-These applications follow the open Java standards model for Java EE components
+These applications follow the open Java standards model for Jakarta EE components
 and application programmer interfaces (APIs).
 This guide provides information about developer tools, security, and debugging.
 
@@ -165,66 +148,57 @@
 |link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
 |Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSACG00080]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform](`http://docs.oracle.com/javaee/7/firstcup/doc/home.html`).
-For beginning Java EE programmers, this short tutorial explains the entire process for
-developing a simple enterprise application.
-The sample application is a web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service,
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
 
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 7
-Tutorial](`http://docs.oracle.com/javaee/7/tutorial/doc/home.html`).
-This comprehensive tutorial explains how to use Java EE 7 platform
-technologies and APIs to develop Java EE applications.
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 7 of Java EE is located at `http://docs.oracle.com/javaee/7/api/`.
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
 
-* The API specification for GlassFish Server 7, including Java EE 7
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
-GlassFish Server product, is located at `http://glassfish.java.net/nonav/docs/v3/api/`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications]
-(`http://www.oracle.com/technetwork/java/javaee/tech/index.html`) might
-be useful.
+GlassFish Server product, is located at
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support page](`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Java DB database for use with the GlassFish
-Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Java
-DB product page](`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page](`http://glassfish-samples.java.net/`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSACG00081]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -235,7 +209,9 @@
 [width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and onscreen computer output
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
 |Edit your `.login` file.
 
 Use `ls` `a` to list all files.
@@ -264,7 +240,6 @@
 
 [[GSACG00082]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
@@ -320,6 +295,7 @@
 [%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
+
 |as-install
 a|Represents the base installation directory for GlassFish Server.
 In configuration files, as-install is represented as follows:
diff --git a/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc b/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
index ea21603..51e3bbe 100644
--- a/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/add-on-component-development-guide/src/main/jbake/content/title.adoc
@@ -3,6 +3,7 @@
 title=Eclipse GlassFish Server Add-On Component Development Guide, Release 7
 next=preface.html
 prev=lot.html
+~~~~~~
 
 Eclipse GlassFish Server Add-On Component Development Guide, Release 7
 ======================================================================
diff --git a/docs/administration-guide/src/main/jbake/content/batch.adoc b/docs/administration-guide/src/main/jbake/content/batch.adoc
index 8ff3d2a..508b312 100644
--- a/docs/administration-guide/src/main/jbake/content/batch.adoc
+++ b/docs/administration-guide/src/main/jbake/content/batch.adoc
@@ -47,8 +47,8 @@
 
 For detailed information about batch jobs, batch processing, and the
 batch processing framework, see
-"https://javaee.github.io/tutorial/batch-processing.html[Batch
-Processing]" in The Java EE 8 Tutorial. Also see
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#batch-processing[Batch Processing]
+in The Jakarta EE Tutorial. Also see
 http://jcp.org/en/jsr/detail?id=352[Java Specification Request 352:
 Batch Applications for the Java Platform]
 (`http://jcp.org/en/jsr/detail?id=352`). The specification defines the
@@ -64,7 +64,7 @@
 steps. Users who log in to the `asadmin` utility or to the
 Administration Console as administrator are the only users who can view
 details for all batch jobs submitted by all applications in the
-GlassFish Server environment.
+{productName} environment.
 
 The following tasks are used to view information about batch jobs:
 
diff --git a/docs/administration-guide/src/main/jbake/content/concurrent.adoc b/docs/administration-guide/src/main/jbake/content/concurrent.adoc
index 7926a57..88a3579 100644
--- a/docs/administration-guide/src/main/jbake/content/concurrent.adoc
+++ b/docs/administration-guide/src/main/jbake/content/concurrent.adoc
@@ -37,7 +37,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Concurrent resources are managed objects that provide concurrency
-capabilities to Java EE applications. In GlassFish Server, you configure
+capabilities to Jakarta EE applications. In GlassFish Server, you configure
 concurrent resources and make them available for use by application
 components such as servlets and EJBs. Concurrent resources are accessed
 through JNDI lookup or resource injection.
@@ -53,11 +53,10 @@
 Managed Scheduled Executor Services].
 
 For detailed information about concurrent resources, see
-"https://javaee.github.io/tutorial/concurrency-utilities.html[Concurrency
-Utilities]" in The Java EE 8 Tutorial. Also see
-http://jcp.org/en/jsr/detail?id=236[Java Specification Request 236:
-Concurrency Utilities for Java EE]
-(`http://jcp.org/en/jsr/detail?id=236`).
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#jakarta-concurrency-2[Concurrency Utilities]
+in The Jakarta EE Tutorial. Also see
+http://jcp.org/en/jsr/detail?id=236[
+Java Specification Request 236: Concurrency Utilities for Jakarta EE].
 
 [[DAFFGDCD]][[GSADG1110]][[default-concurrent-resources]]
 
@@ -67,24 +66,24 @@
 When you create a concurrent resource, you specify a unique JNDI name
 for the resource. Applications use this name to access the resource.
 
-The Java EE standard specifies that certain default resources be made
+The Jakarta EE standard specifies that certain default resources be made
 available to applications, and defines specific JNDI names for these
 default resources. GlassFish Server makes these names available through
-the use of logical JNDI names, which map Java EE standard JNDI names to
+the use of logical JNDI names, which map Jakarta EE standard JNDI names to
 specific GlassFish Server resources. For concurrent resources, the
 mappings are as follows:
 
 java:comp/DefaultContextService::
-  This Java EE standard name is mapped to the
+  This Jakarta EE standard name is mapped to the
   `concurrent/__defaultContextService` resource.
 java:comp/DefaultManagedThreadFactory::
-  This Java EE standard name is mapped to the
+  This Jakarta EE standard name is mapped to the
   `concurrent/__defaultManagedThreadFactory` resource.
 java:comp/DefaultManagedExecutorService::
-  This Java EE standard name is mapped to the
+  This Jakarta EE standard name is mapped to the
   `concurrent/__defaultManagedExecutorService` resource.
 java:comp/DefaultManagedScheduledExecutorService::
-  This Java EE standard name is mapped to the
+  This Jakarta EE standard name is mapped to the
   `concurrent/__defaultManagedScheduledExecutorService` resource.
 
 [[DAFFCEEA]][[GSADG1111]][[configuring-context-services]]
@@ -293,12 +292,10 @@
 
 Because all JNDI names are in the `java:comp/env` subcontext, when
 specifying the JNDI name of a managed thread factory, use only the
-`concurrent/`name format. For example, `concurrent/Factory1`.
+``concurrent/``name format. For example, `concurrent/Factory1`.
 
 For more information about the default managed thread factory resource
-included with GlassFish Server, see link:#DAFFGDCD[Default Concurrent
-Resources].
-
+included with GlassFish Server, see link:#DAFFGDCD[Default Concurrent Resources].
 
 [NOTE]
 ====
@@ -310,7 +307,6 @@
 application will not be able to locate the resource.
 ====
 
-
 1. Ensure that the server is running. Remote subcommands require a running server.
 2. Create a managed thread factory by using the
 link:../reference-manual/create-jdbc-resource.html#GSRFM00037[`create-managed-thread-factory`] subcommand.
diff --git a/docs/administration-guide/src/main/jbake/content/connectors.adoc b/docs/administration-guide/src/main/jbake/content/connectors.adoc
index d66519b..417b286 100644
--- a/docs/administration-guide/src/main/jbake/content/connectors.adoc
+++ b/docs/administration-guide/src/main/jbake/content/connectors.adoc
@@ -59,9 +59,9 @@
 The key elements of EIS connectivity are the following:
 
 * Connector Module. A connector module, also called a resource adapter,
-is a Java EE component that enables applications to interact with EIS
+is a Jakarta EE component that enables applications to interact with EIS
 software. A connector module is used by GlassFish Server to implement
-Java Message Service (JMS). Like other Java EE modules, a connector
+Java Message Service (JMS). Like other Jakarta EE modules, a connector
 module is installed when it is deployed. For instructions on creating a
 connector module, see "link:../application-development-guide/connectors.html#GSDVG00013[Developing Connectors]" in
 GlassFish Server Open Source Edition Application Development Guide.
diff --git a/docs/administration-guide/src/main/jbake/content/domains.adoc b/docs/administration-guide/src/main/jbake/content/domains.adoc
index e9907bd..0c2638c 100644
--- a/docs/administration-guide/src/main/jbake/content/domains.adoc
+++ b/docs/administration-guide/src/main/jbake/content/domains.adoc
@@ -56,7 +56,7 @@
 platform (Java Virtual Machine or JVM machine) on a single node in which
 GlassFish Server is running. A node defines the host where the GlassFish
 Server instance resides. The JVM machine must be compatible with the
-Java Platform, Enterprise Edition (Java EE).
+Java Platform, Enterprise Edition (Jakarta EE).
 
 GlassFish Server instances form the basis of an application deployment.
 
@@ -1004,7 +1004,7 @@
 This behavior causes the GlassFish Server service to shut down. To
 prevent the service from shutting down when a user logs out, you must
 set the `-Xrs` Java VM option
-(`https://javaee.github.io/glassfish/documentation`).
+(`https://github.com/eclipse-ee4j/glassfishdocumentation`).
 
 1. Ensure that the DAS is running.
 
diff --git a/docs/administration-guide/src/main/jbake/content/general-administration.adoc b/docs/administration-guide/src/main/jbake/content/general-administration.adoc
index 3ff458e..4eb51f6 100644
--- a/docs/administration-guide/src/main/jbake/content/general-administration.adoc
+++ b/docs/administration-guide/src/main/jbake/content/general-administration.adoc
@@ -76,7 +76,7 @@
 
 The replaceable items in this syntax are described in the subsections
 that follow. For full details of this syntax, see the
-https://javaee.github.io/glassfish/doc/5.0/reference-manual.pdf[`asadmin`(1M)]
+https://github.com/eclipse-ee4j/glassfishdoc/5.0/reference-manual.pdf[`asadmin`(1M)]
 help page.
 
 [[ghvzn]][[GSADG00631]][[subcommands-of-the-asadmin-utility]]
@@ -97,7 +97,7 @@
 
 For a list of the subcommands for this release of GlassFish Server, see
 Section 1 of the
-https://javaee.github.io/glassfish/doc/5.0/reference-manual.pdf[GlassFish
+https://github.com/eclipse-ee4j/glassfishdoc/5.0/reference-manual.pdf[GlassFish
 Server Open Source Edition Reference Manual].
 
 [[ghvyd]][[GSADG00632]][[asadmin-utility-options-and-subcommand-options]]
@@ -122,7 +122,7 @@
 subcommand, not the `asadmin` utility. Subcommand options must follow
 the subcommand. For a description of a subcommand's options, see the
 entry for the subcommand in the
-https://javaee.github.io/glassfish/doc/5.0/reference-manual.pdf[GlassFish
+https://github.com/eclipse-ee4j/glassfishdoc/5.0/reference-manual.pdf[GlassFish
 Server Open Source Edition Reference Manual].
 +
 
@@ -1177,11 +1177,13 @@
 * JavaFX
 
 The implementation of the GlassFish Server REST interfaces is based on
-https://jersey.github.io[project Jersey] . Project Jersey is the
-reference implementation of http://jcp.org/en/jsr/summary?id=311[Java
-Specification Request (JSR) 311: JAX-RS: The Java API for RESTful Web
-Services]. Information about JSR 311 is also available from the JSR
+https://eclipse-ee4j.github.io/jersey/[project Jersey]. Project Jersey is the
+reference implementation of http://jcp.org/en/jsr/summary?id=311[
+Java Specification Request (JSR) 311: JAX-RS: The Java API for RESTful Web Services].
+Information about JSR 311 is also available from the JSR
 https://javaee.github.io/jsr311/[311 project home page] .
+Information about Jakarta RESTful Web Services is here:
+https://jakarta.ee/specifications/restful-ws/
 
 The following topics are addressed here:
 
diff --git a/docs/administration-guide/src/main/jbake/content/http_https.adoc b/docs/administration-guide/src/main/jbake/content/http_https.adoc
index b0dec81..fab96ed 100644
--- a/docs/administration-guide/src/main/jbake/content/http_https.adoc
+++ b/docs/administration-guide/src/main/jbake/content/http_https.adoc
@@ -838,7 +838,7 @@
 created. You can assign a default virtual server to each new HTTP
 listener you create.
 
-Web applications and Java EE applications containing web components (web
+Web applications and Jakarta EE applications containing web components (web
 modules) can be assigned to virtual servers during deployment. A web
 module can be assigned to more than one virtual server, and a virtual
 server can have more than one web module assigned to it. If you deploy a
diff --git a/docs/administration-guide/src/main/jbake/content/javamail.adoc b/docs/administration-guide/src/main/jbake/content/javamail.adoc
index 5bd9a9b..ab39139 100644
--- a/docs/administration-guide/src/main/jbake/content/javamail.adoc
+++ b/docs/administration-guide/src/main/jbake/content/javamail.adoc
@@ -46,7 +46,7 @@
 must have access to a mail server to use JavaMail.
 
 The JavaMail API is implemented as an optional package in the Java
-platform and is also available as part of the Java EE platform.
+platform and is also available as part of the Jakarta EE platform.
 
 To learn more about the JavaMail API, consult the
 http://www.oracle.com/technetwork/java/javamail/[JavaMail web site] .
@@ -120,8 +120,8 @@
 
 [source]
 ----
-asadmin> create-javamail-resource --mailhost localhost 
---mailuser sample --fromaddress sample\@sun\.com mail/MyMailSession 
+asadmin> create-javamail-resource --mailhost localhost
+--mailuser sample --fromaddress sample\@sun\.com mail/MyMailSession
 Command create-javamail-resource executed successfully.
 ----
 
@@ -151,7 +151,7 @@
 
 [source]
 ----
-asadmin> list-javamail-resources 
+asadmin> list-javamail-resources
 mail/MyMailSession
 Command list-javamail-resources executed successfuly.
 ----
@@ -220,7 +220,7 @@
 
 [source]
 ----
-asadmin> delete-javamail-resource mail/MyMailSession 
+asadmin> delete-javamail-resource mail/MyMailSession
 Command delete-javamail-resource executed successfully.
 ----
 
diff --git a/docs/administration-guide/src/main/jbake/content/jdbc.adoc b/docs/administration-guide/src/main/jbake/content/jdbc.adoc
index ee2f320..b1b2abc 100644
--- a/docs/administration-guide/src/main/jbake/content/jdbc.adoc
+++ b/docs/administration-guide/src/main/jbake/content/jdbc.adoc
@@ -884,11 +884,11 @@
 name for the resource of a payroll database might be
 `java:comp/env/jdbc/payrolldb`.
 
-The Java EE standard specifies that certain default resources be made
+The Jakarta EE standard specifies that certain default resources be made
 available to applications, and defines specific JNDI names for these
 default resources. GlassFish Server makes these names available through
-the use of logical JNDI names, which map Java EE standard JNDI names to
-specific GlassFish Server resources. For JDBC resources, the Java EE
+the use of logical JNDI names, which map Jakarta EE standard JNDI names to
+specific GlassFish Server resources. For JDBC resources, the Jakarta EE
 standard name `java:comp/DefaultDataSource` is mapped to the
 `jdbc/__default` resource.
 
@@ -1201,7 +1201,7 @@
 
 [source]
 ----
-LD_LIBRARY_PATH=/usr/db2user/sqllib/lib:${Java EE.home}/lib
+LD_LIBRARY_PATH=/usr/db2user/sqllib/lib:${Jakarta EE.home}/lib
 DB2DIR=/opt/IBM/db2/V8.2
 DB2INSTANCE=db2user
 INSTHOME=/usr/db2user
@@ -1334,7 +1334,7 @@
 sure that the shared library is available through `LD_LIBRARY_PATH` and
 that the `ORACLE_HOME` property is set.
 
-To make the Oracle driver behave in a Java EE-compliant manner, you must
+To make the Oracle driver behave in a Jakarta EE-compliant manner, you must
 define the following JVM property:
 
 [source]
@@ -1367,7 +1367,7 @@
 
 The JAR file for the Oracle 11 database driver is `ojdbc6.jar`.
 
-To make the Oracle driver behave in a Java EE-compliant manner, you must
+To make the Oracle driver behave in a Jakarta EE-compliant manner, you must
 define the following JVM property:
 
 [source]
@@ -1557,7 +1557,7 @@
 
 The JAR file for the DataDirect driver is `oracle.jar`.
 
-To make the Oracle driver behave in a Java EE-compliant manner, you must
+To make the Oracle driver behave in a Jakarta EE-compliant manner, you must
 define the following JVM property:
 
 [source]
diff --git a/docs/administration-guide/src/main/jbake/content/jms.adoc b/docs/administration-guide/src/main/jbake/content/jms.adoc
index 8c30767..21471bc 100644
--- a/docs/administration-guide/src/main/jbake/content/jms.adoc
+++ b/docs/administration-guide/src/main/jbake/content/jms.adoc
@@ -16,13 +16,13 @@
 -----------------------------------------------
 
 The Java Message Service (JMS) API is a messaging standard that allows
-Java EE applications and components, including message-driven beans
+Jakarta EE applications and components, including message-driven beans
 (MDBs), to create, send, receive, and read messages. It enables
 distributed communication that is loosely coupled, reliable, and
 asynchronous.
 
 GlassFish Server supports JMS messaging by communicating with a JMS
-provider through a Java EE Connector resource adapter. By default,
+provider through a Jakarta EE Connector resource adapter. By default,
 GlassFish Server provides JMS messaging through its built-in jmsra
 resource adapter communicating with Open Message Queue, which is
 included with GlassFish Server. This combination, known as the JMS
@@ -585,12 +585,12 @@
 application developer, you can determine what resources must be created.
 The order in which the resources are created does not matter.
 
-The Java EE standard specifies that certain default resources be made
+The Jakarta EE standard specifies that certain default resources be made
 available to applications, and defines specific JNDI names for these
 default resources. GlassFish Server makes these names available through
-the use of logical JNDI names, which map Java EE standard JNDI names to
+the use of logical JNDI names, which map Jakarta EE standard JNDI names to
 specific GlassFish Server resources. For JMS connection factory
-resources, the Java EE standard name
+resources, the Jakarta EE standard name
 `java:comp/DefaultJMSConnectionFactory` is mapped to the
 `jms/__defaultConnectionFactory` resource.
 
@@ -1083,7 +1083,7 @@
 
 GlassFish Server supports the integration and use of Oracle WebLogic JMS
 and IBM WebSphere MQ JMS providers through the use of the Generic
-Resource Adapter for JMS (GenericJMSRA). This Java EE connector 1.5
+Resource Adapter for JMS (GenericJMSRA). This Jakarta EE connector 1.5
 resource adapter can wrap the JMS client library of Oracle WebLogic JMS
 and IBM WebSphere MQ and make it available for use by GlassFish. The
 adapter is a `.rar` archive that can be deployed and configured using
@@ -1735,7 +1735,7 @@
 corresponding WebLogic JMS object.
 2. Declaring the connection factory and destination
 +
-In accordance with standard Java EE requirements, these resources need
+In accordance with standard Jakarta EE requirements, these resources need
 to be declared in the deployment descriptor for the MDB, EJB or other
 component. For example, for a session bean, configure the `ejb-jar.xml`
 with `<resource-env-ref>` elements, as follows:
diff --git a/docs/administration-guide/src/main/jbake/content/jndi.adoc b/docs/administration-guide/src/main/jbake/content/jndi.adoc
index 0c40dd6..cd5c09b 100644
--- a/docs/administration-guide/src/main/jbake/content/jndi.adoc
+++ b/docs/administration-guide/src/main/jbake/content/jndi.adoc
@@ -16,7 +16,7 @@
 -----------------------------------------------------------------------
 
 The Java Naming and Directory Interface (JNDI) API is used for accessing
-different kinds of naming and directory services. Java EE components
+different kinds of naming and directory services. Jakarta EE components
 locate objects by invoking the JNDI lookup method.
 
 The following topics are addressed here:
@@ -47,32 +47,32 @@
 
 The following topics are addressed here:
 
-* link:#abllb[Java EE Naming Environment]
+* link:#abllb[Jakarta EE Naming Environment]
 * link:#gglpg[How the Naming Environment and the Container Work
 Together]
 * link:#abllc[Naming References and Binding Information]
 
 [[abllb]][[GSADG00780]][[java-ee-naming-environment]]
 
-Java EE Naming Environment
+Jakarta EE Naming Environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 JNDI names are bound to their objects by the naming and directory
-service that is provided by a Java EE server. Because Java EE components
+service that is provided by a Jakarta EE server. Because Jakarta EE components
 access this service through the JNDI API, the object usually uses its
 JNDI name. For example, the JNDI name of the Apache Derby database is
 `jdbc/_default`. At startup, the GlassFish Server reads information from
 the configuration file and automatically adds JNDI database names to the
 name space, one of which is `jdbc/_default`.
 
-Java EE application clients, enterprise beans, and web components must
+Jakarta EE application clients, enterprise beans, and web components must
 have access to a JNDI naming environment.
 
 The application component's naming environment is the mechanism that
 allows customization of the application component's business logic
 during deployment or assembly. This environment allows you to customize
 the application component without needing to access or change the source
-code off the component. A Java EE container implements the provides the
+code off the component. A Jakarta EE container implements the provides the
 environment to the application component instance as a JNDI naming
 context.
 
@@ -120,11 +120,11 @@
 deployment, but it also decouples components from resources. Because of
 this decoupling, if at a later time the component needs to access a
 different resource, the name does not need to change. This flexibility
-makes it easier for you to assemble Java EE applications from
+makes it easier for you to assemble Jakarta EE applications from
 preexisting components.
 
 The following table lists JNDI lookups and their associated resource
-references for the Java EE resources used by the GlassFish Server.
+references for the Jakarta EE resources used by the GlassFish Server.
 
 [[GSADG1029]][[sthref87]][[fxizy]]
 
@@ -207,7 +207,7 @@
 
 [source]
 ----
-asadmin> create-custom-resource --restype topic --factoryclass com.imq.topic 
+asadmin> create-custom-resource --restype topic --factoryclass com.imq.topic
 sample_custom_resource
 Command create-custom-resource executed successfully.
 ----
@@ -239,8 +239,8 @@
 [source]
 ----
 asadmin> list-custom-resources
-sample_custom_resource01 
-sample_custom_resource02 
+sample_custom_resource01
+sample_custom_resource02
 Command list-custom-resources executed successfully
 ----
 
@@ -358,8 +358,8 @@
 
 [source]
 ----
-asadmin> create-jndi-resource --jndilookupname sample_jndi 
---restype queue --factoryclass sampleClass --description "this is a sample jndi 
+asadmin> create-jndi-resource --jndilookupname sample_jndi
+--restype queue --factoryclass sampleClass --description "this is a sample jndi
 resource" sample_jndi_resource
 Command create-jndi-resource executed successfully
 ----
@@ -456,7 +456,7 @@
 [source]
 ----
 asadmin> set server.resources.external-jndi-resource.my-jndi-resource.
-jndi-lookup-name=bar server.resources.external-jndi-resource.my-jndi-resource.jndi-lookup-name=bar 
+jndi-lookup-name=bar server.resources.external-jndi-resource.my-jndi-resource.jndi-lookup-name=bar
 ----
 
 [[gitvt]][[GSADG00511]][[to-delete-an-external-jndi-resource]]
@@ -497,7 +497,7 @@
 [source,xml]
 ----
 <resources>
- <!-- external-jndi-resource element specifies how to access Java EE resources
+ <!-- external-jndi-resource element specifies how to access Jakarta EE resources
  -- stored in an external JNDI repository. This example
  -- illustrates how to access a java object stored in LDAP.
  -- factory-class element specifies the JNDI InitialContext factory that
diff --git a/docs/administration-guide/src/main/jbake/content/jvm.adoc b/docs/administration-guide/src/main/jbake/content/jvm.adoc
index 698e0d0..dfa67d7 100644
--- a/docs/administration-guide/src/main/jbake/content/jvm.adoc
+++ b/docs/administration-guide/src/main/jbake/content/jvm.adoc
@@ -215,12 +215,12 @@
 
 [source]
 ----
-asadmin> generate-jvm-report --type summary 
+asadmin> generate-jvm-report --type summary
 Operating System Information:
 Name of the Operating System: Windows XP
 Binary Architecture name of the Operating System: x86, Version: 5.1
 Number of processors available on the Operating System: 2
-System load on the available processors for the last minute: NOT_AVAILABLE. 
+System load on the available processors for the last minute: NOT_AVAILABLE.
 (Sum of running and queued runnable entities per minute).
 .
 ,
diff --git a/docs/administration-guide/src/main/jbake/content/logging.adoc b/docs/administration-guide/src/main/jbake/content/logging.adoc
index 82c41b9..65b3dc9 100644
--- a/docs/administration-guide/src/main/jbake/content/logging.adoc
+++ b/docs/administration-guide/src/main/jbake/content/logging.adoc
@@ -1381,7 +1381,7 @@
 Logger Name                            Subsystem         Logger Description
 ...
 jakarta.enterprise.monitoring            Monitoring        Monitoring Logger
-jakarta.enterprise.system.core.ee        AS-CORE           Java EE Core Kernel
+jakarta.enterprise.system.core.ee        AS-CORE           Jakarta EE Core Kernel
 jakarta.enterprise.system.jmx            JMX               JMX System Logger
 jakarta.enterprise.system.tools.admin    ADMIN             Administration Services
 ...
diff --git a/docs/administration-guide/src/main/jbake/content/overview.adoc b/docs/administration-guide/src/main/jbake/content/overview.adoc
index 6cd9736..16d05dd 100644
--- a/docs/administration-guide/src/main/jbake/content/overview.adoc
+++ b/docs/administration-guide/src/main/jbake/content/overview.adoc
@@ -16,7 +16,7 @@
 ---------------------------------------------
 
 GlassFish Server Open Source Edition provides a server for developing
-and deploying Java Platform Enterprise Edition (Java EE) applications
+and deploying Java Platform Enterprise Edition (Jakarta EE) applications
 and web Java Web Services.
 
 As an administrator ofGlassFish Server, your main responsibilities are
diff --git a/docs/administration-guide/src/main/jbake/content/preface.adoc b/docs/administration-guide/src/main/jbake/content/preface.adoc
index 986ce45..ccfab24 100644
--- a/docs/administration-guide/src/main/jbake/content/preface.adoc
+++ b/docs/administration-guide/src/main/jbake/content/preface.adoc
@@ -9,42 +9,25 @@
 =======
 
 [[GSADG00003]][[gkamj]]
-
-
 [[preface]]
 Preface
 -------
 
-[NOTE]
-====
-This documentation is part of the Java Enterprise Edition contribution
-to the Eclipse Foundation and is not intended for use in relation to
-Java Enterprise Edition or Orace GlassFish. The documentation is in the
-process of being revised to reflect the new Jakarta EE branding.
-Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
-Enterprise Edition should be considered references to Jakarta EE.
-
-Please see the Title page for additional license information.
-====
-
-GlassFish Server Open Source Edition 7 Administration Guide provides
-instructions for configuring and administering GlassFish Server Open
-Source Edition.
+The GlassFish Server Open Source Edition Administration Guide provides
+instructions for configuring and administering
+GlassFish Server Open Source Edition.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://javaee.github.io/glassfish/`. The
-GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
-GlassFish Server. The GlassFish project is designed to encourage
-communication between Oracle engineers and the community.
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -56,16 +39,15 @@
 
 [[GSADG00518]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
-GlassFish Server Documentation Set
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Eclipse GlassFish Server Documentation Set
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The GlassFish Server documentation set describes deployment planning and
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -73,137 +55,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-| |
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSADG00519]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 8 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The Java EE specifications and API specification for version 8 is
-located at `https://javaee.github.io/javaee-spec/`.
-* The API specification for GlassFish Server 7, including Java EE 8
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`https://javaee.github.io/glassfish/documentation`.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
+
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
 available from the repository
-(`https://github.com/javaee/glassfish-samples`).
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSADG00520]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -211,73 +197,84 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
 [[GSADG00521]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSADG00522]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -285,50 +282,46 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
-|as-install + a|
-Represents the base installation directory for GlassFish Server.
 
+|as-install
+a|Represents the base installation directory for GlassFish Server.
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
- a|
-Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
++
+user's-home-directory``/glassfish7/glassfish``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7\glassfish``
 
-user's-home-directory`/glassfish7/glassfish`
-
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7\glassfish`
-
-|as-install-parent + |Represents the parent of the base installation
-directory for GlassFish Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+|as-install-parent
+|Represents the parent of the base installation directory for GlassFish Server.
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
++
+user's-home-directory``/glassfish7``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7``
 
-user's-home-directory`/glassfish7`
+|domain-root-dir
+|Represents the directory in which a domain is created by default.
+|as-install``/domains/``
 
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7`
-
-|domain-root-dir + |Represents the directory in which a domain is
-created by default. |as-install`/domains/`
-
-|domain-dir + a|
-Represents the directory in which a domain's configuration is stored.
-
+|domain-dir
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
+|domain-root-dir/domain-name
 
- |domain-root-dir`/`domain-name
-
-|instance-dir + |Represents the directory for a server instance.
-|domain-dir`/`instance-name
+|instance-dir
+|Represents the directory for a server instance.
+|domain-dir/instance-name
 |===
 
diff --git a/docs/administration-guide/src/main/jbake/content/threadpools.adoc b/docs/administration-guide/src/main/jbake/content/threadpools.adoc
index 6dd7d5e..120d883 100644
--- a/docs/administration-guide/src/main/jbake/content/threadpools.adoc
+++ b/docs/administration-guide/src/main/jbake/content/threadpools.adoc
@@ -105,7 +105,7 @@
 
 [source]
 ----
-asadmin> create-threadpool --maxthreadpoolsize 100 
+asadmin> create-threadpool --maxthreadpoolsize 100
 --minthreadpoolsize 20 --idletimeout 2 --workqueues 100 threadpool-1
 Command create-threadpool executed successfully
 ----
diff --git a/docs/administration-guide/src/main/jbake/content/transactions.adoc b/docs/administration-guide/src/main/jbake/content/transactions.adoc
index 69cd4a4..4ab4643 100644
--- a/docs/administration-guide/src/main/jbake/content/transactions.adoc
+++ b/docs/administration-guide/src/main/jbake/content/transactions.adoc
@@ -38,8 +38,8 @@
 `http://www.oracle.com/technetwork/java/javaee/tech/jts-140022.html`.
 
 You might also want to read
-"https://javaee.github.io/tutorial/transactions.html[Transactions]" in
-The Java EE 8 Tutorial.
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]"
+in The Jakarta EE Tutorial.
 
 [[ablso]][[GSADG00605]][[about-transactions]]
 
@@ -145,7 +145,7 @@
 A local transaction involves only one non-XA resource and requires that
 all participating application components execute within one process.
 Local transaction optimization is specific to the resource manager and
-is transparent to the Java EE application.
+is transparent to the Jakarta EE application.
 
 In the GlassFish Server, a JDBC resource is non-XA if it meets either of
 the following criteria:
diff --git a/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc b/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
index 9d193e6..c291fb8 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/asadmin-deployment-subcommands.adoc
@@ -29,7 +29,7 @@
   application-specific class loader directory.
 link:../reference-manual/create-application-ref.html#GSRFM00013[`create-application-ref`]::
   Creates a reference from a cluster or an unclustered server instance
-  to a previously deployed Java EE application or module. This
+  to a previously deployed Jakarta EE application or module. This
   effectively results in the application element being deployed and made
   available on the targeted instance or cluster.
 link:../reference-manual/create-lifecycle-module.html#GSRFM00043[`create-lifecycle-module`]::
@@ -38,7 +38,7 @@
   in the server life cycle.
 link:../reference-manual/delete-application-ref.html#GSRFM00064[`delete-application-ref`]::
   Removes a reference from a cluster or an unclustered server instance
-  to a previously deployed Java EE application or module. This
+  to a previously deployed Jakarta EE application or module. This
   effectively results in the application element being undeployed on the
   targeted instance or cluster.
 link:../reference-manual/delete-lifecycle-module.html#GSRFM00095[`delete-lifecycle-module`]::
@@ -72,14 +72,14 @@
   link:deploying-applications.html#beaek[EJB Module Deployment
   Guidelines].
 link:../reference-manual/list-applications.html#GSRFM00148[`list-applications`]::
-  Lists deployed Java EE applications and modules. Optionally lists
+  Lists deployed Jakarta EE applications and modules. Optionally lists
   subcomponents and scoped resources. If the `--type` option is not
   specified, all applications and modules are listed. Supported in
   remote mode only. For usage instructions, see
   link:deploying-applications.html#giulr[To List Deployed Applications or
   Modules].
 link:../reference-manual/list-application-refs.html#GSRFM00147[`list-application-refs`]::
-  Lists Java EE applications and modules deployed on the specified
+  Lists Jakarta EE applications and modules deployed on the specified
   target server instance or cluster.
 link:../reference-manual/list-libraries.html#GSRFM00819[`list-libraries`]::
   Lists library JAR files that have been added to GlassFish Server. You
diff --git a/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc b/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
index 937cc2a..e095990 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/dd-elements.adoc
@@ -1356,7 +1356,7 @@
 resolution is always delegated to the parent class loader regardless of
 the delegate setting. This prevents applications from overriding core
 Java runtime classes or changing the API versions of specifications that
-are part of the Java EE platform.
+are part of the Jakarta EE platform.
 
 |`dynamic-reload-interval` | |(optional) Not implemented. Included
 for backward compatibility with previous Oracle Web Server versions.
@@ -1373,7 +1373,7 @@
 classes and resources packaged within the WAR file.
 
 Portable programs that use this element should not be packaged with any
-classes or interfaces that are a part of the Java EE specification. The
+classes or interfaces that are a part of the Jakarta EE specification. The
 behavior of a program that includes such classes or interfaces in its
 WAR file is undefined.
 ====
@@ -2017,10 +2017,10 @@
 Specifies the GlassFish Server release with which to be backward
 compatible in terms of JAR visibility requirements for applications. The
 current allowed value is `v2`, which refers to GlassFish Server version
-2 or GlassFish Server version 9.1 or 9.1.1. Starting in Java EE 6, the
-Java EE specification imposes stricter requirements than Java EE 5 did
+2 or GlassFish Server version 9.1 or 9.1.1. Starting in Jakarta EE 6, the
+Jakarta EE specification imposes stricter requirements than Jakarta EE 5 did
 on which JAR files can be visible to various modules within an EAR file.
-Setting this element to `v2` removes these Java EE 6 and later
+Setting this element to `v2` removes these Jakarta EE 6 and later
 restrictions.
 
 [[gjjaf]][[GSDPG00417]][[superelements-37]]
@@ -3284,21 +3284,21 @@
 
 
  |zero or more |Maps the absolute JNDI name to the `ejb-ref` element in
-the corresponding Java EE XML file.
+the corresponding Jakarta EE XML file.
 
 a|
 link:#beaww[`resource-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beawu[`resource-env-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-env-ref` in
-the corresponding Java EE XML file.
+the corresponding Jakarta EE XML file.
 
 a|
 link:#beaxk[`service-ref`]
@@ -3548,7 +3548,7 @@
 `ejb-ref`
 ~~~~~~~~~
 
-Maps the `ejb-ref-name` in the corresponding Java EE deployment
+Maps the `ejb-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `ejb-ref` entry to the absolute `jndi-name` of a
 resource.
 
@@ -3584,7 +3584,7 @@
 link:#beasv[`ejb-ref-name`]
 
 
- |only one |Specifies the `ejb-ref-name` in the corresponding Java EE
+ |only one |Specifies the `ejb-ref-name` in the corresponding Jakarta EE
 deployment descriptor file `ejb-ref` entry.
 
 a|
@@ -3600,7 +3600,7 @@
 `ejb-ref-name`
 ~~~~~~~~~~~~~~
 
-Specifies the `ejb-ref-name` in the corresponding Java EE deployment
+Specifies the `ejb-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `ejb-ref` entry.
 
 [[fvyuh]][[GSDPG00463]][[superelements-60]]
@@ -4379,7 +4379,7 @@
 link:#beaxg[`security-role-mapping`]
 
 
- |zero or more |Maps a role in the corresponding Java EE XML file to a
+ |zero or more |Maps a role in the corresponding Jakarta EE XML file to a
 user or group.
 
 a|
@@ -4393,21 +4393,21 @@
 
 
  |zero or more |Maps the absolute JNDI name to the `ejb-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beaww[`resource-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beawu[`resource-env-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-env-ref` in
-the corresponding Java EE XML file.
+the corresponding Jakarta EE XML file.
 
 a|
 link:#beaxk[`service-ref`]
@@ -4495,21 +4495,21 @@
 
 
  |zero or more |Maps the absolute JNDI name to the `ejb-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beaww[`resource-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beawu[`resource-env-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-env-ref` in
-the corresponding Java EE XML file.
+the corresponding Jakarta EE XML file.
 
 a|
 link:#beaxk[`service-ref`]
@@ -4580,7 +4580,7 @@
 link:#beaxg[`security-role-mapping`]
 
 
- |zero or more |Maps a role in the corresponding Java EE XML file to a
+ |zero or more |Maps a role in the corresponding Jakarta EE XML file to a
 user or group.
 
 a|
@@ -4690,21 +4690,21 @@
 
 
  |zero or more |Maps the absolute JNDI name to the `ejb-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beaww[`resource-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-ref` in the
-corresponding Java EE XML file.
+corresponding Jakarta EE XML file.
 
 a|
 link:#beawu[`resource-env-ref`]
 
 
  |zero or more |Maps the absolute JNDI name to the `resource-env-ref` in
-the corresponding Java EE XML file.
+the corresponding Jakarta EE XML file.
 
 a|
 link:#beaxk[`service-ref`]
@@ -5573,7 +5573,7 @@
 non-Java-EE components, such as servlet filters, lifecycle modules, and
 third party persistence managers, can use this JDBC connection pool. The
 returned connection is automatically enlisted with the transaction
-context obtained from the transaction manager. Standard Java EE
+context obtained from the transaction manager. Standard Jakarta EE
 components can also use such pools. Connections obtained by
 non-component callers are not automatically closed at the end of a
 transaction by the container. They must be explicitly closed by the
@@ -7278,9 +7278,9 @@
 
 Specifies the name of a logical `message-destination` defined within an
 application. The `message-destination-name` matches the corresponding
-`message-destination-name` in the corresponding Java EE deployment
+`message-destination-name` in the corresponding Jakarta EE deployment
 descriptor file. Use when the message destination reference in the
-corresponding Java EE deployment descriptor file specifies a
+corresponding Jakarta EE deployment descriptor file specifies a
 `message-destination-link` to a logical `message-destination`.
 
 [[fvzaz]][[GSDPG00573]][[superelements-116]]
@@ -7314,7 +7314,7 @@
 
 
  |only one |Specifies the name of a logical message destination defined
-within the corresponding Java EE deployment descriptor file.
+within the corresponding Jakarta EE deployment descriptor file.
 
 a|
 link:#beatw[`jndi-name`]
@@ -7330,7 +7330,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Specifies the name of a logical message destination defined within the
-corresponding Java EE deployment descriptor file.
+corresponding Jakarta EE deployment descriptor file.
 
 [[fvzcj]][[GSDPG00575]][[superelements-117]]
 
@@ -7354,7 +7354,7 @@
 
 Directly binds a message destination reference to the JNDI name of a
 `Queue`, `Topic`, or other physical destination. Use only when the
-message destination reference in the corresponding Java EE deployment
+message destination reference in the corresponding Jakarta EE deployment
 descriptor file does not specify a `message-destination-link` to a
 logical `message-destination`.
 
@@ -7389,7 +7389,7 @@
 
 
  |only one |Specifies the name of a physical message destination defined
-within the corresponding Java EE deployment descriptor file.
+within the corresponding Jakarta EE deployment descriptor file.
 
 a|
 link:#beatw[`jndi-name`]
@@ -7405,7 +7405,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Specifies the name of a physical message destination defined within the
-corresponding Java EE deployment descriptor file.
+corresponding Jakarta EE deployment descriptor file.
 
 [[gauaj]][[GSDPG00579]][[superelements-119]]
 
@@ -9181,7 +9181,7 @@
 `res-ref-name`
 ~~~~~~~~~~~~~~
 
-Specifies the `res-ref-name` in the corresponding Java EE deployment
+Specifies the `res-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `resource-ref` entry. The `res-ref-name` element
 specifies the name of a resource manager connection factory reference.
 The name must be unique within an enterprise bean.
@@ -9378,7 +9378,7 @@
 `resource-env-ref`
 ~~~~~~~~~~~~~~~~~~
 
-Maps the `res-ref-name` in the corresponding Java EE deployment
+Maps the `res-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `resource-env-ref` entry to the absolute `jndi-name` of
 a resource.
 
@@ -9412,7 +9412,7 @@
 link:#beawv[`resource-env-ref-name`]
 
 
- |only one |Specifies the `res-ref-name` in the corresponding Java EE
+ |only one |Specifies the `res-ref-name` in the corresponding Jakarta EE
 deployment descriptor file `resource-env-ref` entry.
 
 a|
@@ -9441,7 +9441,7 @@
 `resource-env-ref-name`
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Specifies the `res-ref-name` in the corresponding Java EE deployment
+Specifies the `res-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `resource-env-ref` entry.
 
 [[fvzau]][[GSDPG00688]][[superelements-169]]
@@ -9464,7 +9464,7 @@
 `resource-ref`
 ~~~~~~~~~~~~~~
 
-Maps the `res-ref-name` in the corresponding Java EE deployment
+Maps the `res-ref-name` in the corresponding Jakarta EE deployment
 descriptor file `resource-ref` entry to the absolute `jndi-name` of a
 resource.
 
@@ -9515,7 +9515,7 @@
 link:#beawr[`res-ref-name`]
 
 
- |only one |Specifies the `res-ref-name` in the corresponding Java EE
+ |only one |Specifies the `res-ref-name` in the corresponding Jakarta EE
 deployment descriptor file `resource-ref` entry.
 
 a|
@@ -9768,7 +9768,7 @@
 ~~~~~~~~~~~
 
 Contains the `role-name` in the `security-role` element of the
-corresponding Java EE deployment descriptor file.
+corresponding Jakarta EE deployment descriptor file.
 
 [[fvzek]][[GSDPG00699]][[superelements-174]]
 
@@ -10203,7 +10203,7 @@
 
 
  |only one |Contains the `role-name` in the `security-role` element of
-the corresponding Java EE deployment descriptor file.
+the corresponding Jakarta EE deployment descriptor file.
 
 a|
 link:#beavw[`principal-name`]
@@ -10323,7 +10323,7 @@
 * To define the port used to resolve a container-managed port
 * To define the default Stub/Call property settings for Stub objects
 * To define the URL of a final WSDL document to be used instead of the
-one associated with the `service-ref` in the standard Java EE deployment
+one associated with the `service-ref` in the standard Jakarta EE deployment
 descriptor
 
 [[fvzfh]][[GSDPG00722]][[superelements-185]]
@@ -10878,7 +10878,7 @@
 modified. A session is considered to have been modified if
 `HttpSession.setAttribute()` or `HttpSession.removeAttribute()` was
 called. You must guarantee that `setAttribute` is called every time an
-attribute is changed. This is not a Java EE specification requirement,
+attribute is changed. This is not a Jakarta EE specification requirement,
 but it is required for this mode to work properly.
 * `modified-attribute` - Only modified session attributes are stored.
 For this mode to work properly, you must follow some guidelines, which
@@ -12041,7 +12041,7 @@
 
 Specifies a valid URL pointing to a final WSDL document. If not
 specified, the WSDL document associated with the `service-ref` in the
-standard Java EE deployment descriptor is used.
+standard Jakarta EE deployment descriptor is used.
 
 [[fvzjl]][[GSDPG00798]][[superelements-220]]
 
diff --git a/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc b/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
index ab84acd..a191248 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/dd-files.adoc
@@ -72,7 +72,7 @@
 |===
 |Deployment Descriptor |DTD File |Description
 |`glassfish-application.xml` |`glassfish-application_6_0-1.dtd`
-|Configures an entire Java EE application (EAR file).
+|Configures an entire Jakarta EE application (EAR file).
 
 |`glassfish-web.xml` |`glassfish-web-app_3_0-1.dtd` |Configures a web
 application (WAR file).
@@ -112,7 +112,7 @@
 The glassfish-application.xml File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The `glassfish-application.xml` file configures an entire Java EE
+The `glassfish-application.xml` file configures an entire Jakarta EE
 application (EAR file). The element hierarchy is as follows:
 
 [source]
@@ -188,7 +188,7 @@
 [source,xml]
 ----
 <!DOCTYPE glassfish-application PUBLIC "-//GlassFish.org//DTD
-GlassFish Application Server 3.1 Java EE Application 6.0//EN"
+GlassFish Application Server 3.1 Jakarta EE Application 6.0//EN"
 "http://glassfish.org/dtds/glassfish-application_6_0-1.dtd">
 <glassfish-application>
    <unique-id>67488732739338240</unique-id>
diff --git a/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc b/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
index 9d7499f..f540420 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/deploying-applications.adoc
@@ -105,7 +105,7 @@
 Use the `--altdd` or `--runtimealtdd` options of the `deploy` (and
 `redeploy`) subcommand to deploy an application or module using a
 top-level alternate deployment descriptor. The `--altdd` option
-specifies a top-level alternate Java EE standard deployment descriptor.
+specifies a top-level alternate Jakarta EE standard deployment descriptor.
 The `--runtimealtdd` option specifies a top-level alternate GlassFish
 Server runtime deployment descriptor. See link:#CHDFHDGD[Example 2-3].
 For more information about deployment descriptors associated with
@@ -159,9 +159,9 @@
 ----
 
 [[GSDPG809]][[CHDFHDGD]]
-Example 2-3 Using an Alternate Java EE Standard Deployment Descriptor
+Example 2-3 Using an Alternate Jakarta EE Standard Deployment Descriptor
 
-This example deploys an application using an alternate Java EE standard
+This example deploys an application using an alternate Jakarta EE standard
 deployment descriptor file that resides outside of an application
 archive. Specify an absolute path or a relative path to the alternate
 deployment descriptor file.
@@ -249,7 +249,7 @@
 [[GSDPG00010]][[giumj]]
 Example 2-5 Listing Applications
 
-The `list-applications` subcommand lists all deployed Java EE
+The `list-applications` subcommand lists all deployed Jakarta EE
 applications or modules. If the `--type` option is not specified, all
 components are listed. This example lists deployed applications.
 
@@ -879,7 +879,7 @@
 of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE)
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE)
 application
 
 [[GSDPG823]]
@@ -935,7 +935,7 @@
 items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE)
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE)
 application
 
 When an entry is unset, its value reverts to the value, if any, that is
@@ -1058,7 +1058,7 @@
 items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE)
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE)
 application
 
 [[GSDPG828]]
@@ -1318,10 +1318,10 @@
 with which to be backward compatible in terms of JAR visibility
 requirements for applications. The current allowed value is `v2`, which
 refers to GlassFish Server version 2 or GlassFish Server version 9.1 or
-9.1.1. Starting in Java EE 6, the Java EE specification imposes stricter
-requirements than Java EE 5 did on which JAR files can be visible to
+9.1.1. Starting in Jakarta EE 6, the Jakarta EE specification imposes stricter
+requirements than Jakarta EE 5 did on which JAR files can be visible to
 various modules within an EAR file. Setting this element to `v2` removes
-these Java EE 6 and later restrictions.
+these Jakarta EE 6 and later restrictions.
 
 [[gilxc]][[GSDPG00069]][[deploying-a-connector-module]]
 
@@ -1419,13 +1419,13 @@
 Deploying and Configuring an Embedded Resource Adapter
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A connector module can be deployed as a Java EE component in a Java EE
+A connector module can be deployed as a Jakarta EE component in a Jakarta EE
 application. Such connectors are only visible to components residing in
-the same Java EE application. Deploy this application as you would any
-other Java EE application.
+the same Jakarta EE application. Deploy this application as you would any
+other Jakarta EE application.
 
 You can create new connector connection pools and connector resources
-for a connector module embedded within a Java EE application by
+for a connector module embedded within a Jakarta EE application by
 prefixing the connector name with app-name`#`. For example, if an
 application `appX.ear` has `jdbcra.rar` embedded within it, the
 connector connection pools and connector resources refer to the
@@ -1815,7 +1815,7 @@
 name, it is added. For example, application-scoped databases have JNDI
 names in the following format: `java:app/jdbc/`DataSourceName or
 `java:module/jdbc/`DataSourceName. This is in accordance with the naming
-scopes introduced in the Java EE 6 Specification.
+scopes introduced in the Jakarta EE 6 Specification.
 
 Errors. Application-scoped resource definitions with same resource name,
 resource type, attributes, and properties are duplicates. These generate
diff --git a/docs/application-deployment-guide/src/main/jbake/content/overview.adoc b/docs/application-deployment-guide/src/main/jbake/content/overview.adoc
index 6345d9f..8c0067f 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/overview.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/overview.adoc
@@ -6,18 +6,18 @@
 ~~~~~~
 
 Overview of GlassFish Server Open Source Edition 7 Application Deployment
-===========================================================================
+=========================================================================
 
 [[GSDPG00003]][[gihxo]]
 
 
 [[overview-of-glassfish-server-open-source-edition-5.0-application-deployment]]
 1 Overview of GlassFish Server Open Source Edition 7 Application Deployment
------------------------------------------------------------------------------
+---------------------------------------------------------------------------
 
 GlassFish Server Open Source Edition 7 provides an environment for
 developing and deploying Java applications and web services. GlassFish
-Server applications include Java Platform, Enterprise Edition (Java EE
+Server applications include Java Platform, Enterprise Edition (Jakarta EE
 platform) standard features as well as features specific to GlassFish
 Server. This guide explains the tools and processes used for deploying
 applications and modules in the GlassFish Server environment. Only
@@ -43,7 +43,7 @@
 Assembly, also known as packaging, is the process of combining discrete
 components of an application or module into a single unit that can be
 installed on an application server. The GlassFish Server assembly
-process conforms to the customary Java EE specifications. The only
+process conforms to the customary Jakarta EE specifications. The only
 difference is that when you assemble applications or modules in
 GlassFish Server, you can include optional GlassFish Server deployment
 descriptors that enhance functionality.
@@ -70,7 +70,7 @@
 General Deployment Functionality
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Various Java EE module types, such as connector module, web module, EJB
+Various Jakarta EE module types, such as connector module, web module, EJB
 module, application client module, can be deployed in the following
 ways:
 
@@ -127,7 +127,7 @@
 Deployment Descriptors and Annotations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-A deployment descriptor is an XML file that describes how a Java EE
+A deployment descriptor is an XML file that describes how a Jakarta EE
 application or module should be deployed. Each deployment descriptor XML
 file has a corresponding Document Type Definition (DTD) file or schema
 (XSD) file, which defines the elements, data, and attributes that the
@@ -144,18 +144,19 @@
 The following types of deployment descriptors are associated with
 GlassFish Server:
 
-* Java EE Standard Descriptors. Java EE standard deployment descriptors
-are described in the Java EE 8 specification. You can find the
-specification at `http://www.oracle.com/technetwork/java/javaee/tech/`.
-Information about the XML schemas that define Java EE standard
+* Jakarta EE Standard Descriptors.
+Jakarta EE standard deployment descriptors are described
+in the Jakarta EE specification. You can find the
+specification at `https://jakarta.ee/specifications/`.
+Information about the XML schemas that define Jakarta EE standard
 deployment descriptors is available at
-`http://xmlns.jcp.org/xml/ns/javaee/`.
+`https://jakarta.ee/xml/ns/jakartaee/`.
 +
-The Java EE 8 specification permits the use of alternate top-level
+The Jakarta EE specification permits the use of alternate top-level
 standard deployment descriptors that reside outside of the application
 archive using the `alt-dd` mechanism (alternate module-level deployment
-descriptors were permitted prior to Java EE 7). Alternate deployment
-descriptors are described in the Java EE 7 specification. You can find
+descriptors were permitted prior to Jakarta EE 7). Alternate deployment
+descriptors are described in the Jakarta EE 7 specification. You can find
 the specification at
 `http://www.oracle.com/technetwork/java/javaee/tech/`. Alternate
 deployment descriptors override the top-level deployment descriptors
@@ -188,7 +189,7 @@
 `sun-*.xml` deployment descriptors.
 +
 Unless otherwise stated, settings in the GlassFish Server deployment
-descriptors override corresponding settings in the Java EE standard
+descriptors override corresponding settings in the Jakarta EE standard
 descriptors and in the GlassFish Server configuration.
 
 An annotation, also called metadata, enables a declarative style of
@@ -206,15 +207,15 @@
 The following annotation and deployment descriptor combinations are
 supported:
 
-* Java EE applications or modules can be packaged with full Java EE
+* Jakarta EE applications or modules can be packaged with full Jakarta EE
 compliant standard and runtime deployment descriptors. If the standard
 deployment descriptors have specified the `metadata-complete` attribute,
 annotations in the application or module are ignored.
-* Java EE applications or modules can be fully annotated with metadata
+* Jakarta EE applications or modules can be fully annotated with metadata
 defined by the listed specifications. Annotation eliminates the need for
-Java EE standard deployment descriptors. In most cases, the GlassFish
+Jakarta EE standard deployment descriptors. In most cases, the GlassFish
 Server deployment descriptors are also not needed.
-* Java EE applications or modules can be partially annotated with some
+* Jakarta EE applications or modules can be partially annotated with some
 deployment information in standard deployment descriptors. In case of
 conflicts, deployment descriptor values supersede the annotated
 metadata, and a warning message is logged.
@@ -230,7 +231,7 @@
 optionally, deployment descriptors into an Enterprise archive (EAR) file
 which is deployed.
 
-A module is a collection of one or more Java EE components that run in
+A module is a collection of one or more Jakarta EE components that run in
 the same container type, such as a web container or EJB container. The
 module uses annotations or deployment descriptors of that container
 type. You can deploy a module alone or as part of an application.
@@ -250,7 +251,7 @@
 
 * Web Module. A web module, also known as a web application, is a
 collection of servlets, EJBs, HTML pages, classes, and other resources
-that you can bundle and deploy to several Java EE application servers. A
+that you can bundle and deploy to several Jakarta EE application servers. A
 web application archive (WAR) file is the standard format for assembling
 web applications. A WAR file can consist of the following items:
 servlets, JavaServer Pages (JSP) files, JSP tag libraries, utility
@@ -282,11 +283,11 @@
 deployable software unit that consists of one or more classes, and
 application client deployment descriptors (`application-client.xml` and
 `glassfish-application-client.xml`). An application client JAR file
-applies to a GlassFish Server type of Java EE client. An application
-client supports the standard Java EE Application Client specifications.
+applies to a GlassFish Server type of Jakarta EE client. An application
+client supports the standard Jakarta EE Application Client specifications.
 * Lifecycle Module. A lifecycle module provides a means of running
 short-duration or long-duration Java-based tasks within the GlassFish
-Server environment. Lifecycle modules are not Java EE standard modules.
+Server environment. Lifecycle modules are not Jakarta EE standard modules.
 See link:../application-development-guide/lifecycle-listeners.html#GSDVG00014[Developing Lifecycle Listeners] in GlassFish Server
 Open Source Edition Application Development Guide for more information.
 
@@ -322,14 +323,14 @@
 together as one unit.
 
 The following figure shows EJB, web, application client, and connector
-modules assembled into a Java EE application.
+modules assembled into a Jakarta EE application.
 
 [[GSDPG00002]][[fvyip]]
 
 
 .*Figure 1-2 Application-Based Assembly and Deployment*
 image:img/dgdeploya.png[
-"Figure shows Java EE application assembly and deployment."]
+"Figure shows Jakarta EE application assembly and deployment."]
 
 
 [[gijla]][[GSDPG00322]][[access-to-shared-framework-classes]]
@@ -340,7 +341,7 @@
 If you assemble a large, shared library into every module that uses it,
 the result is a huge file that takes too long to register with the
 server. In addition, several versions of the same class could exist in
-different class loaders, which is a waste of resources. When Java EE
+different class loaders, which is a waste of resources. When Jakarta EE
 applications and modules use shared framework classes (such as utility
 classes and libraries), the classes can be put in the path for the
 common class loader or an application-specific class loader rather than
@@ -363,7 +364,7 @@
 
 [NOTE]
 ====
-According to the Java EE specification, section 8.1.1.2, "Dependencies,"
+According to the Jakarta EE specification, section 8.1.1.2, "Dependencies,"
 you cannot package utility classes within an individually-deployed EJB
 module. Instead, you must package the EJB module and utility JAR within
 an application using the JAR Extension Mechanism Architecture.
@@ -386,7 +387,7 @@
 `ejb-jar.xml` files, and EJB names as found in the `ejb-name` portion of
 the `ejb-jar.xml` files. This hierarchical naming scheme ensures that
 name collisions do not occur. The benefits of this naming practice apply
-not only to GlassFish Server, but to other Java EE application servers
+not only to GlassFish Server, but to other Jakarta EE application servers
 as well.
 
 The following topics are addressed here:
@@ -401,7 +402,7 @@
 Portable Naming
 +++++++++++++++
 
-Starting in Java EE 6, the Java EE specification defines the portable
+Starting in Jakarta EE 6, the Jakarta EE specification defines the portable
 `application-name`, which allows you to specify an application name in
 the `application.xml` file. For example:
 
@@ -410,7 +411,7 @@
 <application-name>xyz</application-name>
 ----
 
-The Java EE specification also defines the portable `module-name`
+The Jakarta EE specification also defines the portable `module-name`
 element in the module standard deployment descriptors.
 
 GlassFish Server determines the application registration name according
@@ -419,7 +420,7 @@
 1. The name specified at deployment time in the Administration Console
 or in the `--name` option of the `asadmin deploy` command is used.
 2. If no name is specified at deployment time, the portable
-`application-name` or `module-name` in the Java EE deployment descriptor
+`application-name` or `module-name` in the Jakarta EE deployment descriptor
 is used.
 3. If no name is specified at deployment time or in the deployment
 descriptors, the archive name, minus the file type suffix, is used.
@@ -441,7 +442,7 @@
 +++++++++++++++++++
 
 Application and module directory structures must follow the structure
-outlined in the Java EE specification. During deployment, the
+outlined in the Jakarta EE specification. During deployment, the
 application or module is expanded from the archive file to an open
 directory structure. The directories that hold the individual modules
 are named with `_jar`, `_rar`, and `_war` suffixes.
@@ -728,8 +729,8 @@
 ^^^^^^^^^^^^
 
 You can use the NetBeans Integrated Development Environment (IDE), or
-another IDE, to assemble Java EE applications and modules. The NetBeans
-IDE is included in the tools bundle of the Java EE Software Development
+another IDE, to assemble Jakarta EE applications and modules. The NetBeans
+IDE is included in the tools bundle of the Jakarta EE Software Development
 Kit (SDK). To download, see
 `http://www.oracle.com/technetwork/java/javaee/downloads/index.html`.
 For additional information, see `http://www.netbeans.org`.
@@ -767,37 +768,32 @@
 Additional Information on Application Deployment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As specified from Java EE 8 specifications, the relevant specifications
+As specified from Jakarta EE specifications, the relevant specifications
 are the following:
 
-* Java Platform, Enterprise Edition 8 Specification
-+
-`https://jcp.org/en/jsr/detail?id=366`
-* Java EE Application Deployment JSR 88 Specification
-+
+* Jakarta EE Platform, Enterprise Edition 10 Specification +
+`https://jakarta.ee/specifications/platform/`
+* Jakarta EE Application Deployment JSR 88 Specification +
 `http://jcp.org/en/jsr/detail?id=88`
-* Common Annotations for the Java Platform 1.6 Specification
-+
+* Common Annotations for the Java Platform 1.6 Specification +
 `http://jcp.org/en/jsr/detail?id=250`
-* Java Servlet 3.0 Specification
-+
+* Java Servlet 3.0 Specification +
 `http://jcp.org/en/jsr/detail?id=315`
-* Enterprise JavaBeans 3.1 Specification
-+
+* Enterprise JavaBeans 3.1 Specification +
 `http://jcp.org/en/jsr/detail?id=318`
-* Java EE Connector Architecture 1.6 Specification
-+
+* Jakarta EE Connector Architecture 1.6 Specification +
 `http://jcp.org/en/jsr/detail?id=322`
 
 The following product documentation might be relevant to some aspects of
 application deployment:
 
-* link:../application-development-guide/toc.html#GSDVG[GlassFish Server Open Source Edition Application
-Development Guide]
-* link:../administration-guide/toc.html#GSADG[GlassFish Server Open Source Edition Administration Guide]
-* link:../add-on-component-development-guide/toc.html#GSACG[GlassFish Server Open Source Edition Add-On Component
-Development Guide]
-* link:../reference-manual/toc.html#GSRFM[GlassFish Server Open Source Edition Reference Manual]
+* link:../application-development-guide/toc.html#GSDVG[
+GlassFish Server Open Source Edition Application Development Guide]
+* link:../administration-guide/toc.html#GSADG[
+GlassFish Server Open Source Edition Administration Guide]
+* link:../add-on-component-development-guide/toc.html#GSACG[
+GlassFish Server Open Source Edition Add-On Component Development Guide]
+* link:../reference-manual/toc.html#GSRFM[
+GlassFish Server Open Source Edition Reference Manual]
 * GlassFish Server Administration Console online help
 
-
diff --git a/docs/application-deployment-guide/src/main/jbake/content/preface.adoc b/docs/application-deployment-guide/src/main/jbake/content/preface.adoc
index 944625b..f884f93 100644
--- a/docs/application-deployment-guide/src/main/jbake/content/preface.adoc
+++ b/docs/application-deployment-guide/src/main/jbake/content/preface.adoc
@@ -9,8 +9,6 @@
 =======
 
 [[GSDPG806]][[sthref2]]
-
-
 [[preface]]
 Preface
 -------
@@ -22,7 +20,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -33,18 +31,18 @@
 includes information about deployment descriptors.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://github.com/javaee/glassfish`. The
-GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
-GlassFish Server. The GlassFish project is designed to encourage
-communication between Oracle engineers and the community.
+GlassFish Server.
+
+The following topics are addressed here:
 
 * link:#ghpbz[GlassFish Server Documentation Set]
 * link:#giprl[Related Documentation]
@@ -63,7 +61,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -71,96 +69,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
+your system and enterprise.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
+
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
+
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-| |
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
+scalability through failover and load balancing.
+
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
+
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
+
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
+
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
+
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
+the Message Queue messaging service.
+
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
+
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
+programmatically configuring and monitoring Message Queue resources in
+conformance with the Java Management Extensions (JMX).
+
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
+applications (Java clients) that work with GlassFish Server.
+
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
+Message Queue who want to use the C language binding to the Message
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSDPG00054]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 8 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 8 of Java EE is located at
-`https://javaee.github.io/javaee-spec/`.
-* The API specification for GlassFish Server 7, including Java EE 8
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`https://javaee.github.io/glassfish/documentation`.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby database for use with the
-GlassFish Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Apache
-Derby product page] (`http://db.apache.org/derby/`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the https://github.com/javaee/glassfish-samples[Java EE
-Samples project page] (`https://github.com/javaee/glassfish-samples`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSDPG00055]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -168,73 +211,84 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
 [[GSDPG00056]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSDPG00057]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -242,51 +296,46 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
-|as-install + a|
-Represents the base installation directory for GlassFish Server.
 
+|as-install
+a|Represents the base installation directory for GlassFish Server.
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
- a|
-Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
++
+user's-home-directory``/glassfish7/glassfish``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7\glassfish``
 
-user's-home-directory`/glassfish7/glassfish`
-
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7\glassfish`
-
-|as-install-parent + |Represents the parent of the base installation
-directory for GlassFish Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+|as-install-parent
+|Represents the parent of the base installation directory for GlassFish Server.
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
++
+user's-home-directory``/glassfish7``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7``
 
-user's-home-directory`/glassfish7`
+|domain-root-dir
+|Represents the directory in which a domain is created by default.
+|as-install``/domains/``
 
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7`
-
-|domain-root-dir + |Represents the directory in which a domain is
-created by default. |as-install`/domains/`
-
-|domain-dir + a|
-Represents the directory in which a domain's configuration is stored.
-
+|domain-dir
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
+|domain-root-dir/domain-name
 
- |domain-root-dir`/`domain-name
-
-|instance-dir + |Represents the directory for a server instance.
-|domain-dir`/`instance-name
+|instance-dir
+|Represents the directory for a server instance.
+|domain-dir/instance-name
 |===
 
-
diff --git a/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc b/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
index b2817c4..5e93cf4 100644
--- a/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/class-loaders.adoc
@@ -77,7 +77,7 @@
 
 |Public API |The Public API class loader makes available all classes
 specifically exported by the GlassFish Server runtime for use by
-deployed applications. This includes, but is not limited to, Java EE
+deployed applications. This includes, but is not limited to, Jakarta EE
 APIs and other Oracle APIs. It is parent to the Common class loader.
 
 |Common |The Common class loader loads JAR files in the as-install`/lib`
@@ -98,7 +98,7 @@
 
 |Applib a|
 The Applib class loader loads the library classes, specified during
-deployment, for a specific enabled module or Java EE application; see
+deployment, for a specific enabled module or Jakarta EE application; see
 link:#gatej[Application-Specific Class Loading]. One instance of this
 class loader is present in each class loader universe; see
 link:#beadg[Class Loader Universes]. It is parent to the Archive class loader.
@@ -163,7 +163,7 @@
 resolution is always delegated to the parent class loader regardless of
 the `delegate` setting. This prevents applications from overriding core
 Java runtime classes or changing the API versions of specifications that
-are part of the Java EE platform.
+are part of the Jakarta EE platform.
 
 [[beadk]][[GSDVG00096]][[using-the-java-optional-package-mechanism]]
 
@@ -215,7 +215,7 @@
 server occurs within the context of isolated class loader universes,
 each of which has its own Applib and Archive class loaders.
 
-* Application Universe - Each Java EE application has its own class
+* Application Universe - Each Jakarta EE application has its own class
 loader universe, which loads the classes in all the modules in the
 application.
 * Individually Deployed Module Universe - Each individually deployed EJB
@@ -402,7 +402,7 @@
 Class-Path: filepath1.jar filepath2.jar ...
 ----
 Each filepath is relative to the directory or JAR file containing the
-`MANIFEST.MF` file. For details, see the Java EE specification.
+`MANIFEST.MF` file. For details, see the Jakarta EE specification.
 * For a calling web component, add the client JAR file under the
 `WEB-INF/lib` directory.
 3. If you need to package the client JAR with both the EJB and web
diff --git a/docs/application-development-guide/src/main/jbake/content/connectors.adoc b/docs/application-development-guide/src/main/jbake/content/connectors.adoc
index 8e7f43a..baaa823 100644
--- a/docs/application-development-guide/src/main/jbake/content/connectors.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/connectors.adoc
@@ -15,25 +15,24 @@
 11 Developing Connectors
 ------------------------
 
-This chapter describes Oracle GlassFish Server support for the Java EE
+This chapter describes Oracle GlassFish Server support for the Jakarta EE
 Connector Architecture, also known as
 http://jcp.org/en/jsr/detail?id=322[JSR 322]
 (`http://jcp.org/en/jsr/detail?id=322`).
 
-The Java EE Connector Architecture provides a Java solution to the
+The Jakarta EE Connector Architecture provides a Java solution to the
 problem of connectivity between multiple application servers and
-existing enterprise information systems (EISs). By using the Java EE
+existing enterprise information systems (EISs). By using the Jakarta EE
 Connector architecture, EIS vendors no longer need to customize their
 product for each application server. Application server vendors who
-conform to the Java EE Connector architecture do not need to write
+conform to the Jakarta EE Connector architecture do not need to write
 custom code to add connectivity to a new EIS.
 
 This chapter uses the terms connector and resource adapter
 interchangeably. Both terms refer to a resource adapter module that is
-developed in conformance with the Java EE Connector Architecture
+developed in conformance with the Jakarta EE Connector Architecture
 Specification.
 
-
 [NOTE]
 ====
 If you installed the Web Profile, connector modules that use only
@@ -41,15 +40,13 @@
 involve inbound communication features are supported. Other connector
 features are supported only in the full GlassFish Server.
 ====
-
-
 For more information about connectors, see
-"https://javaee.github.io/tutorial/resources.html[Resource Adapters and
-Contracts]" in The Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#resource-adapters-and-contracts[
+Resource Adapters and Contracts] in The Jakarta EE Tutorial.
 
 For information about deploying a connector to the GlassFish Server, see
-the link:../application-deployment-guide/toc.html#GSDPG[GlassFish Server Open Source Edition Application
-Deployment Guide].
+the link:../application-deployment-guide/toc.html#GSDPG[
+GlassFish Server Open Source Edition Application Deployment Guide].
 
 The following topics are addressed here:
 
@@ -57,8 +54,7 @@
 * link:#bealr[Advanced Connector Configuration Options]
 * link:#bealz[Inbound Communication Support]
 * link:#gizdm[Outbound Communication Support]
-* link:#beama[Configuring a Message Driven Bean to Use a Resource
-Adapter]
+* link:#beama[Configuring a Message Driven Bean to Use a Resource Adapter]
 
 [[beall]][[GSDVG00162]][[connector-support-in-the-glassfish-server]]
 
diff --git a/docs/application-development-guide/src/main/jbake/content/ejb.adoc b/docs/application-development-guide/src/main/jbake/content/ejb.adoc
index 75f6d61..5b1ed63 100644
--- a/docs/application-development-guide/src/main/jbake/content/ejb.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/ejb.adoc
@@ -27,8 +27,8 @@
 * link:#beait[Using Message-Driven Beans]
 
 For general information about enterprise beans, see
-"https://javaee.github.io/tutorial/partentbeans.html[Enterprise Beans]"
-in The Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#enterprise-beans[Enterprise Beans]
+in The Jakarta EE Tutorial.
 
 
 [NOTE]
@@ -579,7 +579,7 @@
 
 [[GSDVG549]][[sthref18]][[fvyed]]
 
-Table 8-1 Object Types Supported for Java EE Stateful Session Bean State
+Table 8-1 Object Types Supported for Jakarta EE Stateful Session Bean State
 Failover
 
 [width="100%",cols="45%,55%",options="header",]
@@ -858,7 +858,7 @@
 
 For better performance, specify a small subset of methods. The methods
 chosen should accomplish a significant amount of work in the context of
-the Java EE application or should result in some important modification
+the Jakarta EE application or should result in some important modification
 to the bean's state.
 ====
 
diff --git a/docs/application-development-guide/src/main/jbake/content/java-clients.adoc b/docs/application-development-guide/src/main/jbake/content/java-clients.adoc
index 8e404b8..b994b99 100644
--- a/docs/application-development-guide/src/main/jbake/content/java-clients.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/java-clients.adoc
@@ -31,8 +31,7 @@
 specification, which allows enterprise beans within web applications,
 among other features. The full GlassFish Server supports the entire EJB
 3.1 specification. For details, see
-http://jcp.org/en/jsr/detail?id=318[JSR 318]
-(`http://jcp.org/en/jsr/detail?id=318`).
+http://jcp.org/en/jsr/detail?id=318[JSR 318].
 
 Accordingly, the Application Client Container is supported only in the
 full GlassFish Server, not in the Web Profile.
@@ -50,14 +49,14 @@
 The Application Client Container (ACC) includes a set of Java classes,
 libraries, and other files that are required for and distributed with
 Java client programs that execute in their own Java Virtual Machine
-(JVM). The ACC manages the execution of Java EE application client
+(JVM). The ACC manages the execution of Jakarta EE application client
 components (application clients), which are used to access a variety of
-Java EE services (such as JMS resources, EJB components, web services,
+Jakarta EE services (such as JMS resources, EJB components, web services,
 security, and so on.) from a JVM outside the Oracle GlassFish Server.
 
 The ACC communicates with the GlassFish Server using RMI-IIOP protocol
 and manages the details of RMI-IIOP communication using the client ORB
-that is bundled with it. Compared to other Java EE containers, the ACC
+that is bundled with it. Compared to other Jakarta EE containers, the ACC
 is lightweight.
 
 For information about debugging application clients, see
@@ -96,7 +95,7 @@
 for the client. The ACC uses this class instead of its default class for
 asking for and reading the authentication information. The class must
 implement the javax.security.auth.callback.CallbackHandler interface.
-See the Java EE specification, section 9.2, Application Clients:
+See the Jakarta EE specification, section 9.2, Application Clients:
 Security, for more details.
 
 Application clients can use link:securing-apps.html#beacm[Programmatic
@@ -108,7 +107,7 @@
 ^^^^^^^^^^
 
 The client container enables the application clients to use the Java
-Naming and Directory Interface (JNDI) to look up Java EE services (such
+Naming and Directory Interface (JNDI) to look up Jakarta EE services (such
 as JMS resources, EJB components, web services, security, and so on.)
 and to reference configurable parameters set at the time of deployment.
 
@@ -207,7 +206,7 @@
 
 4. Ensure that the client JAR file includes the following files:
 * A Java class to access the bean.
-* `application-client.xml` - (optional) Java EE application client
+* `application-client.xml` - (optional) Jakarta EE application client
 deployment descriptor.
 * `glassfish-application-client.xml` - (optional) GlassFish Server
 specific client deployment descriptor. For information on the
@@ -285,8 +284,8 @@
 1. Create a JMS client.
 +
 For detailed instructions on developing a JMS client, see
-"https://javaee.github.io/tutorial/jms-examples.html[Java Message
-Service Examples]" in The Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#jakarta-messaging-examples[
+Java Message Service Examples]" in The Jakarta EE Tutorial.
 2. Next, configure a JMS resource on the GlassFish Server.
 +
 For information on configuring JMS resources, see
@@ -305,7 +304,7 @@
 see link:jndi.html#beaoa[Mapping References].
 4. Ensure that the client JAR file includes the following files:
 * A Java class to access the resource.
-* `application-client.xml` - (optional) Java EE application client
+* `application-client.xml` - (optional) Jakarta EE application client
 deployment descriptor.
 * `glassfish-application-client.xml` - (optional) GlassFish Server
 specific client deployment descriptor. For information on the
@@ -800,7 +799,7 @@
 the application client requires.
 
 Do not specify every JAR on which the client depends. GlassFish Server
-automatically handles JAR files that the Java EE specification requires
+automatically handles JAR files that the Jakarta EE specification requires
 to be available to the application client. This includes JAR files
 listed in the application client JAR file's manifest `Class-Path` and
 JAR files in the EAR file's library directory (if any) and their
@@ -816,7 +815,7 @@
 references correspond directly to the relative path to the JAR files
 within the EAR file.
 
-Neither the Java EE specification nor GlassFish Server supports
+Neither the Jakarta EE specification nor GlassFish Server supports
 packaging JAR files inside the application client JAR file itself.
 Nothing prevents this, but GlassFish Server does no special processing
 of such JAR files. They do not appear in the runtime class path and they
@@ -1211,7 +1210,7 @@
 
 The `client.policy` file is the J2SE policy file used by the application
 client. Each application client has a `client.policy` file. The default
-policy file limits the permissions of Java EE deployed application
+policy file limits the permissions of Jakarta EE deployed application
 clients to the minimal set of permissions required for these
 applications to operate correctly. If an application client requires
 more than this default set of permissions, edit the `client.policy` file
@@ -1646,14 +1645,14 @@
 1. Create a JMS client.
 +
 For detailed instructions on developing a JMS client, see
-"https://javaee.github.io/tutorial/jms-examples.html[Java Message
-Service Examples]" in The Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#jakarta-messaging-examples[
+Java Message Service Examples] in The Jakarta EE Tutorial.
 2. Configure a JMS resource on GlassFish Server.
 +
 For information on configuring JMS resources, see
-"link:../administration-guide/jms.html#GSADG00598[Administering JMS Connection Factories and
-Destinations]" in GlassFish Server Open Source Edition Administration
-Guide.
+"link:../administration-guide/jms.html#GSADG00598[
+Administering JMS Connection Factories and Destinations]"
+in GlassFish Server Open Source Edition Administration Guide.
 3. Copy the following JAR files to the client machine and include them
 in the classpath on the client side:
 * `gf-client.jar` - available at as-install`/lib`
diff --git a/docs/application-development-guide/src/main/jbake/content/jdbc.adoc b/docs/application-development-guide/src/main/jbake/content/jdbc.adoc
index c60e42a..2bae3e4 100644
--- a/docs/application-development-guide/src/main/jbake/content/jdbc.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/jdbc.adoc
@@ -30,7 +30,7 @@
 [NOTE]
 ====
 The GlassFish Server does not support connection pooling or transactions
-for an application's database access if it does not use standard Java EE
+for an application's database access if it does not use standard Jakarta EE
 `DataSource` objects.
 ====
 
@@ -477,7 +477,7 @@
 be shared.
 
 Connections obtained through a resource are shared only if the resource
-reference declared by the Java EE component allows it to be shareable.
+reference declared by the Jakarta EE component allows it to be shareable.
 This is specified in a component's deployment descriptor by setting the
 `res-sharing-scope` element to `Shareable` for the particular resource
 reference. To turn off connection sharing, set `res-sharing-scope` to
@@ -661,7 +661,7 @@
 modules, and third party persistence managers, to use this JDBC
 connection pool. The returned connection is automatically enlisted with
 the transaction context obtained from the transaction manager. Standard
-Java EE components can also use such pools. Connections obtained by
+Jakarta EE components can also use such pools. Connections obtained by
 non-component callers are not automatically closed at the end of a
 transaction by the container. They must be explicitly closed by the
 caller.
diff --git a/docs/application-development-guide/src/main/jbake/content/jms.adoc b/docs/application-development-guide/src/main/jbake/content/jms.adoc
index 1dc37e9..7365948 100644
--- a/docs/application-development-guide/src/main/jbake/content/jms.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/jms.adoc
@@ -28,8 +28,8 @@
 
 
 For information about the JMS, see
-"https://javaee.github.io/tutorial/partmessaging.html[Messaging]" in The
-Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#messaging[Messaging]
+in The Jakarta EE Tutorial.
 
 For detailed information about JMS concepts and JMS support in the
 GlassFish Server, see "link:../administration-guide/jms.html#GSADG00020[Administering the Java Message
diff --git a/docs/application-development-guide/src/main/jbake/content/jndi.adoc b/docs/application-development-guide/src/main/jbake/content/jndi.adoc
index 2a6f775..f5d2973 100644
--- a/docs/application-development-guide/src/main/jbake/content/jndi.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/jndi.adoc
@@ -16,7 +16,7 @@
 ------------------------------------------------
 
 A naming service maintains a set of bindings, which relate names to
-objects. The Java EE naming service is based on the Java Naming and
+objects. The Jakarta EE naming service is based on the Java Naming and
 Directory Interface (JNDI) API. The JNDI API allows application
 components and clients to look up distributed resources, services, and
 EJB components. For general information about the JNDI API, see
@@ -48,10 +48,10 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Oracle GlassFish Server provides a naming environment, or context,
-which is compliant with standard Java EE requirements. A `Context`
+which is compliant with standard Jakarta EE requirements. A `Context`
 object provides the methods for binding names to objects, unbinding
 names from objects, renaming objects, and listing the bindings. The
-`InitialContext` is the handle to the Java EE naming service that
+`InitialContext` is the handle to the Jakarta EE naming service that
 application components and clients use for lookups.
 
 The JNDI API also provides subcontext functionality. Much like a
@@ -93,10 +93,10 @@
 bean class itself in order to have the portable global JNDI name
 automatically assigned when deployed to an EJB 3.1 container.
 
-For more information, see the Java EE 8 Platform Specification, section
+For more information, see the Jakarta EE Platform Specification, section
 EE.5.2.2, "Application Component Environment Namespaces"
-(`http://jcp.org/en/jsr/detail?id=366`), and the EJB 3.1 Specification,
-section 4.4, "Global JNDI Access"
+(`http://jcp.org/en/jsr/detail?id=366`),
+and the EJB 3.1 Specification, section 4.4, "Global JNDI Access"
 (`http://jcp.org/en/jsr/detail?id=318`).
 
 If the `disable-nonportable-jndi-names` property is set to false (the
@@ -196,7 +196,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The preferred way of accessing the naming service, even in code that
-runs outside of a Java EE container, is to use the no-argument
+runs outside of a Jakarta EE container, is to use the no-argument
 `InitialContext` constructor. However, if EJB client code explicitly
 instantiates an `InitialContext` that points to the `CosNaming` naming
 service, it is necessary to set the `java.naming.factory.initial`
@@ -251,7 +251,7 @@
 The deployer can change the way the EJB components are physically
 distributed without having to change the code.
 
-For Java EE components, the code still performs a `java:comp/env` lookup
+For Jakarta EE components, the code still performs a `java:comp/env` lookup
 on an EJB reference. The only difference is that the deployer maps the
 `ejb-ref` element to an interoperable name in a GlassFish Server
 deployment descriptor file instead of to a simple global JNDI name.
@@ -278,7 +278,7 @@
 Object o = ic.lookup("java:comp/env/ejb/Foo");
 ----
 
-For a client that doesn't run within a Java EE container, the code just
+For a client that doesn't run within a Jakarta EE container, the code just
 uses the interoperable global name instead of the simple global JNDI
 name. For example:
 
@@ -509,7 +509,7 @@
 see link:class-loaders.html#beade[Class Loaders].
 
 For each property found in more than one `jndi.properties` file, the
-Java EE naming service either uses the first value found or concatenates
+Jakarta EE naming service either uses the first value found or concatenates
 all of the values, whichever makes sense.
 
 [[beaoa]][[GSDVG00195]][[mapping-references]]
@@ -522,13 +522,13 @@
 application components to JNDI names configured in GlassFish Server:
 
 * `resource-env-ref` - Maps the `@Resource` or `@Resources` annotation
-(or the `resource-env-ref` element in the corresponding Java EE XML
+(or the `resource-env-ref` element in the corresponding Jakarta EE XML
 file) to the absolute JNDI name configured in GlassFish Server.
 * `resource-ref` - Maps the `@Resource` or `@Resources` annotation (or
-the `resource-ref` element in the corresponding Java EE XML file) to the
+the `resource-ref` element in the corresponding Jakarta EE XML file) to the
 absolute JNDI name configured in GlassFish Server.
 * `ejb-ref` - Maps the `@EJB` annotation (or the `ejb-ref` element in
-the corresponding Java EE XML file) to the absolute JNDI name configured
+the corresponding Jakarta EE XML file) to the absolute JNDI name configured
 in GlassFish Server.
 +
 JNDI names for EJB components must be unique. For example, appending the
diff --git a/docs/application-development-guide/src/main/jbake/content/jpa.adoc b/docs/application-development-guide/src/main/jbake/content/jpa.adoc
index 5a4a8ea..714341f 100644
--- a/docs/application-development-guide/src/main/jbake/content/jpa.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/jpa.adoc
@@ -49,7 +49,7 @@
 
 * Java Persistence Architecture (JPA) 2.0.
 +
-JPA 2.0 is part of Java Platform, Enterprise Edition 6 (Java EE 6). It
+JPA 2.0 is part of Java Platform, Enterprise Edition 6 (Jakarta EE 6). It
 includes improvements and enhancements to domain modeling,
 object/relational mapping, `EntityManager` and `Query` interfaces, and
 the Java Persistence Query Language (JPQL). It includes an API for
@@ -61,8 +61,8 @@
 http://jcp.org/aboutJava/communityprocess/pfd/jsr317/index.html[Java
 Specification Request (JSR) 317]. For basic information about the Java
 Persistence API, see
-"https://javaee.github.io/tutorial/partpersist.html[Persistence]" in The
-Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#persistence[Persistence]
+in The Jakarta EE Tutorial.
 * Java Architecture for XML Binding (JAXB) 2.0. The EclipseLink JAXB
 implementation, plus EclipseLink extensions, is called MOXy. The
 `org.eclipse.persistence.moxy.jar` file is bundled with GlassFish
@@ -127,12 +127,12 @@
 Guide for Oracle TopLink. For more detailed explanations of these steps,
 see the links in the steps.
 
-1. Set up the datasource. See "link:../administration-guide/jdbc.html#GSADG00015[Administering Database
-Connectivity]" in GlassFish Server Open Source Edition Administration
-Guide.
+1. Set up the datasource. See "link:../administration-guide/jdbc.html#GSADG00015[
+Administering Database Connectivity]"
+in GlassFish Server Open Source Edition Administration Guide.
 2. Create the application. For guidance in writing your application,
-see "https://javaee.github.io/tutorial/partpersist.html[Persistence]" in
-The Java EE 8 Tutorial.
+see https://eclipse-ee4j.github.io/jakartaee-tutorial/#persistence[Persistence]
+in The Jakarta EE Tutorial.
 3. Create the `persistence.xml` file. See link:#gbwmj[Specifying the
 Database for an Application] for considerations specific to GlassFish
 Server.
@@ -148,9 +148,9 @@
 Application Deployment Guide.
 6. Run the application. See "Application Client Launch" and "To Launch
 an Application" in Administration Console online help.
-7. Monitor the application. See "link:../administration-guide/monitoring.html#GSADG00011[Administering the
-Monitoring Service]" in GlassFish Server Open Source Edition
-Administration Guide.
+7. Monitor the application. See "link:../administration-guide/monitoring.html#GSADG00011[
+Administering the Monitoring Service]"
+in GlassFish Server Open Source Edition Administration Guide.
 
 [[gbwmj]][[GSDVG00130]][[specifying-the-database-for-an-application]]
 
@@ -194,7 +194,7 @@
 
 The following `eclipselink.target-database` property values are allowed.
 Supported platforms have been tested with the GlassFish Server and are
-found to be Java EE compatible.
+found to be Jakarta EE compatible.
 
 [source]
 ----
diff --git a/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc b/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
index 77cf28a..ec22526 100644
--- a/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/lifecycle-listeners.adoc
@@ -82,7 +82,7 @@
 
 [source,java]
 ----
-public void handleEvent(com.sun.appserv.server.LifecycleEvent event) 
+public void handleEvent(com.sun.appserv.server.LifecycleEvent event)
 throws ServerLifecycleException
 ----
 
diff --git a/docs/application-development-guide/src/main/jbake/content/lot.adoc b/docs/application-development-guide/src/main/jbake/content/lot.adoc
index a92513f..761a322 100644
--- a/docs/application-development-guide/src/main/jbake/content/lot.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/lot.adoc
@@ -22,11 +22,11 @@
 * link:jpa.html#gbwmm[6-2 The asadmin undeploy Generation Options]
 * link:webapps.html#fvygg[7-1 The cache Attributes]
 * link:webapps.html#fvyep[7-2 The flush Attributes]
-* link:webapps.html#fvyem[7-3 Object Types Supported for Java EE Web
+* link:webapps.html#fvyem[7-3 Object Types Supported for Jakarta EE Web
 Application Session State Failover]
 * link:webapps.html#gheoy[7-4 SSIServlet init-param Values]
 * link:webapps.html#ghern[7-5 CGIServlet init-param Values]
-* link:ejb.html#fvyed[8-1 Object Types Supported for Java EE Stateful
+* link:ejb.html#fvyed[8-1 Object Types Supported for Jakarta EE Stateful
 Session Bean State Failover]
 * link:container_managed-persistence.html#fvyaq[9-1 Java Type to JDBC
 Type Mappings for CMP]
diff --git a/docs/application-development-guide/src/main/jbake/content/mail.adoc b/docs/application-development-guide/src/main/jbake/content/mail.adoc
index a70118b..1e896f5 100644
--- a/docs/application-development-guide/src/main/jbake/content/mail.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/mail.adoc
@@ -178,7 +178,7 @@
 msg.setSubject(msgSubject);
 msg.setSentDate(new Date());
 msg.setFrom();
-msg.setRecipients(Message.RecipientType.TO, 
+msg.setRecipients(Message.RecipientType.TO,
    InternetAddress.parse(msgRecipient, false));
 msg.setText(msgTxt);
 ----
diff --git a/docs/application-development-guide/src/main/jbake/content/osgi.adoc b/docs/application-development-guide/src/main/jbake/content/osgi.adoc
index 704dcc5..68a6114 100644
--- a/docs/application-development-guide/src/main/jbake/content/osgi.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/osgi.adoc
@@ -1,18 +1,18 @@
 type=page
 status=published
-title=Developing OSGi-enabled Java EE Applications
+title=Developing OSGi-enabled Jakarta EE Applications
 next=part-services-and-apis.html
 prev=lifecycle-listeners.html
 ~~~~~~
 
-Developing OSGi-enabled Java EE Applications
-============================================
+Developing OSGi-enabled Jakarta EE Applications
+===============================================
 
 [[GSDVG00015]][[gkpch]]
 
 [[developing-osgi-enabled-java-ee-applications]]
-13 Developing OSGi-enabled Java EE Applications
------------------------------------------------
+13 Developing OSGi-enabled Jakarta EE Applications
+--------------------------------------------------
 
 This chapter describes the features and interfaces that GlassFish Server
 provides to develop OSGi-enabled enterprise applications. This chapter
@@ -22,32 +22,22 @@
 * link:#gkqff[Developing OSGi Application Bundles for GlassFish Server]
 * link:#gkveh[Deploying OSGi Bundles in GlassFish Server]
 
-
-[NOTE]
-====
-Many of the features and interfaces presented in this chapter are
-demonstrated in samples and video clips available from the OSGi section
-of the GlassFish Server wiki. See
-`http://wikis.sun.com/display/GlassFish/Osgi` for more information.
-====
-
-
 [[gkpay]][[GSDVG00173]][[overview-of-osgi-application-and-glassfish-server]]
 
 Overview of OSGi Application and GlassFish Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GlassFish Server is fully-compliant with Java EE 8, so it provides the
-latest Java EE APIs and frameworks. It is built using OSGi technology,
+{productName} is fully-compliant with Jakarta EE 10, so it provides the
+latest Jakarta EE APIs and frameworks. It is built using OSGi technology,
 and includes as its OSGi module management subsystem the
 http://felix.apache.org[Apache Felix OSGi framework]
 (`http://felix.apache.org`), which is a fully-compliant implementation
 of the OSGi Service Platform R4 Version 4.3 specification. GlassFish
 Server supports deployment of OSGi-based applications using this
 framework. OSGi applications can make use of core as well as enterprise
-OSGi features. GlassFish Server makes available many of its Java EE
+OSGi features. GlassFish Server makes available many of its Jakarta EE
 platform services, such as the transaction service, HTTP service, JDBC
-Service and JMS, as OSGi services. It also enables use of Java EE
+Service and JMS, as OSGi services. It also enables use of Jakarta EE
 programming model in OSGi applications, so enterprise Java application
 developers can continue to leverage their existing skills in OSGi-based
 applications. See link:#glhek[Benefits of Using OSGi in Enterprise Java
@@ -61,8 +51,8 @@
 * Plain OSGi Application Bundles - bundles that do not contain any Java
 EE components. See link:#gkupd[Developing Plain OSGi Bundles].
 * Hybrid Application Bundles - bundles that are an OSGi bundle as wells
-as a Java EE module. At runtime, such modules have both an OSGi bundle
-context and a Java EE context. GlassFish Server supports the following
+as a Jakarta EE module. At runtime, such modules have both an OSGi bundle
+context and a Jakarta EE context. GlassFish Server supports the following
 hybrid application bundles:
 
 ** Web Application Bundles (or WABs) , see link:#gkunr[Developing Web
@@ -79,7 +69,7 @@
 Enterprise applications typically need transactional, secured access to
 data stores, messaging systems and other such enterprise information
 systems, and have to cater to a wide variety of clients such as web
-browsers and desktop applications, and so on. Java EE makes development
+browsers and desktop applications, and so on. Jakarta EE makes development
 of such applications easier with a rich set of APIs and frameworks. It
 also provides a scalable, reliable and easy to administer runtime to
 host such applications.
@@ -102,7 +92,7 @@
 Platform-as-a-Service (PaaS) environment.
 
 With GlassFish Server, you do not have to chose one of the two
-platforms. A hybrid approach like OSGi enabling your Java EE
+platforms. A hybrid approach like OSGi enabling your Jakarta EE
 applications allows new capabilities to applications hitherto
 unavailable to applications built using just one of the two platforms.
 
@@ -111,16 +101,16 @@
 Developing OSGi Application Bundles for GlassFish Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GlassFish Server enables interaction between OSGi components and Java EE
+GlassFish Server enables interaction between OSGi components and Jakarta EE
 components. OSGi services managed by the OSGi framework can invoke Java
-EE components managed by the Java EE container and vice versa. For
+EE components managed by the Jakarta EE container and vice versa. For
 example, developers can declaratively export EJBs as OSGi services
 without having to write any OSGi code. This allows any plain OSGi
-component, which is running without the Java EE context, to discover the
-EJB and invoke it. Similarly, Java EE components can locate OSGi
+component, which is running without the Jakarta EE context, to discover the
+EJB and invoke it. Similarly, Jakarta EE components can locate OSGi
 services provided by plain OSGi bundles and use them as well. GlassFish
-Server extends the Java EE Context and Dependency Injection (CDI)
-framework to make it easier for Java EE components to consume dynamic
+Server extends the Jakarta EE Context and Dependency Injection (CDI)
+framework to make it easier for Jakarta EE components to consume dynamic
 OSGi services in a type-safe manner.
 
 * link:#gkupd[Developing Plain OSGi Bundles]
@@ -132,16 +122,16 @@
 Developing Plain OSGi Bundles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Java EE components (like an EJB or Servlet) can look up Java EE platform
-services using JNDI names in the associated Java EE naming context. Such
-code can rely on the Java EE container to inject the required services
+Jakarta EE components (like an EJB or Servlet) can look up Jakarta EE platform
+services using JNDI names in the associated Jakarta EE naming context. Such
+code can rely on the Jakarta EE container to inject the required services
 as well. Unfortunately, neither of them works when the code runs outside
-a Java EE context. An example of such code is the `BundleActivator` of
-an OSGi bundle. For such code to access Java EE platform services,
+a Jakarta EE context. An example of such code is the `BundleActivator` of
+an OSGi bundle. For such code to access Jakarta EE platform services,
 GlassFish Server makes key services and resources of the underlying Java
 EE platform available as OSGi services. Thus, an OSGi bundle deployed in
 GlassFish Server can access these services using OSGi Service look-up
-APIs or by using a white board pattern. The following Java EE services
+APIs or by using a white board pattern. The following Jakarta EE services
 are available as OSGi services:
 
 * link:#gkunk[HTTP Service]
@@ -228,7 +218,7 @@
 There is no additional service property associated with them. Although
 `UserTransaction` appears to be a singleton, in reality any call to it
 gets rerouted to the actual transaction associated with the calling
-thread. Code that runs in the context of a Java EE component typically
+thread. Code that runs in the context of a Jakarta EE component typically
 gets a handle on `UserTransaction` by doing a JNDI lookup in the
 component naming context or by using injection, as shown here:
 
@@ -245,7 +235,7 @@
 ----
 
 When certain code (such as an OSGi Bundle Activator), which does not
-have a Java EE component context, wants to get hold of
+have a Jakarta EE component context, wants to get hold of
 `UserTransaction`, or any of the other JTA artifacts, then they can look
 it up in the service registry. Here is an example of such code:
 
@@ -427,7 +417,7 @@
 GlassFish Server includes a CDI extension that enables web applications,
 such as servlets, that are part of WABs to express a type-safe
 dependency on an OSGi service using CDI APIs. An OSGi service can be
-provided by any OSGi bundle without any knowledge of Java EE/CDI, and
+provided by any OSGi bundle without any knowledge of Jakarta EE/CDI, and
 they are allowed to be injected transparently in a type-safe manner into
 a web application.
 
@@ -553,7 +543,7 @@
 GlassFish Server includes a CDI extension that enables EJB application
 bundles to express a type-safe dependency on an OSGi Service using CDI
 APIs. An OSGi service can be provided by any OSGi bundle without any
-knowledge of Java EE/CDI, and they are allowed to be injected
+knowledge of Jakarta EE/CDI, and they are allowed to be injected
 transparently in a type-safe manner into an EJB bundle.
 
 A custom CDI Qualifier, `@org.glassfish.osgicdi.OSGiService`, is used by
@@ -572,8 +562,9 @@
 Deploying OSGi Bundles in GlassFish Server
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-For instruction on deploying OSGi bundle, see "link:../application-deployment-guide/deploying-applications.html#GSDPG00073[OSGi
-Bundle Deployment Guidelines]" in GlassFish Server Open Source Edition
-Application Deployment Guide.
+For instruction on deploying OSGi bundle, see
+"link:../application-deployment-guide/deploying-applications.html#GSDPG00073[
+OSGi Bundle Deployment Guidelines]"
+in GlassFish Server Open Source Edition Application Deployment Guide.
 
 
diff --git a/docs/application-development-guide/src/main/jbake/content/preface.adoc b/docs/application-development-guide/src/main/jbake/content/preface.adoc
index 61f6697..b24bff3 100644
--- a/docs/application-development-guide/src/main/jbake/content/preface.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/preface.adoc
@@ -22,33 +22,31 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
 This Application Development Guide describes how to create and run Java
-Platform, Enterprise Edition (Java EE platform) applications that follow
-the open Java standards model for Java EE components and APIs in the
-Oracle GlassFish Server environment. Topics include developer tools,
-security, and debugging. This book is intended for use by software
-developers who create, assemble, and deploy Java EE applications using
-Oracle servers and software.
+Platform, Enterprise Edition (Jakarta EE platform) applications that follow
+the open Java standards model for Jakarta EE components and APIs in the
+{productName} environment.
+Topics include developer tools, security, and debugging.
+This book is intended for use by software developers who create, assemble,
+and deploy Jakarta EE applications using GlassFish servers.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://javaee.github.io/glassfish/`. The
-GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
-GlassFish Server. The GlassFish project is designed to encourage
-communication between Oracle engineers and the community.
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -58,10 +56,8 @@
 * link:#fquvc[Symbol Conventions]
 * link:#ghpfg[Default Paths and File Names]
 
-
 [[GSDVG00082]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -70,7 +66,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -78,93 +74,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
+your system and enterprise.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
+
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
+
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
+scalability through failover and load balancing.
+
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
+
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
+
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
+
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
+
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
+the Message Queue messaging service.
+
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
+
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
+programmatically configuring and monitoring Message Queue resources in
+conformance with the Java Management Extensions (JMX).
+
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
+applications (Java clients) that work with GlassFish Server.
+
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
+Message Queue who want to use the C language binding to the Message
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSDVG00083]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 8 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The Java EE specifications and API specification for version 8 is
-located at `https://javaee.github.io/javaee-spec/`.
-* The API specification for GlassFish Server 7, including Java EE 8
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`https://javaee.github.io/glassfish/documentation`.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby database for use with the
-GlassFish Server, see:
-(`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
 available from the repository
-(`https://github.com/javaee/glassfish-samples`).
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSDVG00084]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -172,73 +216,84 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
 [[GSDVG00085]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSDVG00086]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -246,26 +301,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
+
 |as-install
-a|Represents the base installation directory for GlassFish Server. +
+a|Represents the base installation directory for GlassFish Server.
 In configuration files, as-install is represented as follows:
 `${com.sun.aas.installRoot}`
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
-user's-home-directory``/glassfish7/glassfish`` +
-Installations on the Windows operating system: +
++
+user's-home-directory``/glassfish7/glassfish``
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
-system, and Mac operating system: +
-user's-home-directory``/glassfish7`` +
-Installations on the Windows operating system: +
+a|* Installations on the Oracle Solaris operating system, Linux operating
+system, and Mac operating system:
++
+user's-home-directory``/glassfish7``
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -273,13 +334,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored. +
-In configuration files, domain-dir is represented as follows: +
+|Represents the directory in which a domain's configuration is stored.
+In configuration files, domain-dir is represented as follows:
 `${com.sun.aas.instanceRoot}`
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
 
diff --git a/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc b/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
index dcbfbd8..d37ec18 100644
--- a/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/securing-apps.adoc
@@ -15,17 +15,17 @@
 4 Securing Applications
 -----------------------
 
-This chapter describes how to write secure Java EE applications, which
+This chapter describes how to write secure Jakarta EE applications, which
 contain components that perform user authentication and access
-authorization for the business logic of Java EE components.
+authorization for the business logic of Jakarta EE components.
 
 For information about administrative security for the Oracle GlassFish
 Server, see the link:../security-guide/toc.html#GSSCG[GlassFish Server Open Source Edition
 Security Guide].
 
-For general information about Java EE security, see
-https://javaee.github.io/tutorial/partsecurity.html[Security] in The
-Java EE 8 Tutorial.
+For general information about Jakarta EE security, see
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#security-2[Security]
+in The Jakarta EE Tutorial.
 
 The following topics are addressed here:
 
@@ -34,7 +34,7 @@
 * link:#beabj[Container Security]
 * link:#beacr[Roles, Principals, and Principal to Role Mapping]
 * link:#beabo[Realm Configuration]
-* link:#BACDEIHB[Java EE Security API Support]
+* link:#BACDEIHB[Jakarta EE Security API Support]
 * link:#beabt[JACC Support]
 * link:#beabu[Pluggable Audit Module Support]
 * link:#beabx[The `server.policy` File]
@@ -62,10 +62,10 @@
 
 In an enterprise computing environment, there are many security risks.
 The goal of the GlassFish Server is to provide highly secure,
-interoperable, and distributed component computing based on the Java EE
+interoperable, and distributed component computing based on the Jakarta EE
 security model. Security goals include:
 
-* Full compliance with the Java EE security model. This includes EJB and
+* Full compliance with the Jakarta EE security model. This includes EJB and
 servlet role-based authorization.
 * Support for single sign-on across all GlassFish Server applications
 within a single security domain.
@@ -79,18 +79,17 @@
 * Support for declarative security through GlassFish Server specific
 XML-based role mapping.
 * Support for Java Authorization Contract for Containers (JACC)
-pluggable authorization as included in the Java EE specification and
+pluggable authorization as included in the Jakarta EE specification and
 defined by http://www.jcp.org/en/jsr/detail?id=115[Java Specification
 Request (JSR) 115] (`http://www.jcp.org/en/jsr/detail?id=115`).
 * Support for Java Authentication Service Provider Interface for
-Containers as included in the Java EE specification and defined by
+Containers as included in the Jakarta EE specification and defined by
 http://www.jcp.org/en/jsr/detail?id=196[JSR 196]
 (`http://www.jcp.org/en/jsr/detail?id=196`).
-* Support for Web Services Interoperability Technologies (WSIT) as
-described in
-https://javaee.github.io/metro/doc/user-guide/index.html[Metro Users
-Guide] (`https://javaee.github.io/metro/doc/user-guide/index.html`).
-* Support for the Java EE Security API as included in the Java EE
+* Support for Web Services Interoperability Technologies (WSIT) as described in
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#web-services-interoperability-and-jakarta-xml-web-services[
+Jakarta EE Tutorial].
+* Support for the Jakarta EE Security API as included in the Jakarta EE
 specification and defined by https://jcp.org/en/jsr/detail?id=375[JSR
 375] (`https://jcp.org/en/jsr/detail?id=375`)
 
@@ -99,7 +98,7 @@
 GlassFish Server Specific Security Features
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The GlassFish Server supports the Java EE security model, as well as the
+The GlassFish Server supports the Jakarta EE security model, as well as the
 following features which are specific to the GlassFish Server:
 
 * Message security; see link:#beaca[Configuring Message Security for Web
@@ -115,7 +114,7 @@
 Container Security
 ~~~~~~~~~~~~~~~~~~
 
-The component containers are responsible for providing Java EE
+The component containers are responsible for providing Jakarta EE
 application security. The container provides two security forms:
 
 * link:#beabl[Declarative Security]
@@ -135,12 +134,12 @@
 
 Declarative security means that the security mechanism for an
 application is declared and handled externally to the application.
-Deployment descriptors describe the Java EE application's security
+Deployment descriptors describe the Jakarta EE application's security
 structure, including security roles, access control, and authentication
 requirements.
 
 The GlassFish Server supports the deployment descriptors specified by
-Java EE and has additional security elements included in its own
+Jakarta EE and has additional security elements included in its own
 deployment descriptors. Declarative security is the application
 deployer's responsibility. For more information about GlassFish Server
 deployment descriptors, see the link:../application-deployment-guide/toc.html#GSDPG[GlassFish Server Open Source
@@ -163,7 +162,7 @@
 `glassfish-ejb-jar.xml` files) and to the servlet XML deployment
 descriptors (`web.xml` and `glassfish-web.xml` files). For an
 individually deployed web or EJB module, you define roles using
-`@DeclareRoles` annotations or `role-name` elements in the Java EE
+`@DeclareRoles` annotations or `role-name` elements in the Jakarta EE
 deployment descriptor files `web.xml` or `ejb-jar.xml`.
 
 To map roles to principals and groups, define matching
@@ -199,13 +198,13 @@
 ^^^^^^^^^^^^^^^^^^^^^
 
 Programmatic security involves an EJB component or servlet using method
-calls to the security API, as specified by the Java EE security model,
+calls to the security API, as specified by the Jakarta EE security model,
 to make business logic decisions based on the caller or remote user's
 security role. Programmatic security should only be used when
 declarative security alone is insufficient to meet the application's
 security model.
 
-The API for programmatic security consists of methods of the Java EE
+The API for programmatic security consists of methods of the Jakarta EE
 Security API `SecurityContext` interface, and methods of the EJB
 `EJBContext` interface and the servlet `HttpServletRequest` interface.
 The GlassFish Server supports these interfaces as specified in the Java
@@ -215,8 +214,8 @@
 link:#beacm[Programmatic Login Using the ProgrammaticLogin Class].
 
 For more information about programmatic security, see
-https://javaee.github.io/tutorial/security-intro003.html#using-programmatic-security[Using
-Programmatic Security] in the The Java EE Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#using-programmatic-security-with-web-applications[
+Using Programmatic Security] in the The Jakarta EE Tutorial.
 
 [[beacr]][[GSDVG00117]][[roles-principals-and-principal-to-role-mapping]]
 
@@ -228,17 +227,17 @@
 Role Mapping setting is enabled by default on the Security page of the
 GlassFish Administration Console. To change the default mapping you can
 clear this setting. For applications, you define roles in
-`@DeclareRoles` annotations or the Java EE deployment descriptor file
+`@DeclareRoles` annotations or the Jakarta EE deployment descriptor file
 `application.xml`. You define the corresponding role mappings in the
 GlassFish Server deployment descriptor file `glassfish-application.xml`.
 For individually deployed web or EJB modules, you define roles in
-`@DeclareRoles` annotations or the Java EE deployment descriptor files
+`@DeclareRoles` annotations or the Jakarta EE deployment descriptor files
 `web.xml` or `ejb-jar.xml`. You define the corresponding role mappings
 in the GlassFish Server deployment descriptor files `glassfish-web.xml`
 or `glassfish-ejb-jar.xml`.
 
-For more information regarding Java EE deployment descriptors, see the
-Java EE Specification. For more information regarding GlassFish Server
+For more information regarding Jakarta EE deployment descriptors, see the
+Jakarta EE Specification. For more information regarding GlassFish Server
 deployment descriptors, see "link:../application-deployment-guide/dd-elements.html#GSDPG00007[Elements of the GlassFish
 Server Deployment Descriptors]" in GlassFish Server Open Source Edition
 Application Deployment Guide.
@@ -426,15 +425,16 @@
 JAAS is a set of APIs that enable services to authenticate and enforce
 access controls upon users. JAAS provides a pluggable and extensible
 framework for programmatic user authentication and authorization. JAAS
-is a core API and an underlying technology for Java EE security
+is a core API and an underlying technology for Jakarta EE security
 mechanisms. For more information about JAAS, refer to the JAAS
 specification for Java SDK, available at
 `http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html`.
 
 For general information about realms and login modules, see the section
 about working with realms, users, groups, and roles in
-"https://javaee.github.io/tutorial/security-intro.html[Introduction to
-Security in the Java EE Platform]" in The Java EE 8 Tutorial.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#security-2[
+Introduction to Security in the Jakarta EE Platform]
+in The Jakarta EE Tutorial.
 
 For Javadoc tool pages relevant to custom realms, see the
 `com.sun.appserv.security` package.
@@ -602,7 +602,7 @@
 
 [[BACDEIHB]][[GSDVG563]][[java-ee-security-api-support]]
 
-Java EE Security API Support
+Jakarta EE Security API Support
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 JSR-375 defines several authentication-related plugin SPIs, such as,
@@ -624,7 +624,7 @@
 periodically without needing to present primary authentication
 credentials each time.
 
-In addition to these authentication plugin SPIs, the Java EE Security
+In addition to these authentication plugin SPIs, the Jakarta EE Security
 API specification defines the `SecurityContext` API for use by
 application code to query and interact with the current security
 context. The `SecurityContext` interface defines methods that allow an
@@ -638,12 +638,12 @@
 JACC Support
 ~~~~~~~~~~~~
 
-JACC (Java Authorization Contract for Containers) is part of the Java EE
+JACC (Java Authorization Contract for Containers) is part of the Jakarta EE
 specification and defined by http://www.jcp.org/en/jsr/detail?id=115[JSR
 115] (`http://www.jcp.org/en/jsr/detail?id=115`). JACC defines an
 interface for pluggable authorization providers. Specifically, JACC is
 used to plug in the Java policy provider used by the container to
-perform Java EE caller access decisions. The Java policy provider
+perform Jakarta EE caller access decisions. The Java policy provider
 performs Java policy decisions during application execution. This
 provides third parties with a mechanism to develop and plug in modules
 that are responsible for answering authorization decisions during Java
@@ -775,10 +775,10 @@
 Each GlassFish Server domain has its own global J2SE policy file,
 located in domain-dir`/config`. The file is named `server.policy`.
 
-The GlassFish Server is a Java EE compliant application server. As such,
-it follows the requirements of the Java EE specification, including the
+The GlassFish Server is a Jakarta EE compliant application server. As such,
+it follows the requirements of the Jakarta EE specification, including the
 presence of the security manager (the Java component that enforces the
-policy) and a limited permission set for Java EE application code.
+policy) and a limited permission set for Jakarta EE application code.
 
 The following topics are addressed here:
 
@@ -805,7 +805,7 @@
 
 A few permissions above the minimal set are also granted in the default
 `server.policy` file. These are necessary due to various internal
-dependencies of the server implementation. Java EE application
+dependencies of the server implementation. Jakarta EE application
 developers must not rely on these additional permissions. In some cases,
 deleting these permissions might be appropriate. For example, one
 additional permission is granted specifically for using connectors. If
@@ -869,7 +869,7 @@
 Changing Permissions for an Application
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The default policy for each domain limits the permissions of Java EE
+The default policy for each domain limits the permissions of Jakarta EE
 deployed applications to the minimal set of permissions required for
 these applications to operate correctly. Do not add extra permissions to
 the default set (the grant block with no codebase, which applies to all
@@ -968,7 +968,7 @@
 ====
 
 
-As noted in the Java EE specification, an application should provide
+As noted in the Jakarta EE specification, an application should provide
 documentation of the additional permissions it needs. If an application
 requires extra permissions but does not document the set it needs,
 contact the application author for details.
@@ -1059,12 +1059,12 @@
 Persistence API by injecting or looking up an entity manager or entity
 manager factory, the EJB container sets this JVM option for you.
 
-You must grant additional permissions to CDI-enabled Java EE
+You must grant additional permissions to CDI-enabled Jakarta EE
 applications that are deployed in a GlassFish Server 7 domain or
 cluster for which security manager is enabled. These additional
 permissions are not required when security manager is disabled.
 
-To deploy CDI-enabled Java EE applications in a GlassFish Server 7
+To deploy CDI-enabled Jakarta EE applications in a GlassFish Server 7
 domain or cluster for which security manager is enabled, add the
 following permissions to the applications:
 
@@ -1127,8 +1127,8 @@
 
 For more information about message security, see the following:
 
-* "https://javaee.github.io/tutorial/security-intro.html[Introduction to
-Security in the Java EE Platform]" in The Java EE 8 Tutorial
+* "https://eclipse-ee4j.github.io/jakartaee-tutorial/#security-2[Introduction to
+Security in the Jakarta EE Platform]" in The Jakarta EE Tutorial
 * link:../security-guide/toc.html#GSSCG[GlassFish Server Open Source Edition Security Guide]
 * http://www.jcp.org/en/jsr/detail?id=196[JSR 196]
 (`http://www.jcp.org/en/jsr/detail?id=196`), Java Authentication Service
@@ -1551,7 +1551,7 @@
 
 The objective of this sample application is to demonstrate how a web
 service can be secured with WSS. The web service in the `xms` example is
-a simple web service implemented using a Java EE EJB endpoint and a web
+a simple web service implemented using a Jakarta EE EJB endpoint and a web
 service endpoint implemented using a servlet. In this example, a service
 endpoint interface is defined with one operation, `sayHello`, which
 takes a string then sends a response with `Hello` prefixed to the given
@@ -1684,23 +1684,23 @@
 Programmatic Login Using the ProgrammaticLogin Class
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Programmatic login allows a deployed Java EE application or module to
+Programmatic login allows a deployed Jakarta EE application or module to
 invoke a login method. If the login is successful, a `SecurityContext`
 is established as if the client had authenticated using any of the
-conventional Java EE mechanisms. Programmatic login is supported for
+conventional Jakarta EE mechanisms. Programmatic login is supported for
 servlet and EJB components on the server side, and for stand-alone or
 application clients on the client side. Programmatic login is useful for
 an application having special needs that cannot be accommodated by any
-of the Java EE standard authentication mechanisms.
+of the Jakarta EE standard authentication mechanisms.
 
 This section describes a proprietary GlassFish mechanism, but see also
-the standard security APIs in the Java EE tutorial.
+the standard security APIs in the Jakarta EE tutorial.
 
 
 [NOTE]
 ====
 The `com.sun.appserv.security.ProgrammaticLogin` class in GlassFish
-Server is not a Java EE API; therefore, it is not portable to other
+Server is not a Jakarta EE API; therefore, it is not portable to other
 application servers.
 ====
 
@@ -1757,7 +1757,7 @@
 programmatic login mechanism for an application if the security manager
 is enabled. For information about the security manager, see
 link:#beabx[The `server.policy` File]. This permission is not granted by
-default to deployed applications because this is not a standard Java EE
+default to deployed applications because this is not a standard Jakarta EE
 mechanism.
 
 To grant the required permission to the application, add the following
@@ -1977,9 +1977,9 @@
 built-in implementations of these APIs, or define custom
 implementations.
 
-Java EE Security API defines several annotations, with names that end
+Jakarta EE Security API defines several annotations, with names that end
 with Definition, which when used makes the corresponding built-in
-mechanism available as a CDI bean. Java EE Security API also supports
+mechanism available as a CDI bean. Jakarta EE Security API also supports
 the use of Expression Language 3.0 in these annotations to allow dynamic
 configuration.
 
@@ -2007,7 +2007,7 @@
 
 In GlassFish Server, all built-in authentication mechanisms need to be
 authenticated using an identity store. The `IdentityStore` interface,
-included in the Java EE Security API, defines an SPI for interacting
+included in the Jakarta EE Security API, defines an SPI for interacting
 with identity stores, which are directories or databases containing user
 account information. The `IdentityStore` interface has four methods:
 `validate(Credential)`, `getCallerGroups(CredentialValidationResult)`,
@@ -2038,7 +2038,7 @@
 )
 ----
 
-Since Java EE Security API provides support for Expression Langauge 3.0,
+Since Jakarta EE Security API provides support for Expression Langauge 3.0,
 regular expressions can be used to set value of annotation attributes.
 
 The GlassFish Server provides out of the box implementation of
@@ -2058,7 +2058,7 @@
 authentication mechanism, apart from built-in authentication mechanism.
 
 A custom authentication mechanism implements the
-`HttpAuthenticationMechanism` interface, introduced in Java EE Security
+`HttpAuthenticationMechanism` interface, introduced in Jakarta EE Security
 API. This interface defines the following three methods.
 
 [source,java]
@@ -2106,7 +2106,7 @@
 
 The class `MyAuthenticationMechanism.java` is a sample
 `HttpAuthenticationMechanism` implementation. Note that only
-`validateRequest` method has been implemented, since Java EE Security
+`validateRequest` method has been implemented, since Jakarta EE Security
 API provides default implementation of other two methods. An application
 provider may choose to override the default implementation depending on
 the requirement.
diff --git a/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc b/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
index 2feefd5..c761972 100644
--- a/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/setting-up-dev-env.adoc
@@ -34,27 +34,21 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For more information about GlassFish Server installation, see the
-link:../installation-guide/toc.html#GSING[GlassFish Server Open Source Edition Installation Guide].
+link:../installation-guide/toc.html#GSING[
+GlassFish Server Open Source Edition Installation Guide].
 
 The following components are included in the full installation.
 
 * JDK
 * GlassFish Server core
 
-** Java Platform, Standard Edition (Java SE) 8
-
-** Java EE 8 compliant application server
-
+** Java Platform, Standard Edition (Java SE) 11
+** Jakarta EE 10 compliant application server
 ** Administration Console
-
 ** `asadmin` utility
-
 ** Other development and deployment tools
-
 ** Open Message Queue software
-
 ** Apache http://db.apache.org/derby/manuals[Derby database]
-
 ** Load balancer plug-ins for web servers
 
 The NetBeans Integrated Development Environment (IDE) bundles the
@@ -70,9 +64,9 @@
 * Set up debugging. For more information, see
 link:debugging-apps.html#beafc[Debugging Applications].
 * Configure the Virtual Machine for the Java platform (JVM software).
-For more information, see "link:../administration-guide/jvm.html#GSADG00007[Administering the Virtual
-Machine for the Java Platform]" in GlassFish Server Open Source Edition
-Administration Guide.
+For more information, see "link:../administration-guide/jvm.html#GSADG00007[
+Administering the Virtual Machine for the Java Platform]"
+in GlassFish Server Open Source Edition Administration Guide.
 
 [[beaas]][[GSDVG00091]][[high-availability-features]]
 
@@ -152,7 +146,7 @@
 The Migration Tool
 ^^^^^^^^^^^^^^^^^^
 
-The Migration Tool converts and reassembles Java EE applications and
+The Migration Tool converts and reassembles Jakarta EE applications and
 modules developed on other application servers. This tool also generates
 a report listing how many files are successfully and unsuccessfully
 migrated, with reasons for migration failure. For more information and
@@ -196,9 +190,7 @@
 Sample Applications
 ~~~~~~~~~~~~~~~~~~~
 
-Sample applications that you can examine and deploy to the GlassFish
-Server are included as part of the Java EE 8 SDK bundle. The samples are
-also available from `https://github.com/javaee/glassfish-samples`.
+The samples are available from `https://github.com/eclipse-ee4j/glassfish-samples`.
 
 Most GlassFish Server samples have the following directory structure:
 
diff --git a/docs/application-development-guide/src/main/jbake/content/title.adoc b/docs/application-development-guide/src/main/jbake/content/title.adoc
index df9c962..52a3e53 100644
--- a/docs/application-development-guide/src/main/jbake/content/title.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/title.adoc
@@ -19,11 +19,11 @@
 Contributed 2018, 2019
 
 This Application Development Guide describes how to create and run Java
-Platform, Enterprise Edition (Java EE platform) applications that follow
-the open Java standards model for Java EE components and APIs in the
+Platform, Enterprise Edition (Jakarta EE platform) applications that follow
+the open Java standards model for Jakarta EE components and APIs in the
 Eclipse GlassFish Server environment. Topics include
 developer tools, security, and debugging. This book is intended for use
-by software developers who create, assemble, and deploy Java EE
+by software developers who create, assemble, and deploy Jakarta EE
 applications using Oracle servers and software.
 
 [[sthref1]]
diff --git a/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc b/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
index 371cad6..5c38c18 100644
--- a/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/transaction-service.adoc
@@ -15,9 +15,9 @@
 15 Using the Transaction Service
 --------------------------------
 
-The Java EE platform provides several abstractions that simplify
+The Jakarta EE platform provides several abstractions that simplify
 development of dependable transaction processing for applications. This
-chapter discusses Java EE transactions and transaction support in the
+chapter discusses Jakarta EE transactions and transaction support in the
 Oracle GlassFish Server.
 
 The following topics are addressed here:
@@ -36,8 +36,8 @@
 `http://www.oracle.com/technetwork/java/javaee/tech/index.html`.
 
 You might also want to read
-"https://javaee.github.io/tutorial/transactions.html[Transactions]" in
-The Java EE 8 Tutorial.
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]"
+in The Jakarta EE Tutorial.
 
 [[giybi]][[GSDVG00188]][[handling-transactions-with-databases]]
 
@@ -363,7 +363,7 @@
 Using the ConfigurableTransactionSupport Interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The Java EE Connector 1.6 specification allows a resource adapter to use
+The Jakarta EE Connector 1.6 specification allows a resource adapter to use
 the `transaction-support` attribute to specify the level of transaction
 support that the resource adapter handles. However, the resource adapter
 vendor does not have a mechanism to figure out the current transactional
@@ -399,10 +399,9 @@
 of javax.transaction.TransactionManager , for portability. You can look
 up the implementation of this interface by using the JNDI name
 `java:comp/``TransactionSynchronizationRegistry`. For details, see the
-https://javaee.github.io/javaee-spec/javadocs/[`TransactionSynchronizationRegistryInterface`]
-API documentation (`https://javaee.github.io/javaee-spec/javadocs/`) and
-http://www.jcp.org/en/jsr/detail?id=907[Java Specification Request (JSR)
-907] (`http://www.jcp.org/en/jsr/detail?id=907`).
+https://jakarta.ee/specifications/transactions/2.0/apidocs/jakarta/transaction/transactionsynchronizationregistry[`TransactionSynchronizationRegistryInterface`]
+API documentation and
+http://www.jcp.org/en/jsr/detail?id=907[Java Specification Request (JSR) 907]
 
 If accessing the javax.transaction.TransactionManager implementation is
 absolutely necessary, you can look up the GlassFish Server
diff --git a/docs/application-development-guide/src/main/jbake/content/webapps.adoc b/docs/application-development-guide/src/main/jbake/content/webapps.adoc
index 22546f9..f566840 100644
--- a/docs/application-development-guide/src/main/jbake/content/webapps.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/webapps.adoc
@@ -27,8 +27,8 @@
 * link:#beaft[Advanced Web Application Features]
 
 For general information about web applications, see
-"https://javaee.github.io/tutorial/partwebtier.html[The Web Tier]" in
-The Java EE 8 Tutorial.
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#getting-started-with-web-applications[
+The Web Tier]" in The Jakarta EE Tutorial.
 
 
 [NOTE]
@@ -782,7 +782,7 @@
 In the event of an instance or hardware failure, another server instance
 can take over a distributed session, with the following limitations:
 
-* If a distributable web application references a Java EE component or
+* If a distributable web application references a Jakarta EE component or
 resource, the reference might be lost. See link:#fvyem[Table 7-3] for a
 list of the types of references that `HTTPSession` failover supports.
 * References to open files or network connections are lost.
@@ -807,7 +807,7 @@
 [[GSDVG543]][[sthref15]][[fvyem]]
 
 
-Table 7-3 Object Types Supported for Java EE Web Application Session
+Table 7-3 Object Types Supported for Jakarta EE Web Application Session
 State Failover
 
 [width="100%",cols="45%,55%",options="header",]
@@ -1251,8 +1251,7 @@
 ^^^^^^^^^^^^^
 
 For details on using Grizzly Comet including a sample application, refer
-to the Grizzly Comet documentation on GitHub
-(`https://javaee.github.io/grizzly/comet.html`).
+to the https://eclipse-ee4j.github.io/grizzly/comet.html[Grizzly Comet documentation].
 
 Grizzly's support for Comet includes a small set of APIs that make it
 easy to add Comet functionality to your web applications. The Grizzly
@@ -1576,7 +1575,7 @@
 resolution is always delegated to the parent class loader regardless of
 the `delegate` setting. This prevents applications from overriding core
 Java runtime classes or changing the API versions of specifications that
-are part of the Java EE platform.
+are part of the Jakarta EE platform.
 
 For general information about class loaders, see
 link:class-loaders.html#beade[Class Loaders].
diff --git a/docs/application-development-guide/src/main/jbake/content/webservices.adoc b/docs/application-development-guide/src/main/jbake/content/webservices.adoc
index 722651f..da73c0d 100644
--- a/docs/application-development-guide/src/main/jbake/content/webservices.adoc
+++ b/docs/application-development-guide/src/main/jbake/content/webservices.adoc
@@ -22,7 +22,7 @@
 * link:#gbixz[Deploying a Web Service]
 * link:#gbiyw[The Web Service URI, WSDL File, and Test Page]
 * link:#CHDEBBCH[The Databinding Provider]
-* link:#gcgzz[GlassFish Java EE Service Engine]
+* link:#gcgzz[GlassFish Jakarta EE Service Engine]
 
 
 [NOTE]
@@ -43,37 +43,28 @@
 ====
 
 
-"https://javaee.github.io/tutorial/partwebsvcs.html[Web Services]" in
-The Java EE 8 Tutorial shows how to deploy simple web services to
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#web-services[Web Services]"
+in The Jakarta EE Tutorial shows how to deploy simple web services to
 GlassFish Server.
 
-For additional information about JAXB (Java Architecture for XML
-Binding), see
+For additional information about JAXB (Java Architecture for XML Binding), see
 http://jcp.org/aboutJava/communityprocess/pfd/jsr222/index.html[Java
-Specification Request (JSR) 222] and link:#CHDEBBCH[The Databinding
-Provider].
+Specification Request (JSR) 222] and link:#CHDEBBCH[The Databinding Provider].
 
-For additional information about JAX-WS (Java API for XML-Based Web
-Services), see
+For additional information about JAX-WS (Java API for XML-Based Web Services), see
 http://jcp.org/aboutJava/communityprocess/pfd/jsr224/index.html[Java
 Specification Request (JSR) 224] and
-http://jcp.org/en/jsr/detail?id=109[Java Specification Request (JSR)
-109].
+http://jcp.org/en/jsr/detail?id=109[Java Specification Request (JSR) 109].
 
 For information about web services security, see
-link:securing-apps.html#beaca[Configuring Message Security for Web
-Services].
+link:securing-apps.html#beaca[Configuring Message Security for Web Services].
 
-The Fast Infoset standard specifies a binary format based on the XML
-Information Set. This format is an efficient alternative to XML. For
-information about using Fast Infoset, see the following links:
+The Fast Infoset standard specifies a binary format based on the XML Information Set.
+This format is an efficient alternative to XML.
+For more information about using Fast Infoset,
+see the https://eclipse-ee4j.github.io/metro-wsit/3.0.0/guide/ch02.html#using-fastinfoset[
+Metro WSIT Guide]
 
-* http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.6/ReleaseNotes.html[Java
-Web Services Developer Pack 1.6 Release Notes]
-* http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.6/jaxrpc/fastinfoset/manual.html[Fast
-Infoset in Java Web Services Developer Pack, Version 1.6]
-* https://javaee.github.io/metro-fi/[Fast Infoset Project]
-(`https://javaee.github.io/metro-fi/`
 
 [[gbizi]][[GSDVG00126]][[creating-portable-web-service-artifacts]]
 
@@ -81,8 +72,8 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 For a tutorial that shows how to use the `wsimport` and `wsgen`
-commands, see "https://javaee.github.io/tutorial/partwebsvcs.html[Web
-Services]" in The Java EE 8 Tutorial.
+commands, see "https://eclipse-ee4j.github.io/jakartaee-tutorial/#web-services[
+Web Services]" in The Jakarta EE Tutorial.
 
 [[gbixz]][[GSDVG00127]][[deploying-a-web-service]]
 
@@ -109,10 +100,11 @@
 link:#gbiyw[The Web Service URI, WSDL File, and Test Page].
 
 For more information about deployment, autodeployment, and deployment
-descriptors, see the link:../application-deployment-guide/toc.html#GSDPG[GlassFish Server Open Source Edition
-Application Deployment Guide]. For more information about the
-`asadmin deploy` command, see the link:../reference-manual/toc.html#GSRFM[GlassFish Server Open
-Source Edition Reference Manual].
+descriptors, see the link:../application-deployment-guide/toc.html#GSDPG[
+GlassFish Server Open Source Edition Application Deployment Guide].
+For more information about the
+`asadmin deploy` command, see the link:../reference-manual/toc.html#GSRFM[
+GlassFish Server Open Source Edition Reference Manual].
 
 [[gbiyw]][[GSDVG00128]][[the-web-service-uri-wsdl-file-and-test-page]]
 
@@ -185,7 +177,7 @@
 The JAX-WS reference implementation (RI) used to be dependent on the
 JAXB RI for databinding. JAXB and JAX-WS implementations have been
 decoupled, and databinding is modular. JAXB and JAX-WS are no longer
-Java EE APIs.
+Jakarta EE APIs.
 
 The EclipseLink JAXB implementation, plus EclipseLink extensions, is
 called MOXy. The `org.eclipse.persistence.moxy.jar` file is bundled with
@@ -268,23 +260,22 @@
 
 [[gcgzz]][[GSDVG00129]][[glassfish-java-ee-service-engine]]
 
-GlassFish Java EE Service Engine
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=== GlassFish Jakarta EE Service Engine
 
-GlassFish Server 7 provides the GlassFish Java EE Service Engine, a
+GlassFish Server 7 provides the GlassFish Jakarta EE Service Engine, a
 JSR 208 compliant Java Business Integration (JBI) runtime component that
-connects Java EE web services to JBI components. The Java EE Service
+connects Jakarta EE web services to JBI components. The Jakarta EE Service
 Engine is installed as an add-on component using the Update Tool. Look
-for the JBI component named Java EE Service Engine. A JBI runtime is not
+for the JBI component named Jakarta EE Service Engine. A JBI runtime is not
 installed with or integrated into GlassFish Server 7 and must be
 obtained separately. For more information about using the Update Tool to
-obtain the Java EE Service Engine and other add-on components, see
+obtain the Jakarta EE Service Engine and other add-on components, see
 "link:../administration-guide/toc.html#GSADG00701[Update Tool]" in GlassFish Server Open Source Edition
 Administration Guide.
 
-The Java EE Service Engine acts as a bridge between the Java EE and JBI
+The Jakarta EE Service Engine acts as a bridge between the Jakarta EE and JBI
 runtime environments for web service providers and web service
-consumers. The Java EE Service Engine provides better performance than a
+consumers. The Jakarta EE Service Engine provides better performance than a
 SOAP over HTTP binding component due to in-process communication between
 components and additional protocols provided by JBI binding components
 such as JMS, SMTP, and File.
@@ -293,26 +284,27 @@
 (`http://jcp.org/en/jsr/detail?id=208`) specification allows
 transactions to be propagated to other components using a message
 exchange property specified in the `JTA_TRANSACTION_PROPERTY_NAME`
-field. The Java EE Service Engine uses this property to set and get a
+field. The Jakarta EE Service Engine uses this property to set and get a
 transaction object from the JBI message exchange. It then uses the
-transaction object to take part in a transaction. This means a Java EE
+transaction object to take part in a transaction. This means a Jakarta EE
 application or module can take part in a transaction started by a JBI
 application. Conversely, a JBI application can take part in a
-transaction started by a Java EE application or module.
+transaction started by a Jakarta EE application or module.
 
 Similarly, the JSR 208 specification allows a security subject to be
 propagated as a message exchange property named
 `javax.jbi.security.subject`. Thus a security subject can be propagated
-from a Java EE application or module to a JBI application or the
+from a Jakarta EE application or module to a JBI application or the
 reverse.
 
-To deploy a Java EE application or module as a JBI service unit, use the
+To deploy a Jakarta EE application or module as a JBI service unit, use the
 `asadmin deploy` command, or autodeployment. For more information about
-the `asadmin deploy` command, see the link:../reference-manual/toc.html#GSRFM[GlassFish Server Open
-Source Edition Reference Manual]. For more information about
-autodeployment, see "link:../application-deployment-guide/deploying-applications.html#GSDPG00041[To Deploy an Application or Module
-Automatically]" in GlassFish Server Open Source Edition Application
-Deployment Guide.
+the `asadmin deploy` command, see the link:../reference-manual/toc.html#GSRFM[
+GlassFish Server Open Source Edition Reference Manual].
+For more information about autodeployment, see
+"link:../application-deployment-guide/deploying-applications.html#GSDPG00041[
+To Deploy an Application or Module Automatically]"
+in GlassFish Server Open Source Edition Application Deployment Guide.
 
 [[gelxr]][[GSDVG00387]][[using-the-jbi.xml-file]]
 
@@ -321,7 +313,7 @@
 
 Section 6.3.1 of the JSR 208 specification describes the `jbi.xml` file.
 This is a deployment descriptor, located in the `META-INF` directory. To
-deploy a Java EE application or module as a JBI service unit, you need
+deploy a Jakarta EE application or module as a JBI service unit, you need
 only specify a small subset of elements in the `jbi.xml` file. Here is
 an example provider:
 
@@ -347,10 +339,10 @@
 </jbi>
 ----
 
-The Java EE Service Engine enables the endpoints described in the
+The Jakarta EE Service Engine enables the endpoints described in the
 `provides` section of the `jbi.xml` file in the JBI runtime. Similarly,
-the Java EE Service Engine routes invocations of the endpoints described
-in the `consumes` section from the Java EE web service consumer to the
+the Jakarta EE Service Engine routes invocations of the endpoints described
+in the `consumes` section from the Jakarta EE web service consumer to the
 JBI runtime.
 
 
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc b/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
index f85d41e..85f0194 100644
--- a/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
+++ b/docs/deployment-planning-guide/src/main/jbake/content/checklist.adoc
@@ -94,7 +94,7 @@
 a|
 * Logging: Enable access log rotation.
 * Choose the right logging level. WARNING is usually appropriate.
-* Configure Java EE containers using the Administration Console.
+* Configure Jakarta EE containers using the Administration Console.
 * Configure HTTP listeners using the Administration Console.
 * Configure ORB threadpool using the Administration Console.
 * If using Type2 drivers or calls involving native code, ensure that
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc b/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
index 190aee6..09615b5 100644
--- a/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
+++ b/docs/deployment-planning-guide/src/main/jbake/content/concepts.adoc
@@ -16,39 +16,37 @@
 ------------------
 
 GlassFish Server Open Source Edition provides a robust platform for the
-development, deployment, and management of Java EE applications. Key
+development, deployment, and management of Jakarta EE applications. Key
 features include scalable transaction management, web services
 performance, clustering, security, and integration capabilities.
 
 The following topics are addressed here:
 
-* link:#abfar[Java EE Platform Overview]
+* link:#abfar[Jakarta EE Platform Overview]
 * link:#abfay[GlassFish Server Components]
 * link:#abfca[Configuration Roadmap for High Availability of GlassFish
 Server]
 
 [[abfar]][[GSPLG00016]][[java-ee-platform-overview]]
 
-Java EE Platform Overview
-~~~~~~~~~~~~~~~~~~~~~~~~~
+=== Jakarta EE Platform Overview
 
-GlassFish Server implements Java platform, Enterprise Edition (Java EE)
-7 technology. The Java EE platform is a set of standard specifications
+GlassFish Server implements Java platform, Enterprise Edition (Jakarta EE)
+7 technology. The Jakarta EE platform is a set of standard specifications
 that describe application components, APIs, and the runtime containers
 and services of an application server.
 
 [[abfas]][[GSPLG00040]][[java-ee-applications]]
 
-Java EE Applications
-^^^^^^^^^^^^^^^^^^^^
+==== Jakarta EE Applications
 
-Java EE applications are made up of components such as JavaServer Pages
+Jakarta EE applications are made up of components such as JavaServer Pages
 (JSP), Java servlets, and Enterprise JavaBeans (EJB) modules. These
 components enable software developers to build large-scale, distributed
-applications. Developers package Java EE applications in Java Archive
+applications. Developers package Jakarta EE applications in Java Archive
 (JAR) files (similar to zip files), which can be distributed to
-production sites. Administrators install Java EE applications onto
-GlassFish Server by deploying Java EE JAR files onto one or more server
+production sites. Administrators install Jakarta EE applications onto
+GlassFish Server by deploying Jakarta EE JAR files onto one or more server
 instances (or clusters of instances).
 
 [[abfat]][[GSPLG00041]][[containers]]
@@ -58,22 +56,21 @@
 
 Each server instance includes two containers: web and EJB. A container
 is a runtime environment that provides services such as security and
-transaction management to Java EE components. Web components, such as
+transaction management to Jakarta EE components. Web components, such as
 Java Server Pages and servlets, run within the web container. Enterprise
 JavaBeans run within the EJB container.
 
 [[abfau]][[GSPLG00042]][[java-ee-services]]
 
-Java EE Services
-^^^^^^^^^^^^^^^^
+==== Jakarta EE Services
 
-The Java EE platform provides services for applications, including:
+The Jakarta EE platform provides services for applications, including:
 
 * Naming - A naming and directory service binds objects to names. A Java
 EE application can locate an object by looking up its Java Naming and
 Directory Interface (JNDI) name.
 * Security - The Java Authorization Contract for Containers (JACC) is a
-set of security contracts defined for the Java EE containers. Based on
+set of security contracts defined for the Jakarta EE containers. Based on
 the client's identity, containers can restrict access to the container's
 resources and services.
 * Transaction management - A transaction is an indivisible unit of work.
@@ -82,7 +79,7 @@
 completed, or is rolled back.
 * Message Service - Applications hosted on separate systems can
 communicate with each other by exchanging messages using the Java
-Message Service (JMS). JMS is an integral part of the Java EE platform
+Message Service (JMS). JMS is an integral part of the Jakarta EE platform
 and simplifies the task of integrating heterogeneous enterprise
 applications.
 
@@ -91,10 +88,10 @@
 Web Services
 ^^^^^^^^^^^^
 
-Clients can access a Java EE application as a remote web service in
+Clients can access a Jakarta EE application as a remote web service in
 addition to accessing it through HTTP, RMI/IIOP, and JMS. Web services
 are implemented using the Java API for XML-based web services (JAX-WS).
-A Java EE application can also act as a client to web services, which
+A Jakarta EE application can also act as a client to web services, which
 would be typical in network applications.
 
 Web Services Description Language (WSDL) is an XML format that describes
@@ -109,7 +106,7 @@
 Client Access
 ^^^^^^^^^^^^^
 
-Clients can access Java EE applications in several ways. Browser clients
+Clients can access Jakarta EE applications in several ways. Browser clients
 access web applications using hypertext transfer protocol (HTTP). For
 secure communication, browsers use the HTTP secure (HTTPS) protocol that
 uses secure sockets layer (SSL).
@@ -123,8 +120,8 @@
 message-driven beans.
 
 Clients that conform to the Web Services-Interoperability (WS-I) Basic
-Profile can access Java EE web services. WS-I is an integral part of the
-Java EE standard and defines interoperable web services. It enables
+Profile can access Jakarta EE web services. WS-I is an integral part of the
+Jakarta EE standard and defines interoperable web services. It enables
 clients written in any supporting language to access web services
 deployed to GlassFish Server.
 
@@ -134,7 +131,7 @@
 set up multiple listeners for each protocol for increased scalability
 and reliability.
 
-Java EE applications can also act as clients of Java EE components such
+Jakarta EE applications can also act as clients of Jakarta EE components such
 as Enterprise JavaBeans modules deployed on other servers, and can use
 any of these access mechanisms.
 
@@ -143,7 +140,7 @@
 External Systems and Resources
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-On the Java EE platform, an external system is called a resource. For
+On the Jakarta EE platform, an external system is called a resource. For
 example, a database management system is a JDBC resource. Each resource
 is uniquely identified and by its Java Naming and Directory Interface
 (JNDI) name. Applications access external systems through the following
@@ -162,13 +159,13 @@
 to, and receives messages from, any other client via a messaging
 provider that implements the Java Messaging Service (JMS) API. GlassFish
 Server includes a high-performance JMS broker, Open Message Queue.
-* Java EE Connectors - The Java EE Connector architecture enables
-integrating Java EE applications and existing Enterprise Information
-Systems (EIS). An application accesses an EIS through a portable Java EE
+* Jakarta EE Connectors - The Jakarta EE Connector architecture enables
+integrating Jakarta EE applications and existing Enterprise Information
+Systems (EIS). An application accesses an EIS through a portable Jakarta EE
 component called a connector or resource adapter, analogous to using
 JDBC driver to access an RDBMS. Resource adapters are distributed as
-standalone Resource Adapter Archive (RAR) modules or included in Java EE
-application archives. As RARs, they are deployed like other Java EE
+standalone Resource Adapter Archive (RAR) modules or included in Jakarta EE
+application archives. As RARs, they are deployed like other Jakarta EE
 components. GlassFish Server includes evaluation resource adapters that
 integrate with popular EIS.
 * JavaMail - Through the JavaMail API, applications can connect to a
@@ -261,7 +258,7 @@
 server. It is referred to as the default server because it is the
 default target for some administrative operations.
 
-Since the DAS is a GlassFish Server instance, it can also host Java EE
+Since the DAS is a GlassFish Server instance, it can also host Jakarta EE
 applications for testing purposes. However, do not use it to host
 production applications. You might want to deploy applications to the
 DAS, for example, if the clusters and instances that will host the
@@ -325,7 +322,7 @@
 A named configuration is an abstraction that encapsulates GlassFish
 Server property settings. Clusters and stand-alone server instances
 reference a named configuration to get their property settings. With
-named configurations, Java EE containers' configurations are independent
+named configurations, Jakarta EE containers' configurations are independent
 of the physical machine on which they reside, except for particulars
 such as IP address, port number, and amount of heap memory. Using named
 configurations provides power and flexibility to GlassFish Server
@@ -400,7 +397,7 @@
 Session Persistence
 ^^^^^^^^^^^^^^^^^^^
 
-Java EE applications typically have significant amounts of session state
+Jakarta EE applications typically have significant amounts of session state
 data. A web shopping cart is the classic example of a session state.
 Also, an application can cache frequently-needed data in the session
 object. In fact, almost all applications with significant user
@@ -511,7 +508,7 @@
 The Open Message Queue (Message Queue) provides reliable, asynchronous
 messaging for distributed applications. Message Queue is an enterprise
 messaging system that implements the Java Message Service (JMS)
-standard. Message Queue provides messaging for Java EE application
+standard. Message Queue provides messaging for Jakarta EE application
 components such as message-driven beans (MDBs).
 
 GlassFish Server implements the Java Message Service (JMS) API by
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc b/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
index 7adfdca..9cee352 100644
--- a/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
+++ b/docs/deployment-planning-guide/src/main/jbake/content/planning.adoc
@@ -600,7 +600,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Java Message Service (JMS) API is a messaging standard that allows
-Java EE applications and components to create, send, receive, and read
+Jakarta EE applications and components to create, send, receive, and read
 messages. It enables distributed communication that is loosely coupled,
 reliable, and asynchronous. Message Queue, which implements JMS, is
 integrated with GlassFish Server, enabling you to create components that
@@ -608,7 +608,7 @@
 
 Message Queue is integrated with GlassFish Server using a resource
 adapter also known as a connector module. A resource adapter is a Java
-EE component defined according to the Java EE Connector Architecture
+EE component defined according to the Jakarta EE Connector Architecture
 (JCA) Specification. This specification defines a standardized way in
 which application servers such as GlassFish Server can integrate with
 enterprise information systems such as JMS providers. GlassFish Server
diff --git a/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc b/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
index 24b7e63..518c86b 100644
--- a/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
+++ b/docs/deployment-planning-guide/src/main/jbake/content/preface.adoc
@@ -8,8 +8,8 @@
 Preface
 =======
 
-[[sthref2]][[preface]]
-
+[[sthref2]]
+[[preface]]
 Preface
 -------
 
@@ -20,7 +20,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -30,18 +30,16 @@
 deployment of GlassFish Server Open Source Edition.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `http://glassfish.java.net/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 [[sthref3]][[glassfish-server-documentation-set]]
 
@@ -60,148 +58,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSPLG00011]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform]
-(`http://docs.oracle.com/javaee/7/firstcup/doc/home.html`). For beginning
-Java EE programmers, this short tutorial explains the entire process for
-developing a simple enterprise application. The sample application is a
-web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service, and a
-JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 7
-Tutorial] (`http://docs.oracle.com/javaee/7/tutorial/doc/home.html`).
-This comprehensive tutorial explains how to use Java EE 7 platform
-technologies and APIs to develop Java EE applications.
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
+and a JavaServer Faces component for the web front end.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 7 of Java EE is located at
-`http://docs.oracle.com/javaee/7/api/`.
-* The API specification for GlassFish Server 7, including Java EE 7
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`http://glassfish.java.net/nonav/docs/v3/api/`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications]
-(`http://www.oracle.com/technetwork/java/javaee/tech/index.html`) might
-be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Java DB database for use with the GlassFish
-Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Java
-DB product page]
-(`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page] (`http://glassfish-samples.java.net/`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSPLG00013]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -212,36 +203,37 @@
 [width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
 [[GSPLG00014]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
@@ -251,31 +243,41 @@
 [width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSPLG00012]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -283,29 +285,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="<14%,<34%,<52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
+
 |as-install
 a|Represents the base installation directory for GlassFish Server.
-
 In configuration files, as-install is represented as follows:
 `${com.sun.aas.installRoot}`
-
-a|Installations on the Oracle Solaris operating system, Linux operating
-system, and Mac OS operating system: +
+a|* Installations on the Oracle Solaris operating system, Linux operating
+system, and Mac OS operating system:
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system: +
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
-system, and Mac operating system: +
+a|* Installations on the Oracle Solaris operating system, Linux operating
+system, and Mac operating system:
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system: +
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -313,12 +318,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored.
-In configuration files, domain-dir is represented as follows: +
+|Represents the directory in which a domain's configuration is stored.
+In configuration files, domain-dir is represented as follows:
 `${com.sun.aas.instanceRoot}`
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
+
diff --git a/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc b/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
index f21d6c7..0d6b931 100644
--- a/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
+++ b/docs/embedded-server-guide/src/main/jbake/content/embedded-server-guide.adoc
@@ -200,15 +200,15 @@
   Corresponds to the nucleus distribution. Download this file from
   `http://download.java.net/maven/glassfish/org/glassfish/extras/glassfish-embedded-nucleus/`.
 `glassfish-embedded-web.jar`::
-  Contains classes needed for deploying Java EE web applications.
+  Contains classes needed for deploying Jakarta EE web applications.
   Download this file from
   `http://download.java.net/maven/glassfish/org/glassfish/extras/glassfish-embedded-web/`.
 `glassfish-embedded-all.jar`::
-  Contains classes needed for deploying all Java EE application types.
+  Contains classes needed for deploying all Jakarta EE application types.
   Download this file from
   `http://download.java.net/maven/glassfish/org/glassfish/extras/glassfish-embedded-all/`.
 `glassfish-embedded-static-shell.jar`::
-  Contains references to classes needed for deploying all Java EE
+  Contains references to classes needed for deploying all Jakarta EE
   application types. Must be used with a nonembedded installation of
   GlassFish Server. Reference this file from the
   as-install`/lib/embedded` directory of a nonembedded GlassFish Server
@@ -529,7 +529,7 @@
 
 An archive file contains the resources, deployment descriptor, and
 classes of an application. The content of the file must be organized in
-the directory structure that the Java EE specifications define for the
+the directory structure that the Jakarta EE specifications define for the
 type of archive that the file contains. For more information, see
 "link:../application-deployment-guide/deploying-applications.html#GSDPG00004[Deploying Applications]" in GlassFish Server Open
 Source Edition Application Deployment Guide.
@@ -537,7 +537,7 @@
 Deploying an application from a directory enables you to deploy an
 application without the need to package the application in an archive
 file. The contents of the directory must match the contents of the
-expanded Java EE archive file as laid out by the GlassFish Server. The
+expanded Jakarta EE archive file as laid out by the GlassFish Server. The
 directory must be accessible to the machine on which the deploying
 application runs. For more information about the requirements for
 deploying an application from a directory, see "link:../application-deployment-guide/deploying-applications.html#GSDPG00043[To
@@ -1751,7 +1751,7 @@
 [NOTE]
 ====
 Do not deploy your embeddable EJB application or any of its dependent
-Java EE modules before invoking one of the `createEJBContainer` methods.
+Jakarta EE modules before invoking one of the `createEJBContainer` methods.
 These methods perform deployment in the background and do not load
 previously deployed applications or modules.
 ====
@@ -1992,7 +1992,7 @@
 The `glassfish-embedded-web.jar` file for embedded GlassFish Server
 supports only these features of nonembedded GlassFish Server:
 
-* The following web technologies of the Java EE platform:
+* The following web technologies of the Jakarta EE platform:
 
 ** Java Servlet API
 
diff --git a/docs/embedded-server-guide/src/main/jbake/content/preface.adoc b/docs/embedded-server-guide/src/main/jbake/content/preface.adoc
index 6b3a0de..7af9c08 100644
--- a/docs/embedded-server-guide/src/main/jbake/content/preface.adoc
+++ b/docs/embedded-server-guide/src/main/jbake/content/preface.adoc
@@ -8,8 +8,8 @@
 Preface
 =======
 
-[[sthref2]][[preface]]
-
+[[sthref2]]
+[[preface]]
 Preface
 -------
 
@@ -20,44 +20,31 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
-This document explains how to run applications in embedded GlassFish
-Server Open Source Edition and to develop applications in which
+This document explains how to run applications in embedded
+GlassFish Server Open Source Edition and to develop applications in which
 GlassFish Server is embedded. This document is for software developers
-who are developing applications to run in embedded GlassFish Server. The
-ability to program in the Java language is assumed.
-
-
-[NOTE]
-====
-The main thrust of the GlassFish Server Open Source Edition 7 release
-is to provide an application server for developers to explore and begin
-exploiting the new and updated technologies in the Java EE 7 platform.
-Thus, the embedded server feature of GlassFish Server was not a focus of
-this release. This feature is included in the release, but it may not
-function properly with some of the new features added in support of the
-Java EE 7 platform.
-====
-
+who are developing applications to run in embedded GlassFish Server.
+The ability to program in the Java language is assumed.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `http://glassfish.java.net/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
+
+The following topics are addressed here:
 
 * link:#ghpbz[GlassFish Server Documentation Set]
 * link:#giprl[Related Documentation]
@@ -67,7 +54,6 @@
 
 [[GSESG00027]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -84,148 +70,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSESG00028]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform]
-(`http://docs.oracle.com/javaee/7/firstcup/doc/home.html`). For beginning
-Java EE programmers, this short tutorial explains the entire process for
-developing a simple enterprise application. The sample application is a
-web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service, and a
-JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 7
-Tutorial] (`http://docs.oracle.com/javaee/7/tutorial/doc/home.html`).
-This comprehensive tutorial explains how to use Java EE 7 platform
-technologies and APIs to develop Java EE applications.
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
+and a JavaServer Faces component for the web front end.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 7 of Java EE is located at
-`http://docs.oracle.com/javaee/7/api/`.
-* The API specification for GlassFish Server 7, including Java EE 7
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`http://glassfish.java.net/nonav/docs/v3/api/`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications]
-(`http://www.oracle.com/technetwork/java/javaee/tech/index.html`) might
-be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Java DB database for use with the GlassFish
-Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Java
-DB product page]
-(`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page] (`http://glassfish-samples.java.net/`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSESG00029]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -236,36 +215,37 @@
 [width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
 [[GSESG00030]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
@@ -275,31 +255,41 @@
 [width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSESG00031]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -307,52 +297,46 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="<14%,<34%,<52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
-|as-install + a|
-Represents the base installation directory for GlassFish Server.
 
+|as-install
+a|Represents the base installation directory for GlassFish Server.
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
- a|
-Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
++
+user's-home-directory``/glassfish7/glassfish``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7\glassfish``
 
-user's-home-directory`/glassfish7/glassfish`
-
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7\glassfish`
-
-|as-install-parent + |Represents the parent of the base installation
-directory for GlassFish Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+|as-install-parent
+|Represents the parent of the base installation directory for GlassFish Server.
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
++
+user's-home-directory``/glassfish7``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7``
 
-user's-home-directory`/glassfish7`
+|domain-root-dir
+|Represents the directory in which a domain is created by default.
+|as-install``/domains/``
 
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7`
-
-|domain-root-dir + |Represents the directory in which a domain is
-created by default. |as-install`/domains/`
-
-|domain-dir + a|
-Represents the directory in which a domain's configuration is stored.
-
+|domain-dir
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
+|domain-root-dir/domain-name
 
- |domain-root-dir`/`domain-name
-
-|instance-dir + |Represents the directory for a server instance.
-|domain-dir`/`instance-name
+|instance-dir
+|Represents the directory for a server instance.
+|domain-dir/instance-name
 |===
 
-
-
diff --git a/docs/embedded-server-guide/src/main/jbake/content/title.adoc b/docs/embedded-server-guide/src/main/jbake/content/title.adoc
index e6836b8..c17ca9d 100644
--- a/docs/embedded-server-guide/src/main/jbake/content/title.adoc
+++ b/docs/embedded-server-guide/src/main/jbake/content/title.adoc
@@ -26,11 +26,11 @@
 
 Note: The main thrust of the Eclipse GlassFish Server 7
 release is to provide an application server for developers to explore
-and begin exploiting the new and updated technologies in the Java EE 7
+and begin exploiting the new and updated technologies in the Jakarta EE 10
 platform. Thus, the embedded server feature of GlassFish Server was not
 a focus of this release. This feature is included in the release, but it
 may not function properly with some of the new features added in support
-of the Java EE 7 platform.
+of the Jakarta EE 10 platform.
 
 [[sthref1]]
 
diff --git a/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc b/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
index 52a43dd..393029a 100644
--- a/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
+++ b/docs/error-messages-reference/src/main/jbake/content/error-messages.adoc
@@ -686,7 +686,7 @@
 +
   Action: Trying to invoke the ejb application
 
-[[sthref122]]AS-EJB-00053 The feature \{0} requires Full Java EE Profile to be supported ::
+[[sthref122]]AS-EJB-00053 The feature \{0} requires Full Jakarta EE Profile to be supported ::
   Cause: As described in the message.
 +
   Action: Resolve the situation described in the message, if necessary.
diff --git a/docs/error-messages-reference/src/main/jbake/content/preface.adoc b/docs/error-messages-reference/src/main/jbake/content/preface.adoc
index a196599..7da9e26 100644
--- a/docs/error-messages-reference/src/main/jbake/content/preface.adoc
+++ b/docs/error-messages-reference/src/main/jbake/content/preface.adoc
@@ -9,8 +9,6 @@
 =======
 
 [[GSEMR00001]][[gkbbw]]
-
-
 [[preface]]
 Preface
 -------
@@ -22,28 +20,26 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
 This document describes error messages that you might encounter when
-using Sun GlassFish Server 7.
+using {productName}.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
-GlassFish Server is developed through the GlassFish project open-source
-community at `https://javaee.github.io/glassfish/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+GlassFish Server 7 is developed through the GlassFish project
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -61,7 +57,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -69,89 +65,91 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-| |
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
@@ -160,49 +158,44 @@
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 7 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 8 of Java EE is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
-* The API specification for GlassFish Server 7, including Java EE 8
-platform packages and non-platform packages that are specific to the
-GlassFish Server product, is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
 
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications] (`https://javaee.github.io/javaee-spec/Specifications`)
-might be useful.
+* The API specification for GlassFish Server 7, including Jakarta EE
+platform packages and nonplatform packages that are specific to the
+GlassFish Server product, is located at
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby database for use with the
-GlassFish Server, see the https://db.apache.org/derby/manuals/[Apache
-Derby product page] (`https://db.apache.org/derby/manuals/`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the https://github.com/javaee/glassfish-samples[Java EE
-Samples project page] (`https://github.com/javaee/glassfish-samples`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[BABGCFGH]][[typographic-conventions]]
 
@@ -212,33 +205,35 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
@@ -249,28 +244,39 @@
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
@@ -282,37 +288,45 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
-|as-install + |Represents the base installation directory for GlassFish
-Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+
+|as-install
+a|Represents the base installation directory for GlassFish Server.
+In configuration files, as-install is represented as follows:
+`${com.sun.aas.installRoot}`
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
++
+user's-home-directory``/glassfish7/glassfish``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7\glassfish``
 
-user's-home-directory`/glassfish7/glassfish`
-
-Installations on the Windows operating system:
-
-SystemDrive`:\glassfish7\glassfish`
-
-|as-install-parent + |Represents the parent of the base installation
-directory for GlassFish Server. a|
-Installations on the Oracle Solaris operating system, Linux operating
+|as-install-parent
+|Represents the parent of the base installation directory for GlassFish Server.
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
++
+user's-home-directory``/glassfish7``
++
+* Installations on the Windows operating system:
++
+SystemDrive``:\glassfish7``
 
-user's-home-directory`/glassfish7`
+|domain-root-dir
+|Represents the directory in which a domain is created by default.
+|as-install``/domains/``
 
-Installations on the Windows operating system:
+|domain-dir
+|Represents the directory in which a domain's configuration is stored.
+In configuration files, domain-dir is represented as follows:
+`${com.sun.aas.instanceRoot}`
+|domain-root-dir/domain-name
 
-SystemDrive`:\glassfish7`
-
-|domain-root-dir + |Represents the directory in which a domain is
-created by default. |as-install`/domains/`
-
-|domain-dir + |Represents the directory in which a domain's
-configuration is stored. |domain-root-dir`/`domain-name
-
-|instance-dir + |Represents the directory for a server instance.
-|domain-dir`/`instance-name
+|instance-dir
+|Represents the directory for a server instance.
+|domain-dir/instance-name
 |===
diff --git a/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc b/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
index 6eceac4..c7442d6 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/clusters.adoc
@@ -17,7 +17,7 @@
 
 A cluster is a collection of GlassFish Server instances that work
 together as one logical entity. A cluster provides a runtime environment
-for one or more Java Platform, Enterprise Edition (Java EE)
+for one or more Java Platform, Enterprise Edition (Jakarta EE)
 applications. A cluster provides high availability through failure
 protection, scalability, and load balancing.
 
diff --git a/docs/ha-administration-guide/src/main/jbake/content/instances.adoc b/docs/ha-administration-guide/src/main/jbake/content/instances.adoc
index d78f234..ea45d75 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/instances.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/instances.adoc
@@ -18,7 +18,7 @@
 platform (Java Virtual Machine or JVM machine) on a single node in which
 GlassFish Server is running. A node defines the host where the GlassFish
 Server instance resides. The JVM machine must be compatible with the
-Java Platform, Enterprise Edition (Java EE).
+Java Platform, Enterprise Edition (Jakarta EE).
 
 GlassFish Server instances form the basis of an application deployment.
 An instance is a building block in the clustering, load balancing, and
@@ -1384,7 +1384,7 @@
   If a file below a top-level subdirectory is changed without a change
   to a file in the top-level subdirectory, full synchronization is required.
 `generated`::
-  This directory contains generated files for Java EE applications and
+  This directory contains generated files for Jakarta EE applications and
   modules, for example, EJB stubs, compiled JSP classes, and security
   policy files. Do not modify the contents of this directory. +
   This directory is resynchronized when the `applications` directory is
diff --git a/docs/ha-administration-guide/src/main/jbake/content/overview.adoc b/docs/ha-administration-guide/src/main/jbake/content/overview.adoc
index 31f079d..02a5ce6 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/overview.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/overview.adoc
@@ -68,7 +68,7 @@
 GlassFish Server provides high availability of HTTP requests and session
 data (both HTTP session data and stateful session bean data).
 
-Java EE applications typically have significant amounts of session state
+Jakarta EE applications typically have significant amounts of session state
 data. A web shopping cart is the classic example of a session state.
 Also, an application can cache frequently-needed data in the session
 object. In fact, almost all applications with significant user
diff --git a/docs/ha-administration-guide/src/main/jbake/content/preface.adoc b/docs/ha-administration-guide/src/main/jbake/content/preface.adoc
index a50e6f0..edbd6cc 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/preface.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/preface.adoc
@@ -22,7 +22,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -37,11 +37,11 @@
 ====
 The main thrust of the GlassFish Server Open Source Edition 7 release
 is to provide an application server for developers to explore and begin
-exploiting the new and updated technologies in the Java EE 7 platform.
+exploiting the new and updated technologies in the Jakarta EE 10 platform.
 Thus, the clustering, standalone instance and high availability features
 of GlassFish Server were not a focus of this release. These features are
 included in the release, but they may not function properly with some of
-the new features added in support of the Java EE 7 platform.
+the new features added in support of the Jakarta EE 10 platform.
 ====
 
 
@@ -52,7 +52,7 @@
 GlassFish Server 7 is developed through the GlassFish project
 open-source community at `http://glassfish.java.net/`. The GlassFish
 project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
+Server platform that makes the new features of the Jakarta EE platform
 available faster, while maintaining the most important feature of Java
 EE: compatibility. It enables Java developers to access the GlassFish
 Server source code and to contribute to the development of the GlassFish
@@ -107,9 +107,9 @@
 about deployment descriptors.
 
 |link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
+implement Java Platform, Enterprise Edition (Jakarta EE platform)
 applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
+applications follow the open Java standards model for Jakarta EE components
 and application programmer interfaces (APIs). This guide provides
 information about developer tools, security, and debugging.
 
diff --git a/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc b/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
index d53f05f..219658d 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/rmi-iiop.adoc
@@ -46,7 +46,7 @@
 following apply:
 
 * Your deployment has a cluster of at least two instances.
-* Java EE applications are deployed to all instances and clusters that
+* Jakarta EE applications are deployed to all instances and clusters that
 participate in load balancing.
 * RMI-IIOP client applications are enabled for load balancing.
 
diff --git a/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc b/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
index 5f532f7..ca47ad5 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/session-persistence-and-failover.adoc
@@ -31,7 +31,7 @@
 data. Failover means that in the event of an server instance or hardware
 failure, another server instance in a cluster takes over a distributed session.
 
-For example, Java EE applications typically have significant amounts of
+For example, Jakarta EE applications typically have significant amounts of
 session state data. A web shopping cart is the classic example of
 session state. Also, an application can cache frequently-needed data in
 the session object. In fact, almost all applications with significant
diff --git a/docs/ha-administration-guide/src/main/jbake/content/title.adoc b/docs/ha-administration-guide/src/main/jbake/content/title.adoc
index e3dede5..d0773ee 100644
--- a/docs/ha-administration-guide/src/main/jbake/content/title.adoc
+++ b/docs/ha-administration-guide/src/main/jbake/content/title.adoc
@@ -24,12 +24,12 @@
 
 Note: The main thrust of the Eclipse GlassFish Server 7
 release is to provide an application server for developers to explore
-and begin exploiting the new and updated technologies in the Java EE 7
+and begin exploiting the new and updated technologies in the Jakarta EE 10
 platform. Thus, the clustering, standalone instance and high
 availability features of GlassFish Server were not a focus of this
 release. These features are included in the release, but they may not
 function properly with some of the new features added in support of the
-Java EE 7 platform.
+Jakarta EE 10 platform.
 
 [[sthref1]]
 
diff --git a/docs/installation-guide/src/main/jbake/content/installing.adoc b/docs/installation-guide/src/main/jbake/content/installing.adoc
index 0c61fdd..9b92b10 100644
--- a/docs/installation-guide/src/main/jbake/content/installing.adoc
+++ b/docs/installation-guide/src/main/jbake/content/installing.adoc
@@ -590,10 +590,10 @@
 
 Installation files for Eclipse GlassFish Server 7 are
 available by download from the
-https://javaee.github.io/glassfish/download[GlassFish Server Downloads]
+https://github.com/eclipse-ee4j/glassfishdownload[GlassFish Server Downloads]
 page.
 
-Eclipse GlassFish Server 7 is also part of the Java EE SDK
+Eclipse GlassFish Server 7 is also part of the Jakarta EE SDK
 distributions. The SDK distributions are available from the
 http://www.oracle.com/technetwork/java/javaee/downloads/index.html[Java
 EE downloads page] and are not described in this document.
@@ -612,7 +612,7 @@
 ====
 Before performing any GlassFish Server installation, ensure that your
 environment adheres to the JDK guidelines in
-"https://javaee.github.io/glassfish/doc/5.0/release-notes.pdf[Paths and
+"https://github.com/eclipse-ee4j/glassfishdoc/5.0/release-notes.pdf[Paths and
 Environment Settings for the JDK Software]" in GlassFish Server Open
 Source Edition Release Notes.
 ====
@@ -669,7 +669,7 @@
 let you choose to install either the GlassFish Server Full Platform or
 Web Profile distribution. link:#gkuap[Table 1-2] lists the features
 available in each of these two distributions. Note that some of these
-features are value-adds, and are not required by the Java EE specification.
+features are value-adds, and are not required by the Jakarta EE specification.
 
 [[GSING104]][[sthref4]][[gkuap]]
 
@@ -681,7 +681,7 @@
 
 |Java Platform, Enterprise Edition 8 |X |X
 
-|Java EE Security API |X |X
+|Jakarta EE Security API |X |X
 
 |Java API for JSON Processing 1.1 |X |X
 
@@ -727,7 +727,7 @@
 
 |EJB 3.2 Full API (Support for Remote Container) |X |-
 
-|Java EE Connector Architecture 1.7 |X |-
+|Jakarta EE Connector Architecture 1.7 |X |-
 
 |JAX-WS 2.3 |X |-
 
@@ -745,7 +745,7 @@
 
 |Java Authentication Service Provider Interface for Containers 1.1 |X |-
 
-|Java EE Application Deployment 1.2 |X |-
+|Jakarta EE Application Deployment 1.2 |X |-
 
 |J2EE Management 1.1 |X |-
 
@@ -759,8 +759,8 @@
 |===
 
 
-* The Full Java EE Platform contains the complete CORBA package. The OMG
-CORBA v3.0 APIs are available in the Java EE Web Profile.
+* The Full Jakarta EE Platform contains the complete CORBA package. The OMG
+CORBA v3.0 APIs are available in the Jakarta EE Web Profile.
 
 ** Transaction propagation not supported.
 
diff --git a/docs/installation-guide/src/main/jbake/content/preface.adoc b/docs/installation-guide/src/main/jbake/content/preface.adoc
index 006b597..609bc61 100644
--- a/docs/installation-guide/src/main/jbake/content/preface.adoc
+++ b/docs/installation-guide/src/main/jbake/content/preface.adoc
@@ -9,8 +9,6 @@
 =======
 
 [[GSING00001]][[gjxfa]]
-
-
 [[preface]]
 Preface
 -------
@@ -22,28 +20,26 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
 This document contains instructions for installing and uninstalling
-GlassFish Server Open Source Edition 7 software.
+GlassFish Server Open Source Edition.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://javaee.github.io/glassfish/`. The
-GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
-GlassFish Server. The GlassFish project is designed to encourage
-communication between Oracle engineers and the community.
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -55,7 +51,6 @@
 
 [[GSING00014]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -64,7 +59,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -72,145 +67,141 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-| |
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSING00015]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 8 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
-GlassFish Server is available as follows:
+GlassFish Server is available as follows.
 
-* The API specification of Java EE is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
-* The API specification for GlassFish Server 7, including Java EE
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
-
-Additionally, the
-https://javaee.github.io/javaee-spec/Specifications[Java EE
-Specifications] might be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page].
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby for use with the GlassFish
-Server, see the
-https://db.apache.org/derby/[`Apache Derby product page`].
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the https://javaee.github.io/glassfish-samples/[Java EE
-Samples project page].
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[GSING00016]][[fwbkx]]
 
-
 [[typographic-conventions]]
 Typographic Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -218,12 +209,13 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
+
 |`AaBbCc123`
 |The names of commands, files, and directories, and onscreen computer output
-a|Edit your `.login` file.
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
@@ -231,8 +223,7 @@
 
 |`AaBbCc123`
 |What you type, contrasted with onscreen computer output
-a|
-`machine_name%` `su`
+|`machine_name%` `su`
 
 `Password:`
 
@@ -241,9 +232,8 @@
 |The command to remove a file is `rm` filename.
 
 |AaBbCc123
-|Book titles, new terms, and terms to be emphasized
-(note that some emphasized items appear bold online)
-a|Read Chapter 6 in the User's Guide.
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
@@ -253,16 +243,16 @@
 
 [[GSING00017]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
+
 |`[ ]`
 |Contains optional arguments and command options.
 |`ls [-l]`
@@ -271,25 +261,24 @@
 |`{ \| }`
 |Contains a set of choices for a required command option.
 |`-d {y\|n}`
-|The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
 
 |`${ }`
 |Indicates a variable reference.
 |`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|-
+|`-`
 |Joins simultaneous multiple keystrokes.
 |Control-A
 |Press the Control key while you press the A key.
 
-|+ +
+|`+`
 |Joins consecutive multiple keystrokes.
 |Ctrl+A+N
 |Press the Control key, release it, and then press the subsequent keys.
 
-|>
+|`>`
 |Indicates menu item selection in a graphical user interface.
 |File > New > Templates
 |From the File menu, choose New. From the New submenu, choose Templates.
@@ -298,7 +287,6 @@
 
 [[GSING00018]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -306,34 +294,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
+
 |as-install
 a|Represents the base installation directory for GlassFish Server.
-
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
-
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -341,15 +327,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored.
-
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
 
diff --git a/docs/installation-guide/src/main/jbake/content/uninstalling.adoc b/docs/installation-guide/src/main/jbake/content/uninstalling.adoc
index 47fdc7c..19b0426 100644
--- a/docs/installation-guide/src/main/jbake/content/uninstalling.adoc
+++ b/docs/installation-guide/src/main/jbake/content/uninstalling.adoc
@@ -4,36 +4,19 @@
 prev=installing.html
 ~~~~~~
 
-Uninstalling GlassFish Server 7
-=================================
+= Uninstalling GlassFish
 
 [[GSING00003]][[ghmlt]]
 
 
-[[uninstalling-glassfish-server-5.0]]
-2 Uninstalling GlassFish Server 7
------------------------------------
+[[uninstalling-glassfish]]
+== 2 Uninstalling GlassFish
 
-This chapter describes how to uninstall GlassFish Server Open Source
-Edition 7 software.
+This chapter describes how to uninstall {productName}.
 
 [[gjxfv]][[GSING00028]][[removing-a-glassfish-server-installation]]
 
-Removing a GlassFish Server Installation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This section describes how to remove GlassFish Server Open Source
-Edition 7 software.
-
-The following topics are addressed here:
-
-* link:#gkrfi[To Uninstall GlassFish Server Software After a ZIP File
-Installation]
-
-[[gkrfi]][[GSING00012]][[to-uninstall-glassfish-server-software-after-a-zip-file-installation]]
-
-To Uninstall GlassFish Server Software After a ZIP File Installation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=== Removing a Eclipse GlassFish Installation
 
 This procedure describes how to uninstall GlassFish Server software that
 was installed using a ZIP file, as described in
diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml
index 9b16919..114da26 100644
--- a/docs/parent/pom.xml
+++ b/docs/parent/pom.xml
@@ -64,6 +64,7 @@
                             <ignoreTagPatterns>JEET.*</ignoreTagPatterns>
                         </configuration>
                     </execution>
+                    <!-- Filtering - uses properties directly -->
                     <execution>
                         <id>generate-book</id>
                         <phase>generate-resources</phase>
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc b/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
index 2f5e618..3c3b2e4 100644
--- a/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
+++ b/docs/performance-tuning-guide/src/main/jbake/content/lof.adoc
@@ -12,4 +12,4 @@
 List of Figures
 ---------------
 
-* link:overview.html#gacmj[1-1 Java EE Application Model]
+* link:overview.html#gacmj[1-1 Jakarta EE Application Model]
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc b/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
index 52c9231..119fea3 100644
--- a/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
+++ b/docs/performance-tuning-guide/src/main/jbake/content/overview.adoc
@@ -136,7 +136,7 @@
 Application Architecture
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-The Java EE Application model, as shown in the following figure, is very
+The Jakarta EE Application model, as shown in the following figure, is very
 flexible; allowing the application architect to split application logic
 functionally into many tiers. The presentation layer is typically
 implemented using servlets and JSP technology and executes in the web
@@ -145,8 +145,8 @@
 [[GSPTG00001]][[gacmj]]
 
 
-.*Figure 1-1 Java EE Application Model*
-image:img/appmodel.png["Java EE Application Mode"]
+.*Figure 1-1 Jakarta EE Application Model*
+image:img/appmodel.png["Jakarta EE Application Mode"]
 
 
 Moderately complex enterprise applications can be developed entirely
@@ -206,7 +206,7 @@
 availability guidelines.
 
 An authenticated user's access to application functions may also need
-authorization checks. If the application uses the role-based Java EE
+authorization checks. If the application uses the role-based Jakarta EE
 authorization checks, the application server performs some additional
 checking, which incurs additional overheads. When you perform capacity
 planning, you must take this additional overhead into account.
diff --git a/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc b/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
index 810ca79..e129f7a 100644
--- a/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
+++ b/docs/performance-tuning-guide/src/main/jbake/content/preface.adoc
@@ -22,7 +22,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -37,7 +37,7 @@
 GlassFish Server 7 is developed through the GlassFish project
 open-source community at `http://glassfish.java.net/`. The GlassFish
 project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
+Server platform that makes the new features of the Jakarta EE platform
 available faster, while maintaining the most important feature of Java
 EE: compatibility. It enables Java developers to access the GlassFish
 Server source code and to contribute to the development of the GlassFish
@@ -88,9 +88,9 @@
 about deployment descriptors.
 
 |link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
+implement Java Platform, Enterprise Edition (Jakarta EE platform)
 applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
+applications follow the open Java standards model for Jakarta EE components
 and application programmer interfaces (APIs). This guide provides
 information about developer tools, security, and debugging.
 
diff --git a/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc b/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
index fa125a2..aa2a17a 100644
--- a/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
+++ b/docs/quick-start-guide/src/main/jbake/content/basic-features.adoc
@@ -15,7 +15,7 @@
 --------------------------------
 
 Eclipse GlassFish Server provides a server for the
-development and deployment of Java Platform, Enterprise Edition (Java EE
+development and deployment of Java Platform, Enterprise Edition (Jakarta EE
 platform) applications and web technologies based on Java technology.
 GlassFish Server 7 provides the following:
 
@@ -50,7 +50,7 @@
 This guide assumes that you have already obtained and installed the
 GlassFish Server 7 software. For more information about installing
 GlassFish Server 7, see the
-https://javaee.github.io/glassfish/documentation[GlassFish Server Open
+https://github.com/eclipse-ee4j/glassfishdocumentation[GlassFish Server Open
 Source Edition Installation Guide].
 
 Instructions and examples in this guide that apply to all supported
@@ -145,7 +145,7 @@
 
 |Master password |`changeit`
 
-|https://javaee.github.io/glassfish/doc/5.0/reference-manual.pdf[
+|https://github.com/eclipse-ee4j/glassfishdoc/5.0/reference-manual.pdf[
 `asadmin`(1M)] command-line utility
 |as-install`/bin`
 
@@ -245,11 +245,11 @@
 your specific product.
 
 For the list of database products supported in this release, see the
-https://javaee.github.io/glassfish/documentation[GlassFish Server Open
+https://github.com/eclipse-ee4j/glassfishdocumentation[GlassFish Server Open
 Source Edition Release Notes].
 
 For more information about database connectivity, see
-"https://javaee.github.io/glassfish/documentation[Administering Database
+"https://github.com/eclipse-ee4j/glassfishdocumentation[Administering Database
 Connectivity]" in Eclipse GlassFish Server Administration Guide.
 
 [[ggncr]][[GSQSG00007]][[to-start-the-apache-derby-server]]
@@ -354,7 +354,7 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1. Download a copy of the `hello.war` sample application from
-`https://javaee.github.io/glassfish/downloads/quickstart/hello.war`.
+`https://github.com/eclipse-ee4j/glassfishdownloads/quickstart/hello.war`.
 
 2. Save the `hello.war` file in the directory of your choice.
 +
@@ -694,7 +694,7 @@
 
 A cluster is a collection of GlassFish Server instances that work
 together as one logical entity. A cluster provides a runtime environment
-for one or more Java Platform, Enterprise Edition (Java EE)
+for one or more Java Platform, Enterprise Edition (Jakarta EE)
 applications. A cluster provides high availability through failure
 protection, scalability, and load balancing.
 
@@ -702,7 +702,7 @@
 platform (Java Virtual Machine or JVM machine) on a single node in which
 GlassFish Server is running. A node defines the host where the GlassFish
 Server instance resides. The JVM machine must be compatible with the
-Java Platform, Enterprise Edition (Java EE).
+Java Platform, Enterprise Edition (Jakarta EE).
 
 GlassFish Server instances form the basis of an application deployment.
 An instance is a building block in the clustering, load balancing, and
@@ -776,9 +776,8 @@
 The following resources are described here:
 
 * link:#ghhir[Product Documentation]
-* link:#ghhis[GlassFish Communities]
 * link:#giyjo[Tutorials]
-* link:#gintm[Java EE 8 Samples]
+* link:#gintm[Jakarta EE Examples]
 
 [[ghhir]][[GSQSG00050]][[product-documentation]]
 
@@ -791,34 +790,7 @@
 * link:../release-notes/toc.html#GSRLN[GlassFish Server Open Source Edition Release Notes]:
 Latest details about new features, known issues, and tips for installing
 and working with GlassFish Server software.
-* http://docs.oracle.com/cd/E26576_01/index.html[Oracle GlassFish Server
-Documentation Library]
-(`http://docs.oracle.com/cd/E26576_01/index.html`): Collection of guides
-that document Oracle GlassFish Server features and functions.
-* https://javaee.github.io/glassfish/documentation[GlassFish Server Open
-Source Edition Product Documentation page]
-(`https://javaee.github.io/glassfish/documentation`): Collection of
-guides that document Eclipse GlassFish Server features and
-functions.
-
-[[ghhis]][[GSQSG00051]][[glassfish-communities]]
-
-GlassFish Communities
-^^^^^^^^^^^^^^^^^^^^^
-
-The following resources will help you connect with other users, learn
-more about GlassFish Server, and get help if needed.
-
-* https://javaee.groups.io/g/javaee[GlassFish Forum]
-(`https://javaee.groups.io/g/javaee`):
-+
-Public online discussion forum that provides community support and tips
-for working with GlassFish Server.
-* https://javaee.github.io/glassfish/documentation[GlassFish
-Documentation Project]
-(`https://javaee.github.io/glassfish/documentation`): Documentation
-community site that provides details about GlassFish Server
-documentation and how you can participate.
+* https://glassfish.org/docs/[{productName}]
 
 [[giyjo]][[GSQSG00052]][[tutorials]]
 
@@ -826,32 +798,25 @@
 ^^^^^^^^^
 
 The following tutorials provide working examples and detailed
-instructions for creating enterprise applications for the Java EE 8
-platform.
+instructions for creating enterprise applications for the Jakarta EE platform.
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/[Your First Cup: An
-Introduction to the Java EE Platform]
-(`https://javaee.github.io/firstcup/`). For beginning Java EE
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[Your First Cup: An
+Introduction to the Jakarta EE Platform]. For beginning Jakarta EE
 programmers, this short tutorial explains the entire process for
 developing a simple enterprise application. The sample application is a
 web application that consists of a component that is based on the
 Enterprise JavaBeans specification, a JAX-RS web service, and a
 JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 8 platform technologies and APIs to develop
-Java EE applications.
+* https://eclipse-ee4j.github.io/jakartaee-tutorial/[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
-[[gintm]][[GSQSG00053]][[java-ee-8-samples]]
+[[gintm]][[GSQSG00053]][[jakarta-ee-examples]]
 
-Java EE 8 Samples
-^^^^^^^^^^^^^^^^^
+==== Jakarta EE Examples
 
-The sample applications demonstrate Java EE technologies. The samples
-are available as part of the Java EE SDK distributions. The SDK
-distributions are available from the
-http://www.oracle.com/technetwork/java/javaee/downloads/index.html[Java
-EE SDK downloads page]
-(`http://www.oracle.com/technetwork/java/javaee/downloads/index.html`).
+https://github.com/eclipse-ee4j/jakartaee-examples[Jakarta EE Examples] -
+The example applications demonstrate Jakarta EE technologies.
+
 
 
diff --git a/docs/quick-start-guide/src/main/jbake/content/preface.adoc b/docs/quick-start-guide/src/main/jbake/content/preface.adoc
index cf7d37a..523d348 100644
--- a/docs/quick-start-guide/src/main/jbake/content/preface.adoc
+++ b/docs/quick-start-guide/src/main/jbake/content/preface.adoc
@@ -20,7 +20,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -36,11 +36,11 @@
 set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://javaee.github.io/glassfish/`. The
+open-source community at `https://github.com/eclipse-ee4j/glassfish`. The
 GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
 GlassFish Server. The GlassFish project is designed to encourage
 communication between Oracle engineers and the community.
@@ -97,9 +97,9 @@
 about deployment descriptors.
 
 |link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
+implement Java Platform, Enterprise Edition (Jakarta EE platform)
 applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
+applications follow the open Java standards model for Jakarta EE components
 and application programmer interfaces (APIs). This guide provides
 information about developer tools, security, and debugging.
 
diff --git a/docs/reference-manual/src/main/jbake/content/application.adoc b/docs/reference-manual/src/main/jbake/content/application.adoc
index a6a1577..d407e24 100644
--- a/docs/reference-manual/src/main/jbake/content/application.adoc
+++ b/docs/reference-manual/src/main/jbake/content/application.adoc
@@ -19,14 +19,14 @@
 
 === Description
 
-The Java EE platform enables applications to access systems that are
+The Jakarta EE platform enables applications to access systems that are
 outside of the application server. Applications connect to these systems
 through resources. The {productName} infrastructure supports the
 deployment of many types of distributed applications and is an ideal
 foundation for building applications based on Service Oriented
 Architectures (SOA). SOA is a design methodology aimed at maximizing the
 reuse of application services. These features enable you to run scalable
-and highly available Java EE applications.
+and highly available Jakarta EE applications.
 
 [[sthref2393]]
 
diff --git a/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc b/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
index 98c8e5b..8b4924f 100644
--- a/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
+++ b/docs/reference-manual/src/main/jbake/content/configure-lb-weight.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] configure-lb-weight [--help] 
+asadmin [asadmin-options] configure-lb-weight [--help]
 --cluster cluster_name
 instance-name=weight[:instance-name=weight]
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc b/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
index be930bb..39f1baf 100644
--- a/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
+++ b/docs/reference-manual/src/main/jbake/content/configure-ldap-for-admin.adoc
@@ -56,10 +56,10 @@
 
 [source]
 ----
-asadmin> configure-ldap-for-admin 
+asadmin> configure-ldap-for-admin
 Enter the value for the basedn option>
 Enter the value for the ldap-group option>
-The LDAP Auth Realm admin-realm was configured correctly 
+The LDAP Auth Realm admin-realm was configured correctly
 in admin server's configuration.
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/copy-config.adoc b/docs/reference-manual/src/main/jbake/content/copy-config.adoc
index d983b27..0dd4bd6 100644
--- a/docs/reference-manual/src/main/jbake/content/copy-config.adoc
+++ b/docs/reference-manual/src/main/jbake/content/copy-config.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] copy-config [--help] 
+asadmin [asadmin-options] copy-config [--help]
 [--systemproperties (name=value)[:name=value]*]
 source-configuration-name destination-configuration-name
 ----
@@ -152,8 +152,8 @@
 
 [source]
 ----
-asadmin> copy-config 
---systemproperties HTTP_LISTENER_PORT=2000:HTTP_SSL_LISTENER_PORT=3000 
+asadmin> copy-config
+--systemproperties HTTP_LISTENER_PORT=2000:HTTP_SSL_LISTENER_PORT=3000
 default-config pmdsaconfig
 
 Command copy-config executed successfully.
diff --git a/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc b/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
index 94f5d44..0c905fb 100644
--- a/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-application-ref.adoc
@@ -33,7 +33,7 @@
 
 The `create-application-ref` subcommand creates a reference from a
 cluster or an unclustered server instance to a previously deployed
-application element (for example, a Java EE application, a Web module,
+application element (for example, a Jakarta EE application, a Web module,
 or an enterprise bean module). This effectively results in the
 application element being deployed and made available on the targeted
 instance or cluster.
@@ -69,7 +69,7 @@
 `--virtualservers`::
   Specifies a comma-separated list of virtual server IDs on which to
   deploy. This option applies only to Web modules (either standalone or
-  in a Java EE application). If this option is not specified, the
+  in a Jakarta EE application). If this option is not specified, the
   application is deployed to all virtual servers except the
   administrative server, `__asadmin`.
 `--enabled`::
@@ -85,7 +85,7 @@
 === Operands
 
 reference_name::
-  The name of the application or module, which can be a Java EE
+  The name of the application or module, which can be a Jakarta EE
   application, Web module, EJB module, connector module, application
   client module, or lifecycle module. +
   The name can include an optional version identifier, which follows the
diff --git a/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
index 564684e..77f1098 100644
--- a/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-connector-work-security-map.adoc
@@ -21,11 +21,11 @@
 
 [source]
 ----
-asadmin [asadmin-options] create-connector-work-security-map [--help] 
+asadmin [asadmin-options] create-connector-work-security-map [--help]
 --raname raname
-[--principalsmap eis-principal1=principal_name1[, eis-principal2=principal_name2]* 
+[--principalsmap eis-principal1=principal_name1[, eis-principal2=principal_name2]*
 |--groupsmap eis-group1=server-group1[, eis-group2=server-group2]*}
-[--description description] 
+[--description description]
 mapname
 ----
 
@@ -96,7 +96,7 @@
 ----
 asadmin create-connector-work-security-map --raname my-resource-adapter
 --principalsmap eis-principal-1=server-principal-1,eis-principal-2
-=server-principal-2,eis-principal-3=server-principal-1 
+=server-principal-2,eis-principal-3=server-principal-1
 workSecurityMap1
 Command create-connector-work-security-map executed successfully.
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/create-domain.adoc b/docs/reference-manual/src/main/jbake/content/create-domain.adoc
index 2e117a7..96bb771 100644
--- a/docs/reference-manual/src/main/jbake/content/create-domain.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-domain.adoc
@@ -44,7 +44,7 @@
 
 The `create-domain` subcommand creates a {productName} domain. A
 domain in {productName} is an administrative namespace that complies
-with the Java Platform, Enterprise Edition (Java EE) standard. Every
+with the Java Platform, Enterprise Edition (Jakarta EE) standard. Every
 domain has a configuration, which is stored in a set of files. Any
 number of domains, each of which has a distinct administrative identity,
 can be created in a given installation of {productName}. A domain
diff --git a/docs/reference-manual/src/main/jbake/content/create-file-user.adoc b/docs/reference-manual/src/main/jbake/content/create-file-user.adoc
index 1b79c83..33d8f05 100644
--- a/docs/reference-manual/src/main/jbake/content/create-file-user.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-file-user.adoc
@@ -21,9 +21,9 @@
 
 [source]
 ----
-asadmin [asadmin-options] create-file-user [--help] 
-[--authrealmnameauth_realm_name] 
-[--target target 
+asadmin [asadmin-options] create-file-user [--help]
+[--authrealmnameauth_realm_name]
+[--target target
 [--groups user_groups[:user_groups]*] user_name
 ----
 
@@ -90,8 +90,8 @@
 
 [source]
 ----
-asadmin> create-file-user 
---groups staff:manager 
+asadmin> create-file-user
+--groups staff:manager
 --authrealmname auth-realm1 sample_user
 Command create-file-user executed successfully
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc b/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
index 87f9d1d..c18470d 100644
--- a/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-http-lb-ref.adoc
@@ -22,12 +22,12 @@
 
 [source]
 ----
-asadmin [asadmin-options] create-http-lb-ref [--help] 
---config config_name | --lbname load_balancer_name 
-[--lbpolicy round-robin] [--lbpolicymodule lb_policy_module] 
-[--healthcheckerurl url] [--healthcheckerinterval 10] 
-[--healthcheckertimeout 10] [--lbenableallinstances=true] 
-[--lbenableallapplications=true] [--lbweight instance=weight[:instance=weight]*] 
+asadmin [asadmin-options] create-http-lb-ref [--help]
+--config config_name | --lbname load_balancer_name
+[--lbpolicy round-robin] [--lbpolicymodule lb_policy_module]
+[--healthcheckerurl url] [--healthcheckerinterval 10]
+[--healthcheckertimeout 10] [--lbenableallinstances=true]
+[--lbenableallapplications=true] [--lbweight instance=weight[:instance=weight]*]
 target
 ----
 
@@ -139,7 +139,7 @@
 
 [source]
 ----
-asadmin> create-http-lb-ref --config mylbconfig cluster2 
+asadmin> create-http-lb-ref --config mylbconfig cluster2
 
 Command create-http-lb-ref executed successfully.
 ----
@@ -153,7 +153,7 @@
 
 [source]
 ----
-asadmin> create-http-lb-ref --lbname mylb cluster2 
+asadmin> create-http-lb-ref --lbname mylb cluster2
 
 Command create-http-lb-ref executed successfully.
 ----
@@ -167,9 +167,9 @@
 
 [source]
 ----
-asadmin> create-http-lb-ref --config mylbconfig --lbpolicy weighted-round-robin 
---healthcheckerinterval 40 --healthcheckertimeout 20 
---lbenableallinstances=true --lbenableallapplications=true cluster2 
+asadmin> create-http-lb-ref --config mylbconfig --lbpolicy weighted-round-robin
+--healthcheckerinterval 40 --healthcheckertimeout 20
+--lbenableallinstances=true --lbenableallapplications=true cluster2
 
 Command create-http-lb-ref executed successfully.
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc b/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
index 6a702da..a0966a6 100644
--- a/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-http-redirect.adoc
@@ -22,8 +22,8 @@
 [source]
 ----
 asadmin [asadmin-options] create-http-redirect [--help]
-[--redirect-port redirect-port] 
-[--secure-redirect={false|true}] 
+[--redirect-port redirect-port]
+[--secure-redirect={false|true}]
 [--target target]
 protocol-name
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc b/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
index dd3880b..884974e 100644
--- a/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-iiop-listener.adoc
@@ -21,9 +21,9 @@
 
 [source]
 ----
-asadmin [asadmin-options] create-iiop-listener [--help] 
+asadmin [asadmin-options] create-iiop-listener [--help]
 --listeneraddress address
-[--iiopport iiop-port-number] [--securityenabled={false|true}] [--enabled={true|false}] 
+[--iiopport iiop-port-number] [--securityenabled={false|true}] [--enabled={true|false}]
 [--property (name=value)[:name=value]*]
 [--target target] listener_id
 ----
@@ -93,7 +93,7 @@
 
 [source]
 ----
-asadmin> create-iiop-listener --listeneraddress 192.168.1.100 
+asadmin> create-iiop-listener --listeneraddress 192.168.1.100
 --iiopport 1400 sample_iiop_listener
 Command create-iiop-listener executed successfully.
 ----
@@ -107,7 +107,7 @@
 
 [source]
 ----
-asadmin> create-iiop-listener --listeneraddress 0.0.0.0 --iiopport 1401 
+asadmin> create-iiop-listener --listeneraddress 0.0.0.0 --iiopport 1401
 --target mycluster iiop_listener_2
 Command create-iiop-listener executed successfully.
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/create-instance.adoc b/docs/reference-manual/src/main/jbake/content/create-instance.adoc
index db4d3dc..cc5d3af 100644
--- a/docs/reference-manual/src/main/jbake/content/create-instance.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-instance.adoc
@@ -55,7 +55,7 @@
 platform (Java Virtual Machine or JVM machine) on a single node in which
 {productName} is running. A node defines the host where the
 {productName} instance resides. The JVM machine must be compatible
-with the Java Platform, Enterprise Edition (Java EE).
+with the Java Platform, Enterprise Edition (Jakarta EE).
 
 A {productName} instance requires a reference to the following
 items:
diff --git a/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
index 13b88b0..365e802 100644
--- a/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-jdbc-connection-pool.adoc
@@ -174,7 +174,7 @@
   single validation check fails. The default value is false. One attempt
   is made to reestablish failed connections.
 `--allownoncomponentcallers`::
-  A pool with this property set to true can be used by non-Java EE
+  A pool with this property set to true can be used by non-Jakarta EE
   components, that is, components other than EJBs or Servlets. The
   returned connection is enlisted automatically with the transaction
   context obtained from the transaction manager. Connections obtained by
diff --git a/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc b/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
index f58d107..9c3c2b9 100644
--- a/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-local-instance.adoc
@@ -57,7 +57,7 @@
 platform (Java Virtual Machine or JVM machine) on a single node in which
 {productName} is running. A node defines the host where the
 {productName} instance resides. The JVM machine must be compatible
-with the Java Platform, Enterprise Edition (Java EE).
+with the Java Platform, Enterprise Edition (Jakarta EE).
 
 A {productName} instance requires a reference to the following items:
 
diff --git a/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc b/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
index 273d535..10cfc41 100644
--- a/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
+++ b/docs/reference-manual/src/main/jbake/content/create-resource-adapter-config.adoc
@@ -21,10 +21,10 @@
 
 [source]
 ----
-asadmin [asadmin-options] create-resource-adapter-config [--help] 
-[--threadpoolid threadpool] 
-[--objecttype object-type] 
-[--property (property-name=value)[:name=value]*] 
+asadmin [asadmin-options] create-resource-adapter-config [--help]
+[--threadpoolid threadpool]
+[--objecttype object-type]
+[--property (property-name=value)[:name=value]*]
 raname
 ----
 
@@ -88,7 +88,7 @@
 
 [source]
 ----
-asadmin> create-resource-adapter-config --property foo=bar --threadpoolid 
+asadmin> create-resource-adapter-config --property foo=bar --threadpoolid
 mycustomerthreadpool ra1
 Command create-resource-adapter-config executed successfully
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc b/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
index 9ddf66b..cf2959b 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-application-ref.adoc
@@ -75,7 +75,7 @@
 === Operands
 
 reference_name::
-  The name of the application or module, which can be a Java EE
+  The name of the application or module, which can be a Jakarta EE
   application module, Web module, EJB module, connector module,
   application client module, or lifecycle module. +
   The name can include an optional version identifier, which follows the
diff --git a/docs/reference-manual/src/main/jbake/content/delete-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-config.adoc
index 94e8c87..0ed6ae4 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-config.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-config.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] delete-config [--help] 
+asadmin [asadmin-options] delete-config [--help]
 configuration-name
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
index d58489d..c4e90d0 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-connector-connection-pool.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] delete-connector-connection-pool [--help] 
+asadmin [asadmin-options] delete-connector-connection-pool [--help]
 [--target target]
 [--cascade={false|true}] poolname
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
index 5ab7a57..68044b6 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-connector-work-security-map.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] delete-connector-work-security-map [--help] 
+asadmin [asadmin-options] delete-connector-work-security-map [--help]
 --raname raname
 mapname
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/delete-domain.adoc b/docs/reference-manual/src/main/jbake/content/delete-domain.adoc
index 5a465e4..b216c6b 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-domain.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-domain.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] delete-domain [--help] 
+asadmin [asadmin-options] delete-domain [--help]
 [--domaindir domaindir] domain-name
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc b/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
index fb7b0e4..48621b3 100644
--- a/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
+++ b/docs/reference-manual/src/main/jbake/content/delete-resource-adapter-config.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] delete-resource-adapter-config [--help] 
+asadmin [asadmin-options] delete-resource-adapter-config [--help]
 raname
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/deploy.adoc b/docs/reference-manual/src/main/jbake/content/deploy.adoc
index 0898422..fac0db0 100644
--- a/docs/reference-manual/src/main/jbake/content/deploy.adoc
+++ b/docs/reference-manual/src/main/jbake/content/deploy.adoc
@@ -179,7 +179,7 @@
   pure EAR file. A pure EAR file is an EAR without {productName}
   descriptors.
 `--altdd`::
-  Deploys the application using a Java EE standard deployment descriptor
+  Deploys the application using a Jakarta EE standard deployment descriptor
   that resides outside of the application archive. Specify an absolute
   path or a relative path to the alternate deployment descriptor file.
   The alternate deployment descriptor overrides the top-level deployment
@@ -345,13 +345,13 @@
     compatible in terms of JAR visibility requirements for applications.
     The only allowed value is `v2`, which refers to Sun GlassFish
     Enterprise Server version 2 or Sun Java System Application Server
-    version 9.1 or 9.1.1.Beginning in Java EE 6, the Java EE platform
-    specification imposed stricter requirements than Java EE 5 did on
+    version 9.1 or 9.1.1.Beginning in Jakarta EE 6, the Jakarta EE platform
+    specification imposed stricter requirements than Jakarta EE 5 did on
     which JAR files can be visible to various modules within an EAR
     file. In particular, application clients must not have access to EJB
     JAR files or other JAR files in the EAR file unless references use
     the standard Java SE mechanisms (extensions, for example) or the
-    Java EE library-directory mechanism. Setting this property to `v2`
+    Jakarta EE library-directory mechanism. Setting this property to `v2`
     removes these restrictions.
   `keepSessions={false|true}`;;
     Superseded by the `--keepstate` option. +
@@ -517,9 +517,9 @@
 
 [[GSRFM857]][[sthref1026]]
 
-==== Example 7   Deploying an Application Using an Alternate Java EE 8 Deployment Descriptor File
+==== Example 7   Deploying an Application Using an Alternate Jakarta EE Deployment Descriptor File
 
-This example deploys an application using a Java EE standard deployment
+This example deploys an application using a Jakarta EE standard deployment
 descriptor file that resides outside of the application archive.
 
 [source]
diff --git a/docs/reference-manual/src/main/jbake/content/deploydir.adoc b/docs/reference-manual/src/main/jbake/content/deploydir.adoc
index e0b22ea..497fb84 100644
--- a/docs/reference-manual/src/main/jbake/content/deploydir.adoc
+++ b/docs/reference-manual/src/main/jbake/content/deploydir.adoc
@@ -61,7 +61,7 @@
 
 The `deploydir` subcommand deploys an application directly from a
 development directory. The appropriate directory hierarchy and
-deployment descriptors conforming to the Java EE specification must
+deployment descriptors conforming to the Jakarta EE specification must
 exist in the deployment directory.
 
 Directory deployment is for advanced developers only. Do not use
@@ -168,7 +168,7 @@
   pure EAR file. A pure EAR file is an EAR without {productName}
   descriptors.
 `--altdd`::
-  Deploys the application using a Java EE standard deployment descriptor
+  Deploys the application using a Jakarta EE standard deployment descriptor
   that resides outside of the application archive. Specify an absolute
   path or a relative path to the alternate deployment descriptor file.
   The alternate deployment descriptor overrides the top-level deployment
@@ -335,13 +335,13 @@
     compatible in terms of JAR visibility requirements for applications.
     The only allowed value is `v2`, which refers to Sun GlassFish
     Enterprise Server version 2 or Sun Java System Application Server
-    version 9.1 or 9.1.1. Beginning in Java EE 6, the Java EE platform
-    specification imposed stricter requirements than Java EE 5 did on
+    version 9.1 or 9.1.1. Beginning in Jakarta EE 6, the Jakarta EE platform
+    specification imposed stricter requirements than Jakarta EE 5 did on
     which JAR files can be visible to various modules within an EAR
     file. In particular, application clients must not have access to EJB
     JAR files or other JAR files in the EAR file unless references use
     the standard Java SE mechanisms (extensions, for example) or the
-    Java EE library-directory mechanism. Setting this property to `v2`
+    Jakarta EE library-directory mechanism. Setting this property to `v2`
     removes these restrictions.
   `keepSessions={false|true}`;;
     Superseded by the `--keepstate` option. +
diff --git a/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc b/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
index 7ce85d9..7efc6e4 100644
--- a/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
+++ b/docs/reference-manual/src/main/jbake/content/disable-monitoring.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] disable-monitoring [--help] 
+asadmin [asadmin-options] disable-monitoring [--help]
 [--modules module-name][:module-name]*
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
index 9188256..665928b 100644
--- a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
+++ b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-internal-user.adoc
@@ -23,7 +23,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] disable-secure-admin-internal-user [--help] 
+asadmin [asadmin-options] disable-secure-admin-internal-user [--help]
 admin-username
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
index 939d51e..7be407a 100644
--- a/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
+++ b/docs/reference-manual/src/main/jbake/content/disable-secure-admin-principal.adoc
@@ -22,8 +22,8 @@
 
 [source]
 ----
-asadmin [asadmin-options] disable-secure-admin-principal [--help] 
---alias aliasname | DN 
+asadmin [asadmin-options] disable-secure-admin-principal [--help]
+--alias aliasname | DN
 ----
 
 [[sthref1088]]
@@ -76,7 +76,7 @@
 
 [source]
 ----
-asadmin> disable-secure-admin-principal 
+asadmin> disable-secure-admin-principal
 "CN=system.amer.oracle.com,OU=GlassFish,
 O=Oracle Corporation,L=Santa Clara,ST=California,C=US"
 
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
index a5f7814..a5efb63 100644
--- a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
+++ b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-internal-user.adoc
@@ -23,7 +23,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] enable-secure-admin-internal-user [--help] 
+asadmin [asadmin-options] enable-secure-admin-internal-user [--help]
 [--passwordalias pwdaliasname]
 admin-username
 ----
@@ -42,7 +42,7 @@
 +
 [source]
 ----
-asadmin> create-file-user --authrealmname admin-realm --groups 
+asadmin> create-file-user --authrealmname admin-realm --groups
 asadmin newAdminUsername
 ----
 2. Create a password alias for the just-created password.
@@ -56,7 +56,7 @@
 +
 [source]
 ----
-asadmin> enable-secure-admin-internal-user 
+asadmin> enable-secure-admin-internal-user
 --passwordalias passwordAliasName
 newAdminUsername
 ----
@@ -117,7 +117,7 @@
 
 [source]
 ----
-asadmin> enable-secure-admin-internal-user 
+asadmin> enable-secure-admin-internal-user
 --passwordalias passwordAliasName
 newAdminUsername
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
index 5821332..96d9a18 100644
--- a/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
+++ b/docs/reference-manual/src/main/jbake/content/enable-secure-admin-principal.adoc
@@ -22,8 +22,8 @@
 
 [source]
 ----
-asadmin [asadmin-options] enable-secure-admin-principal [--help] 
---alias aliasname | DN 
+asadmin [asadmin-options] enable-secure-admin-principal [--help]
+--alias aliasname | DN
 ----
 
 [[sthref1144]]
diff --git a/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc b/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
index 99e547b..447abb3 100644
--- a/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
+++ b/docs/reference-manual/src/main/jbake/content/enable-secure-admin.adoc
@@ -23,8 +23,8 @@
 
 [source]
 ----
-asadmin [asadmin-options] enable-secure-admin [--help] 
-[--adminalias=alias] 
+asadmin [asadmin-options] enable-secure-admin [--help]
+[--adminalias=alias]
 [--instancealias=alias]
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
index ccd8bac..84a434c 100644
--- a/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
+++ b/docs/reference-manual/src/main/jbake/content/flush-connection-pool.adoc
@@ -22,9 +22,9 @@
 
 [source]
 ----
-asadmin [asadmin-options] flush-connection-pool [--help] 
+asadmin [asadmin-options] flush-connection-pool [--help]
 [--appname application [--modulename module]
-pool_name 
+pool_name
 ----
 
 [[sthref1179]]
@@ -53,10 +53,10 @@
 
 The `jndi-name` for application-scoped-resources or
 module-scoped-resources are specified using the format
-`java:app/`jdbc/myDataSource or
-`java:module/`jdbc/myModuleLevelDataSource. This naming scope is defined
-in the Java EE Specification
-(`https://javaee.github.io/javaee-spec/javadocs/`).
+``java:app/``jdbc/myDataSource or
+``java:module/``jdbc/myModuleLevelDataSource. This naming scope is defined
+in the Jakarta EE Specification
+(`https://jakarta.ee/specifications/platform/10/`).
 
 [[sthref1180]]
 
diff --git a/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc b/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
index 861b66b..7be54a8 100644
--- a/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
+++ b/docs/reference-manual/src/main/jbake/content/freeze-transaction-service.adoc
@@ -96,10 +96,10 @@
 link:rollback-transaction.html#rollback-transaction-1[`rollback-transaction`(1)],
 link:unfreeze-transaction-service.html#unfreeze-transaction-service-1[`unfreeze-transaction-service`(1)]
 
-"link:../administration-guide/transactions.html#GSADG00022[Administering Transactions]" in GlassFish Server Open
-Source Edition Administration Guide
+link:../administration-guide/transactions.html#GSADG00022[Administering Transactions]
+in GlassFish Server Open Source Edition Administration Guide
 
-"http://docs.oracle.com/javaee/7/tutorial/doc/transactions.html[Transactions]"
-in The Java EE 8 Tutorial
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]
+in The Jakarta EE Tutorial
 
 
diff --git a/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc b/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
index fd07bc6..8b8680e 100644
--- a/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
+++ b/docs/reference-manual/src/main/jbake/content/import-sync-bundle.adoc
@@ -23,7 +23,7 @@
 [source]
 ----
 asadmin [asadmin-options] import-sync-bundle [--help]
---instance instance-name 
+--instance instance-name
 [--nodedir node-dir] [--node node-name]
 file-name
 ----
@@ -123,7 +123,7 @@
 
 [source]
 ----
-sj02# asadmin --host sr04 import-sync-bundle --node sj02 --instance ymli2 
+sj02# asadmin --host sr04 import-sync-bundle --node sj02 --instance ymli2
 /export/glassfish7/glassfish/domains/domain1/sync/ymlcluster-sync-bundle.zip
 Command import-sync-bundle executed successfully.
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/instance.adoc b/docs/reference-manual/src/main/jbake/content/instance.adoc
index 16ecba4..a2e3449 100644
--- a/docs/reference-manual/src/main/jbake/content/instance.adoc
+++ b/docs/reference-manual/src/main/jbake/content/instance.adoc
@@ -13,7 +13,7 @@
 instance
 --------
 
-An instance in {productName} has its own Java EE configuration, Java
+An instance in {productName} has its own Jakarta EE configuration, Java
 EE resources, application deployment areas, and server configuration
 settings
 
diff --git a/docs/reference-manual/src/main/jbake/content/list-applications.adoc b/docs/reference-manual/src/main/jbake/content/list-applications.adoc
index 1c14f31..9d2c614 100644
--- a/docs/reference-manual/src/main/jbake/content/list-applications.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-applications.adoc
@@ -30,7 +30,7 @@
 
 === Description
 
-The `list-applications` subcommand lists deployed Java EE applications
+The `list-applications` subcommand lists deployed Jakarta EE applications
 and the type of each application that is listed.
 
 If the `--type` option is not specified, all applications are listed. If
@@ -65,7 +65,7 @@
   resources for each component within the application.
 `--subcomponents`::
   Lists the subcomponents of each application. The subcomponents listed
-  depend on the application type. For example, for a Java EE application
+  depend on the application type. For example, for a Jakarta EE application
   (EAR file), modules are listed. For a web application, servlets and
   JSP pages are listed. For an EJB module, EJB subcomponents are listed.
 `--type`::
diff --git a/docs/reference-manual/src/main/jbake/content/list-components.adoc b/docs/reference-manual/src/main/jbake/content/list-components.adoc
index 4c13734..170a027 100644
--- a/docs/reference-manual/src/main/jbake/content/list-components.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-components.adoc
@@ -36,7 +36,7 @@
 `list-applications` subcommand instead.
 ====
 
-The `list-components` subcommand lists all deployed Java EE components.
+The `list-components` subcommand lists all deployed Jakarta EE components.
 
 If the `--type` option is not specified, all components are listed. If
 the type option is specified, you must specify a type. The possible
@@ -70,7 +70,7 @@
   resources for each component within an application.
 `--subcomponents`::
   Lists the subcomponents of each component. The subcomponents listed
-  depend on the component type. For example, for a Java EE application
+  depend on the component type. For example, for a Jakarta EE application
   (EAR file), modules are listed. For a web application, servlets and
   JSP pages are listed. For an EJB module, EJB subcomponents are listed.
 `--type`::
diff --git a/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc b/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
index bd158cf..dc03ed6 100644
--- a/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-connector-work-security-maps.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] list-connector-work-security-maps [--help] 
+asadmin [asadmin-options] list-connector-work-security-maps [--help]
 [--securitymap securitymap]
 resource_adapter_name
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/list-loggers.adoc b/docs/reference-manual/src/main/jbake/content/list-loggers.adoc
index 822d2c9..6c00ce7 100644
--- a/docs/reference-manual/src/main/jbake/content/list-loggers.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-loggers.adoc
@@ -62,7 +62,7 @@
 Logger Name                            Subsystem         Logger Description
 ...
 jakarta.enterprise.monitoring            Monitoring        Monitoring Logger
-jakarta.enterprise.system.core.ee        AS-CORE           Java EE Core Kernel
+jakarta.enterprise.system.core.ee        AS-CORE           Jakarta EE Core Kernel
 jakarta.enterprise.system.jmx            JMX               JMX System Logger
 jakarta.enterprise.system.tools.admin    ADMIN             Administration Services
 ...
diff --git a/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc b/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
index e442b2f..8ccfcf6 100644
--- a/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-password-aliases.adoc
@@ -51,7 +51,7 @@
 
 [source]
 ----
-asadmin> list-password-aliases 
+asadmin> list-password-aliases
 jmspassword-alias
 Command list-password-aliases executed successfully
 ----
diff --git a/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc b/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
index 03b2bb6..e2f3a64 100644
--- a/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-resource-adapter-configs.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] list-resource-adapter-configs [--help] 
+asadmin [asadmin-options] list-resource-adapter-configs [--help]
 [--raname raname] [--verbose {false|true}]
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/list-timers.adoc b/docs/reference-manual/src/main/jbake/content/list-timers.adoc
index d839d26..0dc6704 100644
--- a/docs/reference-manual/src/main/jbake/content/list-timers.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-timers.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] list-timers [--help] 
+asadmin [asadmin-options] list-timers [--help]
 [target]
 ----
 
@@ -91,10 +91,10 @@
 
 link:migrate-timers.html#migrate-timers-1[`migrate-timers`(1)]
 
-"http://docs.oracle.com/javaee/7/tutorial/doc/ejb-basicexamples.html[Using
-the Timer Service]" in The Java EE 8 Tutorial
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#using-the-timer-service[
+Using the Timer Service] in The Jakarta EE Tutorial
 
-"link:../application-development-guide/ejb.html#GSDVG00146[EJB Timer Service]" in GlassFish Server Open Source
-Edition Application Development Guide
+"link:../application-development-guide/ejb.html#GSDVG00146[EJB Timer Service]"
+in GlassFish Server Open Source Edition Application Development Guide
 
 
diff --git a/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
index 35fb296..ef61ca5 100644
--- a/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-web-context-param.adoc
@@ -34,7 +34,7 @@
 context-initialization parameters of one of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE) application
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE) application
 
 The application must already be deployed. Otherwise, an error occurs.
 
@@ -82,7 +82,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the servlet context-initialization
-  parameter applies to a web module of a Java EE application. If
+  parameter applies to a web module of a Jakarta EE application. If
   specified, module must follow application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
index 27915a4..4a5fc51 100644
--- a/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
+++ b/docs/reference-manual/src/main/jbake/content/list-web-env-entry.adoc
@@ -33,7 +33,7 @@
 one of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE)
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE)
 application
 
 The application must already be deployed. Otherwise, an error occurs.
@@ -85,7 +85,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the environment entry applies to a web
-  module of a Java EE application. If specified, module must follow
+  module of a Jakarta EE application. If specified, module must follow
   application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/login.adoc b/docs/reference-manual/src/main/jbake/content/login.adoc
index 0332394..7f92676 100644
--- a/docs/reference-manual/src/main/jbake/content/login.adoc
+++ b/docs/reference-manual/src/main/jbake/content/login.adoc
@@ -85,15 +85,15 @@
 
 [source]
 ----
-asadmin --host foo --port 8282 login 
+asadmin --host foo --port 8282 login
 Please enter the admin user name>admin
 Please enter the admin password>
 
-Trying to authenticate for administration of server at host [foo] 
+Trying to authenticate for administration of server at host [foo]
 and port [8282] ...
-Login information relevant to admin user name [admin] for host [foo] 
+Login information relevant to admin user name [admin] for host [foo]
 and admin port [8282] stored at [/.asadminpass] successfully.
-Make sure that this file remains protected. Information stored in this 
+Make sure that this file remains protected. Information stored in this
 file will be used by asadmin commands to manage associated domain.
 ----
 
@@ -106,17 +106,17 @@
 
 [source]
 ----
-asadmin --host myhost login 
+asadmin --host myhost login
 Please enter the admin user name>admin
 Please enter the admin password>
-Trying to authenticate for administration of server 
+Trying to authenticate for administration of server
 at host [myhost] and port [4848] ...
-An entry for login exists for host [myhost] and port [4848], probably 
+An entry for login exists for host [myhost] and port [4848], probably
 from an earlier login operation.
 Do you want to overwrite this entry (y/n)?y
-Login information relevant to admin user name [admin] for host [myhost] 
+Login information relevant to admin user name [admin] for host [myhost]
 and admin port [4848] stored at [/home/joe/.asadminpass] successfully.
-Make sure that this file remains protected. Information stored in this 
+Make sure that this file remains protected. Information stored in this
 file will be used by asadmin commands to manage associated domain.
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/multimode.adoc b/docs/reference-manual/src/main/jbake/content/multimode.adoc
index e18f383..bfc3425 100644
--- a/docs/reference-manual/src/main/jbake/content/multimode.adoc
+++ b/docs/reference-manual/src/main/jbake/content/multimode.adoc
@@ -22,8 +22,8 @@
 
 [source]
 ----
-asadmin [asadmin-options] multimode [--help] 
-[--file filename] 
+asadmin [asadmin-options] multimode [--help]
+[--file filename]
 [--printprompt={true|false}] [--encoding encode]
 ----
 
@@ -92,7 +92,7 @@
 [source]
 ----
 % asadmin multimode
-asadmin> 
+asadmin>
 ----
 
 You can also start a multimode session by typing `asadmin` without
diff --git a/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc b/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
index 594e5f0..73f886c 100644
--- a/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
+++ b/docs/reference-manual/src/main/jbake/content/ping-connection-pool.adoc
@@ -57,7 +57,7 @@
 module-scoped-resources are specified using the format
 ``java:app/``jdbc/myDataSource or
 ``java:module/``jdbc/myModuleLevelDataSource.
-This naming scope is defined in the Java EE 6 Specification
+This naming scope is defined in the Jakarta EE 6 Specification
 (`http://download.oracle.com/javaee/6/api/`).
 
 [[sthref1928]]
diff --git a/docs/reference-manual/src/main/jbake/content/preface.adoc b/docs/reference-manual/src/main/jbake/content/preface.adoc
index 5342f74..04b252d 100644
--- a/docs/reference-manual/src/main/jbake/content/preface.adoc
+++ b/docs/reference-manual/src/main/jbake/content/preface.adoc
@@ -21,7 +21,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
diff --git a/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc b/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
index 8531784..ea4a741 100644
--- a/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
+++ b/docs/reference-manual/src/main/jbake/content/recover-transactions.adoc
@@ -138,7 +138,7 @@
 "link:../administration-guide/transactions.html#GSADG00022[Administering Transactions]"
 in GlassFish Server Open Source Edition Administration Guide
 
-"http://docs.oracle.com/javaee/7/tutorial/doc/transactions.html[Transactions]"
-in The Java EE 8 Tutorial
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]"
+in The Jakarta EE Tutorial
 
 
diff --git a/docs/reference-manual/src/main/jbake/content/redeploy.adoc b/docs/reference-manual/src/main/jbake/content/redeploy.adoc
index 69b5708..88ae277 100644
--- a/docs/reference-manual/src/main/jbake/content/redeploy.adoc
+++ b/docs/reference-manual/src/main/jbake/content/redeploy.adoc
@@ -166,7 +166,7 @@
   pure EAR file. A pure EAR file is an EAR without {productName}
   descriptors.
 `--altdd`::
-  Deploys the application using a Java EE standard deployment descriptor
+  Deploys the application using a Jakarta EE standard deployment descriptor
   that resides outside of the application archive. Specify an absolute
   path or a relative path to the alternate deployment descriptor file.
   The alternate deployment descriptor overrides the top-level deployment
@@ -335,13 +335,13 @@
     compatible in terms of JAR visibility requirements for applications.
     The only allowed value is `v2`, which refers to Sun Java System
     Application Server version 2 or Sun Java System Application Server
-    version 9.1 or 9.1.1. Beginning in Java EE 6, the Java EE platform
-    specification imposed stricter requirements than Java EE 5 did on
+    version 9.1 or 9.1.1. Beginning in Jakarta EE 6, the Jakarta EE platform
+    specification imposed stricter requirements than Jakarta EE 5 did on
     which JAR files can be visible to various modules within an EAR
     file. In particular, application clients must not have access to EJB
     JAR files or other JAR files in the EAR file unless references use
     the standard Java SE mechanisms (extensions, for example) or the
-    Java EE library-directory mechanism. Setting this property to `v2`
+    Jakarta EE library-directory mechanism. Setting this property to `v2`
     removes these restrictions.
   `keepSessions={false|true}`;;
     Superseded by the `--keepstate` option. +
diff --git a/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc b/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
index fe28358..6d732d1 100644
--- a/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
+++ b/docs/reference-manual/src/main/jbake/content/rollback-transaction.adoc
@@ -110,7 +110,7 @@
 "link:../administration-guide/transactions.html#GSADG00022[Administering Transactions]" in GlassFish Server Open
 Source Edition Administration Guide
 
-"http://docs.oracle.com/javaee/7/tutorial/doc/transactions.html[Transactions]"
-in The Java EE 8 Tutorial
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]"
+in The Jakarta EE Tutorial
 
 
diff --git a/docs/reference-manual/src/main/jbake/content/security.adoc b/docs/reference-manual/src/main/jbake/content/security.adoc
index 348d53c..0628c15 100644
--- a/docs/reference-manual/src/main/jbake/content/security.adoc
+++ b/docs/reference-manual/src/main/jbake/content/security.adoc
@@ -20,7 +20,7 @@
 
 Security is about protecting data: how to prevent unauthorized access or
 damage to it in storage or transit. {productName} has a dynamic,
-extensible security architecture based on the Java EE standard. Built in
+extensible security architecture based on the Jakarta EE standard. Built in
 security features include cryptography, authentication and
 authorization, and public key infrastructure. {productName} is built
 on the Java security model, which uses a sandbox where applications can
diff --git a/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
index 614c6c6..063c644 100644
--- a/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
+++ b/docs/reference-manual/src/main/jbake/content/set-web-context-param.adoc
@@ -36,7 +36,7 @@
 context-initialization parameter of one of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE) application
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE) application
 
 The application must already be deployed. Otherwise, an error occurs.
 
@@ -108,7 +108,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the servlet context-initialization
-  parameter applies to a web module of a Java EE application. If
+  parameter applies to a web module of a Jakarta EE application. If
   specified, module must follow application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
index c8fcab4..03a92fe 100644
--- a/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
+++ b/docs/reference-manual/src/main/jbake/content/set-web-env-entry.adoc
@@ -35,7 +35,7 @@
 the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE) application
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE) application
 
 The application must already be deployed. Otherwise, an error occurs.
 
@@ -126,7 +126,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the environment entry applies to a web
-  module of a Java EE application. If specified, module must follow
+  module of a Jakarta EE application. If specified, module must follow
   application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc b/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
index e12f0f6..7db6d70 100644
--- a/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
+++ b/docs/reference-manual/src/main/jbake/content/unfreeze-transaction-service.adoc
@@ -96,7 +96,7 @@
 "link:../administration-guide/transactions.html#GSADG00022[Administering Transactions]" in GlassFish Server Open
 Source Edition Administration Guide
 
-"http://docs.oracle.com/javaee/7/tutorial/doc/transactions.html[Transactions]"
-in The Java EE 8 Tutorial
+"https://eclipse-ee4j.github.io/jakartaee-tutorial/#transactions[Transactions]"
+in The Jakarta EE Tutorial
 
 
diff --git a/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc b/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
index e0875cc..399f974 100644
--- a/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
+++ b/docs/reference-manual/src/main/jbake/content/unset-web-context-param.adoc
@@ -34,7 +34,7 @@
 context-initialization parameter of one of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE) application
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE) application
 
 When a parameter is unset, its value reverts to the value, if any, that
 is set in the application's deployment descriptor.
@@ -88,7 +88,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the servlet context-initialization
-  parameter applies to a web module of a Java EE application. If
+  parameter applies to a web module of a Jakarta EE application. If
   specified, module must follow application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc b/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
index 82a5582..d0ca056 100644
--- a/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
+++ b/docs/reference-manual/src/main/jbake/content/unset-web-env-entry.adoc
@@ -33,7 +33,7 @@
 of the following items:
 
 * A deployed web application
-* A web module in a deployed Java Platform, Enterprise Edition (Java EE) application
+* A web module in a deployed Java Platform, Enterprise Edition (Jakarta EE) application
 
 When an entry is unset, its value reverts to the value, if any, that is
 set in the application's deployment descriptor.
@@ -89,7 +89,7 @@
   archive (EAR) file. The path to the module is specified in the
   `module` element of the application's `application.xml` file. +
   module is required only if the environment entry applies to a web
-  module of a Java EE application. If specified, module must follow
+  module of a Jakarta EE application. If specified, module must follow
   application-name, separated by a slash (`/`). +
   For example, the `application.xml` file for the `myApp` application
   might specify the following web module:
diff --git a/docs/reference-manual/src/main/jbake/content/unset.adoc b/docs/reference-manual/src/main/jbake/content/unset.adoc
index b33514f..2bc4c9f 100644
--- a/docs/reference-manual/src/main/jbake/content/unset.adoc
+++ b/docs/reference-manual/src/main/jbake/content/unset.adoc
@@ -21,7 +21,7 @@
 
 [source]
 ----
-asadmin [asadmin-options] unset [--help] 
+asadmin [asadmin-options] unset [--help]
 variable-list
 ----
 
diff --git a/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc b/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
index 6f435d8..89ae1ec 100644
--- a/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
+++ b/docs/reference-manual/src/main/jbake/content/update-connector-work-security-map.adoc
@@ -21,9 +21,9 @@
 
 [source]
 ----
-asadmin [asadmin-options] update-connector-work-security-map [--help] 
+asadmin [asadmin-options] update-connector-work-security-map [--help]
 --raname raname
-[--addprincipals eis-principal1=server-principal1[, eis-principal2=server-principal2]*] 
+[--addprincipals eis-principal1=server-principal1[, eis-principal2=server-principal2]*]
 [--addgroups eis-group1=server-group1[, eis-group2=server-group2]*]
 [--removeprincipals eis-principal1[,eis-principal2]*]
 [--removegroups eis-group1[, eis-group2]*]
diff --git a/docs/release-notes/src/main/jbake/content/preface.adoc b/docs/release-notes/src/main/jbake/content/preface.adoc
index 38a0854..b762cff 100644
--- a/docs/release-notes/src/main/jbake/content/preface.adoc
+++ b/docs/release-notes/src/main/jbake/content/preface.adoc
@@ -20,25 +20,23 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
-GlassFish Server is developed through the GlassFish project open-source
-community at `https://javaee.github.io/glassfish/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+GlassFish Server 7 is developed through the GlassFish project
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -57,7 +55,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -65,87 +63,91 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
@@ -154,49 +156,44 @@
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* https://javaee.github.io/firstcup/[Your First Cup: An Introduction to
-the Java EE Platform] (`https://javaee.github.io/firstcup/`). For
-beginning Java EE programmers, this short tutorial explains the entire
-process for developing a simple enterprise application. The sample
-application is a web application that consists of a component that is
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
 based on the Enterprise JavaBeans specification, a JAX-RS web service,
 and a JavaServer Faces component for the web front end.
-* https://javaee.github.io/tutorial/[The Java EE 8 Tutorial]
-(`https://javaee.github.io/tutorial/`). This comprehensive tutorial
-explains how to use Java EE 7 platform technologies and APIs to develop
-Java EE applications.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 8 of Java EE is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
-* The API specification for GlassFish Server 7, including Java EE 8
-platform packages and non-platform packages that are specific to the
-GlassFish Server product, is located at
-`https://javaee.github.io/javaee-spec/javadocs/`.
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
 
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications] (`https://javaee.github.io/javaee-spec/Specifications`)
-might be useful.
+* The API specification for GlassFish Server 7, including Jakarta EE
+platform packages and nonplatform packages that are specific to the
+GlassFish Server product, is located at
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby database for use with the
-GlassFish Server, see the https://db.apache.org/derby/manuals/[Apache
-Derby product page] (`https://db.apache.org/derby/manuals/`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the https://github.com/javaee/glassfish-samples[Java EE
-Samples project page] (`https://github.com/javaee/glassfish-samples`).
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 [[fwbkx]][[typographic-conventions]]
 
@@ -206,12 +203,13 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
+
 |`AaBbCc123`
 |The names of commands, files, and directories, and onscreen computer output
-a|Edit your `.login` file.
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
@@ -219,7 +217,7 @@
 
 |`AaBbCc123`
 |What you type, contrasted with onscreen computer output
-a|`machine_name%` `su`
+|`machine_name%` `su`
 
 `Password:`
 
@@ -228,15 +226,15 @@
 |The command to remove a file is `rm` filename.
 
 |AaBbCc123
-|Book titles, new terms, and terms to be emphasized
-(note that some emphasized items appear bold online)
-a|Read Chapter 6 in the User's Guide.
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
 |===
 
+
 [[fquvc]][[symbol-conventions]]
 
 Symbol Conventions
@@ -244,9 +242,10 @@
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
+
 |`[ ]`
 |Contains optional arguments and command options.
 |`ls [-l]`
@@ -255,25 +254,24 @@
 |`{ \| }`
 |Contains a set of choices for a required command option.
 |`-d {y\|n}`
-|The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
 
 |`${ }`
 |Indicates a variable reference.
 |`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|-
+|`-`
 |Joins simultaneous multiple keystrokes.
 |Control-A
 |Press the Control key while you press the A key.
 
-|+ +
+|`+`
 |Joins consecutive multiple keystrokes.
 |Ctrl+A+N
 |Press the Control key, release it, and then press the subsequent keys.
 
-|>
+|`>`
 |Indicates menu item selection in a graphical user interface.
 |File > New > Templates
 |From the File menu, choose New. From the New submenu, choose Templates.
@@ -288,29 +286,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
+
 |as-install
-|Represents the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|Represents the base installation directory for GlassFish Server.
+In configuration files, as-install is represented as follows:
+`${com.sun.aas.installRoot}`
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
-
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -319,9 +320,12 @@
 
 |domain-dir
 |Represents the directory in which a domain's configuration is stored.
-|domain-root-dir``/``domain-name
+In configuration files, domain-dir is represented as follows:
+`${com.sun.aas.instanceRoot}`
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
+
diff --git a/docs/release-notes/src/main/jbake/content/release-notes.adoc b/docs/release-notes/src/main/jbake/content/release-notes.adoc
index 8221c06..2fc8c3d 100644
--- a/docs/release-notes/src/main/jbake/content/release-notes.adoc
+++ b/docs/release-notes/src/main/jbake/content/release-notes.adoc
@@ -14,15 +14,21 @@
 1 Eclipse GlassFish Server 7 Release Notes
 ------------------------------------------
 
+[CAUTION]
+====
+To Be Done
+
+This page must be updated before the release!
+====
+
 GlassFish Server provides a lightweight, modular server for the
-development of Java Platform Enterprise Edition (Java EE) 8
-applications. It is the Reference Implementation for Java EE. It
+development of Java Platform Enterprise Edition (Jakarta EE) 8
+applications. It is the Reference Implementation for Jakarta EE. It
 delivers a highly productive platform for developing with the latest
-Java EE technologies.
+Jakarta EE technologies.
 
 For any issue or information on Eclipse GlassFish Server,
-see the https://javaee.github.io/glassfish/[GlassFish Server Community]
-(`https://javaee.github.io/glassfish/`).
+see the https://glassfish.org/.
 
 These Release Notes provide late-breaking information about GlassFish Server 7
 software and documentation. These Release Notes include
@@ -42,8 +48,8 @@
 * link:#ggqok["Restrictions and Deprecated Functionality"]
 * link:#BABDACBE["Documentation Errata"]
 * link:#giraq["Features Available Only in the Full Platform"]
-* link:#gipkz["Java EE Standards Support"]
-* link:#ghmtl["Java EE SDK"]
+* link:#gipkz["Jakarta EE Standards Support"]
+* link:#ghmtl["Jakarta EE SDK"]
 * link:#abpha["How to Report Problems and Provide Feedback"]
 * link:#abphc["Additional Resources"]
 
@@ -70,48 +76,28 @@
 What's New in the GlassFish Server 7 Release?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GlassFish is the Reference Implementation for Java EE. Java EE 8
-introduces the JSON Binding API (JSON-B) for mapping between JSON text
-and Java objects, building on the JSON Processing API (JSON-P). Servlet
-has been enhanced with the addition of support for the new HTTP/2
-protocol. JAX-RS adds support for server-sent events and, building on
-concurrency facilities added in Java SE 8, a reactive client API. The
-new Java EE Security API provides enhanced support for authentication
-and authorization in web modules, and also introduces APIs for access to
-identity stores. The Bean Validation facility is updated to reflect
-enhancements made in Java SE 8 and to extend the range of validated
-objects.
+GlassFish is the Reference Implementation for Jakarta EE. Jakarta EE 10
+introduces ... To Be Done
 
-GlassFish Server 7 includes the following new and updated Java EE standards.
+GlassFish Server 7 includes the following new and updated Jakarta EE standards.
 
 New Features
 
-* Java EE Security API 1.0
-* Java API for JSON Binding (JSON-B) 1.0
+* To Be Done
 
 Updated
 
-* Java API for JSON Processing (JSON-P) 1.1
-* Java API for WebSocket 1.1
-* Java API for RESTful Web Services (JAX-RS) 2.1
-* Contexts and Dependency Injection for Java EE (CDI) 2.0
-* Java Persistence API (JPA) 2.2
-* Common annotations 1.3
-* JavaServer Faces (JSF) 2.3
-* Java Servlet 5.1
-* Bean Validation (BV) 2.0
-* Interceptors 1.2
-* JavaMail 1.6
+* To Be Done
 
-For a complete list of the Java EE technologies included in GlassFish Server 7,
-see link:#gipkz[Java EE Standards Support].
+For a complete list of the Jakarta EE technologies included in GlassFish Server 7,
+see link:#gipkz[Jakarta EE Standards Support].
 
 
 [NOTE]
 ====
 The main thrust of the Eclipse GlassFish Server 7 release
 is to provide an application server for developers to explore and begin
-exploiting the new and updated technologies in the Java EE 8 platform.
+exploiting the new and updated technologies in the Jakarta EE 10 platform.
 Thus, the following features of GlassFish Server were not a focus of
 this release:
 
@@ -121,8 +107,7 @@
 * Embedded Server
 
 These features are included in the release, but they may not function
-properly with some of the new features added in support of the Java EE 8
-platform.
+properly with some of the new features added in support of the Jakarta EE 10 platform.
 ====
 
 [[abpaj]][[GSRLN00131]][[hardware-and-software-requirements]]
@@ -310,7 +295,7 @@
 
 GlassFish Server 7 is now bundled with Message Queue (MQ) Broker
 5.1.1. Refer to the
-https://javaee.github.io/glassfish/doc/5.1/mq-release-notes.pdf[`Open Message Queue Release Notes`]
+https://github.com/eclipse-ee4j/glassfishdoc/5.1/mq-release-notes.pdf[`Open Message Queue Release Notes`]
 for complete information about MQ Broker requirements.
 
 [[gfgps]][[GSRLN00252]][[paths-and-environment-settings-for-the-jdk-software]]
@@ -398,23 +383,23 @@
 
 The following topics are addressed here:
 
-* link:#CHDIBHHF[JAXB and JAX-WS no longer part of Java EE platform]
+* link:#CHDIBHHF[JAXB and JAX-WS no longer part of Jakarta EE platform]
 * link:#CHDIBEAJ[Resource validation property is enabled in the JVM option for deployment]
 * link:#CHDBJDGF[Update Tool and pkg Command no longer part of GlassFish Server]
 * link:#CHDJGJHD[Java DB has been replaced by Apache Derby]
 
 [[CHDIBHHF]][[jaxb-and-jax-ws-no-longer-part-of-java-ee-platform]]
 
-JAXB and JAX-WS no longer part of Java EE platform
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+==== JAXB and JAX-WS no longer part of Jakarta EE platform
 
 [[sthref6]][[description]]
 
 Description
 +++++++++++
 
-Jakarta XML Binding (previous JAXB) and Jakarta XML Web Services (previouly JAX-WS) are part of Java EE platform,
-but as optional technologies. However, the jars are packaged in GlassFish.
+Jakarta XML Binding (previous JAXB) and Jakarta XML Web Services (previouly JAX-WS)
+are part of Jakarta EE platform, but as optional technologies. However,
+the jars are packaged in GlassFish.
 
 [NOTE]
 ====
@@ -454,7 +439,7 @@
 deployment of such applications to succeed, the server(s) must be
 started with this property set to false. For more information on JVM
 deployment options see
-https://javaee.github.io/glassfish/doc/5.1/administration-guide.pdf#G11.998994[`Administering JVM Options.`]
+https://github.com/eclipse-ee4j/glassfishdoc/5.1/administration-guide.pdf#G11.998994[`Administering JVM Options.`]
 ====
 
 
@@ -761,10 +746,10 @@
 
 [[gipkz]][[GSRLN00136]][[java-ee-standards-support]]
 
-Java EE Standards Support
+Jakarta EE Standards Support
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-link:#gjxcp[Table 1-4] lists the Java EE standards implemented in
+link:#gjxcp[Table 1-4] lists the Jakarta EE standards implemented in
 GlassFish Server 7. The table also indicates the distributions in
 which the implementation of a standard is available.
 
@@ -774,208 +759,204 @@
 
 [[sthref15]][[gjxcp]]
 
-Table 1-4 Java EE Standards Implementations in GlassFish Server 7
+Table 1-4 Jakarta EE Standards Implementations in GlassFish Server 7
 
-[width="100%",cols="48%,24%,16%,12%",options="header",]
+[width="100%",cols="<48%,<10%,<10%,<10%",options="header",]
 |===
-|Java EE Standard |Java Specification Request (JSR)
-|GlassFish Server 7 Full Platform |GlassFish Server 7 Web Profile
+|Jakarta EE Standard |Version |GlassFish Server 7 Full Platform |GlassFish Server 7 Web Profile
 
-|https://javaee.github.io/javaee-spec/javadocs/[
-Java Platform, Enterprise Edition 8] `(https://javaee.github.io/javaee-spec/javadocs/)`
-|http://jcp.org/en/jsr/detail?id=366[JSR 366]
+|https://jakarta.ee/specifications/platform/10/[Jakarta EE Specification]
+|10
 |X
 |X
 
-|Java EE Security API
-|http://jcp.org/en/jsr/detail?id=375[JSR 375]
-|X
-|X
-
-|Batch Applications for the Java Platform 1.0
-|http://jcp.org/en/jsr/detail?id=352[JSR 352]
+|https://jakarta.ee/specifications/activation/[Activation]
+|2.1
 |X
 |-
 
-|Concurrency Utilities for Java EE 1.0
-|http://jcp.org/en/jsr/detail?id=236[JSR 236]
+|https://jakarta.ee/specifications/security/[Security]
+|3.0
+|X
+|X
+
+|https://jakarta.ee/specifications/batch/[Batch]
+|2.1
 |X
 |-
 
-|Java API for JSON Processing 1.1
-|http://jcp.org/en/jsr/detail?id=374[JSR 374]
-|X
-|X
-
-|Java API for JSON Binding 1.0
-|http://jcp.org/en/jsr/detail?id=367[JSR 367]
-|X
-|X
-
-|Java API for WebSocket 1.1
-|http://jcp.org/en/jsr/detail?id=356[JSR 356]
-|X
-|X
-
-|https://javaee.github.io/servlet-spec/[
-Java Servlet Technology 5.1]`(https://javaee.github.io/servlet-spec/)/`
-|http://jcp.org/en/jsr/detail?id=369[JSR 369]
-|X
-|X
-
-|JavaServer Pages 2.3
-|http://jcp.org/en/jsr/detail?id=245[JSR 245]
-|X
-|X
-
-|Expression Language 3.0
-|http://jcp.org/en/jsr/detail?id=341[JSR 341]
-|X
-|X
-
-|Debugging Support for Other Languages 1.0
-|http://jcp.org/en/jsr/detail?id=45[JSR 45]
-|X
-|X
-
-|Standard Tag Library for JavaServer Pages 1.2
-|http://jcp.org/en/jsr/detail?id=52[JSR 52]
-|X
-|X
-
-|http://www.oracle.com/technetwork/java/javaee/javaserverfaces-139869.html[
-JavaServer Faces 2.3]`(https://github.com/javaserverfaces/)`
-|http://jcp.org/en/jsr/detail?id=372[JSR 372]
-|X
-|X
-
-|Common Annotations for the Java Platform 1.2
-|http://jcp.org/en/jsr/detail?id=250[JSR 250]
-|X
-|X
-
-|https://github.com/javaee/jta-spec[Java Transaction API 1.2]
-`(https://github.com/javaee/jta-spec)`
-|http://jcp.org/en/jsr/detail?id=907[JSR 907]
-|X
-|X
-
-|https://github.com/javaee/jpa-spec[Java Persistence API 2.2]
-`(https://github.com/javaee/jpa-spec)`
-|http://jcp.org/en/jsr/detail?id=338[JSR 338]
-|X
-|X
-
-|Managed Beans 1.0 |http://jcp.org/en/jsr/detail?id=316[JSR 316]
-|X
-|X
-
-|Interceptors 1.2 |http://jcp.org/en/jsr/detail?id=318[JSR 318]
-|X
-|X
-
-|Dependency Injection for Java 1.0
-|http://jcp.org/en/jsr/detail?id=330[JSR 330]
-|X
-|X
-
-|https://github.com/javaee/ejb-spec[Enterprise JavaBeans 3.2 Lite]
-`(https://github.com/javaee/ejb-spec)`
-|http://jcp.org/en/jsr/detail?id=345[JSR 345]
-|X
-|X
-
-|https://github.com/javaee/ejb-spec[
-Enterprise JavaBeans 3.2 Full API]`(https://github.com/javaee/ejb-spec)`
-|http://jcp.org/en/jsr/detail?id=345[JSR 345]
+|https://jakarta.ee/specifications/concurrency/[Concurrency]
+|3.0
 |X
 |-
 
-|Contexts and Dependency Injection for Java EE 2.0
-|http://jcp.org/en/jsr/detail?id=365[JSR 365]
+|https://jakarta.ee/specifications/jsonp/[JSON Processing]
+|2.1
 |X
 |X
 
-|Java API for RESTful Web Service (JAX-RS) 2.1
-|http://jcp.org/en/jsr/detail?id=370[JSR 370]
+|https://jakarta.ee/specifications/jsonb/[JSON Binding]
+|3.0
 |X
 |X
 
-|Bean Validation 2.0
-|http://jcp.org/en/jsr/detail?id=349[JSR 380]
+|https://jakarta.ee/specifications/websocket/[WebSocket]
+|2.1
 |X
 |X
 
-|https://github.com/javaee/connector-spec[
-Java EE Connector Architecture 1.7]`(https://github.com/javaee/connector-spec)`
-|http://jcp.org/en/jsr/detail?id=322[JSR 322]
+|https://jakarta.ee/specifications/websocket/[Servlet]
+|6.0
+|X
+|X
+
+|https://jakarta.ee/specifications/pages/[Server Pages]
+|3.1
+|X
+|X
+
+|https://jakarta.ee/specifications/expression-language/[Expression Language]
+|5.0
+|X
+|X
+
+|https://jakarta.ee/specifications/debugging/[Debugging Support for Other Languages]
+|2.0
+|X
+|X
+
+|https://jakarta.ee/specifications/tags/[Standard Tag Library]
+|3.0
+|X
+|X
+
+|https://jakarta.ee/specifications/mvc/[MVC]
+|2.1
+|X
+|X
+
+|https://jakarta.ee/specifications/faces/[JavaServer Faces]
+|4.0
+|X
+|X
+
+|https://jakarta.ee/specifications/annotations/[Annotations]
+|2.1
+|X
+|X
+
+|https://jakarta.ee/specifications/transactions/[Transactions]
+|2.0
+|X
+|X
+
+|https://jakarta.ee/specifications/persistence/[Persistence]
+|3.1
+|X
+|X
+
+|https://jakarta.ee/specifications/managedbeans/[Managed Beans]
+|2.0
+|X
+|X
+
+|https://jakarta.ee/specifications/interceptors/[Interceptors]
+|2.0
+|X
+|X
+
+|https://jakarta.ee/specifications/dependency-injection/[Dependency Injection]
+|2.0
+|X
+|X
+
+|https://jakarta.ee/specifications/cdi/[Contexts and Dependency Injection]
+|3.0
+|X
+|X
+
+|https://jakarta.ee/specifications/persistence/[Enterprise Beans]
+|4.0
+|X
+|-
+
+|https://jakarta.ee/specifications/restful-ws/[RESTful Web Services]
+|4.0
+|X
+|X
+
+|https://jakarta.ee/specifications/bean-validation/[Bean Validation]
+|3.0
+|X
+|X
+
+|https://jakarta.ee/specifications/connectors/[Connectors]
+|2.1
 |X
 |X^*^
 
-|https://github.com/javaee/metro-jax-ws[
-Java API for XML-Based Web Services (JAX-WS) 2.3]`(https://github.com/javaee/metro-jax-ws)`
-|http://jcp.org/en/jsr/detail?id=224[JSR 224]
+|https://jakarta.ee/specifications/xml-web-services/[XML Web Services]
+|4.0
 |X
 |-
 
-|https://github.com/javaee/jaxb-v2[
-Java Architecture for XML Binding (JAXB) 2.2]`(https://github.com/javaee/jaxb-v2)`
-|http://jcp.org/en/jsr/detail?id=222[JSR 222]
+|https://jakarta.ee/specifications/soap-attachments/[SOAP With Attachements]
+|3.0
 |X
 |-
 
-|Implementing Enterprise Web Services 1.4
-|http://jcp.org/en/jsr/detail?id=109[JSR 109]
+|https://jakarta.ee/specifications/xml-binding/[XML Binding]
+|4.0
 |X
 |-
 
-|Web Services Metadata for the Java Platform 2.1
-|http://jcp.org/en/jsr/detail?id=181[JSR 181]
+|https://jakarta.ee/specifications/enterprise-ws/[Enterprise Web Services]
+|2.0
 |X
 |-
 
-|https://javaee.github.io/jms-spec/[
-Java Message Service 2.0]`(https://javaee.github.io/jms-spec/)`
-|http://jcp.org/en/jsr/detail?id=343[JSR 343]
+|https://jakarta.ee/specifications/web-services-metadata/[Web Services Metadata]
+|3.0
 |X
 |-
 
-|https://javaee.github.io/javamail/[
-JavaMail 1.6]`(https://javaee.github.io/javamail/)`
-|http://jcp.org/en/jsr/detail?id=919[JSR 919]
+|https://jakarta.ee/specifications/messaging/[Messaging]
+|3.1
 |X
 |-
 
-|https://javaee.github.io/jacc-spec/[
-Java Authorization Contract for Containers 1.5]`(https://javaee.github.io/jacc-spec/)`
-|http://jcp.org/en/jsr/detail?id=115[JSR 115]
+|https://jakarta.ee/specifications/mail/[Mail]
+|2.1
 |X
 |-
 
-|Java Authentication Service Provider Interface for Containers 1.1
-|http://jcp.org/en/jsr/detail?id=196[JSR 196]
+|https://jakarta.ee/specifications/authentication/[Authentication]
+|3.0
+|X
+|X
+
+|https://jakarta.ee/specifications/authorization/[Authorization]
+|2.1
 |X
 |-
 
-|Java EE Application Deployment 1.2
-|http://jcp.org/en/jsr/detail?id=88[JSR 88]
+|https://jakarta.ee/specifications/deployment/[Deployment]
+|1.7
 |X
 |-
 
-|J2EE Management 1.1
-|http://jcp.org/en/jsr/detail?id=77[JSR 77]
+|https://jakarta.ee/specifications/management/[Management]
+|1.1
 |X
 |-
 
-|https://github.com/javaee/jax-rpc-ri[
-Java API for XML-Based Remote Procedure Calls (JAX-RPC) 1.1]`
-(https://github.com/javaee/jax-rpc-ri/)`
-|http://jcp.org/en/jsr/detail?id=101[JSR 101]
+|https://jakarta.ee/specifications/xml-rpc/[XML RPC]
+|1.1
 |X
 |-
 
-|Java API for XML-Based Registries (JAXR) 1.0
-|http://jcp.org/en/jsr/detail?id=93[JSR 93]
+|https://jakarta.ee/specifications/xml-registries/[XML Registries]
+|1.0
 |X
 |-
 |===
@@ -994,31 +975,6 @@
   The ability to embed components that support HTTP, Bayeux Protocol, Java
   Servlet API, and Comet is provided.
 
-[[ghmtl]][[GSRLN00137]][[java-ee-sdk]]
-
-Java EE SDK
-~~~~~~~~~~~
-
-GlassFish Server 7 is available as part of the Java EE 8 SDK. The
-following versions of the Java EE 8 SDK are available:
-
-* Java EE 8 SDK: This version includes GlassFish Server 7. This
-  version is designed for developers who require the full set of Java EE
-  APIs for enterprise application development.
-* Java EE 8 Web Profile SDK: This version includes GlassFish Server 7
-  Web Profile. This version contains web technologies that are subset of
-  the Full Platform and is designed for developers who do not require the
-  full set of Java EE APIs.
-
-More information about the Java EE SDK distributions are available at
-http://www.oracle.com/technetwork/java/javaee/documentation/index.html[Java
-EE Reference at a Glance]
-(`http://www.oracle.com/technetwork/java/javaee/documentation/index.html`).
-Java EE SDK distributions are available from the
-http://www.oracle.com/technetwork/java/javaee/downloads/index.html[Java
-EE SDK Downloads page]
-(`http://www.oracle.com/technetwork/java/javaee/downloads/index.html`).
-
 [[abpha]][[GSRLN00138]][[how-to-report-problems-and-provide-feedback]]
 
 How to Report Problems and Provide Feedback
@@ -1041,8 +997,8 @@
 
 Useful information can be found at the following locations:
 
-* https://javaee.github.io/glassfish/[GlassFish Server Community]
-(`https://javaee.github.io/glassfish/`)
+* https://github.com/eclipse-ee4j/glassfish[GlassFish Server Community]
+(`https://github.com/eclipse-ee4j/glassfish`)
 * http://www.oracle.com/technetwork/index.html[Oracle Developer
 Information] (`http://www.oracle.com/technetwork/index.html`)
 * http://www.oracle.com/technetwork/indexes/documentation/index.html[Oracle
diff --git a/docs/security-guide/src/main/jbake/content/message-security.adoc b/docs/security-guide/src/main/jbake/content/message-security.adoc
index be6fdc2..8c9cdbb 100644
--- a/docs/security-guide/src/main/jbake/content/message-security.adoc
+++ b/docs/security-guide/src/main/jbake/content/message-security.adoc
@@ -353,7 +353,7 @@
 
 GlassFish Server includes a sample application named `xms`. The `xms`
 application features a simple web service that is implemented by both a
-Java EE EJB endpoint and a Java servlet endpoint. Both endpoints share
+Jakarta EE EJB endpoint and a Java servlet endpoint. Both endpoints share
 the same service endpoint interface. The service endpoint interface
 defines a single operation, `sayHello`, which takes a string argument,
 and returns a `String` composed by pre-pending `Hello` to the invocation argument.
@@ -902,9 +902,9 @@
 
 For additional information about message security, see the following documentation:
 
-* "http://docs.oracle.com/javaee/7/tutorial/doc/security-intro.html[Introduction
-to Security in the Java EE Platform]" in The Java EE 8 Tutorial
-* "link:../application-development-guide/securing-apps.html#GSDVG00006[Securing Applications]" in GlassFish Server Open
-Source Edition Application Development Guide
+* https://eclipse-ee4j.github.io/jakartaee-tutorial/#security-2[
+Introduction to Security in the Jakarta EE Platform] in The Jakarta EE Tutorial
+* "link:../application-development-guide/securing-apps.html#GSDVG00006[Securing Applications]"
+in GlassFish Server Open Source Edition Application Development Guide
 
 
diff --git a/docs/security-guide/src/main/jbake/content/preface.adoc b/docs/security-guide/src/main/jbake/content/preface.adoc
index c99ded1..e680724 100644
--- a/docs/security-guide/src/main/jbake/content/preface.adoc
+++ b/docs/security-guide/src/main/jbake/content/preface.adoc
@@ -20,29 +20,26 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
 ====
 
 The GlassFish Server Open Source Edition Security Guide provides
-instructions for configuring and administering GlassFish Server
-security.
+instructions for configuring and administering GlassFish Server security.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `https://javaee.github.io/glassfish/`. The
-GlassFish project provides a structured process for developing the
-GlassFish Server platform that makes the new features of the Java EE
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
 platform available faster, while maintaining the most important feature
-of Java EE: compatibility. It enables Java developers to access the
+of Jakarta EE: compatibility. It enables Java developers to access the
 GlassFish Server source code and to contribute to the development of the
-GlassFish Server. The GlassFish project is designed to encourage
-communication between Oracle engineers and the community.
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -63,7 +60,7 @@
 system installation. For an introduction to GlassFish Server, refer to
 the books in the order in which they are listed in the following table.
 
-[width="100%",cols="30%,70%",options="header",]
+[width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
 |link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
@@ -71,142 +68,138 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSSCG00136]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform]
-(`(https://javaee.github.io/firstcup/`). For beginning Java EE
-programmers, this short tutorial explains the entire process for
-developing a simple enterprise application. The sample application is a
-web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service, and a
-JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 8
-Tutorial] (`https://javaee.github.io/tutorial/`). This comprehensive
-tutorial explains how to use Java EE 8 platform technologies and APIs to
-develop Java EE applications.
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
+and a JavaServer Faces component for the web front end.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 8 of Java EE is located at
-`https://javaee.github.io/javaee-spec/`.
-* The API specification for GlassFish Server 7, including Java EE 8
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`https://javaee.github.io/glassfish/documentation`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications] (`https://javaee.github.io/javaee-spec/`) might be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Apache Derby database for use with the
-GlassFish Server, see the https://db.apache.org/derby/[Apache Derby
-product page] (`https://db.apache.org/derby/`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page] (`https://github.com/javaee/glassfish-samples`).
-
-[[GSSCG00137]][[fwbkx]]
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 
 [[typographic-conventions]]
@@ -216,33 +209,35 @@
 The following table describes the typographic changes that are used in
 this book.
 
-[width="100%",cols="14%,37%,49%",options="header",]
+[width="100%",cols="<14%,<37%,<49%",options="header",]
 |===
 |Typeface |Meaning |Example
-|`AaBbCc123` |The names of commands, files, and directories, and
-onscreen computer output a|
-Edit your `.login` file.
+
+|`AaBbCc123`
+|The names of commands, files, and directories, and onscreen computer output
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
-|AaBbCc123 |A placeholder to be replaced with a real name or value |The
-command to remove a file is `rm` filename.
+|AaBbCc123
+|A placeholder to be replaced with a real name or value
+|The command to remove a file is `rm` filename.
 
-|AaBbCc123 |Book titles, new terms, and terms to be emphasized (note
-that some emphasized items appear bold online) a|
-Read Chapter 6 in the User's Guide.
+|AaBbCc123
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
 Do not save the file.
-
 |===
 
 
@@ -255,28 +250,39 @@
 
 The following table explains symbols that might be used in this book.
 
-[width="100%",cols="10%,26%,28%,36%",options="header",]
+[width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
@@ -290,35 +296,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="14%,34%,52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
 
 |as-install
 a|Represents the base installation directory for GlassFish Server.
-
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
-|Represents the parent of the base installation
-directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+|Represents the parent of the base installation directory for GlassFish Server.
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
-
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -326,16 +329,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored.
-
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
 
-
diff --git a/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc b/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
index 3c86f5f..29e7741 100644
--- a/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
+++ b/docs/security-guide/src/main/jbake/content/running-in-secure-environment.adoc
@@ -39,7 +39,7 @@
 Determining Your Security Needs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Before you deploy GlassFish Server and your Java EE applications into a
+Before you deploy GlassFish Server and your Jakarta EE applications into a
 production environment, determine your security needs and make sure that
 you take the appropriate security measures, as described in the
 following sections:
@@ -136,25 +136,24 @@
 If your applications can run on the Web Profile, use that instead of the
 Full Platform.
 
-Starting in Java EE 6, Java EE introduced the concept of profiles. A
-profile is a collection of Java EE technologies and APIs that address
+Starting in Jakarta EE 6, Jakarta EE introduced the concept of profiles. A
+profile is a collection of Jakarta EE technologies and APIs that address
 specific developer communities and application types.
 
 The following profiles are implemented through the distributions of
 GlassFish Server:
 
-* Full Platform -The full Java EE platform is designed for developers
-who require the full set of Java EE APIs for enterprise application
-development, and is installed when you install GlassFish Server. This
-profile is also installed as part of the Java EE 8 SDK installation.
+* Full Platform -The full Jakarta EE platform is designed for developers
+who require the full set of Jakarta EE APIs for enterprise application
+development, and is installed when you install GlassFish Server.
 * Web Profile -This profile contains Web technologies that are a subset
 of the full Java platform, and is designed for developers who do not
-require the full set of Java EE APIs. This profile is also installed
-with Java EE 8 Web Profile SDK.
+require the full set of Jakarta EE APIs.
 
-For the list of APIs in each profile, see "link:../release-notes/release-notes.html#GSRLN00136[Java EE
-Standards Support]" in GlassFish Server Open Source Edition Release
-Notes.
+For the list of APIs in each profile, see
+"link:../release-notes/release-notes.html#GSRLN00136[
+Jakarta EE Standards Support]"
+in GlassFish Server Open Source Edition Release Notes.
 
 [[gksct]][[GSSCG00173]][[securing-the-glassfish-server-host]]
 
@@ -401,7 +400,7 @@
 
 |Deploy production-ready security providers to the security realm. a|
 Java Authorization Contract for Containers (JACC) is the part of the
-Java EE specification that defines an interface for pluggable
+Jakarta EE specification that defines an interface for pluggable
 authorization providers. This enables you to set up third-party plug-in
 modules to perform authorization.
 
diff --git a/docs/security-guide/src/main/jbake/content/system-security.adoc b/docs/security-guide/src/main/jbake/content/system-security.adoc
index 3c67473..4cfc9d5 100644
--- a/docs/security-guide/src/main/jbake/content/system-security.adoc
+++ b/docs/security-guide/src/main/jbake/content/system-security.adoc
@@ -44,7 +44,7 @@
 applications can run safely, without potential risk to systems or users.
 System security affects all the applications in the GlassFish Server environment.
 
-The Java EE Security API specification defines portable, plug-in
+The Jakarta EE Security API specification defines portable, plug-in
 interfaces for authentication and identity stores, and a new
 injectable-type SecurityContext interface that provides an access point
 for programmatic security. You can use the built-in implementations of
@@ -86,9 +86,9 @@
 ++++++++++++++++++++
 
 Within its deployment descriptors, an application can specify the type
-of authentication that it uses. The Java EE Security API provides an
+of authentication that it uses. The Jakarta EE Security API provides an
 alternative mechanism for configuring the type of authentication an
-application uses. See https://jcp.org/en/jsr/detail?id=375[Java EE
+application uses. See https://jcp.org/en/jsr/detail?id=375[Jakarta EE
 Security API 1.0 specification]. GlassFish Server supports specifying
 the following types of authentication in deployment descriptors:
 
@@ -119,7 +119,7 @@
 JSR 375 Authentication Mechanisms and Identity Stores
 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-The Java EE Security API defines the `HttpAuthenticationMechanism`
+The Jakarta EE Security API defines the `HttpAuthenticationMechanism`
 interface, the `IdentityStore` and `IdentityStoreHandler` interfaces.
 
 The `HttpAuthenticationMechanism` interface defines an SPI for writing
@@ -440,7 +440,7 @@
 ++++++++++++++++++++++++++++++++++++++++++
 
 Java Authorization Contract for Containers (JACC) is the part of the
-Java EE specification that defines an interface for pluggable
+Jakarta EE specification that defines an interface for pluggable
 authorization providers. This enables you to set up third-party plug-in
 modules to perform authorization. By default, the GlassFish Server
 provides a simple, file-based authorization engine that complies with
diff --git a/docs/security-guide/src/main/jbake/content/user-security.adoc b/docs/security-guide/src/main/jbake/content/user-security.adoc
index 01b6599..ae684fd 100644
--- a/docs/security-guide/src/main/jbake/content/user-security.adoc
+++ b/docs/security-guide/src/main/jbake/content/user-security.adoc
@@ -38,9 +38,9 @@
 Stores. It also provides two built-in providers. This mechanism is
 conceptually similar to Authentication Realms, but can be configured and
 managed by applications. See
-https://javaee.github.io/tutorial/security-intro005a.html#working-with-identity-stores[Working
-with Identity Stores] in The Java EE Tutorial for more information about
-Identity Stores.
+https://eclipse-ee4j.github.io/jakartaee-tutorial/#working-with-identity-stores[
+Working with Identity Stores]
+in The Jakarta EE Tutorial for more information about Identity Stores.
 ====
 
 [[ggkuk]][[GSSCG00151]][[administering-authentication-realms]]
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc b/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
index 701d318..45635aa 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/faqs.adoc
@@ -109,7 +109,7 @@
 
 GlassFish Server has a highly modular architecture that enables you to
 add new types of containers that handle many application types, not just
-Java EE. GlassFish Server defines a service provider interface (SPI),
+Jakarta EE. GlassFish Server defines a service provider interface (SPI),
 which container developers implement. The GlassFish Server framework
 then invokes the container's implementation of the SPI to detect,
 deploy, and manage applications of the new type.
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc b/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
index f50a3ec..d46ad5c 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/preface.adoc
@@ -9,8 +9,6 @@
 =======
 
 [[GSTSG00001]][[gkbfu]]
-
-
 [[preface]]
 Preface
 -------
@@ -22,7 +20,7 @@
 Java Enterprise Edition or Orace GlassFish. The documentation is in the
 process of being revised to reflect the new Jakarta EE branding.
 Additional changes will be made as requirements and procedures evolve
-for Jakarta EE. Where applicable, references to Java EE or Java
+for Jakarta EE. Where applicable, references to Jakarta EE or Java
 Enterprise Edition should be considered references to Jakarta EE.
 
 Please see the Title page for additional license information.
@@ -32,18 +30,16 @@
 GlassFish Server Open Source Edition and how to solve them.
 
 This preface contains information about and conventions for the entire
-GlassFish Server Open Source Edition (GlassFish Server) documentation
-set.
+GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `http://glassfish.java.net/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -55,7 +51,6 @@
 
 [[GSTSG00031]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -72,146 +67,138 @@
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
 
-|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide] |Explains how to get started with the
-GlassFish Server product.
+|link:../quick-start-guide/toc.html#GSQSG[Quick Start Guide]
+|Explains how to get started with the GlassFish Server product.
 
-|link:../installation-guide/toc.html#GSING[Installation Guide] |Explains how to install the software
-and its components.
+|link:../installation-guide/toc.html#GSING[Installation Guide]
+|Explains how to install the software and its components.
 
-|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide] |Explains how to upgrade to the latest
-version of GlassFish Server. This guide also describes differences
-between adjacent product releases and configuration options that can
-result in incompatibility with the product specifications.
+|link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
+|Explains how to upgrade to the latest version of GlassFish Server.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
-|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide] |Explains how to build a
-production deployment of GlassFish Server that meets the requirements of
+|link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
 your system and enterprise.
 
-|link:../administration-guide/toc.html#GSADG[Administration Guide] |Explains how to configure, monitor,
-and manage GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility. Instructions for
-performing these tasks from the Administration Console are provided in
-the Administration Console online help.
+|link:../administration-guide/toc.html#GSADG[Administration Guide]
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
-|link:../security-guide/toc.html#GSSCG[Security Guide] |Provides instructions for configuring and
-administering GlassFish Server security.
+|link:../security-guide/toc.html#GSSCG[Security Guide]
+|Provides instructions for configuring and administering GlassFish Server security.
 
-|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide] |Explains how to assemble and
-deploy applications to the GlassFish Server and provides information
+|link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
 about deployment descriptors.
 
-|link:../application-development-guide/toc.html#GSDVG[Application Development Guide] |Explains how to create and
-implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
 
-|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide] |Explains how to run applications in
-embedded GlassFish Server and to develop applications in which GlassFish
-Server is embedded.
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
-|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide] |Explains how to
-configure GlassFish Server to provide higher availability and
+|link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
+
+|link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
+|Explains how to configure GlassFish Server to provide higher availability and
 scalability through failover and load balancing.
 
-|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide] |Explains how to optimize the
-performance of GlassFish Server.
+|link:../performance-tuning-guide/toc.html#GSPTG[Performance Tuning Guide]
+|Explains how to optimize the performance of GlassFish Server.
 
-|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide] |Describes common problems that you
-might encounter when using GlassFish Server and explains how to solve
-them.
+|link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
-|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference] |Describes error messages that you
-might encounter when using GlassFish Server.
+|link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
+|Describes error messages that you might encounter when using GlassFish Server.
 
-|link:../reference-manual/toc.html#GSRFM[Reference Manual] |Provides reference information in man
-page format for GlassFish Server administration commands, utility
+|link:../reference-manual/toc.html#GSRFM[Reference Manual]
+|Provides reference information in man page format for GlassFish Server administration commands, utility
 commands, and related concepts.
 
-|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes] |Describes new features,
-compatibility issues, and existing bugs for Open Message Queue.
+|link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
+|Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
-|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview] |Provides an introduction
-to the technology, concepts, architecture, capabilities, and features of
+|link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
 the Message Queue messaging service.
 
-|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide] |Explains how to set up
-and manage a Message Queue messaging system.
+|link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
+|Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients] |Describes
-the application programming interface in Message Queue for
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
+|Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients] |Provides
-information about concepts and procedures for developing Java messaging
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
+|Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients] |Provides
-programming and reference information for developers working with
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
+|Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
-Queue messaging service to send, receive, and process Message Queue
-messages.
+Queue messaging service to send, receive, and process Message Queue messages.
 |===
 
 
 [[GSTSG00032]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform]
-(`http://docs.oracle.com/javaee/7/firstcup/doc/home.html`). For beginning
-Java EE programmers, this short tutorial explains the entire process for
-developing a simple enterprise application. The sample application is a
-web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service, and a
-JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 7
-Tutorial] (`http://docs.oracle.com/javaee/7/tutorial/doc/home.html`).
-This comprehensive tutorial explains how to use Java EE 7 platform
-technologies and APIs to develop Java EE applications.
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
+and a JavaServer Faces component for the web front end.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 7 of Java EE is located at
-`http://docs.oracle.com/javaee/7/api/`.
-* The API specification for GlassFish Server 7, including Java EE 7
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`http://glassfish.java.net/nonav/docs/v3/api/`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[Java EE
-Specifications]
-(`http://www.oracle.com/technetwork/java/javaee/tech/index.html`) might
-be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Java DB database for use with the GlassFish
-Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Java
-DB product page]
-(`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page] (`http://glassfish-samples.java.net/`).
-
-[[GSTSG00033]][[fwbkx]]
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 
 [[typographic-conventions]]
@@ -227,7 +214,7 @@
 
 |`AaBbCc123`
 |The names of commands, files, and directories, and onscreen computer output
-a|Edit your `.login` file.
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
@@ -235,7 +222,7 @@
 
 |`AaBbCc123`
 |What you type, contrasted with onscreen computer output
-a|`machine_name%` `su`
+|`machine_name%` `su`
 
 `Password:`
 
@@ -244,9 +231,8 @@
 |The command to remove a file is `rm` filename.
 
 |AaBbCc123
-|Book titles, new terms, and terms to be emphasized
-(note that some emphasized items appear bold online)
-a|Read Chapter 6 in the User's Guide.
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
@@ -256,7 +242,6 @@
 
 [[GSTSG00034]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
@@ -266,31 +251,41 @@
 [width="100%",cols="<10%,<26%,<28%,<36%",options="header",]
 |===
 |Symbol |Description |Example |Meaning
-|`[ ]` |Contains optional arguments and command options. |`ls [-l]` |The
-`-l` option is not required.
 
-|`{ \| }` |Contains a set of choices for a required command option.
-|`-d {y\|n}` |The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|`[ ]`
+|Contains optional arguments and command options.
+|`ls [-l]`
+|The `-l` option is not required.
 
-|`${ }` |Indicates a variable reference. |`${com.sun.javaRoot}`
+|`{ \| }`
+|Contains a set of choices for a required command option.
+|`-d {y\|n}`
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
+
+|`${ }`
+|Indicates a variable reference.
+|`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|- |Joins simultaneous multiple keystrokes. |Control-A |Press the
-Control key while you press the A key.
+|`-`
+|Joins simultaneous multiple keystrokes.
+|Control-A
+|Press the Control key while you press the A key.
 
-|+ + |Joins consecutive multiple keystrokes. |Ctrl+A+N |Press the
-Control key, release it, and then press the subsequent keys.
+|`+`
+|Joins consecutive multiple keystrokes.
+|Ctrl+A+N
+|Press the Control key, release it, and then press the subsequent keys.
 
-|> |Indicates menu item selection in a graphical user interface. |File >
-New > Templates |From the File menu, choose New. From the New submenu,
-choose Templates.
+|`>`
+|Indicates menu item selection in a graphical user interface.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSTSG00035]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -298,35 +293,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="<14%,<34%,<52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
 
 |as-install
 a|Represents the base installation directory for GlassFish Server.
-
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
-
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -334,15 +326,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored.
-
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
-
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
+
diff --git a/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc b/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
index 097093a..9678110 100644
--- a/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
+++ b/docs/troubleshooting-guide/src/main/jbake/content/specific-issues.adoc
@@ -818,8 +818,8 @@
 have examined them.
 
 For information related to uninstallation, see
-"link:../installation-guide/uninstalling.html#GSING00003[Uninstalling GlassFish Server 3.1]" in GlassFish
-Server Open Source Edition Installation Guide.
+"link:../installation-guide/uninstalling.html#GSING00003[Uninstalling GlassFish]"
+in GlassFish Server Open Source Edition Installation Guide.
 
 [[ghvrh]][[GSTSG00056]][[issues-related-to-security]]
 
diff --git a/docs/upgrade-guide/src/main/jbake/content/preface.adoc b/docs/upgrade-guide/src/main/jbake/content/preface.adoc
index 68b996d..e8b03ea 100644
--- a/docs/upgrade-guide/src/main/jbake/content/preface.adoc
+++ b/docs/upgrade-guide/src/main/jbake/content/preface.adoc
@@ -15,37 +15,35 @@
 Preface
 -------
 
-This guide explains how to upgrade to GlassFish Server Open Source
-Edition 7 from previous GlassFish Server and Sun GlassFish Enterprise
-Server product releases. Also included in this guide are instructions
-for upgrading configuration data and Java EE applications from
-binary-compatible earlier versions of this software to work with
-GlassFish Server Open Source Edition 7. Finally, this guide describes
-compatibility issues that affect data and applications that are to be
-migrated.
+This guide explains how to upgrade to {productName} from previous
+of GlassFish Server and Sun GlassFish Enterprise Server product releases.
+Also included in this guide are instructions for upgrading configuration
+data and Jakarta EE applications from binary-compatible earlier versions
+of this software to work with GlassFish Server.
+Finally, this guide describes compatibility issues that affect data
+and applications that are to be migrated.
 
 [NOTE]
 ====
 The main thrust of the GlassFish Server Open Source Edition 7 release
 is to provide an application server for developers to explore and begin
-exploiting the new and updated technologies in the Java EE 7 platform.
+exploiting the new and updated technologies in the Jakarta EE 10 platform.
 Thus, the upgrade feature of GlassFish Server was not a focus of this
 release. The feature is included in the release, but it may not function
-properly with some of the new features added in support of the Java EE 7 platform.
+properly with some of the new features added in support of the Jakarta EE 10 platform.
 ====
 
 This preface contains information about and conventions for the entire
 GlassFish Server Open Source Edition (GlassFish Server) documentation set.
 
 GlassFish Server 7 is developed through the GlassFish project
-open-source community at `http://glassfish.java.net/`. The GlassFish
-project provides a structured process for developing the GlassFish
-Server platform that makes the new features of the Java EE platform
-available faster, while maintaining the most important feature of Java
-EE: compatibility. It enables Java developers to access the GlassFish
-Server source code and to contribute to the development of the GlassFish
-Server. The GlassFish project is designed to encourage communication
-between Oracle engineers and the community.
+open-source community at https://github.com/eclipse-ee4j/glassfish.
+The GlassFish project provides a structured process for developing the
+GlassFish Server platform that makes the new features of the Jakarta EE
+platform available faster, while maintaining the most important feature
+of Jakarta EE: compatibility. It enables Java developers to access the
+GlassFish Server source code and to contribute to the development of the
+GlassFish Server.
 
 The following topics are addressed here:
 
@@ -57,7 +55,6 @@
 
 [[GSUPG00020]][[ghpbz]]
 
-
 [[glassfish-server-documentation-set]]
 Eclipse GlassFish Server Documentation Set
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -69,9 +66,7 @@
 [width="100%",cols="<30%,<70%",options="header",]
 |===
 |Book Title |Description
-
-|link:../release-notes/toc.html#GSRLN[Release Notes]
-|Provides late-breaking information about
+|link:../release-notes/toc.html#GSRLN[Release Notes] |Provides late-breaking information about
 the software and the documentation and includes a comprehensive,
 table-based summary of the supported hardware, operating system, Java
 Development Kit (JDK), and database drivers.
@@ -84,38 +79,42 @@
 
 |link:../upgrade-guide/toc.html#GSUPG[Upgrade Guide]
 |Explains how to upgrade to the latest version of GlassFish Server.
-This guide also describes differences between adjacent product releases
-and configuration options that can result in incompatibility
-with the product specifications.
+This guide also describes differences between adjacent product releases and configuration
+options that can result in incompatibility with the product specifications.
 
 |link:../deployment-planning-guide/toc.html#GSPLG[Deployment Planning Guide]
-|Explains how to build a production deployment of GlassFish Server
-that meets the requirements of your system and enterprise.
+|Explains how to build a production deployment of GlassFish Server that meets the requirements of
+your system and enterprise.
 
 |link:../administration-guide/toc.html#GSADG[Administration Guide]
-|Explains how to configure, monitor, and manage
-GlassFish Server subsystems and components from the command
-line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`] utility.
-Instructions for performing these tasks from the Administration Console
-are provided in the Administration Console online help.
+|Explains how to configure, monitor, and manage GlassFish Server subsystems and components
+from the command line by using the link:../reference-manual/asadmin.html#GSRFM00263[`asadmin`(1M)] utility.
+Instructions for performing these tasks from the Administration Console are provided
+in the Administration Console online help.
 
 |link:../security-guide/toc.html#GSSCG[Security Guide]
 |Provides instructions for configuring and administering GlassFish Server security.
 
 |link:../application-deployment-guide/toc.html#GSDPG[Application Deployment Guide]
-|Explains how to assemble and deploy applications to the GlassFish Server
-and provides information about deployment descriptors.
+|Explains how to assemble and deploy applications to the GlassFish Server and provides information
+about deployment descriptors.
 
 |link:../application-development-guide/toc.html#GSDVG[Application Development Guide]
-|Explains how to create and implement Java Platform, Enterprise Edition (Java EE platform)
-applications that are intended to run on the GlassFish Server. These
-applications follow the open Java standards model for Java EE components
-and application programmer interfaces (APIs). This guide provides
-information about developer tools, security, and debugging.
+|Explains how to create and implement Java Platform, Enterprise Edition (Jakarta EE platform)
+applications that are intended to run on the GlassFish Server.
+These applications follow the open Java standards model for Jakarta EE components
+and application programmer interfaces (APIs).
+This guide provides information about developer tools, security, and debugging.
+
+|link:../add-on-component-development-guide/toc.html#GSACG[Add-On Component Development Guide]
+|Explains how to use published interfaces of GlassFish Server to develop add-on components
+for GlassFish Server.
+This document explains how to perform only those tasks that ensure that the add-on component
+is suitable for GlassFish Server.
 
 |link:../embedded-server-guide/toc.html#GSESG[Embedded Server Guide]
-|Explains how to run applications in embedded GlassFish Server and to develop
-applications in which GlassFish Server is embedded.
+|Explains how to run applications in embedded GlassFish Server and to develop applications
+in which GlassFish Server is embedded.
 
 |link:../ha-administration-guide/toc.html#GSHAG[High Availability Administration Guide]
 |Explains how to configure GlassFish Server to provide higher availability and
@@ -125,39 +124,35 @@
 |Explains how to optimize the performance of GlassFish Server.
 
 |link:../troubleshooting-guide/toc.html#GSTSG[Troubleshooting Guide]
-|Describes common problems that you might encounter when using
-GlassFish Server and explains how to solve them.
+|Describes common problems that you might encounter when using GlassFish Server and explains how to solve them.
 
 |link:../error-messages-reference/toc.html#GSEMR[Error Message Reference]
 |Describes error messages that you might encounter when using GlassFish Server.
 
 |link:../reference-manual/toc.html#GSRFM[Reference Manual]
-|Provides reference information in man page format for
-GlassFish Server administration commands, utility commands, and related concepts.
+|Provides reference information in man page format for GlassFish Server administration commands, utility
+commands, and related concepts.
 
 |link:../../openmq/mq-release-notes/toc.html#GMRLN[Message Queue Release Notes]
 |Describes new features, compatibility issues, and existing bugs for Open Message Queue.
 
 |link:../../openmq/mq-tech-over/toc.html#GMTOV[Message Queue Technical Overview]
-|Provides an introduction to the technology, concepts, architecture, capabilities,
-and features of the Message Queue messaging service.
+|Provides an introduction to the technology, concepts, architecture, capabilities, and features of
+the Message Queue messaging service.
 
 |link:../../openmq/mq-admin-guide/toc.html#GMADG[Message Queue Administration Guide]
 |Explains how to set up and manage a Message Queue messaging system.
 
-|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[
-Message Queue Developer's Guide for JMX Clients]
+|link:../../openmq/mq-dev-guide-jmx/toc.html#GMJMG[Message Queue Developer's Guide for JMX Clients]
 |Describes the application programming interface in Message Queue for
 programmatically configuring and monitoring Message Queue resources in
 conformance with the Java Management Extensions (JMX).
 
-|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[
-Message Queue Developer's Guide for Java Clients]
+|link:../../openmq/mq-dev-guide-java/toc.html#GMJVG[Message Queue Developer's Guide for Java Clients]
 |Provides information about concepts and procedures for developing Java messaging
 applications (Java clients) that work with GlassFish Server.
 
-|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[
-Message Queue Developer's Guide for C Clients]
+|link:../../openmq/mq-dev-guide-c/toc.html#GMCCG[Message Queue Developer's Guide for C Clients]
 |Provides programming and reference information for developers working with
 Message Queue who want to use the C language binding to the Message
 Queue messaging service to send, receive, and process Message Queue messages.
@@ -166,60 +161,48 @@
 
 [[GSUPG00021]][[giprl]]
 
-
 [[related-documentation]]
 Related Documentation
 ~~~~~~~~~~~~~~~~~~~~~
 
-The following tutorials explain how to develop Java EE applications:
+The following tutorials explain how to develop Jakarta EE applications:
 
-* http://docs.oracle.com/javaee/7/firstcup/doc/home.html[Your First Cup:
-An Introduction to the Java EE Platform]
-(`http://docs.oracle.com/javaee/7/firstcup/doc/home.html`). For beginning
-Java EE programmers, this short tutorial explains the entire process for
-developing a simple enterprise application. The sample application is a
-web application that consists of a component that is based on the
-Enterprise JavaBeans specification, a JAX-RS web service, and a
-JavaServer Faces component for the web front end.
-* http://docs.oracle.com/javaee/7/tutorial/doc/home.html[The Java EE 7
-Tutorial] (`http://docs.oracle.com/javaee/7/tutorial/doc/home.html`).
-This comprehensive tutorial explains how to use Java EE 7 platform
-technologies and APIs to develop Java EE applications.
+* https://github.com/eclipse-ee4j/jakartaee-firstcup-examples[
+Your First Cup: An Introduction to the Jakarta EE Platform].
+For beginning Jakarta EE programmers, this short tutorial explains the entire
+process for developing a simple enterprise application.
+The sample application is a web application that consists of a component that is
+based on the Enterprise JavaBeans specification, a JAX-RS web service,
+and a JavaServer Faces component for the web front end.
+
+* https://eclipse-ee4j.github.io/jakartaee-tutorial[The Jakarta EE Tutorial].
+This comprehensive tutorial explains how to use Jakarta EE platform technologies
+and APIs to develop Jakarta EE applications.
 
 Javadoc tool reference documentation for packages that are provided with
 GlassFish Server is available as follows.
 
-* The API specification for version 7 of Java EE is located at
-`http://docs.oracle.com/javaee/7/api/`.
-* The API specification for GlassFish Server 7, including Java EE 7
+* The Jakarta EE specifications and API specification is
+located at https://jakarta.ee/specifications/.
+
+* The API specification for GlassFish Server 7, including Jakarta EE
 platform packages and nonplatform packages that are specific to the
 GlassFish Server product, is located at
-`http://glassfish.java.net/nonav/docs/v3/api/`.
-
-Additionally, the
-http://www.oracle.com/technetwork/java/javaee/tech/index.html[
-Java EE Specifications]
-(`http://www.oracle.com/technetwork/java/javaee/tech/index.html`)
-might be useful.
+https://glassfish.org/docs/.
 
 For information about creating enterprise applications in the NetBeans
 Integrated Development Environment (IDE), see the
-http://www.netbeans.org/kb/[NetBeans Documentation, Training & Support
-page] (`http://www.netbeans.org/kb/`).
+https://netbeans.apache.org/kb/docs/java-ee.html[
+NetBeans Documentation, Training & Support page].
 
-For information about the Java DB database for use with the GlassFish
-Server, see the
-http://www.oracle.com/technetwork/java/javadb/overview/index.html[Java
-DB product page]
-(`http://www.oracle.com/technetwork/java/javadb/overview/index.html`).
+For information about the Derby database for use with
+the GlassFish Server, see the https://db.apache.org/derby/index.html[Derby page].
 
-The Java EE Samples project is a collection of sample applications that
-demonstrate a broad range of Java EE technologies. The Java EE Samples
-are bundled with the Java EE Software Development Kit (SDK) and are also
-available from the http://glassfish-samples.java.net/[Java EE Samples
-project page] (`http://glassfish-samples.java.net/`).
-
-[[GSUPG00022]][[fwbkx]]
+The Jakarta EE Samples project is a collection of sample applications that
+demonstrate a broad range of Jakarta EE technologies. The Jakarta EE Samples
+are bundled with the Jakarta EE Software Development Kit (SDK) and are also
+available from the repository
+(`https://github.com/eclipse-ee4j/glassfish-samples`).
 
 
 [[typographic-conventions]]
@@ -235,14 +218,15 @@
 
 |`AaBbCc123`
 |The names of commands, files, and directories, and onscreen computer output
-a|Edit your `.login` file.
+|Edit your `.login` file.
 
 Use `ls` `a` to list all files.
 
 `machine_name% you have mail.`
 
-|`AaBbCc123` |What you type, contrasted with onscreen computer output a|
-`machine_name%` `su`
+|`AaBbCc123`
+|What you type, contrasted with onscreen computer output
+|`machine_name%` `su`
 
 `Password:`
 
@@ -251,9 +235,8 @@
 |The command to remove a file is `rm` filename.
 
 |AaBbCc123
-|Book titles, new terms, and terms to be emphasized
-(note that some emphasized items appear bold online)
-a|Read Chapter 6 in the User's Guide.
+|Book titles, new terms, and terms to be emphasized (note that some emphasized items appear bold online)
+|Read Chapter 6 in the User's Guide.
 
 A cache is a copy that is stored locally.
 
@@ -263,7 +246,6 @@
 
 [[GSUPG00023]][[fquvc]]
 
-
 [[symbol-conventions]]
 Symbol Conventions
 ~~~~~~~~~~~~~~~~~~
@@ -282,34 +264,32 @@
 |`{ \| }`
 |Contains a set of choices for a required command option.
 |`-d {y\|n}`
-|The `-d` option requires that you use either the `y`
-argument or the `n` argument.
+|The `-d` option requires that you use either the `y` argument or the `n` argument.
 
 |`${ }`
 |Indicates a variable reference.
 |`${com.sun.javaRoot}`
 |References the value of the `com.sun.javaRoot` variable.
 
-|-
+|`-`
 |Joins simultaneous multiple keystrokes.
 |Control-A
 |Press the Control key while you press the A key.
 
-|+
+|`+`
 |Joins consecutive multiple keystrokes.
 |Ctrl+A+N
 |Press the Control key, release it, and then press the subsequent keys.
 
-|>
+|`>`
 |Indicates menu item selection in a graphical user interface.
-|File > New > Templates |From the File menu, choose New.
-From the New submenu, choose Templates.
+|File > New > Templates
+|From the File menu, choose New. From the New submenu, choose Templates.
 |===
 
 
 [[GSUPG00024]][[ghpfg]]
 
-
 [[default-paths-and-file-names]]
 Default Paths and File Names
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -317,35 +297,32 @@
 The following table describes the default paths and file names that are
 used in this book.
 
-[width="100%",cols="<14%,<34%,<52%",options="header",]
+[%autowidth.stretch,options="header",]
 |===
 |Placeholder |Description |Default Value
 
 |as-install
 a|Represents the base installation directory for GlassFish Server.
-
 In configuration files, as-install is represented as follows:
-
 `${com.sun.aas.installRoot}`
-
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac OS operating system:
-
++
 user's-home-directory``/glassfish7/glassfish``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7\glassfish``
 
 |as-install-parent
 |Represents the parent of the base installation directory for GlassFish Server.
-a|Installations on the Oracle Solaris operating system, Linux operating
+a|* Installations on the Oracle Solaris operating system, Linux operating
 system, and Mac operating system:
-
++
 user's-home-directory``/glassfish7``
-
-Installations on the Windows operating system:
-
++
+* Installations on the Windows operating system:
++
 SystemDrive``:\glassfish7``
 
 |domain-root-dir
@@ -353,15 +330,13 @@
 |as-install``/domains/``
 
 |domain-dir
-a|Represents the directory in which a domain's configuration is stored.
-
+|Represents the directory in which a domain's configuration is stored.
 In configuration files, domain-dir is represented as follows:
-
 `${com.sun.aas.instanceRoot}`
-
-|domain-root-dir``/``domain-name
+|domain-root-dir/domain-name
 
 |instance-dir
 |Represents the directory for a server instance.
-|domain-dir``/``instance-name
+|domain-dir/instance-name
 |===
+
diff --git a/docs/upgrade-guide/src/main/jbake/content/title.adoc b/docs/upgrade-guide/src/main/jbake/content/title.adoc
index 0243b83..8ca9fe4 100644
--- a/docs/upgrade-guide/src/main/jbake/content/title.adoc
+++ b/docs/upgrade-guide/src/main/jbake/content/title.adoc
@@ -21,7 +21,7 @@
 This guide explains how to upgrade to Eclipse GlassFish Server 7
 from previous GlassFish Server and Sun GlassFish Enterprise
 Server product releases. Also included in this guide are instructions
-for upgrading configuration data and Java EE applications from
+for upgrading configuration data and Jakarta EE applications from
 binary-compatible earlier versions of this software to work with
 Eclipse GlassFish Server 7. Finally, this guide describes
 compatibility issues that affect data and applications that are to be
@@ -29,11 +29,11 @@
 
 Note: The main thrust of the Eclipse GlassFish Server 7
 release is to provide an application server for developers to explore
-and begin exploiting the new and updated technologies in the Java EE 7
+and begin exploiting the new and updated technologies in the Jakarta EE 10
 platform. Thus, the upgrade feature of GlassFish Server was not a focus
 of this release. The feature is included in the release, but it may not
 function properly with some of the new features added in support of the
-Java EE 7 platform.
+Jakarta EE 10 platform.
 
 [[sthref1]]
 
diff --git a/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc b/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
index df70b4d..f8e03db 100644
--- a/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
+++ b/docs/upgrade-guide/src/main/jbake/content/upgrade-compatibility-issues.adoc
@@ -122,16 +122,16 @@
 Application Client Interoperability
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The Java EE 6 platform specification imposes stricter requirements than
-Java EE 5 did on which JAR files can be visible to various modules
+The Jakarta EE 6 platform specification imposes stricter requirements than
+Jakarta EE 5 did on which JAR files can be visible to various modules
 within an EAR file. In particular, application clients must not have
 access to EJB JAR files or other JAR files in the EAR file unless they
 use a `Class-Path` header in the manifest file, or unless references use
 the standard Java SE mechanisms (extensions, for example), or use the
-Java EE `library-directory` mechanism. Deployed Java EE 5 applications
+Jakarta EE `library-directory` mechanism. Deployed Jakarta EE 5 applications
 that are upgraded to GlassFish Server 7 will have the `compatibility`
 property set to `v2` and will run without change on GlassFish Server 7. You may, however, want to consider modifying the applications to
-conform to Java EE 6 requirements.
+conform to Jakarta EE 6 requirements.
 
 If your upgrade includes a deployed application with an application
 client, you will need to retrieve the client stubs using GlassFish
diff --git a/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc b/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
index 4c2c141..af0a5cc 100644
--- a/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
+++ b/docs/upgrade-guide/src/main/jbake/content/upgrading-legacy-installation.adoc
@@ -466,16 +466,16 @@
 Components that may have incompatibilities are deployed on GlassFish
 Server 7 with the `compatibility` property set to `v2` and will run
 without change on GlassFish Server 7. You may, however, want to
-consider modifying the applications to conform to Java EE 6 requirements.
+consider modifying the applications to conform to Jakarta EE 6 requirements.
 
-The Java EE 6 platform specification imposes stricter requirements than
-Java EE 5 did on which JAR files can be visible to various modules
+The Jakarta EE 6 platform specification imposes stricter requirements than
+Jakarta EE 5 did on which JAR files can be visible to various modules
 within an EAR file. In particular, application clients must not have
 access to EJB JAR files or other JAR files in the EAR file unless they
 use a `Class-Path` header in the manifest file, or unless references use
 the standard Java SE mechanisms (extensions, for example), or use the
-Java EE `library-directory` mechanism. Setting the `library-directory`
-property to `v2` removes these Java EE 6 restrictions.
+Jakarta EE `library-directory` mechanism. Setting the `library-directory`
+property to `v2` removes these Jakarta EE 6 restrictions.
 
 Applications and components that are deployed in the source server are
 deployed on the target server during the upgrade. Applications that do