diff --git a/en/where.sgml b/en/where.sgml
index e48337329d..343f360709 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.104 2010/02/23 20:59:45 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.105 2010/06/02 09:13:36 ryusuke Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
@@ -185,7 +185,7 @@
 <!--
 	  <td rowspan="7"><a href="&base;/releases/&betarel.current;R/todo.html">[View]</a></td>
 -->
-	  <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/8.1TODO">[View]</a></td>
+	  <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/8.2TODO">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
@@ -214,8 +214,8 @@
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
-	  <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+	  <td><!--a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;"-->[Distribution]<!--/a--></td>
+	  <td><!--a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/"-->[ISO]<!--/a--></td>
 	</tr>
 	<tr>
 	  <td></td>
@@ -223,36 +223,30 @@
 	  <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
+<!--
       </tbody>
     </table>
-
+-->
   <![ %beta2.testing; [
+<!--
     <table class="tblbasic">
       <thead>
 	<tr style="text-align: center;">
 	  <td colspan="2">Version &amp; Platform</td>
 	  <td>Distribution</td>
 	  <td title="ISO9660 CD image"><a href="&base;/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 rowspan="8"><a href="&base;/releases/&betarel2.current;R/schedule.html">[View]</a></td>
 <!--
 	  <td><a href="&base;/releases/&betarel2.current;R/todo.html">[View]</a></td>
 -->
-	</tr>
-	<tr>
-	  <td>&nbsp;&nbsp;&nbsp;</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>
+	  <td rowspan="7"><a href="http://wiki.freebsd.org/Releng/7.4TODO">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
@@ -269,8 +263,8 @@
 	<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>
+	  <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>
@@ -281,8 +275,8 @@
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><!-- a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;" -->[Distribution]<!-- /a --></td>
-	  <td><!-- a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
+	  <td><!--a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;"-->[Distribution]<!--/a--></td>
+	  <td><!--a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/"-->[ISO]<!--/a--></td>
 	</tr>
 	<tr>
 	  <td></td>
diff --git a/nl/where.sgml b/nl/where.sgml
index ed61e0c927..8c62b9e2fe 100644
--- a/nl/where.sgml
+++ b/nl/where.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.7 2010/02/28 12:40:30 rene Exp $">
+<!ENTITY date "$FreeBSD: www/nl/where.sgml,v 1.8 2010/06/13 11:53:01 rene Exp $">
 <!ENTITY title "&os; verkrijgen">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
@@ -229,7 +229,7 @@
 
   <![ %beta2.testing; [
     <table class="tblbasic">
-      <head>
+      <thead>
 	<tr style="text-align: center;">
 	  <td colspan="2">Versie &amp; platform</td>
 	  <td>Distributie</td>
@@ -239,7 +239,7 @@
 	  <td>TODO-lijst</td>
 -->
 	</tr>
-      </head>
+      </thead>
       <tbody>
 	<tr>
 	  <td colspan="2">&os; &betarel2.current;-&betarel2.vers;</td>
@@ -258,38 +258,38 @@
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&betarel2.curent;-&betarel2.vers;">[Distributie]</a></td>
-	  <td><a href="&url.rle;/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/amd64/&betarel2.current;-&betarel2.vers;">[Distributie]</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.curent;-&betarel2.vers;">[Distributie]</a></td>
-	  <td><a href="&url.rle;/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/i386/&betarel2.current;-&betarel2.vers;">[Distributie]</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.curent;-&betarel2.vers;" -->[Distributie]<!-- /a --></td>
-	  <td><!-- a href="&url.rle;/ia64/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
+	  <td><!-- a href="&url.rel;/ia64/&betarel2.current;-&betarel2.vers;" -->[Distributie]<!-- /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.curent;-&betarel2.vers;">[Distributie]</a></td>
-	  <td><a href="&url.rle;/pc98/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/pc98/&betarel2.current;-&betarel2.vers;">[Distributie]</a></td>
+	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>powerpc</td>
-	  <td><!-- a href="&url.rel;/powerpc/&betarel2.curent;-&betarel2.vers;" -->[Distributie]<!-- /a  --></td>
-	  <td><!-- a href="&url.rle;/powerpc/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
+	  <td><!-- a href="&url.rel;/powerpc/&betarel2.current;-&betarel2.vers;" -->[Distributie]<!-- /a  --></td>
+	  <td><!-- a href="&url.rel;/powerpc/ISO-IMAGES/&betarel2.current;/" -->[ISO]<!-- /a --></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
-	  <td><a href="&url.rel;/sparc64/&betarel2.curent;-&betarel2.vers;">[Distributie]</a></td>
-	  <td><a href="&url.rle;/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
+	  <td><a href="&url.rel;/sparc64/&betarel2.current;-&betarel2.vers;">[Distributie]</a></td>
+	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
 	</tr>
       </tbody>
     </table>
diff --git a/share/sgml/news.xml b/share/sgml/news.xml
index eb03abb06b..bafeb9ed79 100644
--- a/share/sgml/news.xml
+++ b/share/sgml/news.xml
@@ -25,7 +25,7 @@
 <news>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/news.xml,v 1.354 2010/12/07 23:09:19 flo Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.355 2010/12/17 12:52:50 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -48,6 +48,22 @@
 	</event>
       </day>
 
+      <day>
+	<name>11</name>
+      
+	<event>
+	  <title>&os; 7.4/8.2-BETA1 Available</title>
+
+	  <p>The first of the test builds for the &os;-7.4/8.2
+	    release cycles is now available.  ISO images for Tier-1
+	    architectures are now <a
+	    href="&lists.stable;/2010-December/060541.html">available</a>
+	    on most of the <a
+	    href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os;
+	    mirror sites</a>.</p>
+	</event>
+      </day>
+
       <day>
         <name>7</name>
 	<event>
diff --git a/share/sgml/release.ent b/share/sgml/release.ent
index b28fe43e0c..263b29d275 100644
--- a/share/sgml/release.ent
+++ b/share/sgml/release.ent
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.49 2010/07/23 23:53:11 hrs Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.50 2010/11/20 15:22:27 kwm Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -28,18 +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 % beta.testing "IGNORE">
-<!ENTITY betarel.current '8.1'>
-<!ENTITY betarel.vers 'RC2'>
+<!ENTITY beta.testing "INCLUDE">
+<!ENTITY % beta.testing "INCLUDE">
+<!ENTITY betarel.current '8.2'>
+<!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 "IGNORE">
-<!ENTITY % beta2.testing "IGNORE">
-<!ENTITY betarel2.current '6.4'>
-<!ENTITY betarel2.vers 'RC2'>
+<!ENTITY beta2.testing "INCLUDE">
+<!ENTITY % beta2.testing "INCLUDE">
+<!ENTITY betarel2.current '7.4'>
+<!ENTITY betarel2.vers 'BETA1'>
 <!ENTITY u.betarel2.schedule '&base;/releases/&betarel2.current;R/schedule.html'>
 
 <!ENTITY rel.current.major '8'>
