svn commit: r252121 - in head/release/doc: en_US.ISO8859-1/errata share/xml

[Glen Barber]

Author: gjb
Date: Sun Jun 23 20:19:00 2013
New Revision: 252121
URL: http://svnweb.freebsd.org/changeset/base/252121

Log:
  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.'

Modified:
  head/release/doc/en_US.ISO8859-1/errata/article.xml
  head/release/doc/share/xml/release.ent

Modified: head/release/doc/en_US.ISO8859-1/errata/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/errata/article.xml	Sun Jun 23 20:09:58 2013	(r252120)
+++ head/release/doc/en_US.ISO8859-1/errata/article.xml	Sun Jun 23 20:19:00 2013	(r252121)
@@ -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">

Modified: head/release/doc/share/xml/release.ent
==============================================================================
--- head/release/doc/share/xml/release.ent	Sun Jun 23 20:09:58 2013	(r252120)
+++ head/release/doc/share/xml/release.ent	Sun Jun 23 20:19:00 2013	(r252121)
@@ -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