From b485a929f7a9b1bfde813cd02dc3a141bf44249d Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Fri, 27 Sep 2024 13:35:05 +0100
Subject: [PATCH] Prepare for 2.2.1 release

---
 properties.gradle           |  4 ++--
 src/guide/xml/ch03.xml      |  2 +-
 src/guide/xml/changelog.xml | 37 ++++++++++++++++++++++++++++---------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/properties.gradle b/properties.gradle
index dc310c2e4..b0e96f399 100644
--- a/properties.gradle
+++ b/properties.gradle
@@ -2,8 +2,8 @@
 ext {
   xslTNGtitle = 'DocBook xslTNG'
   xslTNGbaseName = 'docbook-xslTNG'
-  xslTNGversion = '2.2.0'
-  guideVersion = '2.2.0a'
+  xslTNGversion = '2.2.1'
+  guideVersion = '2.2.1'
   guidePrerelease = false
 
   docbookVersion = '5.2'
diff --git a/src/guide/xml/ch03.xml b/src/guide/xml/ch03.xml
index 02b172f84..7e2dc1d17 100644
--- a/src/guide/xml/ch03.xml
+++ b/src/guide/xml/ch03.xml
@@ -843,7 +843,7 @@ first figure in chapter 2 will be labeled “2.1” and the first figure
 in the first section in chapter 2 will be labeled “2.1.1”, etc.
 This most closely reproduces the numbering from the 1.x stylesheets.</para>
 
-<section>
+<section xml:id="numeration-overrides">
 <title>Numeration overrides</title>
 
 <para>Although the numeration parameters give you complete control over
diff --git a/src/guide/xml/changelog.xml b/src/guide/xml/changelog.xml
index 2fdbfc60b..4d0f453f4 100644
--- a/src/guide/xml/changelog.xml
+++ b/src/guide/xml/changelog.xml
@@ -10,24 +10,43 @@ be of interest to users of the stylesheets. See the commits and pull requests on
 <link xlink:href="https://github.com/docbook/xslTNG/">the repository</link> for
 finer detail.</para>
 
-<section xml:id="r220a">
+<section xml:id="r221">
 <info>
-  <title>Changes in version 2.2.0a</title>
-  <productnumber>2.2.0a</productnumber>
-  <date>2024-09-21</date>
+  <title>Changes in version 2.2.1</title>
+  <productnumber>2.2.1</productnumber>
+  <date>2024-09-27</date>
 </info>
-<para>This is an intermediate version. It’ll be published as 2.2.1 shortly.</para>
 <itemizedlist>
 <listitem>
-  <para>Support <parameter>variablelist-panelset</parameter> presentation for
-  <tag>variablelist</tag> elements.
+  <para>Add missing zh-cn localization for “Danger”;
+  fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/510">#510</link>.
   </para>
 </listitem>
 <listitem>
-  <para>Added <xref linkend="titlepages"/> to the guide.</para>
+  <para>Added <xref linkend="titlepages"/>, describing how to customize title pages;
+  fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/507">#507</link>.</para>
 </listitem>
 <listitem>
-  <para>(Note to self: review other PRs before publishing 2.2.1!)</para>
+  <para>Added support for a <code>numbered</code> DocBook processing instruction pseudo-attribute
+  to control numbering of divisions, components, and sections on a per-element basis;
+  fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/506">#506</link>.
+  See <xref linkend="numeration-overrides"/>.</para>
+</listitem>
+<listitem>
+  <para>Added <parameter>variablelist-panelset</parameter> to 
+  support a “panel set” presentation of variable lists.</para>
+</listitem>
+<listitem>
+  <para>Simplified and corrected the selection of bibliography entry abbreviations;
+  fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/479">#479</link>.
+  Thanks, Frank!</para>
+</listitem>
+<listitem>
+  <para>Improved <filename>docbook.py</filename> script. Thanks, Rafal!</para>
+</listitem>
+<listitem>
+  <para>Added support for <tag>caption</tag> elements in CALS tables;
+  fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/472">#472</link>.</para>
 </listitem>
 </itemizedlist>
 </section>