From d9c8fbb16ae295533e0830b9fa997bd2767ca2b6 Mon Sep 17 00:00:00 2001
From: "Bruce A. Mah" <bmah@FreeBSD.org>
Date: Sun, 19 Jan 2003 16:11:25 +0000
Subject: [PATCH] Add support in the Web site for the concept of two releases
 that may both be considered "current".

---
 en/includes.sgml       | 23 +++++++++++++++++++----
 en/includes.xsl        | 17 +++++++++++++++--
 en/index.xsl           | 18 ++++++++++++++----
 en/releases/index.sgml | 22 +++++++++++++---------
 4 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/en/includes.sgml b/en/includes.sgml
index 05b964f135..25ba285951 100644
--- a/en/includes.sgml
+++ b/en/includes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/includes.sgml,v 1.53 2002/10/10 14:31:53 murray Exp $ -->
+<!-- $FreeBSD: www/en/includes.sgml,v 1.54 2003/01/01 19:23:22 ceri Exp $ -->
 <!--  
   Base is the absolute URL for the given page, minus the actual page
   part.  It should either be specified as a fully qualified URL, or
@@ -58,7 +58,7 @@ src="&base;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0
 <address>&author;<br>&date;</address>'>
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
-<!-- The currently released version of FreeBSD.  This value is used to
+<!-- The currently released versions of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time.  When you update this, you should also
      update (at least) the following:
@@ -72,16 +72,31 @@ src="&base;/gifs/bar.gif" alt="Navigation Bar" width="565" height="33" border="0
      (If you're the release engineer, feel free to update this list with
      other doc-related things you had to do.  It'll save you time and
      trouble the next time around :-).)
+
+     As of 5.0, we now have the concept of two different "currently"
+     released versions (from two different development branches).  Use
+     rel.* and u.rel.* for the "latest and greatest" version and
+     rel2.* and u.rel2.* for the "conservative users" version.
 -->
-<!ENTITY rel.current '4.7'>
-<!ENTITY rel.current.date 'October, 2002'>
+<!ENTITY rel.current '5.0'>
+<!ENTITY rel.current.date 'January 2003'>
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel.notes '&base;/releases/&rel.current;R/relnotes.html'>
 <!ENTITY u.rel.announce '&base;/releases/&rel.current;R/announce.html'>
 <!ENTITY u.rel.errata '&base;/releases/&rel.current;R/errata.html'>
 <!ENTITY u.rel.hardware '&base;/releases/&rel.current;R/hardware.html'>
+<!ENTITY u.rel.early '&base;/releases/&rel.current;R/early-adopter.html'>
 
+<!-- Secondary "current release" entities -->
+<!ENTITY rel2.current '4.7'>
+<!ENTITY rel2.current.date 'October 2002'>
+
+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel2.notes '&base;/releases/&rel2.current;R/relnotes.html'>
+<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.errata '&base;/releases/&rel2.current;R/errata.html'>
+<!ENTITY u.rel2.hardware '&base;/releases/&rel2.current;R/hardware.html'>
 
 <!-- macro for webbuild paper --> 
 <!ENTITY webbuild ' 
diff --git a/en/includes.xsl b/en/includes.xsl
index 4aac1806c8..53e8c219ba 100644
--- a/en/includes.xsl
+++ b/en/includes.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/en/includes.xsl,v 1.10 2002/10/10 14:31:53 murray Exp $ -->
+<!-- $FreeBSD: www/en/includes.xsl,v 1.11 2003/01/01 19:23:22 ceri Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
@@ -78,7 +78,7 @@
       <xsl:copy-of select="$date"/></address>
   </xsl:variable>
   
-  <xsl:variable name="rel.current" select='"4.7"'/>
+  <xsl:variable name="rel.current" select='"5.0"'/>
   <xsl:variable name="u.rel.notes">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
 
@@ -88,5 +88,18 @@
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/errata.html</xsl:variable>
   <xsl:variable name="u.rel.hardware">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/hardware.html</xsl:variable>
+  <xsl:variable name="u.rel.early">
+    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/early-adopter.html</xsl:variable>
+  
+  <xsl:variable name="rel2.current" select='"4.7"'/>
+  <xsl:variable name="u.rel2.notes">
+    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/relnotes.html</xsl:variable>
+
+  <xsl:variable name="u.rel2.announce">
+    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/announce.html</xsl:variable>
+  <xsl:variable name="u.rel2.errata">
+    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/errata.html</xsl:variable>
+  <xsl:variable name="u.rel2.hardware">
+    <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/hardware.html</xsl:variable>
   
 </xsl:stylesheet>
