You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/16 11:14:31 UTC
(maven-doxia-site) 02/05: Point the XHTML rows at the module that still exists

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch fix-doc-rot
in repository https://gitbox.apache.org/repos/asf/maven-doxia-site.git

commit d7bafd8d1ca8fc738cea91b2e931441fcf61a144
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Aug 16 12:44:09 2026 +0200

    Point the XHTML rows at the module that still exists
    
    The format table linked doxia-module-xhtml, removed in 2.0; the current module
    is doxia-module-xhtml5. Source directory and parser id stay "xhtml" - only the
    artifact was renamed. XHTML 1.0 joins the former-formats table.
    
    That table declared four columns but supplied three separators, so "Removed
    Since" never rendered at all.
    
    Verified: mvn clean site -> former-formats table now renders 4 headers, 8 rows
---
 content/markdown/modules/index.md    |  2 +-
 content/markdown/references/index.md | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/content/markdown/modules/index.md b/content/markdown/modules/index.md
index ae74f4a..486cf45 100644
--- a/content/markdown/modules/index.md
+++ b/content/markdown/modules/index.md
@@ -64,7 +64,7 @@ XDoc is a legacy format for document into a styled HTML document based on XHTML
 
 ## <a id="XHTML"></a>XHTML
 
-[XHTML](https://html.spec.whatwg.org/multipage/xhtml.html) is a markup language with the same expressions as HTML, but also conforms to XML syntax.
+[XHTML](https://html.spec.whatwg.org/multipage/xhtml.html) is a markup language with the same expressions as HTML, but also conforms to XML syntax. Doxia supports it through the `doxia-module-xhtml5` module; the earlier XHTML 1\.0 module was removed in Doxia 2\.0\.
 
 **References**:
 
diff --git a/content/markdown/references/index.md b/content/markdown/references/index.md
index 98549cb..a5e65d9 100644
--- a/content/markdown/references/index.md
+++ b/content/markdown/references/index.md
@@ -32,7 +32,7 @@ The following table gives an overview of the markup languages currently supporte
 
 - if a _Sink_ is available, it means you can generate output in this format.
 
-The source directory is the directory under which Maven expects source documents in this format (e.g. `src/site/apt/` for Apt), the file extension is the default file extension, and the parser id is gives the unique identifier that is used by plexus to lookup the corresponding component. 
+The source directory is the directory under which Maven expects source documents in this format (e.g. `src/site/apt/` for Apt), the file extension is the default file extension, and the parser id is the unique identifier used to look up the corresponding component. 
 
 |Format|Short description|Parser<br />(input)|Sink<br />(output)|Source Directory|File Extension|Doxia Module|Parser Id|
 |---|---|---|---|---|---|---|---|
@@ -42,7 +42,7 @@ The source directory is the directory under which Maven expects source documents
 |[FML](./fml-format.html)|FAQ Markup Language|![Yes](../images/icon_success_sml.gif)|![No](../images/icon_error_sml.gif)|`fml`|`fml`|[`doxia-module-fml`](../doxia/doxia-modules/doxia-module-fml/)|`fml`|
 |[Markdown](./markdown-format.html)|Markdown markup language|![Yes](../images/icon_success_sml.gif)|![Yes](../images/icon_success_sml.gif)|`markdown`|`md`, `markdown`|[`doxia-module-markdown`](../doxia/doxia-modules/doxia-module-markdown/)|`markdown`|
 |[Xdoc](./xdoc-format.html)|XML Documentation Format|![Yes](../images/icon_success_sml.gif)|![Yes](../images/icon_success_sml.gif)|`xdoc`|`xml`|[`doxia-module-xdoc`](../doxia/doxia-modules/doxia-module-xdoc/)|`xdoc`|
-|[XHTML](../modules/index.html#XHTML)|Extensible Hypertext Markup Language|![Yes](../images/icon_success_sml.gif)|![Yes](../images/icon_success_sml.gif)|`xhtml`|`xhtml`|[`doxia-module-xhtml`](../doxia/doxia-modules/doxia-module-xhtml/)|`xhtml`|
+|[XHTML5](../modules/index.html#XHTML)|Extensible Hypertext Markup Language, HTML5 serialisation|![Yes](../images/icon_success_sml.gif)|![Yes](../images/icon_success_sml.gif)|`xhtml`|`xhtml`|[`doxia-module-xhtml5`](../doxia/doxia-modules/doxia-module-xhtml5/)|`xhtml`|
 
 Note some modules are not included per default with the site plugin. Have a look at the available modules here: [https://repo.maven.apache.org/maven2/org/apache/maven/doxia/](https://repo.maven.apache.org/maven2/org/apache/maven/doxia/).   
 
@@ -63,16 +63,17 @@ If you need to add module for the `maven-site-plugin` simply add it as a depende
 </plugin>
 ```
 
-# Former Doxia Formats
+## Former Doxia Formats
 
 The following table gives an overview of the formats which used to be supported mostly as Parser in former versions of Doxia: 
 
-|Format|Short description|Doxia Module|Removed Since
-|---|---|---|
-|iText|iText PDF Library|[`doxia-module-itext`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-itext/)|2.0
-|FO|XSL formatting objects (XSL-FO)|[`doxia-module-fo`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-fo/)|2.0
-|LaTeX|LaTeX typesetting system|[`doxia-module-latex`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-latex/)|2.0
-|RTF|Microsoft Rich Text Format|[`doxia-module-rtf`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-rtf/)|2.0
-|Confluence|Confluence Enterprise Wiki|[`doxia-module-confluence`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-confluence/)|2.0
-|Simplified DocBook|Simplified DocBook XML Standard|[`doxia-module-docbook-simple`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-docbook-simple/)|2.0
-|TWiki|TWiki Structured Wiki|[`doxia-module-twiki`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-twiki/)|2.0
+|Format|Short description|Doxia Module|Removed Since|
+|---|---|---|---|
+|iText|iText PDF Library|[`doxia-module-itext`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-itext/)|2.0|
+|FO|XSL formatting objects (XSL-FO)|[`doxia-module-fo`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-fo/)|2.0|
+|LaTeX|LaTeX typesetting system|[`doxia-module-latex`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-latex/)|2.0|
+|RTF|Microsoft Rich Text Format|[`doxia-module-rtf`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-rtf/)|2.0|
+|Confluence|Confluence Enterprise Wiki|[`doxia-module-confluence`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-confluence/)|2.0|
+|Simplified DocBook|Simplified DocBook XML Standard|[`doxia-module-docbook-simple`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-docbook-simple/)|2.0|
+|TWiki|TWiki Structured Wiki|[`doxia-module-twiki`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-twiki/)|2.0|
+|XHTML|XHTML 1.0, superseded by the XHTML5 module|[`doxia-module-xhtml`](../doxia-archives/doxia-1.11.1/doxia-modules/doxia-module-xhtml/)|2.0|