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

[Ryusuke SUZUKI]

Author: ryusuke
Date: Fri Jun 13 22:36:22 2014
New Revision: 45054
URL: http://svnweb.freebsd.org/changeset/doc/45054

Log:
  - Merge the following from the English version:
  
  	r44775 -> r44776	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	Fri Jun 13 18:34:18 2014	(r45053)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Fri Jun 13 22:36:22 2014	(r45054)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44775
+     Original revision: r44776
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1108,17 +1108,18 @@ before running "/usr/sbin/freebsd-update
 	</listitem>
 
 	<listitem>
-	  <para>&os.current; ¤Î¥½¡¼¥¹¤òƱ´ü¤¹¤ë¡£
+	  <para>&os.current; ¤Î¥½¡¼¥¹¤òƱ´ü¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    ÆÃ¤Ë <link linkend="svn">svn</link> ¤ò»È¤Ã¤Æ
-	    <link linkend="svn-mirrors">Subversion ¥ß¥é¡¼¥µ¥¤¥È</link>
-	    ¤Î¤Ò¤È¤Ä¤Î <literal>head</literal> ¥Ö¥é¥ó¥Á¤«¤é
+	    <xref linkend="svn-mirrors"/> ¤Î°ìÍ÷¤Ë¤¢¤ë
+	    Subversion ¥ß¥é¡¼¥µ¥¤¥È¤Î¤Ò¤È¤Ä¤Î
+	    <literal>head</literal> ¥Ö¥é¥ó¥Á¤«¤é
 	    -CURRENT ¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</listitem>
 
 	<listitem>
 	  <para>¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤ÎÀܳ¤¬¤È¤Æ¤âÃÙ¤«¤Ã¤¿¤ê¡¢
 	    À©¸Â¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢
-	    <link linkend="ctm">CTM</link>
+	    <xref linkend="ctm"/> ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë CTM
 	    ¤òÍøÍѤ¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
 	    ¤¿¤À¤·¡¢<application>svn</application>
 	    ¤Û¤É¤Ë¤Ï¿®Íê¤Ï¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢
@@ -1227,7 +1228,7 @@ before running "/usr/sbin/freebsd-update
 	    Ëè·î¸ø³«¤µ¤ì¤Æ¤¤¤ë &os.stable;
 	    ¤«¤é¥Ó¥ë¥É¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	    ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<link
-	      xlink:href="&url.base;/snapshots/">¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È</link>
+	      xlink:href="&url.base;/ja/snapshots/">www.freebsd.org/ja/snapshots</link>
 	    ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
 	  <para>´û¤Ë &os; ¤¬Æ°¤¤¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤ò
@@ -1238,14 +1239,10 @@ before running "/usr/sbin/freebsd-update
 	      </indexterm> ¤ò»È¤Ã¤Æ¡¢
 	    ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¤Î¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¤·¤Æ¤¯¤À¤µ¤¤¡£
 	    <literal>stable/9</literal> ¤È¤¤¤Ã¤¿¥Ö¥é¥ó¥Á̾¤Ï¡¢
-	    <link xlink:href="&url.base;/releng/">¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤Î¥Ú¡¼¥¸</link>
+	    <link xlink:href="&url.base;/releng/">www.freebsd.org/releng</link>
 	    ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	    ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¤Ø¤ÎÀܳ¤Ë¿®Íê¤Ç¤­¤ë²óÀþ¤òÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
-	    <link linkend="ctm">CTM</link>
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>CTM ¤ò»È¤Ã¤ÆƱ´ü¤¹¤ë</secondary>
-	    </indexterm> ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    CTM (<xref linkend="ctm"/>) ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
 	</listitem>
 
 	<listitem>
@@ -1270,11 +1267,10 @@ before running "/usr/sbin/freebsd-update
 
     <para><emphasis>Ìõ: &a.jp.iwasaki;¡¢1997 ǯ 9 ·î 13 Æü</emphasis></para>
 