diff --git a/en/index.xsl b/en/index.xsl
index f354bb2f5e..abedbc096f 100644
--- a/en/index.xsl
+++ b/en/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/index.xsl,v 1.44 2003/01/03 19:11:56 trhodes Exp $ -->
+<!-- $FreeBSD: www/en/index.xsl,v 1.45 2003/01/16 22:14:41 kuriyama 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.44 2003/01/03 19:11:56 trhodes Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/index.xsl,v 1.45 2003/01/16 22:14:41 kuriyama Exp $'"/>
   <xsl:variable name="title" select="'The FreeBSD Project'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -394,14 +394,24 @@
 		    <table cellpadding="4" cellspacing="0" border="0"
 			   bgcolor="#ffcc66" width="100%">
 		      <tr>
-			<td valign="top"><p><font size="+1" color="#990000"><b>Current Release:
+			<td valign="top"><p><font size="+1" color="#990000"><b>New Technology Release:
 			    <xsl:value-of select="$rel.current"/></b></font><br/>
 			
 			    <small>&#183; <a href="{$u.rel.announce}">Announcement</a><br/>
 			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
 			      &#183; <a href="{$u.rel.notes}">Release Notes</a><br/>
 			      &#183; <a href="{$u.rel.hardware}">Hardware Notes</a><br/>
-			      &#183; <a href="{$u.rel.errata}">Errata</a></small></p>
+			      &#183; <a href="{$u.rel.errata}">Errata</a><br/>
+			      &#183; <a href="{$u.rel.early}">Early Adopter's Guide</a></small></p>
+
+			  <p><font size="+1" color="#990000"><b>Production Release:
+			    <xsl:value-of select="$rel2.current"/></b></font><br/>
+			
+			    <small>&#183; <a href="{$u.rel2.announce}">Announcement</a><br/>
+			      &#183; <a href="{$base}/doc/en_US.ISO8859-1/books/handbook/install.html">Installation Guide</a><br/>
+			      &#183; <a href="{$u.rel2.notes}">Release Notes</a><br/>
+			      &#183; <a href="{$u.rel2.hardware}">Hardware Notes</a><br/>
+			      &#183; <a href="{$u.rel2.errata}">Errata</a></small></p>
 
 			  <p><font size="+1" color="#990000"><b>Project News</b></font><br/>
 			    <font size="-1">
diff --git a/en/releases/index.sgml b/en/releases/index.sgml
index c4f4337c38..5ca7f7b5cc 100644
--- a/en/releases/index.sgml
+++ b/en/releases/index.sgml
@@ -1,10 +1,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.83 2003/01/09 16:09:59 bmah Exp $">
+<!ENTITY date "$FreeBSD: www/en/releases/index.sgml,v 1.84 2003/01/11 18:35:29 bmah Exp $">
 <!ENTITY title "Release Information">
 <!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
 ]>
-<!-- $FreeBSD: www/en/releases/index.sgml,v 1.83 2003/01/09 16:09:59 bmah Exp $ -->
+<!-- $FreeBSD: www/en/releases/index.sgml,v 1.84 2003/01/11 18:35:29 bmah Exp $ -->
 
 <html>
 &header;
@@ -21,7 +21,16 @@ the <A HREF="&base;/news/newsflash.html">Newsflash</A> page.</em></p>
 <a href="&u.rel.announce;">Announcement</a> :
 <a href="&u.rel.notes;">Release Notes</a> :
 <a href="&u.rel.hardware;">Hardware Notes</a> :
-<a href="&u.rel.errata;">Errata</a>
+<a href="&u.rel.errata;">Errata</a> :
+<a href="&u.rel.early;">Early Adopter's Guide</a>
+</em></p>
+
+<p><b>Release &rel2.current;</b> (&rel2.current.date;)
+<em>
+<a href="&u.rel2.announce;">Announcement</a> :
+<a href="&u.rel2.notes;">Release Notes</a> :
+<a href="&u.rel2.hardware;">Hardware Notes</a> :
+<a href="&u.rel2.errata;">Errata</a>
 </em></p>
 
 <p>The latest daily snapshots from our <A
@@ -38,12 +47,7 @@ FreeBSD</A> for details.</p>
        <p>We will continue to bring you new releases from both
        our <A HREF="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#STABLE">FreeBSD-stable</A> and
        <A HREF="&base;/doc/en_US.ISO8859-1/books/handbook/current-stable.html#CURRENT">FreeBSD-current</A>
-       branches, both as developer's snapshots and as regular full releases.
-       The next scheduled release on the <b>-stable</b> branch will be
-       <b>FreeBSD 4.8</b> on March 1, 2003.  Subsequent releases will
-       follow at 4 month intervals.  The first release on what is now
-       the <b>-current</b> branch will be <b>FreeBSD 5.0</b>,
-       scheduled for January 17, 2003.</p>
+       branches, both as developer's snapshots and as regular full releases.</p>
 
        <p>For more information about the release engineering process,
        or to see a comprehensive schedule of upcoming releases, please