From owner-svn-src-releng@freebsd.org  Fri Jul 24 19:50:57 2015
Return-Path: <owner-svn-src-releng@freebsd.org>
Delivered-To: svn-src-releng@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32DC29AA254;
 Fri, 24 Jul 2015 19:50:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2269A112F;
 Fri, 24 Jul 2015 19:50:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OJovke092569;
 Fri, 24 Jul 2015 19:50:57 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OJoua8092567;
 Fri, 24 Jul 2015 19:50:56 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507241950.t6OJoua8092567@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 24 Jul 2015 19:50:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r285855 - in releng/10.2/release/doc:
 en_US.ISO8859-1/readme share/xml
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-releng@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the release engineering / security commits to
 the src tree <svn-src-releng.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-releng/>
List-Post: <mailto:svn-src-releng@freebsd.org>
List-Help: <mailto:svn-src-releng-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-releng>,
 <mailto:svn-src-releng-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jul 2015 19:50:57 -0000

Author: gjb
Date: Fri Jul 24 19:50:55 2015
New Revision: 285855
URL: https://svnweb.freebsd.org/changeset/base/285855

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

Modified:
  releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml
  releng/10.2/release/doc/share/xml/release.ent

Modified: releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml
==============================================================================
--- releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml	Fri Jul 24 19:43:18 2015	(r285854)
+++ releng/10.2/release/doc/en_US.ISO8859-1/readme/article.xml	Fri Jul 24 19:50:55 2015	(r285855)
@@ -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>

Modified: releng/10.2/release/doc/share/xml/release.ent
==============================================================================
--- releng/10.2/release/doc/share/xml/release.ent	Fri Jul 24 19:43:18 2015	(r285854)
+++ releng/10.2/release/doc/share/xml/release.ent	Fri Jul 24 19:50:55 2015	(r285855)
@@ -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;'>