Index: head/zh_CN.UTF-8/share/xml/release.l10n.ent
===================================================================
--- head/zh_CN.UTF-8/share/xml/release.l10n.ent	(revision 51519)
+++ head/zh_CN.UTF-8/share/xml/release.l10n.ent	(revision 51520)
@@ -1,138 +1,179 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $FreeBSD$ -->
-<![%beta2.testing;[
-<!ENTITY beta.second '
-    <table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
-      <thead>
-        <tr style="text-align: center;">
-          <td colspan="2">版本 &amp; 平台</td>
-          <td>发行版安装文件</td>
-          <td title="ISO9660 CD 镜像"><a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
-          <td>计划</td>
-          <td>待决问题列表</td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">FreeBSD &betarel2.current;-&betarel2.vers;</td>
-          <td colspan="2"></td>
-          <td><a href="&enbase;/releases/&betarel2.current;R/schedule.html">[查看]</a></td>
-          <td><a href="&enbase;/releases/&betarel2.current;R/todo.html">[查看]</a></td>
-        </tr>
-        <tr>
-          <td>&nbsp;&nbsp;&nbsp;</td>
-          <td>alpha</td>
-          <td><a href="&url.rel;/alpha/&betarel2.current;-&betarel2.vers;">[安装文件]</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;">[安装文件]</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;">[安装文件]</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;">[安装文件]</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;">[安装文件]</a></td>
-          <td><a href="&url.rel;/pc98/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>ppc</td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/&betarel2.current;-&betarel2.vers;">[安装文件]</a></td>
-          <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
-        </tr>
-      </tbody>
-    </table>
-'>
-]]>
-<!ENTITY beta.second ''>
 
