svn commit: r44036 - head/ja_JP.eucJP/books/handbook/cutting-edge

[Ryusuke SUZUKI]

Author: ryusuke
Date: Sun Feb 23 12:37:32 2014
New Revision: 44036
URL: http://svnweb.freebsd.org/changeset/doc/44036

Log:
  - Merge the following from the English version:
  
  	r43773 -> r43778	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sun Feb 23 12:18:17 2014	(r44035)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sun Feb 23 12:37:32 2014	(r44036)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43773
+     Original revision: r43778
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1151,15 +1151,16 @@ before running "/usr/sbin/freebsd-update
     <indexterm><primary>-STABLE</primary></indexterm>
 
     <para>&os; ¤Ë¤ÏÆó¤Ä¤Î³«È¯¥Ö¥é¥ó¥Á¤¬¤¢¤ê¤Þ¤¹¡£
-      ¤½¤ì¤Ï &os.current; ¤È &os.stable; ¤Ç¤¹¡£
-      ¤³¤Î¾Ï¤Ç¤Ï¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¡¢
-      ¤É¤Î¤è¤¦¤Ë¤·¤Æ¥·¥¹¥Æ¥à¤ÎÂбþ¤¹¤ë¥Ä¥ê¡¼¤òºÇ¿·¤Î¾õÂÖ¤ËÊݤĤ«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
+      ¤½¤ì¤Ï &os.current; ¤È &os.stable; ¤Ç¤¹¡£</para>
+
+    <para>¤³¤ÎÀá¤Ç¤Ï¤½¤ì¤¾¤ì¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¡¢
+      ¤É¤Î¤è¤¦¤Ë¤·¤Æ¥·¥¹¥Æ¥à¤ÎÂбþ¤¹¤ë¥Ö¥é¥ó¥Á¤òºÇ¿·¤Î¾õÂÖ¤ËÊݤĤ«¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£
       ¤Þ¤º¤Ï &os.current;¡¢¼¡¤Ë &os.stable; ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <para><emphasis>Ìõ: &a.hanai;¡¢1996 ǯ 11 ·î 6 Æü</emphasis></para>
 
     <sect2 xml:id="current">
-      <title>ºÇ¿·¤Î &os; ¤òÄɤ¤¤«¤±¤ë</title>
+      <title>&os.current; ¤ò»È¤¦</title>
 
       <para>&os.current; ¤È¤Ï &os; ¤Î³«È¯¤Î <quote>ºÇÁ°Àþ</quote> ¤Ç¤¹¡£
 	&os.current; ¤Î¥æ¡¼¥¶¤Ï¹â¤¤µ»½ÑÎϤò»ý¤Ä¤³¤È¤¬Í׵ᤵ¤ì¡¢
@@ -1167,9 +1168,6 @@ before running "/usr/sbin/freebsd-update
         ¤â¤· &os; ¤ò»È¤¤»Ï¤á¤¿¤Ð¤«¤ê¤Ê¤é¡¢
         ¤³¤ì¤ò±¿ÍѤ¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ½½Ê¬¸¡Æ¤¤ò½Å¤Í¤¿Êý¤¬Îɤ¤¤Ç¤·¤ç¤¦¡£</para>
 
-      <sect3>
-	<title>&os.current; ¤Ã¤Æ¤Ê¤Ë?</title>
-
         <para>&os.current; ¤Ï &os; ¤ÎºÇ¿·¤Î¥½¡¼¥¹¥³¡¼¥É¤Ç¤¹¡£
           Ãæ¤Ë¤Ï¸½ºß³«È¯ÅÓ¾å¤Î¥½¥Õ¥È¥¦¥§¥¢¡¢
           ¼Â¸³Åª¤ÊÊѹ¹¡¢¤¢¤ë¤¤¤Ï²áÅÏŪ¤Êµ¡Ç½¤Ê¤É¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -1181,10 +1179,6 @@ before running "/usr/sbin/freebsd-update
           &os.current; ¤¬ÉÔ¹¬¤ò¤â¤¿¤é¤¹¤«¡¢
           ¤½¤ì¤È¤âÈó¾ï¤ËÁÇÀ²¤é¤·¤¤µ¡Ç½¤ò¤â¤¿¤é¤¹¤«¤Ï¡¢
 	  ¤Þ¤µ¤Ë¥½¡¼¥¹¥³¡¼¥É¤òƱ´ü¤·¤¿½Ö´Ö¤Ë¤è¤ë¤Î¤Ç¤¹!</para>
-      </sect3>
-
-      <sect3>
-	<title>郎 &os.current; ¤òɬÍפȤ·¤Æ¤ë¤Î?</title>
 
         <para>&os.current; ¤Ï¡¢
 	  ¼¡¤Î 3 ¤Ä¤Î½ÅÍפʥ°¥ë¡¼¥×¤òÂоݤȤ·¤Æ¤¤¤Þ¤¹¡£</para>
@@ -1214,11 +1208,9 @@ before running "/usr/sbin/freebsd-update
               »þ¡¹¥³¥á¥ó¥È¤ä¥³¡¼¥É¤ò´ó¹Æ¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
           </listitem>
         </orderedlist>
