From cece1102bb7b28e05d2f4ad6c7024acfd174d77d Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Wed, 4 Oct 2017 14:05:01 +0000
Subject: [PATCH] - Merge the following from the English version:

	r51023 -> r51033	head/ja_JP.eucJP/htdocs/index.xsl
	r50875 -> r51033	head/ja_JP.eucJP/htdocs/releases/index.xml
	r50754 -> r51033	head/ja_JP.eucJP/htdocs/security/security.xml
	r50853 -> r51033	head/ja_JP.eucJP/htdocs/where.xml
---
 ja_JP.eucJP/htdocs/index.xsl             |  6 ++-
 ja_JP.eucJP/htdocs/releases/index.xml    | 13 +++++-
 ja_JP.eucJP/htdocs/security/security.xml | 11 ++++-
 ja_JP.eucJP/htdocs/where.xml             | 58 +++++++++++++++++++++++-
 4 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/ja_JP.eucJP/htdocs/index.xsl b/ja_JP.eucJP/htdocs/index.xsl
index c75ce47c9a..0dd58ccacf 100644
--- a/ja_JP.eucJP/htdocs/index.xsl
+++ b/ja_JP.eucJP/htdocs/index.xsl
@@ -5,7 +5,7 @@
 ]>
 
 <!-- $FreeBSD$ -->
-<!-- Original revision: r51023 -->
+<!-- Original revision: r51033 -->
 
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -102,7 +102,9 @@
 					<a
 				href="&u.rel0.announce;">&rel0.current;</a>,
 					<a
-				href="&u.rel1.announce;">&rel1.current;</a></li>
+				href="&u.rel1.announce;">&rel1.current;</a>,
+					<a
+				href="&u.rel2.announce;">&rel2.current;</a></li>
 			    <xsl:if test="'&beta.upcoming;' != 'IGNORE'">
 			    <li>����ͽ��: <a
 				href="&u.betarel.schedule;">&betarel.current;</a></li>
diff --git a/ja_JP.eucJP/htdocs/releases/index.xml b/ja_JP.eucJP/htdocs/releases/index.xml
index 69ee2b6c7a..0c4d9ad937 100644
--- a/ja_JP.eucJP/htdocs/releases/index.xml
+++ b/ja_JP.eucJP/htdocs/releases/index.xml
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r50875 -->
+<!-- Original revision: r51033 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -75,6 +75,17 @@
 	<a href="&u.rel1.signatures;">���������</a>
 	</em></p>
 
+      <p><b>Release &rel2.current;</b> (&rel2.current.date;)
+	<em>
+	<a href="&u.rel2.announce;">���ʥ���</a> :
+	<a href="&u.rel2.notes;">��꡼���Ρ���</a> :
+	<a href="&u.rel2.installation;">���󥹥ȡ��륬����</a> :
+	<a href="&u.rel2.hardware;">�ϡ��ɥ������Ρ���</a> :
+	<a href="&u.rel2.readme;">README</a> :
+	<a href="&u.rel2.errata;">Errata (����ɽ)</a> :
+	<a href="&u.rel2.signatures;">���������</a>
+	</em></p>
+
   <a name="future"></a>
   <h2>����Υ�꡼��</h2>
 
diff --git a/ja_JP.eucJP/htdocs/security/security.xml b/ja_JP.eucJP/htdocs/security/security.xml
index d2fc38dc71..a90fde572d 100644
--- a/ja_JP.eucJP/htdocs/security/security.xml
+++ b/ja_JP.eucJP/htdocs/security/security.xml
@@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r50754 -->
+<!-- Original revision: r51033 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -152,7 +152,7 @@
       <td>�ʤ�</td>
       <td>�ʤ�</td>
       <td>�ʤ�</td>
-      <td>2018 ǯ 4 �� 30 ��</td>
+      <td>2018 ǯ 10 �� 31 ��</td>
     </tr>
     <tr>
       <td>releng/10.3</td>
@@ -161,6 +161,13 @@
       <td>2016 ǯ 4 �� 4 ��</td>
       <td>2018 ǯ 4 �� 30 ��</td>
     </tr>
+    <tr>
+      <td>releng/10.4</td>
+      <td>10.4-RELEASE</td>
+      <td>Normal</td>
+      <td>2017 ǯ 10 �� 3 ��</td>
+      <td>2018 ǯ 10 �� 31 ��</td>
+    </tr>
     <tr>
       <td>stable/11</td>
       <td>�ʤ�</td>
diff --git a/ja_JP.eucJP/htdocs/where.xml b/ja_JP.eucJP/htdocs/where.xml
index 72031a8186..a6ae52ee4a 100644
--- a/ja_JP.eucJP/htdocs/where.xml
+++ b/ja_JP.eucJP/htdocs/where.xml
@@ -6,7 +6,7 @@
 <!ENTITY url.snapshot "https://download.FreeBSD.org/ftp/snapshots">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r50853 -->
+<!-- Original revision: r51033 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -246,6 +246,62 @@
     </table>
     <br />
 
+    <a name="download-rel2"></a>
+
+    <h1>&os; &rel2.current;-RELEASE</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/&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/README.txt">README</a></li>
+	      <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="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-GUMSTIX.img.xz">GUMSTIX</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-arm-armv6-WANDBOARD.img.xz">WANDBOARD</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.readme;">Readme</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>
+	      <li><a href="&u.rel2.signatures;">��̾�ѥ����å�����</a></li>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    <br />
+
     &beta.desc;
     &beta.second;