-<![%beta.testing;[
-<!ENTITY beta.desc '
-  <div xmlns="http://www.w3.org/1999/xhtml">
-    <a name="helptest"></a>
-    <h2>为即将发布的 FreeBSD 版本提供帮助</h2>
+<!--
+     $FreeBSD$
+     Original revision: r50853
+ -->
 
-    <p>我们的开发人员和交付工程师目前正在为 FreeBSD
-      接下来的版本努力工作； 如果您希望帮助进行测试， 请下载最新联编的版本。
-      请注意这些光盘镜像是设计用于测试目的， 因而不应在生产环境中使用。</p>
+ <![%beta2.testing;[
+ <!ENTITY beta.second '
+     <div xmlns="http://www.w3.org/1999/xhtml">
+       <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
 
-    <table class="tblbasic">
-      <thead>
-        <tr style="text-align: center;">
-          <td colspan="2">版本 &amp; 平台</td>
-          <td>发行版安装文件</td>
-          <td title="ISO9660 CD image"><a href="&enbase;/doc/zh_CN.UTF-8/books/handbook/install-diff-media.html#INSTALL-CDROM">ISO</a></td>
-          <td>计划</td>
-          <td>待决问题列表</td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
-          <td colspan="2"></td>
-          <td rowspan="8"><a href="&enbase;/releases/&betarel.current;R/schedule.html">[查看]</a></td>
-          <td rowspan="8"><a href="&enbase;/releases/&betarel.current;R/todo.html">[查看]</a></td>
-        </tr>
-        <tr>
-          <td>&nbsp;&nbsp;&nbsp;</td>
-          <td>alpha</td>
-          <td><a href="&url.rel;/alpha/&betarel.current;-&betarel.vers;">[安装文件]</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;">[安装文件]</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;">[安装文件]</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;">[安装文件]</a></td>
-          <td><a href="&url.rel;/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>powerpc</td>
-          <td><a href="&url.rel;/powerpc/&betarel.current;-&betarel.vers;">[安装文件]</a></td>
-          <td><a href="&url.rel;/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>sparc64</td>
-          <td><a href="&url.rel;/sparc64/&betarel.current;-&betarel.vers;">[安装文件]</a></td>
-          <td><a href="&url.rel;/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
-        </tr>
-      </tbody>
-    </table>
+       <table class="tblbasic tblwide tbldownload">
+ 	<tbody>
+ 	  <tr>
+ 	    <th>安装程序映像</th>
+ 	    <th>虚拟机映像</th>
+ 	    <th>SD 卡映像</th>
+ 	    <th>文档</th>
+ 	  </tr>
+ 	  <tr>
+ 	    <td>
+ 	      <ul class="txtdownloadlist">
+ 		<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.rel;/VM-IMAGES/README.txt">README</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="txtdownloadlist">
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+ 		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+ 	      </ul>
+ 	    </td>
+ 	    <td>
+ 	      <ul class="txtdocslist">
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/relnotes.html">发行公告</a></li>
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/readme.html">自述文件</a></li>
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/hardware.html">硬件兼容性列表</a></li>
+ 		<?ignore
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/installation.html">安装说明</a></li>
+ 		?>
+ 		<?ignore
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO List</a></li>
+ 		?>
+ 		<li><a href="&enbase;/releases/&betarel2.current;R/signatures.html">已签名校验和</a></li>
+ 	      </ul>
+ 	    </td>
+ 	  </tr>
+ 	</tbody>
+       </table>
+       <br />
+     </div>
+ '>
+ ]]>
+ <!ENTITY beta.second ''>
 
-    &beta.second;
-  </div>
-'>
-]]>
-<!ENTITY beta.desc ''>
+
+ <![%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>安装程序映像</th>
+ 	  <th>虚拟机映像</th>
+ 	  <th>SD 卡映像</th>
+ 	  <th>文档</th>
+ 	</tr>
+ 	<tr>
+ 	  <td>
+ 	    <ul class="txtdownloadlist">
+ 	      <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;/arm64/aarch64/ISO-IMAGES/&betarel.current;/">aarch64</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.rel;/VM-IMAGES/README.txt">README</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>
+ 	      <li><a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/aarch64/Latest/">aarch64</a></li>
+ 	    </ul>
+ 	  </td>
+ 	  <td>
+ 	    <ul class="txtdownloadlist">
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX/HUMMINGBOARD</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI2.img.xz">RPI2</a></li>
+ 	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+ 	    </ul>
+ 	  </td>
+ 	  <td>
+ 	    <ul class="txtdocslist">
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/relnotes.html">发行公告</a></li>
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/readme.html">自述文件</a></li>
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/hardware.html">硬件兼容性列表</a></li>
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/installation.html">安装说明</a></li>
+ 	      <?ignore
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO List</a></li>
+ 	      ?>
+ 	      <li><a href="&enbase;/releases/&betarel.current;R/signatures.html">已签名校验和</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>为即将发布的 FreeBSD 版本提供帮助</h1>
+
+     <p>我们的开发人员和发布工程师正在为 FreeBSD
+       接下来的版本努力工作； 如果您希望帮助进行测试， 请下载最新构建的版本。
+       请注意， 这些映像是用于测试目的提供的， 因此不应在生产环境中使用。</p>
+   </div>
+ '>
+
+ <![%beta.local.where;[
+ <!ENTITY beta.local.where '
+   <div xmlns="http://www.w3.org/1999/xhtml">
+     &beta.helptest;
+     <p>可以在 <a
+ 	href="&base;/where.html#helptest">下载页面</a> 获取可用的安装映像。</p>
+   </div>
+ '>
+ ]]>
+
+ <![%beta2.local.where;[
+ <!ENTITY beta2.local.where '
+   <div xmlns="http://www.w3.org/1999/xhtml">
+     &beta.helptest;
+     <p>可以在 <a
+ 	href="&base;/where.html#helptest">下载页面</a> 获取可用的安装映像。</p>
+   </div>
+ '>
+ ]]>
+
+ <!ENTITY beta.local.where ''>
+ <!ENTITY beta2.local.where ''>