From cd6241e47a2adad78928c5a44d7e5493c966d2b6 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 24 Jul 2015 19:50:55 +0000
Subject: [PATCH] Fix rendering of a URL. Update entities to reflect
 10.2-RELEASE in preparation for adding the hardware, relnotes, and
 installation pages to the website.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: https://svn.freebsd.org/base/releng/10.2@285855 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 release/doc/en_US.ISO8859-1/readme/article.xml |  5 +++--
 release/doc/share/xml/release.ent              | 16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index bdae743b1..18e8f4905 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -349,8 +349,9 @@
 	  other copies are kept updated on the Internet and should be
 	  consulted as the <quote>current errata</quote> for this
 	  release.  These other copies of the errata are located at
-	  <uri
-	    xlink:href="&url.base;/releases/">&url.base;/releases/</uri>
+	  the <uri
+	    xlink:href="&url.base;/releases/">&os;&nbsp;&release.current;
+	      page</uri>
 	  (as well as any sites which keep up-to-date mirrors of this
 	  location).</para>
       </note>
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 45a3597b9..649bbcd7f 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-STABLE">
+<!ENTITY release.current "10.2-RELEASE">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last
@@ -16,16 +16,16 @@
 <!-- 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 "10.0-RELEASE">
+<!ENTITY release.prev.stable "10.1-RELEASE">
 
 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "10.2-RELEASE">
+<!ENTITY release.next "10.3-RELEASE">
 
 <!-- The name of this branch. -->
-<!ENTITY release.branch "10.1-STABLE">
+<!ENTITY release.branch "10.2-STABLE">
 
 <!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "https://www.FreeBSD.org/snapshots/">
+<!ENTITY release.url "https://www.FreeBSD.org/releases/">
 
 <!-- The URL for Security Advisories and Errata Notices. -->
 <!ENTITY security.url "https://www.FreeBSD.org/security/advisories">
@@ -37,10 +37,10 @@
      or "release" -->
 <!-- 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  "INCLUDE">
+<!ENTITY release.type "release">
+<!ENTITY % release.type.current  "IGNORE">
 <!ENTITY % release.type.snapshot "IGNORE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">
 
 <![%release.type.current;[
 <!ENTITY release '&release.current;'>
-- 
2.45.0