svn commit: r39422 - head/ja_JP.eucJP/books/handbook/cutting-edge
Ryusuke SUZUKI
ryusuke at FreeBSD.org
Thu Aug 23 10:22:52 UTC 2012
Author: ryusuke
Date: Thu Aug 23 10:22:51 2012
New Revision: 39422
URL: http://svn.freebsd.org/changeset/doc/39422
Log:
- Merge the following from the English version:
r38879 -> 39399 head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
Modified:
head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
Modified: head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml Thu Aug 23 04:10:45 2012 (r39421)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml Thu Aug 23 10:22:51 2012 (r39422)
@@ -2,7 +2,7 @@
The FreeBSD Documentation Project
The FreeBSD Japanese Documentation Project
- Original revision: r38879
+ Original revision: r39399
$FreeBSD$
-->
@@ -750,13 +750,12 @@ Fetching 133 new ports or files... done.
ºÇ¿·¤Î &os;
¥É¥¥å¥á¥ó¥È¥»¥Ã¥È¤ò¥í¡¼¥«¥ë¤Ç°Ý»ý¤¹¤ëÊýË¡¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
- <sect2 id="csup-doc">
- <title>CVSup ¤òÍѤ¤¤¿¥É¥¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡</title>
+ <sect2 id="dsvn-doc">
+ <title><application>Subversion</application>
+ ¤òÍѤ¤¤¿¥É¥¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥ÈÊýË¡</title>
- <para>&os; ¤Î¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ä¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥É¥¥å¥á¥ó¥È¤Ï¡¢
- ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î¥½¡¼¥¹¤Î¥¢¥Ã¥×¥Ç¡¼¥È
- (<xref linkend="makeworld"> ¤ò»²¾È) ¤ÈƱÍÍ¡¢
- <application>CVSup</application> ¤òÍѤ¤¤Æ¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤¤Þ¤¹¡£
+ <para>&os; ¤Î¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
+ <application>Subversion</application> ¤òÍѤ¤¤ÆÆþ¼ê¤Ç¤¤Þ¤¹¡£
¤³¤ÎÀá¤Ç¤Ï°Ê²¼¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
<itemizedlist>
@@ -767,9 +766,10 @@ Fetching 133 new ports or files... done.
</listitem>
<listitem>
- <para><application>CVSup</application> ¤òÍѤ¤¤Æ
+ <para><application>Subversion</application> ¤òÍѤ¤¤Æ¡¢
+ ¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò
<filename class="directory">/usr/doc</filename>
- ¤Ë¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
+ °Ê²¼¤Ë¥À¥¦¥ó¥í¡¼¥É¤¹¤ëÊýË¡¡£</para>
</listitem>
<listitem>
@@ -787,12 +787,13 @@ Fetching 133 new ports or files... done.
</sect2>
<sect2 id="installing-documentation-toolchain">
- <title>CVSup ¤ª¤è¤Ó¥É¥¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
+ <title><application>Subversion</application>
+ ¤ª¤è¤Ó¥É¥¥å¥á¥ó¥È¥Ä¡¼¥ë¥Á¥§¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë</title>
<para>&os; ¤Î¥É¥¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
¤«¤Ê¤êÂ礤ʥġ¼¥ë¤Î¥³¥ì¥¯¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£
¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤òɬÍפȤ·¡¢¤Þ¤¿¡¢
- ¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¤¤¿¤á¡¢
+ ¤¹¤Ù¤Æ¤Î &os; ¥æ¡¼¥¶¤Ë¤È¤Ã¤ÆÍÍѤȤ¤¤¦¤ï¤±¤Ç¤Ï¤Ê¤¤¤Î¤Ç¡¢
&os; ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
¤³¤ì¤é¤Î¥Ä¡¼¥ë¤Ï¡¢&os;
¤Î¤¿¤á¤Ë¿·¤·¤¤¥É¥¥å¥á¥ó¥È¤ò³èȯ¤Ë¼¹É®¤·¤Æ¤¤¤ëÊý¤ä¡¢
@@ -816,68 +817,36 @@ Fetching 133 new ports or files... done.
¤³¤Î¥Ä¡¼¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤¤³¤È¤Ï¤È¤Æ¤â¸ÌÀ¤Ç¤¹¡£</para>
</note>
- <para><application>CVSup</application>
- ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ª¤è¤ÓÍøÍѤ˴ؤ¹¤ë¤µ¤é¤Ê¤ë¾ðÊó¤Ï¡¢<link
- linkend="cvsup">CVSup ¤ò»È¤¦</link> ¤Î¾Ï¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+ <para><filename role="package">textproc/docproj</filename>
+ ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤È¡¢<application>Subversion</application>
+ ¤â¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
</sect2>
<sect2 id="updating-documentation-sources">
<title>¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë</title>
- <para><application>CVSup</application> ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¡¢
- ¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£
- ¤³¤³¤Ç <filename>/usr/share/examples/cvsup/doc-supfile</filename>
- ¥Õ¥¡¥¤¥ë¤¬ÀßÄê¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ç¤¹¡£
- ¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¥Û¥¹¥È¤Ï <filename>doc-supfile</filename>
- ¤Î¥×¥ì¡¼¥¹¥Û¥ë¥À¤ÎÃͤÇÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢
- &man.cvsup.1; ¤Ë¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥Û¥¹¥È̾¤ò»ØÄꤹ¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£
- <application>CVSup</application> ¥µ¡¼¥Ð¤Î
- 1 ¤Ä¤«¤é¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
- <screen>&prompt.root; <userinput>cvsup -h <replaceable>cvsup.FreeBSD.org</replaceable> -g -L 2 <filename>/usr/share/examples/cvsup/doc-supfile</filename></userinput></screen>
-
- <para>¤³¤³¤Ç <replaceable>cvsup.FreeBSD.org</replaceable> ¤òºÇ¤â¶á¤¯¤Î
- <application>CVSup</application> ¥µ¡¼¥Ð¤ËÃÖ¤´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
- ¥ß¥é¡¼¥µ¥¤¥È¤Î´°Á´¤Ê°ìÍ÷¤Ë¤Ä¤¤¤Æ¤Ï¡¢<xref
- linkend="cvsup-mirrors"> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+ <para>¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤Ï¡¢
+ <application>Subversion</application>
+ ¥×¥í¥°¥é¥à¤ò»È¤Ã¤Æ¥À¥¦¥ó¥í¡¼¥É¤Ç¤¤Þ¤¹¡£
+ ¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤ËÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+ <screen>&prompt.root; <userinput>svn checkout <literal>svn://svn.FreeBSD.org/doc/head</literal> <filename class="directory">/usr/doc</filename></userinput></screen>
<para>ºÇ½é¤Ë¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Ë¤Ï¾¯¤·»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
¥À¥¦¥ó¥í¡¼¥É¤¬½ª¤ï¤ë¤Þ¤Ç¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£</para>
- <para>¾Íè¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
- Ʊ¤¸¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£<application>CVSup</application>
- ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ÏºÇ¸å¤Ë¼Â¹Ô¤·¤¿»þ¤«¤é¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Î¤ß¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Î¤Ç¡¢
- ºÇ½é¤Ë <application>CVSup</application> ¤ò¼Â¹Ô¤·¤¿¸å¤Ç¤Ï¡¢
- ¥³¥Þ¥ó¥É¤Î¼Â¹Ô»þ´Ö¤Ï¤«¤Ê¤êû¤¯¤Ê¤ê¤Þ¤¹</para>
+ <para>¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥É¥¥å¥á¥ó¥È¤Î¥½¡¼¥¹¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
+ °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+ <screen>&prompt.root; <userinput>svn update <filename class="directory">/usr/doc</filename></userinput></screen>
- <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢¥É¥¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¡¢<filename
+ <para>¥½¡¼¥¹¤òÆþ¼ê¤·¤¿¤é¡¢<filename
class="directory">/usr/doc</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤Î
- <filename>Makefile</filename> ¤ò»È¤¦¤³¤È¤â¤Ç¤¤Þ¤¹¡£
- <filename>/etc/make.conf</filename> ¥Õ¥¡¥¤¥ë¤Î
- <makevar>SUP_UPDATE</makevar>, <makevar>SUPHOST</makevar> ¤ª¤è¤Ó
- <makevar>DOCSUPFILE</makevar> ¤òÀßÄꤹ¤ë¤È¡¢
- °Ê²¼¤ò¼Â¹Ô¤Ç¤¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+ <filename>Makefile</filename> ¤ò»È¤¤¡¢
+ °Ê²¼¤Î¤è¤¦¤Ë¥É¥¥å¥á¥ó¥È¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤³¤È¤â¤Ç¤¤Þ¤¹¡£</para>
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make update</userinput></screen>
-
- <para>°Ê²¼¤Ï¡¢<filename>/etc/make.conf</filename> ¤Î &man.make.1;
- ¥ª¥×¥·¥ç¥ó¤Îŵ·¿Åª¤ÊÎã¤Ç¤¹¡£</para>
-
- <programlisting>SUP_UPDATE= yes
-SUPHOST?= cvsup.freebsd.org
-DOCSUPFILE?= /usr/share/examples/cvsup/doc-supfile</programlisting>
-
- <note>
- <para><makevar>SUPHOST</makevar> ¤ª¤è¤Ó
- <makevar>DOCSUPFILE</makevar> ¤ÎÃͤò
- <literal>?=</literal> ¤Ë¤¹¤ë¤È¡¢
- make ¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é¤Î¾å½ñ¤¤òµö²Ä¤·¤Þ¤¹¡£
- ¤³¤ì¤Ï¡¢¤µ¤Þ¤¶¤Þ¤Ê¥ª¥×¥·¥ç¥ó¤ÎÃͤò¥Æ¥¹¥È¤¹¤ë¾ì¹ç¤Ë¡¢
- Ãͤ´¤È¤Ë¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤¹¤ë¤³¤È¤òÈò¤±¤é¤ì¤ë¤¿¤á¡¢
- <filename>make.conf</filename>
- ¤Ë¥ª¥×¥·¥ç¥ó¤òÄɲ乤ëÊýË¡¤È¤·¤Æ¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
- </note>
</sect2>
<sect2 id="updating-documentation-options">
@@ -916,15 +885,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
</varlistentry>
<varlistentry>
- <term><makevar>SUPHOST</makevar></term>
-
- <listitem>
- <para>¥¢¥Ã¥×¥Ç¡¼¥È»þ¤Ë»È¤¦ <application>CVSup</application>
- ¥µ¡¼¥Ð¤Î¥Û¥¹¥È¥Í¡¼¥à¡£</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term><makevar>DOCDIR</makevar></term>
<listitem>
@@ -957,15 +917,6 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<screen>&prompt.root; <userinput>cd /usr/doc</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>¤â¤·¡¢<filename>make.conf</filename> ¤Ç
- <makevar>DOCSUPFILE</makevar>, <makevar>SUPHOST</makevar> ¤ª¤è¤Ó
- <makevar>SUP_UPDATE</makevar> ¥ª¥×¥·¥ç¥ó¤òŬÀÚ¤ËÀßÄꤷ¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
- ¥¤¥ó¥¹¥È¡¼¥ë¤Î¥¹¥Æ¥Ã¥×¤Ï¡¢
- °Ê²¼¤Î¤è¤¦¤Ë¥É¥¥å¥á¥ó¥È¤Î¥¢¥Ã¥×¥Ç¡¼¥Èºî¶È¤ÈÅý¹ç¤Ç¤¤Þ¤¹¡£</para>
-
- <screen>&prompt.root; <userinput>cd /usr/doc</userinput>
-&prompt.root; <userinput>make update install clean</userinput></screen>
-
<para>¤â¤·¡¢¤¢¤ëÆÃÄê¤Î¸À¸ì¤Î¤ß¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
<filename class="directory">/usr/doc</filename>
¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ç°Ê²¼¤Î¤è¤¦¤Ë &man.make.1; ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -1008,7 +959,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
¥É¥¥å¥á¥ó¥È¤ò¥½¡¼¥¹¤«¤é¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
¤«¤Ê¤êÂ礤ʥġ¼¥ë¤È¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤«¤é¹½À®¤µ¤ì¤ë
<emphasis>¥É¥¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥Ä¡¼¥ë¥Á¥§¥¤¥ó</emphasis> ¤¬É¬ÍפǤ¹¡£
- ¤Þ¤¿¡¢<application>CVS</application>
+ ¤Þ¤¿¡¢<application>Subversion</application>
¥ê¥Ý¥¸¥È¥ê¤«¤é¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¡¢
¥Á¥§¥Ã¥¯¥¢¥¦¥È¤·¤¿¥½¡¼¥¹¤«¤é¥É¥¥å¥á¥ó¥È¤ò¼êÆ°¤Ç¹½ÃÛ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¡¢
¤½¤ì¤Ê¤ê¤Ë½ÏÃΤ·¤Æ¤¤¤ëɬÍפ⤢¤ê¤Þ¤¹¡£
@@ -1146,7 +1097,7 @@ DOCSUPFILE?= /usr/share/examples/cvsup/d
<note>
<para>¥Ç¥Õ¥©¥ë¥È¤Î¥¿¡¼¥²¥Ã¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ï¡¢
- <application>CVSup</application>
+ <application>Subversion</application>
¤òÍѤ¤¤ëÊýË¡¤È¤Ï°Û¤Ê¤ê¤Þ¤¹¡£
¤Ê¤¼¤Ê¤é¤Ð¡¢¤³¤ÎÀá¤ÇÀâÌÀ¤ò¤·¤Æ¤¤¤ëÊýË¡¤Ç¤Ï
port ¤òÍѤ¤¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤ª¤ê¡¢
More information about the svn-doc-all
mailing list