- Fix conditional parts that depend on whether we currently have beta

  release(s)

Approved by:	doceng (implicit)

4 files changed, 143 insertions, 127 deletions

diff --git a/zh_TW.Big5/htdocs/where.sgml b/zh_TW.Big5/htdocs/where.sgml
index 6289ffc698..4f927ea58e 100644
--- a/zh_TW.Big5/htdocs/where.sgml
+++ b/zh_TW.Big5/htdocs/where.sgml
@@ -196,133 +196,7 @@
         現在以及將來的發行版本資訊，請訪問
         <a href="&enbase;/releases/index.html">發行版本資訊頁面</a>。</p>
 
-<!--
-  <![ %beta.testing; [
-
-    <a name="helptest"></a>
-    <h2>為即將發佈的 FreeBSD 版本提供幫助</h2>
-
-    <p>我們的開發人員和 release engineers 目前正在為 FreeBSD
-      接下來的版本努力工作； 如果您希望幫助進行測試， 請下載最新編譯的版本。
-      請注意這些光碟鏡像是設計用於測試目的， 因而不應在正式環境中使用。</p>
-
-    <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_TW.Big5/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>ppc</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>
-
-  <![ %beta2.testing; [
-    <table class="tblbasic">
-      <thead>
-	<tr style="text-align: center;">
-	  <td colspan="2">版本 &amp; 平台</td>
-	  <td>發行版安裝檔案</td>
-	  <td title="ISO9660 CD 鏡像"><a href="&enbase;/doc/zh_TW.Big5/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>
-  ]]>
-  ]]>
--->
+    &beta.desc;
 
     <p>如果您對只是針對開發者和骨灰級測試人員的 FreeBSD-CURRENT
       (也就是 &rel.head;-CURRENT) 的純實驗性的 FreeBSD
diff --git a/zh_TW.Big5/share/sgml/catalog b/zh_TW.Big5/share/sgml/catalog
index f6ca95927a..1fc13ef076 100644
--- a/zh_TW.Big5/share/sgml/catalog
+++ b/zh_TW.Big5/share/sgml/catalog
@@ -34,6 +34,9 @@ PUBLIC "-//FreeBSD//ENTITIES DocBook Glossary Entities//ZH"
 PUBLIC "-//FreeBSD//ENTITIES FreeBSD L10N Entities//EN"
        "l10n.ent"
 
+PUBLIC "-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
+       "release.l10n.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES HTML FreeBSD Header L10N Entities//EN"
        "header.l10n.ent"
 
diff --git a/zh_TW.Big5/share/sgml/catalog.xml b/zh_TW.Big5/share/sgml/catalog.xml
index f0529aa7dc..72ea96d059 100644
--- a/zh_TW.Big5/share/sgml/catalog.xml
+++ b/zh_TW.Big5/share/sgml/catalog.xml
@@ -11,6 +11,10 @@
               rewritePrefix="../../"/>
 
   <public
+        publicId="-//FreeBSD//ENTITIES FreeBSD Release L10N Entities//EN"
+        uri="release.l10n.ent" />
+
+  <public
         publicId="-//FreeBSD//ENTITIES HTML FreeBSD Navigation Bar L10N Entities//EN"
         uri="navibar.l10n.ent" />
   <public
diff --git a/zh_TW.Big5/share/sgml/release.l10n.ent b/zh_TW.Big5/share/sgml/release.l10n.ent
new file mode 100644
index 0000000000..3acc284a84
--- /dev/null
+++ b/zh_TW.Big5/share/sgml/release.l10n.ent
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="big5"?>
+<![%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_TW.Big5/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>
+
+    <p>我們的開發人員和 release engineers 目前正在為 FreeBSD
+      接下來的版本努力工作； 如果您希望幫助進行測試， 請下載最新編譯的版本。
+      請注意這些光碟鏡像是設計用於測試目的， 因而不應在正式環境中使用。</p>
+
+    <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_TW.Big5/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>ppc</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>
+
+    &beta.second;
+  </div>
+'>
+]]>
+<!ENTITY beta.desc ''>