From owner-svn-src-head@FreeBSD.ORG  Sun Jun 23 20:19:01 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9E4B176D;
 Sun, 23 Jun 2013 20:19:01 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8FF481BD7;
 Sun, 23 Jun 2013 20:19:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NKJ1jV064813;
 Sun, 23 Jun 2013 20:19:01 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NKJ1GZ064811;
 Sun, 23 Jun 2013 20:19:01 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201306232019.r5NKJ1GZ064811@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 23 Jun 2013 20:19:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252121 - in head/release/doc: en_US.ISO8859-1/errata
 share/xml
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Jun 2013 20:19:01 -0000

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