diff --git a/release-notes/index.dita b/release-notes/index.dita index 2675ad3e..25650d16 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -8,7 +8,8 @@ - + DITA Open Toolkit is a maintenance release that fixes issues + reported in DITA-OT , which .

@@ -25,6 +26,49 @@ + + DITA-OT <keyword keyref="maintenance-version"/> + <!--<ph outputclass="small text-muted">released MMMM DD, YYYY</ph>--> + + +

+

DITA Open Toolkit is a maintenance release that includes the + following bug fixes.

+ + +
+ + + DITA-OT <keyword keyref="release"/> <ph outputclass="small text-muted"> released February 11, 2024</ph> @@ -40,12 +84,10 @@ </prolog> <refbody> <section> - <p><ph id="summary">DITA Open Toolkit Release <keyword - keyref="release" - /> uses map-first pre-processing for HTML5 - output and includes a new local configuration file, better CLI messages with support for overrides, a new - version of the Lightweight DITA plug-in with enhancements to Markdown processing, and updates for the latest - DITA 2.0 draft standard.</ph></p> + <p>DITA Open Toolkit Release <keyword keyref="release"/> + <ph id="summary">uses map-first pre-processing for HTML5 output and includes a new local configuration file, + better CLI messages with support for overrides, a new version of the Lightweight DITA plug-in with + enhancements to Markdown processing, and updates for the latest DITA 2.0 draft standard</ph>.</p> </section> <!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3ANext+is%3Aclosed+label%3Afeature+sort%3Acreated-asc --> diff --git a/resources/external-links.ditamap b/resources/external-links.ditamap index d10a50b7..1134928f 100644 --- a/resources/external-links.ditamap +++ b/resources/external-links.ditamap @@ -859,6 +859,16 @@ <linktext>CommonMark</linktext> </topicmeta> </keydef> + <keydef + keys="chocolatey" + href="https://chocolatey.org/" + scope="external" + format="html" + > + <topicmeta> + <linktext>Chocolatey</linktext> + </topicmeta> + </keydef> <keydef keys="dita-adoption-tc" href="https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=dita-adoption" @@ -1029,6 +1039,16 @@ <linktext>Sass</linktext> </topicmeta> </keydef> + <keydef + keys="sdkman" + href="https://sdkman.io/jdks" + scope="external" + format="html" + > + <topicmeta> + <linktext>SDKMAN!</linktext> + </topicmeta> + </keydef> <keydef keys="python-markdown-attlists" href="https://python-markdown.github.io/extensions/attr_list/" diff --git a/resources/key-definitions.ditamap b/resources/key-definitions.ditamap index 1a7d08f1..4487c13a 100644 --- a/resources/key-definitions.ditamap +++ b/resources/key-definitions.ditamap @@ -26,7 +26,7 @@ <keydef keys="maintenance-version"> <topicmeta> <keywords> - <keyword>4.2</keyword> + <keyword>4.2.1</keyword> </keywords> </topicmeta> </keydef> diff --git a/resources/reusable-components.dita b/resources/reusable-components.dita index a0260863..30e77b87 100644 --- a/resources/reusable-components.dita +++ b/resources/reusable-components.dita @@ -131,7 +131,7 @@ <indexterm>OpenJDK</indexterm> <indexterm>Oracle JDK</indexterm> <ul> - <li>You can download the Oracle JRE or JDK from + <li>You can download Oracle distributions from <xref keyref="download.oracle-jdk"/> under commercial license.</li> <li>Eclipse Temurin is the free OpenJDK distribution available from <xref keyref="download.openjdk"/>.</li> @@ -139,6 +139,10 @@ <xref keyref="download.openjdk.corretto"/>, <xref keyref="download.openjdk.azul"/>, and <xref keyref="download.openjdk.redhat"/>.</li> + <li>Java versions are also available via package managers such as + <xref keyref="chocolatey"/>, + <xref keyref="homebrew"/>, or + <xref keyref="sdkman"/></li> </ul> </p> <p id="java-bc"> diff --git a/samples/docker/Dockerfile b/samples/docker/Dockerfile index 11afdf72..0fcc8394 100644 --- a/samples/docker/Dockerfile +++ b/samples/docker/Dockerfile @@ -1,5 +1,5 @@ # Use the latest DITA-OT image ↓ as parent: -FROM ghcr.io/dita-ot/dita-ot:4.2 +FROM ghcr.io/dita-ot/dita-ot:4.2.1 # Install a custom plug-in from a remote location: RUN dita --install https://github.com/infotexture/dita-bootstrap/archive/master.zip diff --git a/topics/prerequisite-software.dita b/topics/prerequisite-software.dita index 0158d2f3..3a8e217a 100644 --- a/topics/prerequisite-software.dita +++ b/topics/prerequisite-software.dita @@ -37,7 +37,7 @@ <p>DITA-OT requires the following software applications: <dl> <dlentry> - <dt>Java Runtime Environment (JRE) or Java Development Kit (JDK)</dt> + <dt>Java Development Kit (JDK) or Java Runtime Environment (JRE)</dt> <dd> <p conkeyref="reusable-components/java-clients"/> <note>This is the <i>only</i> prerequisite that you need to install. All other required software is