diff --git a/en/index.xsl b/en/index.xsl
index 220bd09850..4b4d563cef 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.141 2005/12/14 21:26:05 pav Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.142 2006/02/06 19:43:18 jcamou Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -6,7 +6,7 @@
<xsl:import href="news/includes.xsl"/>
<xsl:variable name="base" select="'.'"/>
- <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.141 2005/12/14 21:26:05 pav Exp $'"/>
+ <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.142 2006/02/06 19:43:18 jcamou Exp $'"/>
<xsl:variable name="title" select="'The FreeBSD Project'"/>
<!-- these params should be externally bound. The values
@@ -102,6 +102,12 @@
<xsl:value-of select="concat($betarel.current, '-', $betarel.vers)"/></a>
</li>
</xsl:if>
+ <xsl:if test="$beta2.testing">
+ <li>
+ <a href="{$base}/where.html#helptest">Upcoming Release
+ <xsl:value-of select="concat($betarel2.current, '-', $betarel2.vers)"/></a>
+ </li>
+ </xsl:if>
</ul>
</div> <!-- FRONTRELEASESCONTENT -->
</div> <!-- FRONTRELEASES -->
diff --git a/en/where.sgml b/en/where.sgml
index 77e54d9e1a..66f0a7b81a 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.76 2005/11/06 16:37:45 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.77 2006/01/15 15:04:15 remko Exp $">
<!ENTITY title "Getting FreeBSD">
<!ENTITY % navincludes SYSTEM "includes.navdownload.sgml"> %navincludes;
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
@@ -172,8 +172,8 @@
<h2>Help With The Next FreeBSD Release</h2>
<p>Our developers and release engineers are working on the
- the next release of FreeBSD; if you wish to help with testing,
- please download the latest build. Please note that these images
+ the next release<![%beta.testing; [s]]> of FreeBSD; if you wish to help with testing,
+ please download the latest build<![%beta.testing; [s]]>. Please note that these images
are, by their very nature, intended for testing and should not
be used in production environments.</p>
@@ -239,6 +239,69 @@
</tbody>
</table>
+ <![ %beta2.testing; [
+ <table class="tblbasic">
+ <thead>
+ <tr style="text-align: center;">
+ <td colspan="2">Version & Platform</td>
+ <td>Distribution</td>
+ <td title="ISO9660 CD image"><a href="doc/en_US.ISO8859-1/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
+ <td>Schedule</td>
+ <td>TODO List</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
+ <td colspan="2"></td>
+ <td><a href="releases/&betarel2.current;R/schedule.html">[View]</a></td>
+ <td><a href="releases/&betarel2.current;R/todo.html">[View]</a></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>alpha</td>
+ <td><a href="&url.rel;/alpha/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/alpha/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>amd64</td>
+ <td><a href="&url.rel;/amd64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>i386</td>
+ <td><a href="&url.rel;/i386/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>ia64</td>
+ <td><a href="&url.rel;/ia64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>pc98</td>
+ <td><a href="&url.rel;/pc98/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>ppc</td>
+ <td><!-- a href="&url.rel;/ppc/&betarel2.current;-&betarel2.vers;" -->[Distribution]<!-- /a --></td>
+ <td><a href="&url.rel;/ppc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>sparc64</td>
+ <td><a href="&url.rel;/sparc64/&betarel2.current;-&betarel2.vers;">[Distribution]</a></td>
+ <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+ </tr>
+ </tbody>
+ </table>
+ ]]>
]]>
<p>If you are interested in a purely experimental
diff --git a/share/sgml/includes.navdownload.sgml b/share/sgml/includes.navdownload.sgml
index 8bec71946b..de84ea8b73 100644
--- a/share/sgml/includes.navdownload.sgml
+++ b/share/sgml/includes.navdownload.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/includes.navdownload.sgml,v 1.3 2005/10/07 14:15:48 ceri Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.navdownload.sgml,v 1.4 2005/11/06 17:21:28 hrs Exp $ -->
<!ENTITY % relincludes SYSTEM "includes.release.sgml"> %relincludes;
@@ -14,6 +14,9 @@
<![ %beta.testing; [
<li><a href="&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
]]>
+ <![ %beta2.testing; [
+ <li><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
+ ]]>
</ul>
</li>
<li><a href="&base;/ports/">Ported Applications</a></li>
diff --git a/share/sgml/includes.release.sgml b/share/sgml/includes.release.sgml
index eb16f78413..254028f217 100644
--- a/share/sgml/includes.release.sgml
+++ b/share/sgml/includes.release.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/includes.release.sgml,v 1.15 2005/11/04 15:16:43 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.release.sgml,v 1.16 2005/11/04 16:45:41 hrs Exp $ -->
<!-- XXX rel.current and u.rel.* should be available in doc/ -->
<!-- The currently released versions of FreeBSD. This value is used to
@@ -28,11 +28,18 @@
<!-- If there is no release currently in the release cycle (i.e. we
don't have something in BETAn or RCn), then change %beta.testing
below to "IGNORE". If we do, use "INCLUDE". -->
-<!ENTITY % beta.testing "IGNORE">
-<!ENTITY betarel.current '6.0'>
-<!ENTITY betarel.vers 'RC1'>
+<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY betarel.current '6.1'>
+<!ENTITY betarel.vers 'BETA1'>
<!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
+<!-- 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. -->
+<!ENTITY % beta2.testing "INCLUDE">
+<!ENTITY betarel2.current '5.5'>
+<!ENTITY betarel2.vers 'BETA1'>
+<!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
+
<!ENTITY rel.current '6.0'>
<!ENTITY rel.current.date 'Nov 2005'>
<!ENTITY rel.current.major '6'>
diff --git a/share/sgml/includes.release.xsl b/share/sgml/includes.release.xsl
index 240b0a5b3a..799ecb3e30 100644
--- a/share/sgml/includes.release.xsl
+++ b/share/sgml/includes.release.xsl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $FreeBSD: www/share/sgml/includes.release.xsl,v 1.13 2005/10/11 15:29:01 ceri Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.release.xsl,v 1.14 2005/11/04 15:16:43 hrs Exp $ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -9,12 +9,21 @@
<!-- An upcoming release that we want tested. Set $beta.testing to 0
if we're not in the middle of a release cycle. Ha ha. -->
- <xsl:variable name="beta.testing" select="0" />
- <xsl:variable name="betarel.current" select='"6.0"'/>
- <xsl:variable name="betarel.vers" select='"RC1"'/>
+ <xsl:variable name="beta.testing" select="1" />
+ <xsl:variable name="betarel.current" select='"6.1"'/>
+ <xsl:variable name="betarel.vers" select='"BETA1"'/>
<xsl:variable name="u.betarel.schedule">
<xsl:value-of select="$base"/>/releases/<xsl:value-of select="$betarel.current"/>R/schedule.html</xsl:variable>
+ <!-- A second release that we want tested. Set $beta2.testing to 0
+ if we're not in the middle of a release cycle for two releases
+ at once. -->
+ <xsl:variable name="beta2.testing" select="1" />
+ <xsl:variable name="betarel2.current" select='"5.5"'/>
+ <xsl:variable name="betarel2.vers" select='"BETA1"'/>
+ <xsl:variable name="u.betarel2.schedule">
+ <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$betarel2.current"/>R/schedule.html</xsl:variable>
+
<xsl:variable name="rel.current" select='"6.0"'/>
<xsl:variable name="rel.current.major" select='"6"'/>