svn commit: r52394 - in head/ja_JP.eucJP: htdocs share/xml

Sun Oct 21 06:40:24 UTC 2018

Author: ryusuke
Date: Sun Oct 21 06:40:23 2018
New Revision: 52394
URL: https://svnweb.freebsd.org/changeset/doc/52394

Log:
  - Merge the following from the English version:
  
  	r52321 -> r52388	head/ja_JP.eucJP/htdocs/where.xml
    	r52373 -> r52388	head/ja_JP.eucJP/share/xml/news.xml
  	r52172 -> r52388	head/ja_JP.eucJP/share/xml/release.l10n.ent

Modified:
  head/ja_JP.eucJP/htdocs/where.xml
  head/ja_JP.eucJP/share/xml/news.xml
  head/ja_JP.eucJP/share/xml/release.l10n.ent

Modified: head/ja_JP.eucJP/htdocs/where.xml
==============================================================================

--- head/ja_JP.eucJP/htdocs/where.xml	Sun Oct 21 04:56:04 2018	(r52393)
+++ head/ja_JP.eucJP/htdocs/where.xml	Sun Oct 21 06:40:23 2018	(r52394)
@@ -6,7 +6,7 @@
 <!ENTITY url.snapshot "https://download.FreeBSD.org/ftp/snapshots">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r52321 -->
+<!-- Original revision: r52388 -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
@@ -263,6 +263,7 @@
       ²áµî¡¢¸½ºß¡¢¤½¤·¤Æ¾Íè¤Î¥ê¥ê¡¼¥¹¤Ë´Ø¤¹¤ë¤è¤ê¾Ü¤·¤¤¾ðÊó¤¬Íß¤·¤¤»þ¤Ï¡¢<a
        href="&base;/releases/index.html">¥ê¥ê¡¼¥¹¾ðÊó¤Î¥Ú¡¼¥¸</a> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</p>
 
+    <?ignore
     <h1>&os; &rel.head;-CURRENT</h1>
 
     <table class="tblbasic tblwide tbldownload">
@@ -319,6 +320,7 @@
 	</tr>
       </tbody>
     </table>
+    ?>
 
     <p> </p>
 

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sun Oct 21 04:56:04 2018	(r52393)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sun Oct 21 06:40:23 2018	(r52394)
@@ -23,7 +23,7 @@
 	would like to work on.  ***
 
     $FreeBSD$
-    Original revision: r52373
+    Original revision: r52388
 -->
 <news>
   <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -35,6 +35,23 @@
 
     <month>
       <name>10</name>
+
+      <day>
+	<name>20</name>
+
+	<event>
+	  <title>&os; 12.0-BETA1 ¸ø³«</title>
+
+	  <p>&os; 12.0 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤«¤éºÇ½é¤Î
+	    BETA ¥Ó¥ë¥É¤¬¸ø³«¤µ¤ì¤Þ¤·¤¿ (<a
+	      href="&lists.stable;/2018-October/089821.html">¥¢¥Ê¥¦¥ó¥¹</a>)¡£
+	    <a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	      ¥ß¥é¡¼¥µ¥¤¥È</a> ¤«¤é amd64, armv6, armv7,
+	    arm64, i386, powerpc, powerpc64 ¤ª¤è¤Ó sparc64 ¥¢¡¼¥¥Æ¥¯¥Á¥ã¤Î
+	    ISO ¥¤¥á¡¼¥¸¤òÆþ¼ê¤Ç¤¤Þ¤¹¡£</p>
+	</event>
+      </day>
 
       <day>
         <name>16</name>

Modified: head/ja_JP.eucJP/share/xml/release.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Oct 21 04:56:04 2018	(r52393)
+++ head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Oct 21 06:40:23 2018	(r52394)
@@ -2,7 +2,7 @@
 
 <!--
      $FreeBSD$
-     Original revision: r52172
+     Original revision: r52388
  -->
 
 <![%beta2.testing;[
@@ -133,7 +133,6 @@
 	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO ¥ê¥¹¥È</a></li>
 	      <li><a href="&enbase;/releases/&betarel.current;R/signatures.html">½ðÌ¾ºÑ¥Á¥§¥Ã¥¯¥µ¥à</a></li>
 	      ?>
-	      <li><a href="&enbase;/relnotes/11-STABLE/relnotes/article.html">¥ê¥ê¡¼¥¹¥Î¡¼¥È</a></li>
 	    </ul>
 	  </td>
 	</tr>
