svn commit: r50728 - head/ja_JP.eucJP/share/xml

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sun Aug 27 03:02:03 2017
New Revision: 50728
URL: https://svnweb.freebsd.org/changeset/doc/50728

Log:
  - Merge the following from the English version:
  
  	r50694 -> r50725	head/ja_JP.eucJP/share/xml/news.xml
  	r50496 -> r50727	head/ja_JP.eucJP/share/xml/release.l10n.ent

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

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Sat Aug 26 03:00:48 2017	(r50727)
+++ head/ja_JP.eucJP/share/xml/news.xml	Sun Aug 27 03:02:03 2017	(r50728)
@@ -23,7 +23,7 @@
 	would like to work on.  ***
 
     $FreeBSD$
-    Original revision: r50694
+    Original revision: r50725
 -->
 <news>
   <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -35,6 +35,23 @@
 
     <month>
       <name>8</name>
+
+      <day>
+	<name>26</name>
+
+	<event>
+	  <title>&os; 10.4-BETA2 ¸ø³«</title>
+
+	  <p>&os; 10.4 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤«¤é 2 ²óÌܤÎ
+	    BETA ¥Ó¥ë¥É¤¬¸ø³«¤µ¤ì¤Þ¤·¤¿ (<a
+	      href="&lists.stable;/2017-August/087708.html">¥¢¥Ê¥¦¥ó¥¹</a>)¡£
+	    <a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	      ¥ß¥é¡¼¥µ¥¤¥È</a> ¤«¤é amd64, armv6, i386,
+	    ia64, powerpc, powerpc64 ¤ª¤è¤Ó sparc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î
+	    ISO ¥¤¥á¡¼¥¸¤òÆþ¼ê¤Ç¤­¤Þ¤¹¡£</p>
+	</event>
+      </day>
 
       <day>
 	<name>19</name>

Modified: head/ja_JP.eucJP/share/xml/release.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/release.l10n.ent	Sat Aug 26 03:00:48 2017	(r50727)
+++ head/ja_JP.eucJP/share/xml/release.l10n.ent	Sun Aug 27 03:02:03 2017	(r50728)
@@ -2,14 +2,14 @@
 
 <!--
      $FreeBSD$
-     Original revision: r50496
+     Original revision: r50727
  -->
 
 <![%beta2.testing;[
 <!ENTITY beta.second '
     <div xmlns="http://www.w3.org/1999/xhtml">
       <h1>&os; &betarel2.current;-&betarel2.vers;</h1>
-  
+
       <table class="tblbasic tblwide tbldownload">
 	<tbody>
 	  <tr>
@@ -39,16 +39,20 @@
 	    </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.bz2">BEAGLEBONE</a></li>
-		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.bz2">PANDABOARD</a></li>
-		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.bz2">RPI-B</a></li>
-		<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-ZEDBOARD.img.bz2">ZEDBOARD</a></li>
+		<!--<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>
+	      <?ignore
 	      <ul class="txtdocslist">
 		<li><a href="&enbase;/releases/&betarel2.current;R/todo.html">TODO List</a></li>
 	      </ul>
+	      ?>
 	    </td>
 	  </tr>
 	</tbody>