Update docs based on a diff against the already converted pages docs

tck/tck-docs/userguide/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2017, 2022 Oracle and/or its affiliates and others.
+    Copyright (c) 2017, 2024 Oracle and/or its affiliates and others.
     All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.9</version>
     </parent>
     <groupId>org.glassfish</groupId>
     <artifactId>tck_servlet</artifactId>
     <packaging>pom</packaging>
-    <version>6.0.0</version>
-    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Servlet for Jakarta EE, Release 6.0</name>
+    <version>6.1.0</version>
+    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Servlet for Jakarta EE, Release 6.1</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,7 +49,7 @@
 
     <distributionManagement>
         <site>
-            <url>scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git</url>
+            <url>scm:git:git@github.com:jakartaee/servlet.git</url>
         </site>
     </distributionManagement>
 

tck/tck-docs/userguide/src/main/jbake/content/attributes.conf

@@ -1,13 +1,13 @@
 :TechnologyFullName: Jakarta Servlet
 :TechnologyShortName: Servlet
 :LegacyAcronym: Java Servlet		   
-:TechnologyVersion: 6.0
-:ReleaseDate: March 2022
-:CopyrightDates: 2017, 2022
-:TechnologyRI: Eclipse GlassFish 7.0
-:TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.glassfish
+:TechnologyVersion: 6.1
+:ReleaseDate: May 2024
+:CopyrightDates: 2017, 2024
+:TechnologyRI: Tomcat 11.0.0+
+:TechnologyRIURL: https://tomcat.apache.org/download-11.cgi
 :SpecificationURL: https://jakarta.ee/specifications/servlet/6.0/
-:TCKInquiryList: mailto:jakartaee-tck-dev@eclipse.org[jakartaee-tck-dev@eclipse.org]
+:TCKInquiryList: mailto:servlet-dev@eclipse.org[servlet-dev@eclipse.org]
 :SpecificationInquiryList: mailto:servlet-dev@eclipse.org[servlet-dev@eclipse.org]
 :techID: Servlet
 // Define this attribute (uncomment it) if the TCK includes no API tests.  (Rare.)
@@ -20,18 +20,16 @@
 //
 // The environment variable used to specify the home directory
 // for the technology.  Used in config.inc.
-:TechnologyHomeEnv: TS_HOME
+:TechnologyHomeEnv: JAVAEE_HOME
 // Java SE version required.
-:SEversion: 11
-:AntVersion: 1.10.0+
-:JakartaEEVersion: 10
-:JavaTestVersion: 5.0
-:jteFileName: <TS_HOME>/bin/ts.jte
-:jtxFileName: <TS_HOME>/bin/ts.jtx
-:TCKPackageName: jakarta-servlet-tck-6.0.0.zip
+:SEversion: 17
+:MavenVersion: 3.8.5+
+:JakartaEEVersion: 11
+:excludeListFileName: docs/TCK-Exclude-List.txt
+:TCKPackageName: jakarta-servlet-tck-6.1.0.zip
 // Directory names used in examples in using.adoc.
-:sigTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/signaturetest/servlet
-:singleTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/servlet/api/client
-:subsetTestDirectoryExample: <TS_HOME>/src/com/sun/ts/tests/servlet/api
+:sigTestDirectoryExample: servlet/tck/signature
+:singleTestDirectoryExample: servlet/tck/api/jakarta_servlet/asynccontext
+:subsetTestDirectoryExample: servlet/tck/api/jakarta_servlet
 // Define this attribute (uncomment it) if the TCK needs the rebuild appendix.
-:rebuild: 
+// :rebuild: