Add a new macro, release.current.release, to denote the head/ branch

with the -RELEASE suffix.  This fixes the incorrect text on the -CURRENT
errata page from showing '10.0-CURRENT' followed by 'until 9.1-RELEASE is
released.'

2 files changed, 4 insertions, 2 deletions

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 818c93b3825b..e5b0bb0a9c86 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -57,7 +57,7 @@
       &os;.</para>
 
     <para>This errata document for &os; &release;
-      will be maintained until the release of &os; &release.next;.</para>
+      will be maintained until the release of &os; &release.current.release;.</para>
   </abstract>
 
   <sect1 id="intro">
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 1d31710f3d86..4926fc78a21e 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -6,7 +6,9 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "10.0-CURRENT">
+<!ENTITY release.current.version "10.0">
+<!ENTITY release.current "&release.current.version;-CURRENT">
+<!ENTITY release.current.release "&release.current.version;-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last