diff --git a/en_US.ISO8859-1/share/xml/release.l10n.ent b/en_US.ISO8859-1/share/xml/release.l10n.ent
index 6274219aaa..aa660a29b2 100644
--- a/en_US.ISO8859-1/share/xml/release.l10n.ent
+++ b/en_US.ISO8859-1/share/xml/release.l10n.ent
@@ -1,137 +1,137 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- $FreeBSD$ -->
 
 <![%beta2.testing;[
 <!ENTITY beta.plural 's'>
 ]]>
 <!ENTITY beta.plural ''>
 
 <![%beta2.testing;[
 <!ENTITY beta.second '
     <div xmlns="http://www.w3.org/1999/xhtml">
       <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
   
       <table class="tblbasic tblwide tbldownload">
 	<tbody>
 	  <tr>
 	    <th>Installer Images</th>
 	    <th>Virtual Machine Images</th>
 	    <th>Documentation</th>
 	  </tr>
 	  <tr>
 	    <td>
 	      <ul class="txtdownloadlist">
-		<li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">amd64</a></li>
-		<li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel2.current;/">i386</a></li>
-		<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel2.current;/">armv6</a></li>
-		<li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">ia64</a></li>
-		<li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">powerpc</a></li>
-		<li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">powerpc64</a></li>
-		<li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">sparc64</a></li>
+		<li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">amd64</a></li>
+		<li><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">i386</a></li>
+		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/">armv6</a></li>
+		<li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">ia64</a></li>
+		<li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">powerpc</a></li>
+		<li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">powerpc64</a></li>
+		<li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">sparc64</a></li>
 	      </ul>
 	    </td>
 	    <td>
 	      <ul class="txtdownloadlist">
-		<li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/amd64/Latest/">amd64</a></li>
-		<li><a href="&url.snapshot;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/i386/Latest/">i386</a></li>
+		<li><a href="&url.rel;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/amd64/Latest/">amd64</a></li>
+		<li><a href="&url.rel;/VM-IMAGES/&betarel2.current;-&betarel2.vers;/i386/Latest/">i386</a></li>
 	      </ul>
 	    </td>
 	    <td>
 	      <ul class="txtdocslist">
 		<li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO List</a></li>
 	      </ul>
 	    </td>
 	  </tr>
 	</tbody>
       </table>
       <br />
     </div>
 '>
 ]]>
 <!ENTITY beta.second ''>
 
 
 <![%beta.testing;[
 <!ENTITY beta.desc '
   <div xmlns="http://www.w3.org/1999/xhtml">
     &beta.helptest;
 
     <h1>&os; &betarel.current;-&betarel.vers;</h1>
 
     <table class="tblbasic tblwide tbldownload">
       <tbody>
 	<tr>
 	  <th>Installer Images</th>
 	  <th>Virtual Machine Images</th>
 	  <th>Documentation</th>
 	</tr>
 	<tr>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
-	      <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
-	      <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
-	      <li><a href="&url.snapshot;/ia64/ia64/ISO-IMAGES/&betarel.current;/">ia64</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
-	      <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
-	      <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
+	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
+	      <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">ia64</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
+	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdownloadlist">
-	      <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/Latest/">amd64</a></li>
-	      <li><a href="&url.snapshot;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/Latest/">i386</a></li>
 	    </ul>
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
 	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO List</a></li>
 	    </ul>
 	  </td>
 	</tr>
       </tbody>
     </table>
     <br />
 
     &beta.second;
   </div>
 '>
 ]]>
 
 <!ENTITY beta.desc ''>
 
 <!ENTITY beta.helptest '
   <div xmlns="http://www.w3.org/1999/xhtml">
     <a name="helptest"></a>
     <h1>Help With The Next FreeBSD Release&beta.plural;</h1>
 
     <p>Our developers and release engineers are working on the the
       next release&beta.plural; of FreeBSD; if you wish to help with
       testing, please download the latest build&beta.plural;.  Please
       note that these images are, by their very nature, intended for
       testing and should not be used in production environments.</p>
   </div>
 '>
 
 <![%beta.local.where;[
 <!ENTITY beta.local.where '
   <div xmlns="http://www.w3.org/1999/xhtml">
     &beta.helptest;
     <p>Available installation images are listed on the <a
 	href="&base;/where.html#helptest">download page</a>.</p>
   </div>
 '>
 ]]>
 
 <![%beta2.local.where;[
 <!ENTITY beta2.local.where '
   <div xmlns="http://www.w3.org/1999/xhtml">
     &beta.helptest;
     <p>Available installation images are listed on the <a
 	href="&base;/where.html#helptest">download page</a>.</p>
   </div>
 '>
 ]]>
 
 <!ENTITY beta.local.where ''>
 <!ENTITY beta2.local.where ''>