From bf64761c212d3279e90c28b4e167e3d9bf28f2ce Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Tue, 14 Oct 2014 16:44:15 +0000
Subject: Revert r273084:   In the stable/ branches, release.prev intentionally
 points to the   previous version, in addition to a number of intentional
 version   mappings for the errata.html page, that this commit breaks.

Reported by:	hrs
Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
---
 release/doc/en_US.ISO8859-1/errata/article.xml |  6 +++---
 release/doc/share/xml/release.ent              | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 716b680..6cc3f8e 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -10,7 +10,7 @@
   xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
   <info>
-    <title>&os; &release.current; Errata </title>
+    <title>&os; &release.prev; Errata </title>
 
     <author><orgname>The &os; Project</orgname></author>
 
@@ -31,7 +31,7 @@
     </legalnotice>
 
     <abstract>
-      <para>This document lists errata items for &os; &release.current;,
+      <para>This document lists errata items for &os; &release.prev;,
 	containing significant information discovered after the
 	release or too late in the release cycle to be otherwise
 	included in the release documentation.  This information
@@ -41,7 +41,7 @@
 	always be consulted before installing this version of
 	&os;.</para>
 
-      <para>This errata document for &os; &release.current; will be
+      <para>This errata document for &os; &release.prev; will be
 	maintained until the release of &os; &release.next;.</para>
     </abstract>
   </info>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 01057a7..c1c9aa8 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "10.1-RELEASE">
+<!ENTITY release.current "10.0-STABLE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -16,13 +16,13 @@
 <!-- The previous stable release, useful for pointing user's at the
      release they SHOULD be running if they don't want the bleeding
      edge. -->
-<!ENTITY release.prev.stable "9.3-RELEASE">
+<!ENTITY release.prev.stable "10.0-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "10.2-RELEASE">
+<!ENTITY release.next "10.1-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "10.1-STABLE">
+<!ENTITY release.branch "10.0-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
 <!ENTITY release.url "http://www.FreeBSD.org/snapshots/">
@@ -35,8 +35,8 @@
 <!-- WARNING: Do not forget to also change the release type in
      doc.relnotes.mk when updating this -->
 <!ENTITY release.type "snapshot">
-<!ENTITY % release.type.current  "IGNORE">
-<!ENTITY % release.type.snapshot "INCLUDE">
+<!ENTITY % release.type.current  "INCLUDE">
+<!ENTITY % release.type.snapshot "IGNORE">
 <!ENTITY % release.type.release "IGNORE">
 
 <![%release.type.current;[
-- 
cgit v1.1