diff --git a/share/sgml/includes.release.sgml b/share/sgml/includes.release.sgml
index ee64e708d7..f5cfe34f9f 100644
--- a/share/sgml/includes.release.sgml
+++ b/share/sgml/includes.release.sgml
@@ -1,77 +1,77 @@
-<!-- $FreeBSD: www/share/sgml/includes.release.sgml,v 1.24 2006/05/09 08:07:48 ceri Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.release.sgml,v 1.25 2006/05/17 14:13:07 ceri Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- 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:
 
 	- similar entity in the Handbook
 	- similar entity in the Relnotes
 	- releases/index.sgml has the date of the current release
 	- the FAQ has links to the release FTP url
 	- "versions supported" in security.sgml
 
      (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.head '7.0'>
 <!ENTITY rel.head.major '7'>
 
 <!-- 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 "INCLUDE">
+<!ENTITY % beta.testing "IGNORE">
 <!ENTITY betarel.current '5.5'>
 <!ENTITY betarel.vers 'RC1'>
 <!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 "IGNORE">
 <!ENTITY betarel2.current '5.5'>
 <!ENTITY betarel2.vers 'RC1'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current '6.1'>
 <!ENTITY rel.current.date 'May 2006'>
 <!ENTITY rel.current.major '6'>
 
 <!-- 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.installation '&base;/releases/&rel.current;R/installation.html'>
 <!ENTITY u.rel.readme '&base;/releases/&rel.current;R/readme.html'>
 <!ENTITY u.rel.early '&base;/releases/&rel.current;R/migration-guide.html'> <!-- TEMP -->
 <!ENTITY u.rel.migration '&base;/releases/&rel.current;R/migration-guide.html'>
 
 <!-- Secondary "current release" entities -->
-<!ENTITY rel2.current '5.4'>
-<!ENTITY rel2.current.date 'May 2005'>
+<!ENTITY rel2.current '5.5'>
+<!ENTITY rel2.current.date 'May 2006'>
 <!ENTITY rel2.current.major '5'>
 
 <!-- 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'>
 <!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>
 <!ENTITY u.rel2.readme '&base;/releases/&rel2.current;R/readme.html'>
 
 <!-- 
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
diff --git a/share/sgml/includes.release.xsl b/share/sgml/includes.release.xsl
index d5d032a18c..5775c41473 100644
--- a/share/sgml/includes.release.xsl
+++ b/share/sgml/includes.release.xsl
@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
-<!-- $FreeBSD: www/share/sgml/includes.release.xsl,v 1.21 2006/05/09 02:39:17 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/includes.release.xsl,v 1.22 2006/05/17 05:08:51 brueffer Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <xsl:variable name="rel.head" select='"7.0"'/>
   <xsl:variable name="rel.head.major" select='"7"'/>
 
   <!-- 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="1" />
+  <xsl:variable name="beta.testing" select="0" />
   <xsl:variable name="betarel.current" select='"5.5"'/>
   <xsl:variable name="betarel.vers" select='"RC1"'/>
   <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="0" />
   <xsl:variable name="betarel2.current" select='"5.5"'/>
   <xsl:variable name="betarel2.vers" select='"BETA4"'/>
   <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.1"'/>
   <xsl:variable name="rel.current.major" select='"6"'/>
 
   <xsl:variable name="u.rel.notes">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/relnotes.html</xsl:variable>
 
   <xsl:variable name="u.rel.announce">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/announce.html</xsl:variable>
   <xsl:variable name="u.rel.errata">
     <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.installation">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/installation.html</xsl:variable>
   <xsl:variable name="u.rel.readme">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/readme.html</xsl:variable>
   <xsl:variable name="u.rel.early">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
   <xsl:variable name="u.rel.migration">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel.current"/>R/migration-guide.html</xsl:variable>
 
-  <xsl:variable name="rel2.current" select='"5.4"'/>
+  <xsl:variable name="rel2.current" select='"5.5"'/>
   <xsl:variable name="rel2.current.major" select='"5"'/>
 
   <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:variable name="u.rel2.installation">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/installation.html</xsl:variable>
   <xsl:variable name="u.rel2.readme">
     <xsl:value-of select="$base"/>/releases/<xsl:value-of select="$rel2.current"/>R/readme.html</xsl:variable>
 
 </xsl:stylesheet>