revert 50a635b, fix numbering, misc changes

user_guides/jakartaee/src/main/jbake/content/TCKpreface.adoc

@@ -27,16 +27,17 @@ Enterprise Edition should be considered references to Jakarta EE.
 Please see the Title page for additional license information.
 ========================================================================
 
-This book introduces the Test Compatibility Kit (TCK) for the Jakarta
-Platform 9 full profile (Jakarta EE 9) and Jakarta Platform 9 Web Profile (Jakarta EE 9 Web Profile), and explains how to
+This book introduces the Compatibility Test Suite (CTS) for the Jakarta
+Platform, Enterprise Edition 9 (Jakarta EE 9) and Jakarta Platform, Enterprise
+Edition 9 Web Profile (Jakarta EE 9 Web Profile), and explains how to
 configure and run the test suite. It also provides information for
 troubleshooting problems you may encounter as you run the test suite.
 
 The Jakarta Platform, Enterprise Edition 9 Compatibility Test Suite (Jakarta
-EE 9 Platform TCK) is a portable, configurable automated test suite for verifying
+EE 9 CTS) is a portable, configurable automated test suite for verifying
 the compatibility of an implementer's compliance with the Jakarta EE 9
 Specification (hereafter referred to as the implementer's implementation, or VI).
-The Jakarta EE 9 Platform TCK uses the JavaTest harness version 5.0 to run the
+The Jakarta EE 9 CTS uses the JavaTest harness version 5.0 to run the
 test suite.
 
 
@@ -72,7 +73,7 @@ programming language, the Jakarta Platform, Enterprise Edition 9 (Jakarta EE
 The Jakarta Platform, Enterprise Edition 9 (Jakarta EE 9) Specification can be
 downloaded from `https://projects.eclipse.org/projects/ee4j.jakartaee-platform`.
 
-For documentation on the test harness used for running the Jakarta EE 9 Platform TCK
+For documentation on the test harness used for running the Jakarta EE 9 CTS
 test suite, see
 `https://wiki.openjdk.java.net/display/CodeTools/Documentation`.
 

user_guides/jakartaee/src/main/jbake/content/building.adoc

@@ -22,7 +22,7 @@ to use Ant with the following targets to rebuild, list, and run tests:
 * `build`
 * `ld`, `lld`, `lc`, `llc`, `pd`, `pc`
 
-Implementers can only run the version of the tests provided with the TCK
+Implementers can only run the version of the tests provided with the CTS
 for certification, except in the case of rebuildable tests.
 
 This chapter includes the following topics:
@@ -39,12 +39,12 @@ This chapter includes the following topics:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Complete the following steps to set up your environment to build,
-deploy, and run the TCK tests using Ant. The following example is for
+deploy, and run the CTS tests using Ant. The following example is for
 the Solaris platform:
 
 1.  Set the following environment variables in your shell environment to
 use the build infrastructure that comes with the TCK:
-* `TS_HOME` to the directory in which the Jakarta EE 9 TCK software is
+* `TS_HOME` to the directory in which the Jakarta EE 9 CTS software is
 installed.
 * `TS_HOME/bin` to your `PATH` in your command shell.
 * C Shell: +
@@ -79,7 +79,7 @@ build infrastructure
 10.2 Building the Tests
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-To build the Jakarta EE 9 TCK tests using Ant, complete the following
+To build the Jakarta EE 9 CTS tests using Ant, complete the following
 steps:
 
 1.  To build a single test directory, type the following: +
@@ -118,7 +118,7 @@ ant pc
 10.3 Running the Tests
 ~~~~~~~~~~~~~~~~~~~~~~
 
-To run the Jakarta EE 9 TCK tests using Ant, use one of the following
+To run the Jakarta EE 9 CTS tests using Ant, use one of the following
 procedures.
 
 [[GFAOW]][[to-run-a-single-test-directory]]
@@ -222,20 +222,20 @@ HelloHome.class
 10.5 Debugging Service Tests
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The Jakarta EE 9 TCK service tests test the compatibility of the Jakarta
+The Jakarta EE 9 CTS service tests test the compatibility of the Jakarta
 Platform, Enterprise Edition Service APIs: Jakarta Mail, JDBC, Jakarta Messaging, Jakarta Transactions,
 Jakarta XML Web Services, Jakarta Web Services Metadata, Jakarta Annotations. The test suite contains sets of
-tests that the JavaTest harness, in conjunction with the Jakarta EE 9 TCK
+tests that the JavaTest harness, in conjunction with the Jakarta EE 9 CTS
 harness extensions, runs from different Jakarta Platform, Enterprise
 Edition containers (Jakarta Enterprise Beans, Jakarta Server Pages, Jakarta Servlet, and application
 client). The test suite wraps each of these tests inside generic
-components, called vehicles. Each Jakarta EE 9 TCK service test has been
+components, called vehicles. Each Jakarta EE 9 CTS service test has been
 set up to run in a default set of vehicles. Each technology's
 specification determines this set. When run as part of the certification
 process, all service API tests must pass in their default vehicle set.
 
 Refer to the `<TS_HOME>/src/vehicle.properties` file to for a list the
-default vehicle sets for the Jakarta EE 9 TCK service API tests.
+default vehicle sets for the Jakarta EE 9 CTS service API tests.
 
 To help you debug service API tests, the test suite provides a mechanism
 that allows for fine-grained control over which tests you can run in
@@ -278,7 +278,7 @@ Before you run the test or tests, you should temporarily rename the file
 `<TS_HOME>/src/testsuite.jtd`.
 
 Note that you must remove these properties before you run the Jakarta EE 9
-TCK test suite for certification.
+CTS test suite for certification.
 
 [[GFARW]][[obtaining-additional-debugging-information]]