svn commit: r44927 - in head: en_US.ISO8859-1/htdocs en_US.ISO8859-1/share/xml share/xml
Glen Barber
gjb at FreeBSD.org
Fri May 23 22:46:39 UTC 2014
Author: gjb
Date: Fri May 23 22:46:38 2014
New Revision: 44927
URL: http://svnweb.freebsd.org/changeset/doc/44927
Log:
The current flow of our website does not allow easily advertising
that we will be soon entering the release cycle. As such, we are
not able to easily link to the upcoming release schedule.html page
from the index page unless we already have BETA release builds on
the FTP mirrors.
Implement some evil to eliminate this limitation:
- In share/xml/release.l10n.ent, move reusable text from the
'helptest' header, and into a beta.helptest macro, and include
the new macro in beta.desc.
- Add a new entity, beta.local.where, which is ignored by default.
When enabled in the schedule.xml for the upcoming release, it
prints information about where to download the testing builds.
- Add two new entities, beta.upcoming and beta2.upcoming, which
are used in index.xsl, and when set, direct the URL to the
upcoming release schedule.html page instead of directly to
where.html. With this change, we can advertise that a release
cycle is about to start, and not need downloadable images yet.
Sponsored by: The FreeBSD Foundation
Modified:
head/en_US.ISO8859-1/htdocs/index.xsl
head/en_US.ISO8859-1/share/xml/release.l10n.ent
head/share/xml/release.ent
Modified: head/en_US.ISO8859-1/htdocs/index.xsl
==============================================================================
--- head/en_US.ISO8859-1/htdocs/index.xsl Fri May 23 20:29:35 2014 (r44926)
+++ head/en_US.ISO8859-1/htdocs/index.xsl Fri May 23 22:46:38 2014 (r44927)
@@ -83,13 +83,13 @@
href="&u.rel2.announce;">&rel2.current;</a>,
<a
href="&u.rel3.announce;">&rel3.current;</a></li>
- <xsl:if test="'&beta.testing;' != 'IGNORE'">
- <li>Upcoming: <a
- href="&base;/where.html#helptest">&betarel.current;-&betarel.vers;</a></li>
+ <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
+ <li>Upcoming:<br/><a
+ href="&u.betarel.schedule;">&betarel.current;-&betarel.vers;</a></li>
</xsl:if>
- <xsl:if test="'&beta2.testing;' != 'IGNORE'">
- <li>Upcoming: <a
- href="&base;/where.html#helptest">&betarel2.current;-&betarel2.vers;</a></li>
+ <xsl:if test="'&beta2.upcoming;' != 'IGNORE'">
+ <li>Upcoming:<br/><a
+ href="&u.betarel2.schedule;">&betarel2.current;-&betarel2.vers;</a></li>
</xsl:if>
</ul>
</div> <!-- FRONTRELEASESCONTENT -->
Modified: head/en_US.ISO8859-1/share/xml/release.l10n.ent
==============================================================================
--- head/en_US.ISO8859-1/share/xml/release.l10n.ent Fri May 23 20:29:35 2014 (r44926)
+++ head/en_US.ISO8859-1/share/xml/release.l10n.ent Fri May 23 22:46:38 2014 (r44927)
@@ -73,14 +73,7 @@
<![%beta.testing;[
<!ENTITY beta.desc '
<div xmlns="http://www.w3.org/1999/xhtml">
- <a name="helptest"></a>
- <h2>Help With The Next FreeBSD Release&beta.plural;</h2>
-
- <p>Our developers and release engineers are working on the the
- next release&beta.plural; of FreeBSD; if you wish to help with
- testing, please download the latest build&beta.plural;. Please
- note that these images are, by their very nature, intended for
- testing and should not be used in production environments.</p>
+ &beta.helptest;
<table class="tblbasic">
<thead>
@@ -150,3 +143,28 @@
]]>
<!ENTITY beta.desc ''>
+
+<!ENTITY beta.helptest '
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <a name="helptest"></a>
+ <h1>Help With The Next FreeBSD Release&beta.plural;</h1>
+
+ <p>Our developers and release engineers are working on the the
+ next release&beta.plural; of FreeBSD; if you wish to help with
+ testing, please download the latest build&beta.plural;. Please
+ note that these images are, by their very nature, intended for
+ testing and should not be used in production environments.</p>
+ </div>
+'>
+
+<![%beta.local.where;[
+<!ENTITY beta.local.where '
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ &beta.helptest;
+ <p>Available installation images are listed on the <a
+ href="&base;/where.html#helptest">download page</a>.</p>
+ </div>
+'>
+]]>
+
+<!ENTITY beta.local.where ''>
Modified: head/share/xml/release.ent
==============================================================================
--- head/share/xml/release.ent Fri May 23 20:29:35 2014 (r44926)
+++ head/share/xml/release.ent Fri May 23 22:46:38 2014 (r44927)
@@ -22,6 +22,9 @@
rel2.* and u.rel2.* for the "conservative users" version.
-->
+<!-- Do not set this to 'INCLUDE' in this file. -->
+<!ENTITY % beta.local.where "IGNORE">
+
<!ENTITY rel.head.major '11'>
<!ENTITY rel.head '&rel.head.major;.0'>
@@ -29,6 +32,10 @@
don't have something in BETAn or RCn), then change %beta.testing
below to "IGNORE". If we do, use "INCLUDE". -->
+<!-- Set to 'INCLUDE' when the schedule is available. -->
+<!ENTITY beta.upcoming "IGNORE">
+
+<!-- Set to 'INCLUDE' when the installation images are available. -->
<!ENTITY beta.testing "IGNORE">
<!ENTITY % beta.testing "IGNORE">
<!ENTITY betarel.current '10.0'>
@@ -37,6 +44,11 @@
<!-- If we have a second release in the release cycle (e.g. 5.x and 6.y
are having release candidates at the same time), do the same here. -->
+
+<!-- Set to 'INCLUDE' when the schedule is available. -->
+<!ENTITY beta2.upcoming "IGNORE">
+
+<!-- Set to 'INCLUDE' when the installation images are available. -->
<!ENTITY beta2.testing "IGNORE">
<!ENTITY % beta2.testing "IGNORE">
<!ENTITY betarel2.current '9.2'>
More information about the svn-doc-head
mailing list