-      </sect3>
 
-      <sect3>
-        <title>&os.current;
-          ¤Ë´üÂÔ¤·¤Æ¤Ï<emphasis>¤¤¤±¤Ê¤¤</emphasis>¤³¤È¤Ï?</title>
+      <para>&os.current;
+	¤Ë´üÂÔ¤·¤Æ¤Ï<emphasis>¤¤¤±¤Ê¤¤</emphasis>¤³¤È¤Ï?</para>
 
       <orderedlist>
           <listitem>
@@ -1238,10 +1230,6 @@ before running "/usr/sbin/freebsd-update
             <para><quote>¸ø¼°¤Î¥µ¥Ý¡¼¥È</quote> ¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
           </listitem>
         </orderedlist>
-      </sect3>
-
-      <sect3>
-	<title>&os.current; ¤ò»È¤¦</title>
 
         <orderedlist>
           <listitem>
@@ -1345,18 +1333,13 @@ before running "/usr/sbin/freebsd-update
               ¥³¡¼¥É¤òȼ¤¦Äó°Æ¤Ï¤â¤Ã¤È¤â´¿·Þ¤µ¤ì¤ë¤â¤Î¤Ç¤¹!</para>
           </listitem>
         </orderedlist>
-      </sect3>
     </sect2>
 
     <sect2 xml:id="stable">
-      <title>°ÂÄêÈǤΠ&os; ¤ò»È¤¦</title>
+      <title>&os.stable; ¤ò»È¤¦</title>
 
       <para><emphasis>Ìõ: &a.jp.iwasaki;</emphasis></para>
 
-      <sect3>
-	<title>&os.stable; ¤Ã¤Æ¤Ê¤Ë?</title>
-	<indexterm><primary>-STABLE</primary></indexterm>
-
         <para>&os.stable; ¤È¤ÏÄê´üŪ¤Ë¸ø³«¤µ¤ì¤ë¥ê¥ê¡¼¥¹¤òºîÀ®¤¹¤ë¤¿¤á¤Î³«È¯¥Ö¥é¥ó¥Á¤Ç¤¹¡£
           ¤³¤Î¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤ëÊѹ¹¤Ï¸¶Â§¤È¤·¤Æ¡¢
           »öÁ°¤Ë &os.current; ¤Ç»î¸³¤º¤ß¤Ç¤¢¤ë¤È¤¤¤¦ÆÃħ¤¬¤¢¤ê¤Þ¤¹¡£
@@ -1366,10 +1349,6 @@ before running "/usr/sbin/freebsd-update
           ¤É¤ó¤Ê¾ì¹ç¤Ë¤â»È¤¨¤ë¤â¤Î¤Ç¤¢¤ë¤È¤Ï¸Â¤é¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
           ¤³¤Î¥Ö¥é¥ó¥Á¤Ï¤â¤¦°ì¤Ä¤Î³«È¯¤Îή¤ì¤È¤¤¤¦¤À¤±¤Ç¤¢¤Ã¤Æ¡¢
           ¥¨¥ó¥É¥æ¡¼¥¶¸þ¤±¤Î¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
-      </sect3>
-
-      <sect3>
-	<title>郎 &os.stable; ¤òɬÍפȤ·¤Æ¤¤¤ë¤Î?</title>
 
 	<para>FreeBSD ¤Î³«È¯¥×¥í¥»¥¹¤Ë¶½Ì£¤¬¤¢¤Ã¤¿¤ê¡¢
 	  ¤½¤ì¤ËÂФ¹¤ë¹×¸¥¤ò¹Í¤¨¤Æ¤¤¤Æ¡¢Æäˤ½¤ì¤¬¼¡²ó¤Î
@@ -1406,10 +1385,6 @@ before running "/usr/sbin/freebsd-update
 	<para>¤â¤·»î¸³¤ò¤¹¤ë»ñ¸»Åª¤Ê;͵¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢
           ¥ê¥ê¡¼¥¹´Ö¤Î¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥Èµ¡Ç½¤òÍøÍѤ·¤Æ¡¢
           ºÇ¿·¤Î FreeBSD ¥ê¥ê¡¼¥¹¤ò»È¤¦¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£</para>
-      </sect3>
-
-      <sect3>
-	<title>&os.stable; ¤ò»È¤¦</title>
 
 	<indexterm>
 	  <primary>-STABLE</primary>
@@ -1511,7 +1486,6 @@ before running "/usr/sbin/freebsd-update
 	      ¤È¤­¤É¤­É¬ÍפȤʤë´û¸¥·¥¹¥Æ¥à¤«¤é¤Î¿·¥·¥¹¥Æ¥à¤Î¹½ÃÛ¼ê½ç¤Ë¤Ä¤¤¤Æ¤ÎºÇ¿·¾ðÊó¤òÆÀ¤Æ¤¯¤À¤µ¤¤¡£</para>
           </listitem>
         </orderedlist>
-      </sect3>
     </sect2>
   </sect1>