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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Apr 23 15:20:41 2013
New Revision: 41476
URL: http://svnweb.freebsd.org/changeset/doc/41476

Log:
  - Merge the following from the English version:
  
  	r41455 -> r41472	head/ja_JP.eucJP/share/xml/navibar.l10n.ent
  	r41420 -> r41475	head/ja_JP.eucJP/share/xml/news.xml

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

Modified: head/ja_JP.eucJP/share/xml/navibar.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/navibar.l10n.ent	Tue Apr 23 13:46:23 2013	(r41475)
+++ head/ja_JP.eucJP/share/xml/navibar.l10n.ent	Tue Apr 23 15:20:41 2013	(r41476)
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='euc-jp'?>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r41455 -->
+<!-- Original revision: r41472 -->
 
 <!ENTITY nav.about '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
@@ -150,7 +150,7 @@
 	<ul>
 		<li><a href="&enbase;/security/advisories.html">¥»¥­¥å¥ê¥Æ¥£´«¹ð</a></li>
 		<li><a href="&enbase;/security/notices.html">Errata ¾ðÊó</a></li>
-      <li><a href="&base;/security/supported.html">¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥ê¥ê¡¼¥¹</a></li>
+      <li><a href="&base;/security/index.html#sup">¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥ê¥ê¡¼¥¹</a></li>
       <li><a href="&base;/security/unsupported.html">¥µ¥Ý¡¼¥È¤¬½ªÎ»¤·¤¿¥ê¥ê¡¼¥¹</a></li>
       <li><a href="&enbase;/doc/en_US.ISO8859-1/books/handbook/security-advisories.html">
         FreeBSD ¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ÎÆɤßÊý</a></li>

Modified: head/ja_JP.eucJP/share/xml/news.xml
==============================================================================
--- head/ja_JP.eucJP/share/xml/news.xml	Tue Apr 23 13:46:23 2013	(r41475)
+++ head/ja_JP.eucJP/share/xml/news.xml	Tue Apr 23 15:20:41 2013	(r41476)
@@ -20,7 +20,7 @@
      the contents of <title> will be preferred over <p>.
 
      $FreeBSD$
-     Original revision: r41420
+     Original revision: r41475
 -->
 <news>
     <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">
@@ -34,6 +34,31 @@
       <name>4</name>
 
       <day>
+	<name>22</name>
+
+	<event>
+	  <title>&os; 8.4-RC2 ¸ø³«</title>
+
+	  <p>&os;-8.4 ¥ê¥ê¡¼¥¹¥µ¥¤¥¯¥ë¤Î 2 ²óÌܤΥê¥ê¡¼¥¹¸õÊ䤬¸ø³«¤µ¤ì¤Þ¤·¤¿¡£
+	    amd64, i386 ¤ª¤è¤Ó pc98 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Î ISO ¥¤¥á¡¼¥¸¤¬¡¢<a
+	      href="&url.doc.base;/books/handbook/mirrors-ftp.html">&os;
+	    ¥ß¥é¡¼¥µ¥¤¥È</a> ¤Ç <a
+	      href="&lists.stable;/2013-April/073198.html">¸ø³«</a>
+	    ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</p>
+	</event>
+      </day>
+
+      <day>
+	<name>18</name>
+
+	<event>
+	  <p>¥³¥ß¥Ã¥È¸¢¸Â¤Î³ÈÂç: <a
+	      href="mailto:cy at FreeBSD.org">Cy Schubert</a>
+	    (src, ports)</p>
+	</event>
+      </day>
+
+      <day>
 	<name>12</name>
 
 	<event>