From 15d5dcdd3bb387aab28bbe7262011c38c7d6d22c Mon Sep 17 00:00:00 2001
From: Christophe Courtois <christophe.courtois@dalibo.com>
Date: Sun, 26 Feb 2023 08:41:32 +0100
Subject: [PATCH] Add explicit instructions for upgrading between 2.x versions.

Add an explicit statement that there is nothing special to do when upgrading between 2.x versions.

Leave the previous paragraph about the default location that changed between 2.00 and 2.02, as it is more a matter of transitioning from 1.x to 2.x.
---
 doc/xml/release.xml    | 12 ++++++++++++
 doc/xml/user-guide.xml |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 4a4139230..edc1b988a 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -35,6 +35,18 @@
 
             <release-doc-list>
                 <release-improvement-list>
+                    <release-item>
+                        <github-issue id="1774"/>
+                        <github-pull-request id="1993"/>
+
+                        <release-item-contributor-list>
+                            <release-item-contributor id="christophe.courtois"/>
+                            <release-item-reviewer id="david.steele"/>
+                        </release-item-contributor-list>
+
+                        <p>Add explicit instructions for upgrading between <id>2.x</id> versions.</p>
+                    </release-item>
+
                     <release-item>
                         <release-item-contributor-list>
                             <release-item-contributor id="david.steele"/>
diff --git a/doc/xml/user-guide.xml b/doc/xml/user-guide.xml
index 4c645066b..a511de908 100644
--- a/doc/xml/user-guide.xml
+++ b/doc/xml/user-guide.xml
@@ -866,6 +866,13 @@
 
             <p><postgres/> and repository options must be indexed when using the new names introduced in <proper>v2</proper>, e.g. <br-option>pg1-host</br-option>, <br-option>pg1-path</br-option>, <br-option>repo1-path</br-option>, <br-option>repo1-type</br-option>, etc.</p>
         </section>
+
+        <!-- =================================================================================================================== -->
+        <section id="v2.x">
+            <title>Upgrading {[project]} from v2.x to v2.y</title>
+
+            <p>Upgrading from <proper>v2.x</proper> to <proper>v2.y</proper> is straight-forward. The repository format has not changed, so for most installations it is simply a matter of installing binaries for the new version. It is also possible to downgrade if you have not used new features that are unsupported by the older version.</p>
+        </section>
     </section>
 
     <!-- ======================================================================================================================= -->