diff --git a/en/where.sgml b/en/where.sgml
index d592e2ba99..9cef03b112 100644
--- a/en/where.sgml
+++ b/en/where.sgml
@@ -1,378 +1,378 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.85 2006/08/19 21:20:31 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.86 2006/10/08 07:43:57 simon Exp $">
 <!ENTITY title "Getting FreeBSD">
 <!ENTITY % navinclude.download "INCLUDE">
 <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
 ]>
 
 <html>
   &header;
 
     <a name="releases"></a>
 
     <h2><a href="&base;/releases/index.html">Release
 	Information</a></h2>
 
     <p>Detailed descriptions of past, present, and future releases.
       Look here first to determine what the latest version of FreeBSD
       is.</p>
 
     <a name="install"></a>
 
     <h2><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">Installing
 	FreeBSD</a></h2>
 
     <p>There are many options for installing FreeBSD, including
       installation from CD-ROM, DVD, floppy disk, an MS-DOS&reg; partition,
       magnetic tape, anonymous FTP, and NFS.  Please read through the
       <a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">installation
 	guide</a> before downloading the entire FreeBSD distribution.</p>
 
     <a name="distribution"></a>
 
     <h2>Buying FreeBSD</h2>
 
     <p>FreeBSD can be acquired on CD-ROM or DVD from <a
 	href="http://www.freebsdmall.com/">FreeBSD Mall</a>, <a
 	href="http://www.bsdmall.com/freebsd1.html">BSD Mall</a>, or
       one of the other <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors.html">CD-ROM
 	and DVD Publishers</a>.</p>
 
     <h2>Download FreeBSD</h2>
 
     <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>Release<br>Notes</td>
 	  <td>Hardware<br>Notes</td>
 	  <td>Installation<br>Notes</td>
 	  <td>Errata</td>
 	</tr>
       </thead>
       <tbody>
 	<tr>
 	  <td colspan="2">FreeBSD &rel.current;-RELEASE</td>
 	  <td colspan="2"></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation.html">[View]</a></td>
-	  <td rowspan="8"><a href="&base;/releases/&rel.current;R/errata.html">[View]</a></td>
+	  <td rowspan="7"><a href="&base;/releases/&rel.current;R/errata.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td>&nbsp;&nbsp;&nbsp;</td>
 	  <td>alpha</td>
 	  <td><a href="&url.rel;/alpha/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/alpha/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-alpha.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-alpha.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-alpha.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
 	  <td><a href="&url.rel;/amd64/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-amd64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-amd64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-amd64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
 	  <td><a href="&url.rel;/i386/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-i386.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-i386.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-i386.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
 	  <td><a href="&url.rel;/ia64/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-ia64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-ia64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-ia64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>pc98</td>
 	  <td><a href="&url.rel;/pc98/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-pc98.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-pc98.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-pc98.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
 	  <td><a href="&url.rel;/sparc64/&rel.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/relnotes-sparc64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/hardware-sparc64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel.current;R/installation-sparc64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
 	  <td colspan="2"></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation.html">[View]</a></td>
 	  <td rowspan="7"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td>
 	</tr>
-	<tr>
-	  <td></td>
-	  <td>amd64</td>
-	  <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td>
-	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/relnotes-amd64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/hardware-amd64.html">[View]</a></td>
-	  <td><a href="&base;/releases/&rel2.current;R/installation-amd64.html">[View]</a></td>
-	</tr>
 	<tr>
 	  <td></td>
 	  <td>alpha</td>
 	  <td><a href="&url.rel;/alpha/&rel2.current;-RELEASE/">[Distribution]</a></td>
 	  <td><a href="&url.rel;/alpha/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes-alpha.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware-alpha.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation-alpha.html">[View]</a></td>
 	</tr>
