diff --git a/ja_JP.eucJP/htdocs/where.xml b/ja_JP.eucJP/htdocs/where.xml
index 77d1deb3df..4a5f8c91a0 100644
--- a/ja_JP.eucJP/htdocs/where.xml
+++ b/ja_JP.eucJP/htdocs/where.xml
@@ -3,9 +3,10 @@
"http://www.FreeBSD.org/XML/share/xml/xhtml10-freebsd.dtd" [
<!ENTITY title "FreeBSD �����ꤹ��">
<!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">
+<!ENTITY url.snapshot "ftp://ftp.FreeBSD.org/pub/FreeBSD/snapshots">
]>
<!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r45989 -->
+<!-- Original revision: r46192 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -16,221 +17,159 @@
<body class="navinclude.download">
- <a name="releases"></a>
+ <a name="choose-version"></a>
- <h2><a href="&base;/releases/index.html">��������</a></h2>
+ <a name="choose-arch"></a>
- <p>�����ߡ������ƾ���Υ����˴ؤ���ܺ٤Ǥ���
- FreeBSD �κǿ��ΥС�����������ǧ����ˤϡ�
- �ޤ��Ϥ��Υڡ�����������������</p>
+ <h2>�������ƥ����������</h2>
- <a name="install"></a>
+ <p>�Ƕ�� PC �ϡ�Intel® �֥��ɤΥץ����å���ޤᡢ
+ amd64 �������ƥ������ȤäƤ��ޤ���
+ 3 GB �ʾ�Υ������ܤ��Ƥ��륳��ԥ塼���Ǥϡ�
+ amd64 ����Ѥ���ɬ�פ�����ޤ���
+ ����ԥ塼�����Ť���32 �ӥåȤΥ�ǥ�Ǥ���С�i386 ����Ѥ��Ƥ���������
+ �Ȥ߹��ߥǥХ����䡢Raspberry Pi, Beagle, Bone Black, Panda Board,
+ ������ Zed Board �Ȥ��ä�����ܡ��ɥ���ԥ塼�� (SBC) �Ǥϡ�
+ armv6 SD �����ɥ��������Ѥ��Ƥ���������</p>
- <h2>FreeBSD �Υ��ȡ���</h2>
+ <a name="choose-image"></a>
- <p>FreeBSD �Υ��ȡ���ˤϡ�CD-ROM, DVD��USB ���ƥ��å���
- �����ơ�anonymous FTP, HTTP, NFS
- ��ͳ�Υ��ȡ���ȿ�¿���Υ��ץ������ޤ���
+ <h2>�����������</h2>
-<a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html"></a>
-
- FreeBSD ��������ʪ�����������ɤ������ˡ�<a
- href="&enbase;/doc/ja_JP.eucJP/books/handbook/bsdinstall.html">&os; 9.X/10.X
- ���ȡ��륬����</a> �ޤ��� <a
- href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">&os; 8.X
- ���ȡ��륬����</a> ��
- ���ȡ���С������˹�碌�����ɤ��Ƥ���������</p>
-
- <a name="distribution"></a>
+ <p>&os; �Υ��ȡ���ϡ�����Ū�� �ߥ� USB ���ꥹ�ƥ��å��Τۤ��ˡ�
+ CD (disc1), DVD (dvd1), �ͥåȥ�����ȡ��� (bootonly) �������� <a
+ href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a>
+ �ǥ�����������Ȥ��ä������ޤ��ޤʷ����ǥ���������ɤǤ��ޤ���
+ �Ƕ�� &os; �ΥС������Ǥϥӥ�ɺѤߤβ��ۥޥ������
+ �Ȥ߹��ߥץ�åȥե������Ѥˤ� SD
+ �����ɤΥ�������Ѱդ���Ƥ��ޤ���</p>
<a name="download"></a>
- <h2>FreeBSD �����������</h2>
+ <a name="download-rel"></a>
- <p>FreeBSD �� FTP �� HTTP ��ͳ�����ꤷ�褦�ȹͤ��Ƥ���Τʤ顢
- �ϥ�ɥ֥å��� <a
- href="&enbase;/doc/ja_JP.eucJP/books/handbook/mirrors-ftp.html"><strong>�ߥ顼������</strong></a>
- ��������ͥåȥ��Ū�ˤ��ᤤ�����Ȥ�õ���Ƥ���������</p>
+ <h1>&os; &rel.current;-RELEASE</h1>
- <table class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <td colspan="2">�С������ȥץ�åȥե�����</td>
- <td>���۸�</td>
- <td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
- <td>����<br/>����</td>
- <td>�ϡ��ɥ�����<br/>�Ρ���</td>
- <td>���ȡ���<br/>������</td>
- <td>Errata<br/>(����ɽ)</td>
- </tr>
- </thead>
+ <table class="tblbasic tblwide tbldownload">
<tbody>
<tr>
- <td colspan="2">FreeBSD &rel.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/relnotes.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/hardware.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/installation.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel.current;R/errata.html">[View]</a></td>
+ <th>���ȡ��饤���</th>
+ <th>���ۥޥ����</th>
+ <th>ʸ��</th>
</tr>
<tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/">[VM Images]</a></td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">i386</a></li>
+ <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
+ <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel.current;/">ia64</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
+ <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">����</a>: &rel.current.date;</li>
+ <li><a href="&u.rel.notes;">��������</a></li>
+ <li><a href="&u.rel.hardware;">�ϡ��ɥ������ߴ��ꥹ��</a></li>
+ <li><a href="&u.rel.installation;">���ȡ��륬����</a></li>
+ <li><a href="&u.rel.errata;">Errata</a></li>
+ </ul>
+ </td>
</tr>
- <tr>
- <td></td>
- <td>arm</td>
- <td> </td>
- <td><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel.current;/">[SD Card Image]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&rel.current;-RELEASE/i386/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&rel.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td colspan="2">FreeBSD &rel2.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/relnotes.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/hardware.html">[View]</a></td>
- <td rowspan="7"><a href="&base;/releases/&rel2.current;R/installation.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel2.current;R/errata.html">[View]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&rel2.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="5"><a href="&base;/releases/&rel3.current;R/relnotes.html">[View]</a></td>
- <td rowspan="5"><a href="&enbase;/releases/&rel3.current;R/hardware.html">[View]</a></td>
- <td rowspan="5"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">[View]</a></td>
- <td rowspan="5"><a href="&enbase;/releases/&rel3.current;R/errata.html">[View]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <!--
- <tr>
- <td colspan="2">FreeBSD &rel3.current;-RELEASE</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/relnotes.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/hardware.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">[View]</a></td>
- <td rowspan="7"><a href="&enbase;/releases/&rel3.current;R/errata.html">[View]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[���۸�]</a></td>
- <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td>
- </tr>
- -->
</tbody>
</table>
+ <br />
- <p><em>����:</em> �ɤΥץ�åȥե�����䥢�����ƥ���������٤Ф褤���狼��ʤ���С�
- �����餯���Ť�����ԥ塼���Ǥ���� <em>i386</em>��
- �Ƕ�Υ���ԥ塼���Ǥ���� <em>amd64</em> �����֤Ȥ褤�Ǥ��礦��</p>
+ <a name="download-rel2"></a>
+
+ <h1>&os; &rel2.current;-RELEASE</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>���ȡ��饤���</th>
+ <th>���ۥޥ����</th>
+ <th>ʸ��</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
+ <li><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&rel2.current;/">ia64</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
+ <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
+ <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.rel;/VM-IMAGES/&rel2.current;-RELEASE/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">����</a>: &rel2.current.date;</li>
+ <li><a href="&u.rel2.notes;">��������</a></li>
+ <li><a href="&u.rel2.hardware;">�ϡ��ɥ������ߴ��ꥹ��</a></li>
+ <li><a href="&u.rel2.installation;">���ȡ��륬����</a></li>
+ <li><a href="&u.rel2.errata;">Errata</a></li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br />
+
+ <a name="download-rel3"></a>
+
+ <h1>&os; &rel3.current;-RELEASE</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>���ȡ��饤���</th>
+ <th>ʸ��</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.rel;/amd64/ISO-IMAGES/&rel2.current;/">amd64</a></li>
+ <li><a href="&url.rel;/i386/ISO-IMAGES/&rel2.current;/">i386</a></li>
+ <li><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">pc98</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdocslist">
+ <li><a href="&base;/releases/index.html#current">����</a>: &rel3.current.date;</li>
+ <li><a href="&u.rel3.notes;">��������</a></li>
+ <li><a href="&u.rel3.hardware;">�ϡ��ɥ������ߴ��ꥹ��</a></li>
+ <li><a href="&u.rel3.installation;">���ȡ��륬����</a></li>
+ <li><a href="&u.rel3.errata;">Errata</a></li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br />
&beta.desc;
- <p>�⤷���˼¸�Ū�� FreeBSD-CURRENT (&rel.head;-CURRENT)
+ <a name="download-snapshots"></a>
+
+ <h1>��ȯ���ʥåץ���å�</h1>
+
+ <p>�⤷���˼¸�Ū�� &os;-CURRENT (&rel.head;-CURRENT)
(����ϳ�ȯ�ԤȲ̴��˺���ü���ɤ��ƥ��������ѤǤ�) �� <strong>snapshot</strong>
�����˶�̣������Τʤ�С�<a
href="&base;/snapshots/">&os; ���ʥåץ���åȥ���</a>
@@ -238,14 +177,65 @@
�����ߡ������ƾ���Υ������̤ˤĤ��ƤΤ��ܤ��������ߤ������ϡ�<a
href="&base;/releases/index.html">��������Υڡ���</a> �Ƥ���������</p>
+ <h1>&os; &rel.head;-CURRENT</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>���ȡ��饤���</th>
+ <th>���ۥޥ����</th>
+ </tr>
+ <tr>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/amd64/amd64/ISO-IMAGES/&rel.head;/">amd64</a></li>
+ <li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
+ <li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
+ <li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
+ </ul>
+ </td>
+ <td>
+ <ul class="txtdownloadlist">
+ <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/amd64/Latest/">amd64</a></li>
+ <li><a href="&url.snapshot;/VM-IMAGES/&rel.head;-CURRENT/i386/Latest/">i386</a></li>
+ </ul>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <p>HTTP �⤷���� FTP ��ͳ�� &os; �����������ɤ���ݤˤϡ�
+ �ϥ�ɥ֥å��� <a
+ href="&enbase;/doc/ja_JP.eucJP/books/handbook/mirrors-ftp.html"><strong>�ߥ顼������</strong></a> �ΰ����ơ�
+ ���ʤ����ϰ�˶ᤤ�����Ȥ�õ���Ƥ���������</p>
+
+ <a name="install"></a>
+
+ <h2>&os; �Υ��ȡ���</h2>
+
+ <p>&os; �Υ��ȡ���ˤϡ�CD-ROM, DVD��USB ���ꥹ�ƥ��å���
+ �����ơ�anonymous FTP, HTTP, NFS
+ ��ľ�ܻȤä����ȡ���ʤɿ�¿������ˡ���Ѱդ���Ƥ��ޤ���
+ &os; ��������ʪ�����������ɤ������ˡ�
+ ���ȡ��뤹��С������˹�碌�� <a
+ href="&enbase;/doc/ja_JP.eucJP/books/handbook/bsdinstall.html">&os; 9.X/10.X
+ ���ȡ��륬����</a> �ޤ��� <a
+ href="&enbase;/doc/ja_JP.eucJP/books/handbook/install.html">&os; 8.X
+ ���ȡ��륬����</a> �����ɤ��Ƥ���������</p>
+
+ <a name="distribution"></a>
+
<h2>&os; ��ǥ����ι���</h2>
- <p>FreeBSD �� CD-ROM �� DVD �ϡ�<a
+ <p>&os; �� CD-ROM �� DVD �ϡ�<a
href="http://www.freebsdmall.com/">FreeBSD Mall</a> �⤷���� <a
href="&enbase;/doc/ja_JP.eucJP/books/handbook/mirrors.html">CD-ROM
����� DVD �ν��Ǽ�</a> ��������Ǥ��ޤ���</p>
<a name="past"></a>
+
<h2>������</h2>
<p>���Υ����ϡ�<a
@@ -254,26 +244,26 @@
<a name="derived"></a>
- <h2>FreeBSD ��ͳ�褹�륪�ڥ졼�ƥ������ƥ�Υǥ����ȥ�ӥ塼�����</h2>
+ <h2>&os; ��ͳ�褹�륪�ڥ졼�ƥ������ƥ�Υǥ����ȥ�ӥ塼�����</h2>
- <p>FreeBSD �ϡ�
+ <p>&os; �ϡ�
���Ѥ䥪���ץ����Υ��ڥ졼�ƥ������ƥ�Υ١����Ȥ��ơ�
���������Ѥ���Ƥ��ޤ���
- ������ڤ��Ƥ��ơ��ä� FreeBSD
+ ������ڤ��Ƥ��ơ��ä� &os;
�桼���Τߤʤ���̣����������ʥץ��������Ȥ�ʲ��ǾҲ𤷤ޤ���</p>
- <ul>
- <li><p><a href="http://www.freenas.org">FreeNAS</a> �ϡ�FreeBSD
+ <ul class="txtdownloadlist">
+ <li><p><a href="http://www.freenas.org">FreeNAS</a> �ϡ�&os;
�١����Υ����ץ����Υ��ȥ졼���ץ�åȥե�����Ǥ���
Windows, Apple, UNIX-like �����ƥफ��ζ�ͭ���б����Ƥ��ޤ���</p></li>
- <li><p><a href="http://www.pcbsd.org">PC-BSD</a> �ϡ�FreeBSD
+ <li><p><a href="http://www.pcbsd.org">PC-BSD</a> �ϡ�&os;
���Ȥ˥���ե�����ʥ��ȡ�����������ǥ������ȥåץġ����ä���
�����奢��ʥ���ԥ塼���桼���Ǥ��ñ�˻Ȥ��뤳�Ȥ��ܻؤ��Ƥ��ޤ���</p></li>
<li><p><a href="http://www.pfsense.org">pfSense</a> �ϡ�
�ե��������������롼���Ȥ��Ƥλ��Ѥ˥������ޥ������줿��
- �ե�ʥ����ץ����� FreeBSD �ǥ����ȥ�ӥ塼�����Ǥ���</p></li>
+ �ե�ʥ����ץ����� &os; �ǥ����ȥ�ӥ塼�����Ǥ���</p></li>
</ul>
<a name="apps"></a>
@@ -282,11 +272,11 @@
<h3>Ports Collection</h3>
- <p>FreeBSD Ports Collection �ϡ�FreeBSD ���Ѱդ��줿��
+ <p>&os; Ports Collection �ϡ�&os; ���Ѱդ��줿��
���ޤ��ޤʥ桼�ƥ���ƥ��ȥ��ץꥱ������եȥ������Τ��ȤǤ���</p>
- <ul>
- <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">FreeBSD
+ <ul class="txtdownloadlist">
+ <li><a href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/">&os;
Ports Collection</a></li>
<li><a href="&base;/ports/index.html">Ports Collection ��
@@ -300,7 +290,7 @@
�˴�£������ˡ�ˤĤ��Ƥξ���ϡ�<em><a href="&enbase;/doc/ja_JP.eucJP/books/porters-handbook/index.html">
port �����ԤΤ���Υϥ�ɥ֥å�</a></em> �ȡ�
<em><a href="&enbase;/doc/ja_JP.eucJP/articles/contributing/index.html">
- FreeBSD �ؤι�</a></em> �Ȥ���ʸ���������������</p>
+ &os; �ؤι�</a></em> �Ȥ���ʸ���������������</p>
</body>
</html>
diff --git a/ja_JP.eucJP/share/xml/release.l10n.ent b/ja_JP.eucJP/share/xml/release.l10n.ent
index a6b3b575ba..e560f8b172 100644
--- a/ja_JP.eucJP/share/xml/release.l10n.ent
+++ b/ja_JP.eucJP/share/xml/release.l10n.ent
@@ -2,66 +2,49 @@
<!--
$FreeBSD$
- Original revision: r45881
+ Original revision: r46192
-->
<![%beta2.testing;[
<!ENTITY beta.second '
- <table xmlns="http://www.w3.org/1999/xhtml" class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <td colspan="2">�С������ȥץ�åȥե�����</td>
- <td>���۸�</td>
- <td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></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="&enbase;/releases/&betarel2.current;R/todo.html">[View]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&betarel2.current;-&betarel2.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel2.current;/">[ISO]</a></td>
- </tr>
- </tbody>
- </table>
+ <div xmlns="http://www.w3.org/1999/xhtml">
+ <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
+
+ <table class="tblbasic tblwide tbldownload">
+ <tbody>
+ <tr>
+ <th>���ȡ��饤���</th>
+ <th>���ۥޥ����</th>
+ <th>ʸ��</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>
+ </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>
+ </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 ''>
@@ -71,75 +54,42 @@
<div xmlns="http://www.w3.org/1999/xhtml">
&beta.helptest;
- <table class="tblbasic">
- <thead>
- <tr style="text-align: center;">
- <td colspan="2">�С������ȥץ�åȥե�����</td>
- <td>���۸�</td>
- <td title="ISO9660 CD image"><a href="&enbase;/doc/ja_JP.eucJP/books/handbook/install-diff-media.html#install-cdrom">ISO</a></td>
- <td>TODO �ꥹ��</td>
- </tr>
- </thead>
+ <h1>&os; &betarel.current;-&betarel.vers;</h1>
+
+ <table class="tblbasic tblwide tbldownload">
<tbody>
<tr>
- <td colspan="2">FreeBSD &betarel.current;-&betarel.vers;</td>
- <td colspan="2"></td>
- <td rowspan="7"><a href="&enbase;/releases/&betarel.current;R/todo.html">[View]</a></td>
+ <th>���ȡ��饤���</th>
+ <th>���ۥޥ����</th>
+ <th>ʸ��</th>
</tr>
<tr>
- <td></td>
- <td>amd64<br/>(x86-64, x64)</td>
- <td><a href="&url.rel;/amd64/amd64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/amd64/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>arm</td>
- <td><a href="&url.rel;/arm/armv6/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/">[SD Card Image]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>i386</td>
- <td><a href="&url.rel;/i386/i386/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a><br/>
- <a href="&url.rel;/VM-IMAGES/&betarel.current;-&betarel.vers;/i386/">[VM Images]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>ia64</td>
- <td><a href="&url.rel;/ia64/ia64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/ia64/ia64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <!--
- <tr>
- <td></td>
- <td>pc98</td>
- <td><a href="&url.rel;/pc98/i386/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/pc98/i386/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- -->
- <tr>
- <td></td>
- <td>powerpc</td>
- <td><a href="&url.rel;/powerpc/powerpc/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>powerpc64</td>
- <td><a href="&url.rel;/powerpc/powerpc64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
- </tr>
- <tr>
- <td></td>
- <td>sparc64</td>
- <td><a href="&url.rel;/sparc64/sparc64/&betarel.current;-&betarel.vers;">[���۸�]</a></td>
- <td><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">[ISO]</a></td>
+ <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>
+ </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>
+ </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>