Date: Tue, 14 Oct 2014 16:44:16 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r273100 - in stable/10/release/doc: en_US.ISO8859-1/errata share/xml Message-ID: <201410141644.s9EGiG2W033984@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Oct 14 16:44:15 2014 New Revision: 273100 URL: https://svnweb.freebsd.org/changeset/base/273100 Log: 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 Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml stable/10/release/doc/share/xml/release.ent Modified: stable/10/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Oct 14 16:28:37 2014 (r273099) +++ stable/10/release/doc/en_US.ISO8859-1/errata/article.xml Tue Oct 14 16:44:15 2014 (r273100) @@ -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> Modified: stable/10/release/doc/share/xml/release.ent ============================================================================== --- stable/10/release/doc/share/xml/release.ent Tue Oct 14 16:28:37 2014 (r273099) +++ stable/10/release/doc/share/xml/release.ent Tue Oct 14 16:44:15 2014 (r273100) @@ -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;[
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410141644.s9EGiG2W033984>