diff --git a/src/main/asciidoc/faces-intro/faces-intro005.adoc b/src/main/asciidoc/faces-intro/faces-intro005.adoc
index 0bf91968..069da435 100644
--- a/src/main/asciidoc/faces-intro/faces-intro005.adoc
+++ b/src/main/asciidoc/faces-intro/faces-intro005.adoc
@@ -45,37 +45,37 @@ This component is analogous to the `form` tag in HTML.
* `UIGraphic`: Displays an image.
-* `UIInput`: Takes data input from a user.
+* `UIOutput`: Displays data output on a page.
+
+** `UIInput`: Takes data input from a user.
This class is a subclass of `UIOutput`.
+*** `UISelectBoolean`: Allows a user to set a `boolean` value on a control by selecting or deselecting it.
+This class is a subclass of the `UIInput` class.
+
+*** `UISelectMany`: Allows a user to select multiple items from a group of items.
+This class is a subclass of the `UIInput` class.
+
+*** `UISelectOne`: Allows a user to select one item from a group of items.
+This class is a subclass of the `UIInput` class.
+
+*** `UIViewParameter`: Represents the query parameters in a request.
+This class is a subclass of the `UIInput` class.
+
* `UIMessage`: Displays a localized error message.
* `UIMessages`: Displays a set of localized error messages.
* `UIOutcomeTarget`: Displays a link in the form of a link or a button.
-* `UIOutput`: Displays data output on a page.
-
* `UIPanel`: Manages the layout of its child components.
* `UIParameter`: Represents substitution parameters.
-* `UISelectBoolean`: Allows a user to set a `boolean` value on a control by selecting or deselecting it.
-This class is a subclass of the `UIInput` class.
-
* `UISelectItem`: Represents a single item in a set of items.
* `UISelectItems`: Represents an entire set of items.
-* `UISelectMany`: Allows a user to select multiple items from a group of items.
-This class is a subclass of the `UIInput` class.
-
-* `UISelectOne`: Allows a user to select one item from a group of items.
-This class is a subclass of the `UIInput` class.
-
-* `UIViewParameter`: Represents the query parameters in a request.
-This class is a subclass of the `UIInput` class.
-
* `UIViewRoot`: Represents the root of the component tree.
In addition to extending `UIComponentBase`, the component classes also implement one or more behavioral interfaces, each of which defines certain behavior for a set of components whose classes implement the interface.
@@ -84,9 +84,8 @@ These behavioral interfaces, all defined in the `jakarta.faces.component` packag
* `ActionSource`: Indicates that the component can fire an action event.
This interface is intended for use with components based on JavaServer Faces technology 1.1_01 and earlier versions.
-This interface is deprecated in JavaServer Faces 2.
-* `ActionSource2`: Extends `ActionSource` and therefore provides the same functionality.
+** `ActionSource2`: Extends `ActionSource` and therefore provides the same functionality.
However, it allows components to use the Expression Language (EL) when they are referencing methods that handle action events.
* `EditableValueHolder`: Extends `ValueHolder` and specifies additional features for editable components, such as validation and emitting value-change events.
diff --git a/src/main/asciidoc/images/jakartaeett_dt_007.svg b/src/main/asciidoc/images/jakartaeett_dt_007.svg
index 5f6e489a..4ba4e2c2 100644
--- a/src/main/asciidoc/images/jakartaeett_dt_007.svg
+++ b/src/main/asciidoc/images/jakartaeett_dt_007.svg
@@ -1,8 +1,8 @@
-
diff --git a/src/main/asciidoc/images/jakartaeett_dt_008.svg b/src/main/asciidoc/images/jakartaeett_dt_008.svg
index a00ef13a..ced85be5 100644
--- a/src/main/asciidoc/images/jakartaeett_dt_008.svg
+++ b/src/main/asciidoc/images/jakartaeett_dt_008.svg
@@ -1,8 +1,8 @@
-
+
@@ -18,8 +18,8 @@
.st3 {fill:#cadaa9;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
.st4 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
.st5 {fill:#000000;font-family:Arial;font-size:0.666664em}
- .st6 {fill:#729fdc;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
- .st7 {fill:#f2f2f2;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st6 {fill:#f2f2f2;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st7 {font-size:1em}
.st8 {fill:#ffffff;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
.st9 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
]]>
@@ -31,249 +31,307 @@
v:shadowOffsetY="-8.50394"/>
Foglio.1
-
+
-
+ Foglio.2
-
+
-
+ Foglio.3
-
+
-
+ Foglio.5Java SE
-
-
- Java SE
-
+
+
+ Java SE
+ Foglio.9
-
+
-
+ Foglio.10
- Concurrency Utilities
+ Messaging
-
-
- Concurrency Utilities
-
+
+
+ Messaging
+ Foglio.11
-
+
-
+ Foglio.12
- Batch
+ Transactions
-
-
- Batch
-
+
+
+ Transactions
+ Foglio.13
-
+
-
+ Foglio.14
- JSON-P
+ Activation
-
-
- JSON-P
-
+
+
+ Activation
+ Foglio.15
-
+
-
+ Foglio.16
- Bean Validation
+ Mail
-
-
- Bean Validation
-
+
+
+ Mail
+ Foglio.21
-
+
-
+ Foglio.22
- Jakarta Mail
+ Connectors
-
-
- Jakarta Mail
-
+
+
+ Connectors
+ Foglio.25
-
+
-
+ Foglio.26
- Connectors
+ JSON Processing
-
-
- Connectors
-
+
+
+ JSON Processing
+ Foglio.27
-
+
-
+ Foglio.28
- Jakarta Persistence
+ JSON Binding
-
-
- Jakarta Persistence
-
+
+
+ JSON Binding
+ Foglio.29
-
+
-
+ Foglio.30
- JMS
+ Concurrency
-
-
- JMS
-
+
+
+ Concurrency
+ Foglio.31
-
+
-
+ Foglio.32
- Management
+ Batch
-
-
- Management
-
+
+
+ Batch
+ Foglio.33
-
+
-
+ Foglio.34
- WS Metadata
+ Authorization
-
-
- WS Metadata
-
+
+
+ Authorization
+ Foglio.35
-
+
-
+ Foglio.36
- Web Services
+ Authentication
-
-
- Web Services
-
+
+
+ Authentication
+ Foglio.37
-
+
-
+ Foglio.38
- JACC
+ Security
-
-
- JACC
-
+
+
+ Security
+ Foglio.39
-
+
-
+ Foglio.40
- JASPIC
+ Annotations
-
-
- JASPIC
-
+
+
+ Annotations
+ Foglio.41
-
+
-
+ Foglio.42
- JAX-RS
+ Persistence
-
-
- JAX-RS
-
+
+
+ Persistence
+ Foglio.43
-
+
-
+ Foglio.44
- JAX-WS
-
-
-
- JAX-WS
-
- Foglio.52
-
-
-
- Foglio.53
- New in Jakarta EE
+ Bean Validation
-
-
- New in Jakarta EE
-
+
+
+ Bean Validation
+ Foglio.54
-
+
-
+ Foglio.55
- JTA
+ Managed Beans
-
-
- JTA
-
+
+
+ Managed Beans
+ Foglio.56
-
+
-
+ Foglio.57
- CDI
+ Interceptors
+
+
+
+ Interceptors
+
+ Foglio.365
+ Enterprise Beans Container
+
+
+
+ Enterprise Beans Container
+
+ Foglio.421
+
+
+
+ Foglio.422
+ Enterprise Beans
-
-
- CDI
-
+
+
+ Enterprise Beans
+ Foglio.58
-
+
-
+ Foglio.59
+ Contexts and Dependency Injection
+
+
+
+ Contexts and Dependency Injection
+
+ Foglio.60
+
+
+
+ Foglio.61Dependency Injection
-
-
- Dependency Injection
-
- Foglio.365
- EJB Container
+
+
+ Dependency Injection
+
+ Foglio.62
+
+
+
+ Foglio.63
+ XML Binding
-
-
- EJB Container
-
- Foglio.421
-
+
+
+ XML Binding
+
+ Foglio.64
+
-
- Foglio.422
- EJB
+
+ Foglio.65
+ Enterprise Web Services
+
+
+
+ Enterprise Web Services
+
+ Foglio.66
+
+
+
+ Foglio.67
+ XML Web Services
+
+
+
+ XML Web Services
+
+ Foglio.68
+
+
+
+ Foglio.69
+ Web Services Metadata
+
+
+
+ Web Services Metadata
+
+ Foglio.70
+
+
+
+ Foglio.71
+ SOAP with Attachments
-
-
- EJB
+
+
+ SOAP with Attachments