-    <para>¥¤¥ó¥¿¡¼¥Í¥Ã¥ÈÀܳ¤Þ¤¿¤ÏÅŻҥ᡼¥ë¤ò»ÈÍѤ·¤Æ¡¢&os;
-      ¥×¥í¥¸¥§¥¯¥È¤Î¥½¡¼¥¹¤Î¤¢¤ë°ìÉôʬ¤Þ¤¿¤ÏÁ´ÂΤκǿ·¤òÄɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
-      ´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ï
-      <link linkend="svn">Subversion</link> ¤È
-      <link linkend="ctm">CTM</link> ¤Ç¤¹¡£</para>
+    <para>&os; ¤Î¥½¡¼¥¹¤ÎºÇ¿·¤òÄɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
+      ¤³¤ÎÀá¤Ç¤Ï¡¢´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ç¤¢¤ë
+      <application>Subversion</application> ¤ª¤è¤Ó
+      <application>CTM</application> ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <warning>
       <para>¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤òºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
@@ -1296,14 +1292,17 @@ before running "/usr/sbin/freebsd-update
 
     <para><application>Subversion</application>
       ¤Ï <emphasis>pull</emphasis> Ʊ´ü¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£
-      ¥æ¡¼¥¶ (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬ <command>svn</command>
-      ¤òµ¯Æ°¤·¡¢¥Õ¥¡¥¤¥ë¤òºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
-      <application>Subversion</application> ¤Ï¡¢
-      ¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÇ¤â¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
+      ¥æ¡¼¥¶ (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬
+      <command>svn</command> ¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¡¢
+      ¥í¡¼¥«¥ë¤Ë¤¢¤ë¥½¡¼¥¹¤òºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
       ¹¹¿·¾ðÊó¤Ï¤½¤Î»þÅÀ¤ÎºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ê¡¢
-      ¥æ¡¼¥¶¤Ï¤¤¤Ä¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤«¤ò¥³¥ó¥È¥í¡¼¥ë¤·¤Þ¤¹¡£
+      ¤¤¤Ä¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤«¤Ï¥æ¡¼¥¶¤¬¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¤Î¤Ç¡¢
+      <application>Subversion</application>
+      ¤Ï¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
       ÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ÂÄꤷ¤Æ¹¹¿·¤¹¤ë¤³¤È¤â´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
-      ¹¹¿·¾ðÊó¤Ï¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£</para>
+      ¹¹¿·¾ðÊó¤Ï¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£
+      <application>Subversion</application> ¤Ë¤è¤ë¥½¡¼¥¹¤ÎƱ´üÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      <xref linkend="svn"/> ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <indexterm>
       <primary><application>CTM</application></primary>
@@ -1315,25 +1314,26 @@ before running "/usr/sbin/freebsd-update
       ¤½¤Î¤«¤ï¤ê¤Ë¡¢Á°²ó¤Î¼Â¹Ô»þ¤«¤é¤ÎÊѹ¹¤òǧ¼±¤¹¤ë¥¹¥¯¥ê¥×¥È¤¬
       ¥Þ¥¹¥¿ CTM ¥Þ¥·¥ó¾å¤Ç°ìÆü¤Ë¿ô²ó¼Â¹Ô¤µ¤ì¡¢
       ¤¹¤Ù¤Æ¤ÎÊѹ¹¤ò compress ¤·¤ÆÄ̤·ÈÖ¹æ¤ò¿¶¤ê¡¢
-      ¤µ¤é¤ËÅŻҥ᡼¥ë¤Ç¡¢°õ»ú²Äǽ¤Ê ASCII
+      ¤µ¤é¤ËÅŻҥ᡼¥ë¤Ç¡¢°õ»ú²Äǽ¤Ê <acronym>ASCII</acronym>
       ¥­¥ã¥é¥¯¥¿¤Î¤ß¤ÇžÁ÷¤Ç¤­¤ë¤è¤¦¤Ë¥¨¥ó¥³¡¼¥É¤·¤Þ¤¹¡£
-      ¼õ¿®¤·¤¿¸å¤Ï¡¢
-      ¤³¤ì¤é¤Î <quote>CTM ¤Î¥Ç¥ë¥¿</quote> ¤Ï¼«Æ°
-      Ū¤Ë¥Ç¥³¡¼¥É¡¢¸¡ºº¤·¤Æ¥æ¡¼¥¶¤Î¥½¡¼¥¹¤Î¥³¥Ô¡¼¤ËÊѹ¹¤òŬÍѤ¹¤ë
-	&man.ctm.rmail.1; ¤Ë¤è¤Ã¤Æ½èÍý²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£
+      ¥À¥¦¥ó¥í¡¼¥É¤·¤¿¸å¤Ï¡¢
+      ¤³¤ì¤é¤Î <quote>¥Ç¥ë¥¿</quote> ¤Ï¡¢
+      ¼«Æ°Åª¤Ë¥Ç¥³¡¼¥É¡¢¸¡ºº¤·¤Æ¥æ¡¼¥¶¤Î¥½¡¼¥¹¤Î¥³¥Ô¡¼¤ËÊѹ¹¤òŬÍѤ¹¤ë
+      <command>ctm.rmail</command> ¤Ë¤è¤Ã¤Æ½èÍý²Äǽ¤Ç¤¹¡£
       ¤³¤Î½èÍý¤Ï <application>Subversion</application>
       ¤è¤ê¤º¤Ã¤È¸úΨŪ¤Ç¤¢¤ê¡¢<emphasis>pull</emphasis> ¥â¥Ç¥ë¤È¤¤¤¦¤è¤ê¤à¤·¤í
       <emphasis>push</emphasis> ¥â¥Ç¥ë¤Ç¤¢¤ë¤¿¤á¡¢
-      ¥µ¡¼¥Ð»ñ¸»¤ÎÉé²Ù¤Ï·Ú¤¯¤Ê¤ê¤Þ¤¹¡£</para>
+      ¥µ¡¼¥Ð»ñ¸»¤ÎÉé²Ù¤Ï·Ú¤¯¤Ê¤ê¤Þ¤¹¡£
+      <application>CTM</application> ¤òÍѤ¤¤¿¥½¡¼¥¹¤ÎƱ´üÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+      <xref linkend="ctm"/> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
-    <para>¾¤Î¥È¥ì¡¼¥É¥ª¥Õ¤â¤¢¤ê¤Þ¤¹¡£
-      <application>Subversion</application> ¤Ç¤¢¤ì¤Ð¡¢
+    <para><application>Subversion</application> ¤Ç¤¢¤ì¤Ð¡¢
       ¤¦¤Ã¤«¤ê¥í¡¼¥«¥ë¤Î¥¢¡¼¥«¥¤¥Ö¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤Æ¤â¡¢
       ²õ¤ì¤¿Éôʬ¤ò¸¡½Ð¤·¤ÆºÆ¹½ÃÛ¤·¤Æ¤¯¤ì¤Þ¤¹¡£
       <application>CTM</application> ¤Ï¤³¤ì¤ò¤ä¤Ã¤Æ¤¯¤ì¤Þ¤»¤ó¡£
       ¤â¤·¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤¤¡¢
-      ¤½¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ºÇ¿·¤Î CTM
-      <quote>¥Ù¡¼¥¹¥Ç¥ë¥¿</quote> ¤òÍѤ¤¤Æ¡¢°ì¤«¤é¤ä¤êľ¤·¡¢
+      ¤½¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢ºÇ¿·¤Î
+      <firstterm>¥Ù¡¼¥¹¥Ç¥ë¥¿</firstterm> ¤òÍѤ¤¤Æ¡¢°ì¤«¤é¤ä¤êľ¤·¡¢
       <application>CTM</application>
       ¤ò»È¤Ã¤Æ¤¹¤Ù¤Æ¤òºÆ¹½ÃÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
   </sect1>