svn commit: r47596 - head/ja_JP.eucJP/books/handbook/eresources

[Ryusuke SUZUKI]

Author: ryusuke
Date: Fri Oct 16 16:45:41 2015
New Revision: 47596
URL: https://svnweb.freebsd.org/changeset/doc/47596

Log:
  - Merge the following from the English version:
  
  	r32070 -> r32940	head/ja_JP.eucJP/books/handbook/eresources/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/eresources/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/eresources/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Fri Oct 16 14:32:43 2015	(r47595)
+++ head/ja_JP.eucJP/books/handbook/eresources/chapter.xml	Fri Oct 16 16:45:41 2015	(r47596)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r32070
+     Original revision: r32940
      $FreeBSD$
 -->
 <appendix xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="eresources">
@@ -547,6 +547,12 @@
 	    </row>
 
 	    <row>
+	      <entry>&a.virtualization.name;</entry>
+	      <entry>&os;
+		¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤µ¤Þ¤¶¤Þ¤Ê²¾ÁÛ²½µ»½Ñ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</entry>
+	    </row>
+
+	    <row>
 	      <entry>&a.vuxml.name;</entry>
 	      <entry>VuXML ¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¤Ë´Ø¤¹¤ëµÄÏÀ</entry>
 	    </row>
@@ -598,6 +604,11 @@
 	      <entry>&a.usergroups.name;</entry>
 	      <entry>¥æ¡¼¥¶¥°¥ë¡¼¥×¤ÎÄ´À°</entry>
 	    </row>
+
+	    <row>
+	      <entry>&a.wip-status.name;</entry>
+	      <entry>FreeBSD ¤Î¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È¤Ë´Ø¤¹¤ë¾õ¶·</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -1756,6 +1767,45 @@
 	      µ»½ÑŪ¤ÊµÄÏÀ¤Ë¶½Ì£¤ò»ý¤Ã¤Æ¤¤¤ëÊý¤Î»²²Ã¤â´¿·Þ¤·¤Þ¤¹¡£</para>
 	  </listitem>
 	</varlistentry>
+
+	<varlistentry>
+	  <term>&a.virtualization.name;</term>
+
+	  <listitem>
+	    <para><emphasis>&os;
+		¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤µ¤Þ¤¶¤Þ¤Ê²¾ÁÛ²½µ»½Ñ¤Ë¤Ä¤¤¤Æ¤ÎµÄÏÀ</emphasis></para>
+
+	    <para>&os; ¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤µ¤Þ¤¶¤Þ¤Ê²¾ÁÛ²½µ»½Ñ¤Ë´Ø¤¹¤ëµÄÏÀ¡£
+	     ¿·¤·¤¤µ¡Ç½¤ª¤è¤Ó´ðËÜŪ¤Êµ¡Ç½¤Î¼ÂÁõ¤Ë¾ÇÅÀ¤òÅö¤Æ¤ë°ìÊý¤Ç¡¢
+	     ²¾ÁÛ²½µ»½Ñ¤Î»ÈÍѤκݤËÌäÂ꤬µ¯¤­¤¿¾ì¹ç¤Î¼ê½õ¤±¤äµÄÏÀ¤Î¥Õ¥©¡¼¥é¥à¤Ç¤â¤¢¤ê¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
+
+	<varlistentry>
+	  <term>&a.wip-status.name;</term>
+
+	  <listitem>
+	    <para><emphasis>&os; ¤Î¿Ê¹ÔÃæ¤Î¥×¥í¥¸¥§¥¯¥È¤Î¾õ¶·</emphasis></para>
+
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ï¡¢&os;
+	    ¤Ë´ØÏ¢¤·¤¿¥×¥í¥¸¥§¥¯¥È¤ÎΩ¤Á¾å¤²¤ä¿ÊĽ¾õ¶·¤Î¥¢¥Ê¥¦¥ó¥¹¤ËÍøÍѤǤ­¤Þ¤¹¡£
+	    ¥á¡¼¥ë¤Ï¥â¥Ç¥ì¡¼¥¿À©¤Ç¤¹¡£
+	    "To:" ¤È¤·¤ÆºÇ¤âŬÀÚ¤Ê &os; ¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤òÆþ¤ì¡¢
+	    ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò "BCC:" ¤ËÆþ¤ì¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Þ¤¹¡£
+	    ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¾å¤Ç¤Ï¡¢µÄÏÀ¤¬µö¤µ¤ì¤Æ¤¤¤Ê¤¤¤¿¤á¡¢
+	    ¤³¤Î¤è¤¦¤ËÁ÷¿®¤¹¤ë¤³¤È¤Ç¡¢
+	    ¿ÊĽ¾õ¶·¤ÎµÄÏÀ¤òÊ̤ÎŬÀڤʥ᡼¥ê¥ó¥°¥ê¥¹¥È¤ÇµÄÏÀ¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+
+	    <para>¤É¤Î¤è¤¦¤Ê¥á¡¼¥ë¤¬Å¬ÀÚ¤«¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	      ¥¢¡¼¥«¥¤¥Ö¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	    <para>¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ø¤Î¥á¥Ã¥»¡¼¥¸¤ÎÊÔ½¸¥À¥¤¥¸¥§¥¹¥ÈÈǤ¬¡¢
+	      ¿ÊĽ¾õ¶·¥ì¥Ý¡¼¥È
+	      <footnote><para><link xlink:href="http://www.freebsd.org/news/status/"></link></para></footnote> ¤È¤·¤Æ¡¢
+	      ¿ô¥ö·î¤ª¤­¤Ë &os; ¥¦¥§¥Ö¥µ¥¤¥È¤Ë¸ø³«¤µ¤ì¤Þ¤¹¡£
+	      ¿¤¯¤Î¼ÂÎã¤ä²áµî¤Î¥ì¥Ý¡¼¥È¤â¸«¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£</para>
+	  </listitem>
+	</varlistentry>
       </variablelist>
     </sect2>
 
@@ -1994,7 +2044,7 @@
 	  <row>
 	    <entry>ukug.uk.FreeBSD.org</entry>
 	    <entry>forward ¤Î¤ß</entry>
-	    <entry><email>freebsd-users at uk.FreeBSD.org</email></entry>
+	    <entry><email>ukfreebsd at uk.FreeBSD.org</email></entry>
 	    <entry>Lee Johnston
 	      <email>lee at uk.FreeBSD.org</email></entry>
 	  </row>