+	<tr>
+	  <td></td>
+	  <td>amd64</td>
+	  <td><a href="&url.rel;/amd64/&rel2.current;-RELEASE">[Distribution]</a></td>
+	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
+	  <td><a href="&base;/releases/&rel2.current;R/relnotes-amd64.html">[View]</a></td>
+	  <td><a href="&base;/releases/&rel2.current;R/hardware-amd64.html">[View]</a></td>
+	  <td><a href="&base;/releases/&rel2.current;R/installation-amd64.html">[View]</a></td>
+	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
 	  <td><a href="&url.rel;/i386/&rel2.current;-RELEASE/">[Distribution]</a></td>
 	  <td><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes-i386.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware-i386.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation-i386.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
 	  <td><a href="&url.rel;/ia64/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes-ia64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware-ia64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation-ia64.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>pc98</td>
 	  <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes-pc98.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware-pc98.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation-pc98.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
 	  <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td>
 	  <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/relnotes-sparc64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/hardware-sparc64.html">[View]</a></td>
 	  <td><a href="&base;/releases/&rel2.current;R/installation-sparc64.html">[View]</a></td>
 	</tr>
       </tbody>
     </table>
 
     <p><em>Note:</em> If you are in doubt of which platform /
       architecture to get, you probably need <em>i386</em>.</p>
 
     <p>If you plan on getting FreeBSD via FTP, please check the
       listing of <a
 	href="&base;/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html"><strong>mirror
 	  sites</strong></a> in the handbook to see if there is a site
       closer to you.  For more information about past, present and
       future releases in general, please visit the <a
 	href="&base;/releases/index.html">release information page</a>.</p>
 
   <![ %beta.testing; [
 
     <a name="helptest"></a>
     <h2>Help With The Next FreeBSD Release<![%beta2.testing; [s]]></h2>
 
     <p>Our developers and release engineers are working on the
       the next release<![%beta2.testing; [s]]> of FreeBSD; if you wish to help with testing,
       please download the latest build<![%beta2.testing; [s]]>.  Please note that these images
       are, by their very nature, intended for testing and should not
       be used in production environments.</p>
 
     <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 &betarel.current;-&betarel.vers;</td>
 	  <td colspan="2"></td>
-	  <td><a href="&base;/releases/&betarel.current;R/schedule.html">[View]</a></td>
-	  <td><a href="&base;/releases/&betarel.current;R/todo.html">[View]</a></td>
+	  <td rowspan="8"><a href="&base;/releases/&betarel.current;R/schedule.html">[View]</a></td>
+	  <td rowspan="8"><a href="&base;/releases/&betarel.current;R/todo.html">[View]</a></td>
 	</tr>
 	<tr>
 	  <td>&nbsp;&nbsp;&nbsp;</td>
 	  <td>alpha</td>
 	  <td><a href="&url.rel;/alpha/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/alpha/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>amd64</td>
 	  <td><a href="&url.rel;/amd64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>i386</td>
 	  <td><a href="&url.rel;/i386/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ia64</td>
 	  <td><a href="&url.rel;/ia64/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>pc98</td>
 	  <td><a href="&url.rel;/pc98/&betarel.current;-&betarel.vers;">[Distribution]</a></td>
 	  <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>ppc</td>
 	  <td><!-- a href="&url.rel;/ppc/&betarel.current;-&betarel.vers;" -->[Distribution]<!-- /a --></td>
 	  <td><!-- a href="&url.rel;/ppc/ISO-IMAGES/&betarel.current;/" -->[ISO]<!-- /a --></td>
 	</tr>
 	<tr>
 	  <td></td>
 	  <td>sparc64</td>
 	  <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><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>
 	</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
       <strong>snapshot</strong> release of FreeBSD-CURRENT (AKA
       &rel.head;-CURRENT), aimed at developers and bleeding-edge
       testers only, then please see the <a
 	href="&base;/snapshots/">&os; Snapshot Releases</a> page.</p>
 
     <a name="apps"></a>
 
     <h2>Applications and Utility Software</h2>
 
     <h3>The Ports Collection</h3>
 
     <p>The FreeBSD Ports Collection is a diverse collection of utility
       and application software that has been ported to FreeBSD.</p>
 
     <ul>
       <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">FreeBSD
 	  Ports Collection</a></li>
 
       <li><a href="&base;/ports/index.html">Web interface to the Ports
 	  Collection</a></li>
 
       <li><a href="http://www.freshports.org/">FreshPorts - a more
 	  advanced web interface to the Ports Collection</a></li>
     </ul>
 
     <p>For information about how <em>you</em> can contribute
       <em>your</em> favorite piece of software to the Ports Collection,
       have a look at <em><a
 	  href="&base;/doc/en_US.ISO8859-1/books/porters-handbook/index.html">The
 	  Porter's Handbook</a></em> and the article <em><a
 	  href="&base;/doc/en_US.ISO8859-1/articles/contributing/index.html">Contributing
 	  to FreeBSD</a></em>.</p>
 
     &footer;
   </body>
 </html>
 
 <!--
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->

Version & Platform		Distribution	ISO	Release Notes	Hardware Notes	Installation Notes	Errata
FreeBSD &rel.current;-RELEASE				[View]	[View]	[View]	[View]	[View]
	alpha	[Distribution]	[ISO]	[View]	[View]	[View]
	amd64	[Distribution]	[ISO]	[View]	[View]	[View]
	i386	[Distribution]	[ISO]	[View]	[View]	[View]
	ia64	[Distribution]	[ISO]	[View]	[View]	[View]
	pc98	[Distribution]	[ISO]	[View]	[View]	[View]
	sparc64	[Distribution]	[ISO]	[View]	[View]	[View]
FreeBSD &rel2.current;-RELEASE				[View]	[View]	[View]		[View]
	amd64	[Distribution]	[ISO]	[View]	[View]	[View]
	alpha	[Distribution]	[ISO]	[View]	[View]	[View]
	amd64	[Distribution]	[ISO]	[View]	[View]	[View]
	i386	[Distribution]	[ISO]	[View]	[View]	[View]
	ia64	[Distribution]	[ISO]	[View]	[View]	[View]
	pc98	[Distribution]	[ISO]	[View]	[View]	[View]
	sparc64	[Distribution]	[ISO]	[View]	[View]	[View]
Version & Platform		Distribution	ISO	Schedule	TODO List
FreeBSD &betarel.current;-&betarel.vers;				[View]	[View]	[View]	[View]
	alpha	[Distribution]	[ISO]
	amd64	[Distribution]	[ISO]
	i386	[Distribution]	[ISO]
	ia64	[Distribution]	[ISO]
	pc98	[Distribution]	[ISO]
	ppc	[Distribution]	[ISO]
	sparc64	[Distribution]	[ISO]