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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Thu Aug 17 08:07:44 UTC 2017 

Author: ryusuke
Date: Thu Aug 17 08:07:42 2017
New Revision: 50681
URL: https://svnweb.freebsd.org/changeset/doc/50681

Log:
  - Merge the following from the English version:
  
  	r50201 -> r50602	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	Wed Aug 16 20:40:49 2017	(r50680)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Thu Aug 17 08:07:42 2017	(r50681)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r50201
+     Original revision: r50602
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -253,7 +253,7 @@ MergeChanges /etc/ /var/named/etc/ /boot/device.hints<
 	<filename>/etc</filename>
 	¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¤«¤é¥Þ¡¼¥¸¤ò¾µÇ§¤·¤Æ¤¯¤À¤µ¤¤¡£
 	<command>mergemaster</command> ¤Î¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<xref linkend="mergemaster"/> ¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	&man.mergemaster.8; ¤Ç³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <programlisting># Directory in which to store downloaded updates and temporary
 # files used by &os; Update.
@@ -961,8 +961,8 @@ before running "/usr/sbin/freebsd-update install"</scr
       <para>°Ê²¼¤Ï¡¢¾åµ­¤ÎÊÑ¿ô¤òÍѤ¤¤Æ¥Ï¥ó¥¬¥ê¡¼¸ì¤Î¥É¥­¥å¥á¥ó¥È¤ò
 	<acronym>PDF</acronym> ·Á¼°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÊýË¡¤Ç¤¹¡£</para>
 
-      <screen>&prompt.root; cd /usr/ports/misc/freebsd-doc-hu
-&prompt.root; make -DWITH_PDF DOCBASE=share/doc/freebsd/hu install clean</screen>
+      <screen>&prompt.root; <userinput>cd /usr/ports/misc/freebsd-doc-hu</userinput>
+&prompt.root; <userinput>make -DWITH_PDF DOCBASE=share/doc/freebsd/hu install clean</userinput></screen>
 
       <para><xref linkend="ports"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤ò»È¤Ã¤Æ¡¢
 	¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó package ¤Þ¤¿¤Ï port
@@ -1115,1120 +1115,466 @@ before running "/usr/sbin/freebsd-update install"</scr
 	</listitem>
       </orderedlist>
     </sect2>
-
-    <sect2 xml:id="stable">
-      <title>&os.stable; ¤ò»È¤¦</title>
-
-      <para><emphasis>Ìõ: &a.jp.iwasaki;</emphasis></para>
-
-      <para>&os.stable;
-	¤È¤ÏÄê´üŪ¤Ë¸ø³«¤µ¤ì¤ë¥ê¥ê¡¼¥¹¤òºîÀ®¤¹¤ë¤¿¤á¤Î³«È¯¥Ö¥é¥ó¥Á¤Ç¤¹¡£
-	¤³¤Î¥Ö¥é¥ó¥Á¤Ë²Ã¤¨¤é¤ì¤ëÊѹ¹¤Ï &os.current; ¤è¤ê¤æ¤Ã¤¯¤ê¤Ç¡¢
-	¸¶Â§¤È¤·¤Æ¡¢»öÁ°¤Ë &os.current; ¤Ç»î¸³¤º¤ß¤Ç¤¢¤ë¤È¤¤¤¦ÆÃħ¤¬¤¢¤ê¤Þ¤¹¡£
-	¤¿¤À<emphasis>¤½¤¦¤Ç¤¢¤Ã¤Æ¤â</emphasis>¡¢
-	¤³¤ì¤Ï³«È¯ÍÑ¥Ö¥é¥ó¥Á¤Î°ì¤Ä¤Ç¤¢¤ê¡¢¤¢¤ë»þÅÀ¤Ë¤ª¤±¤ë &os.stable;
-	¤Î¥½¡¼¥¹¤¬¤É¤ó¤Ê¾ì¹ç¤Ë¤â»È¤¨¤ë¤â¤Î¤Ç¤¢¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
-	¤³¤Î¥Ö¥é¥ó¥Á¤Ï¤â¤¦°ì¤Ä¤Î³«È¯¤Îή¤ì¤È¤¤¤¦¤À¤±¤Ç¤¢¤Ã¤Æ¡¢
-	¥¨¥ó¥É¥æ¡¼¥¶¸þ¤±¤Î¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	¤â¤·»î¸³¤ò¤¹¤ë»ñ¸»Åª¤Ê;͵¤¬¤Ê¤¤¾ì¹ç¤Ï¡¢Âå¤ï¤ê¤ËºÇ¿·¤Î
-	&os; ¥ê¥ê¡¼¥¹¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>&os; ¤Î³«È¯¥×¥í¥»¥¹¤Ë¶½Ì£¤¬¤¢¤Ã¤¿¤ê¡¢
-	¤½¤ì¤ËÂФ¹¤ë¹×¸¥¤ò¹Í¤¨¤Æ¤¤¤Æ¡¢Æäˤ½¤ì¤¬¼¡²ó¤Î
-	&os; ¤Î¥ê¥ê¡¼¥¹¤Ë´Ø·¸¤¹¤ë¤â¤Î¤Ç¤¢¤ë¤Ê¤é
-	&os.stable; ¤òÄɤ¦¤³¤È¤ò¹Í¤¨¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£</para>
-
-      <para>&os.stable; ¥Ö¥é¥ó¥Á¤Ï¤¤¤Ä¤â¥³¥ó¥Ñ¥¤¥ë¤¬¤Ç¤­¡¢
-	°ÂÄê¤ËÆ°ºî¤¹¤Ù¤­¤Ç¤¹¤¬¡¢
-	¤½¤ì¤¬Êݾڤµ¤ì¤Æ¤¤¤ë¤È¤¤¤¦¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	&os.stable; ¤Î¥æ¡¼¥¶¤Ï &os.current; ¤è¤ê¤â¿¤¤¤¿¤á¡¢&os.current;
-	¤Çȯ¸«¤µ¤ì¤Ê¤«¤Ã¤¿¥Ð¥°¤¬ &os.stable; ¤Çȯ¸«¤µ¤ì¡¢
-	¤È¤­¤É¤­¤½¤ì¤¬ÌäÂê¤È¤Ê¤ë¤³¤È¤¬¤¢¤ë¤Î¤ÏÈò¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£
-	¤³¤Î¤è¤¦¤ÊÍýͳ¤«¤é¡¢ÌÕÌÜŪ¤Ë &os.stable;
-	¤òÄɤ¤¤«¤±¤ë¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	Æäˡ¢³«È¯´Ä¶­¤â¤·¤¯¤Ï¥Æ¥¹¥È´Ä¶­¤Ç¥³¡¼¥É¤ò½½Ê¬¤Ë»î¸³¤»¤º¤Ë¡¢
-	¥×¥í¥À¥¯¥·¥ç¥óÉʼÁ¤¬Í׵ᤵ¤ì¤ë¥µ¡¼¥Ð¤ò &os.stable;
-	¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Æ¤Ï<emphasis>¤¤¤±¤Þ¤»¤ó</emphasis>¡£</para>
-
-      <para>&os.stable; ¤òÄɤ¤¤«¤±¤ë¤Ë¤Ï</para>
-
-      <indexterm>
-	<primary>-STABLE</primary>
-	<secondary>ÍøÍѤ¹¤ë</secondary>
-      </indexterm>
-
-      <orderedlist>
-	<listitem>
-	  <para>&os.stable; ¤Î¹½Ãۤ˴ØÏ¢¤¹¤ë»öÊÁ¤ä¡¢
-	    ¤½¤Î¾¤ÎÃí°Õ¤¹¤Ù¤­ÅÀ ¤Ë´Ø¤¹¤ë¾ðÊó¤òÆÀ¤ë¤¿¤á¤Ë¡¢
-	    &a.stable.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë²Ã¤ï¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤Þ¤¿³«È¯¼Ô¤ÏµÄÏÀ¤Î;ÃϤ¬¤¢¤ë½¤Àµ¤äÊѹ¹¤ò¹Í¤¨¤Æ¤¤¤ë¾ì¹ç¤Ë¡¢
-	    ¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ç¸øɽ¤·¡¢
-	    Äó°Æ¤µ¤ì¤¿Êѹ¹¤Ë´Ø¤·¤ÆÌäÂ꤬À¸¤¸¤ë¤«¤É¤¦¤«¤òÊÖÅú¤¹¤ëµ¡²ñ¤ò¥æ¡¼¥¶¤ËÍ¿¤¨¤Þ¤¹¡£</para>
-
-	  <para>Äɤ¤¤«¤±¤Æ¤¤¤ë¥Ö¥é¥ó¥Á¤Ë´ØÏ¢¤¹¤ë
-	    <application>svn</application> ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤¿¤È¤¨¤Ð¡¢9-STABLE ¥Ö¥é¥ó¥Á¤òÄɤ¤¤«¤±¤Æ¤¤¤ë¥æ¡¼¥¶¤Ï
-	    &a.svn-src-stable-9.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë»²²Ã¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤³¤Î¥ê¥¹¥È¤Ç¤Ï¡¢Êѹ¹¤¬¤Ê¤µ¤ì¤ë¤´¤È¤ËºîÀ®¤µ¤ì¤ë commit log
-	    ¤ä¤½¤ì¤Ëȼ¤¦µ¯¤³¤ê¤¦¤ëÉûºîÍѤˤĤ¤¤Æ¤Î¾ðÊ󤬵­Ï¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-	  <para>¤³¤ì¤é¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÆþ¤ë¤Ë¤Ï¡¢&a.mailman.lists.link;
-	    ¤ò¤¿¤É¤Ã¤Æ»²²Ã¤·¤¿¤¤¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¥¯¥ê¥Ã¥¯¤·¡¢
-	    ¼ê½ç¤ÎÀâÌÀ¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	    ¥½¡¼¥¹¥Ä¥ê¡¼Á´ÂΤÎÊѹ¹ÅÀ¤òÄɤ¤¤«¤±¤ë¤Ë¤Ï¡¢
-	    &a.svn-src-all.name; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ò¹ØÆɤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para>¿·¤·¤¤ &os.stable; ¥·¥¹¥Æ¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢
-	    <link linkend="mirrors">¥ß¥é¡¼¥µ¥¤¥È</link> ¤«¤éºÇ¶á¤Î
-	    &os.stable; ¥ê¥ê¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢
-	    Ëè·î¸ø³«¤µ¤ì¤Æ¤¤¤ë &os.stable;
-	    ¤«¤é¥Ó¥ë¥É¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	    ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢<link
-	      xlink:href="&url.base;/ja/snapshots/">www.freebsd.org/ja/snapshots</link>
-	    ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
-
-	  <para>´û¤Ë &os; ¤¬Æ°¤¤¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤ò
-	    &os.stable; ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤Ë¤Ï¡¢
-	    <link linkend="svn">svn</link>
-	      <indexterm>
-		<primary>Subversion</primary>
-	      </indexterm> ¤ò»È¤Ã¤Æ¡¢
-	    ´õ˾¤¹¤ë³«È¯¥Ö¥é¥ó¥Á¤Î¥½¡¼¥¹¤ò¥Á¥§¥Ã¥¯¥¢¥¦¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    <literal>stable/9</literal> ¤È¤¤¤Ã¤¿¥Ö¥é¥ó¥Á̾¤Ï¡¢
-	    <link xlink:href="&url.base;/releng/">www.freebsd.org/releng</link>
-	    ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-	</listitem>
-
-	<listitem>
-	  <para>&os.stable; ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤ê &os.stable; ¤Ø¤È¥¢¥Ã¥×¥°¥ì¡¼¥É
-	    <indexterm>
-	      <primary>-STABLE</primary>
-	      <secondary>¹½ÃÛ¡¢¥³¥ó¥Ñ¥¤¥ë</secondary>
-	    </indexterm> ¤¹¤ëÁ°¤Ë¡¢
-	    <filename>/usr/src/Makefile</filename> ¤òÃí°Õ¿¼¤¯Æɤߡ¢
-	    <xref linkend="makeworld"/>
-	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£
-	    &a.stable; ¤È <filename>/usr/src/UPDATING</filename> ¤òÆɤó¤Ç¡¢
-	    ¼¡¤Î¥ê¥ê¡¼¥¹¤Ø¸þ¤±¤Æ°Ü¤Ã¤Æ¤æ¤¯¤ËÅö¤¿¤Ã¤Æ¡¢
-	    ¤È¤­¤É¤­É¬ÍפȤʤë´û¸¥·¥¹¥Æ¥à¤«¤é¤Î¿·¥·¥¹¥Æ¥à¤Î¹½ÃÛ¼ê½ç¤Ë¤Ä¤¤¤Æ¤ÎºÇ¿·¾ðÊó¤òÆÀ¤Æ¤¯¤À¤µ¤¤¡£</para>
-	</listitem>
-      </orderedlist>
-    </sect2>
   </sect1>
 
-  <sect1 xml:id="synching">
-    <title>¥½¡¼¥¹¤ÎƱ´ü</title>
-
-    <para><emphasis>Ìõ: &a.jp.iwasaki;¡¢1997 ǯ 9 ·î 13 Æü</emphasis></para>
-
-    <para>&os; ¤Î¥½¡¼¥¹¤ÎºÇ¿·¤òÄɤ¤¤«¤±¤ëÊýË¡¤Ï¿§¡¹¤¢¤ê¤Þ¤¹¡£
-      ¤³¤ÎÀá¤Ç¤Ï¡¢´ðËÜŪ¤Ê¥µ¡¼¥Ó¥¹¤Ç¤¢¤ë
-      <application>Subversion</application>
-      ¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
-
-    <warning>
-      <para>¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤òºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤¹¤ë¤³¤È¤Ï²Äǽ¤Ç¤¹¡£
-	¤¿¤À¤·¡¢¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¥¢¥Ã¥×¥Ç¡¼¥È¼ê½ç¤Ï¡¢
-	¥½¡¼¥¹¥Ä¥ê¡¼Á´ÂΤòºÇ¿·¤Î¤â¤Î¤Ë¹¹¿·¤·¡¢
-	<filename>/bin</filename>, <filename>/sbin</filename>
-	¤È¤¤¤Ã¤¿¥æ¡¼¥¶¶õ´Ö¤ÇÆ°ºî¤¹¤ë¤â¤Î¡¢
-	¤ª¤è¤Ó¥«¡¼¥Í¥ë¥½¡¼¥¹¤òºÆ¹½ÃÛ¤¹¤ë¤³¤È¤Î¤ß¤Ç¤¹¡£
-	¥½¡¼¥¹¥Ä¥ê¡¼¤Î°ìÉô¤À¤±¤Ç¤¢¤Ã¤¿¤ê¡¢¥«¡¼¥Í¥ë¤À¤±¡¢
-	¤â¤·¤¯¤Ï¥æ¡¼¥¶¥é¥ó¥É¤Î¥×¥í¥°¥é¥à¤À¤±¤ò¹¹¿·¤·¤¿¾ì¹ç¤Ï¡¢
-	ÌäÂ꤬À¸¤¸¤ë¤³¤È¤¬¤è¤¯¤¢¤ê¤Þ¤¹¡£
-        ¤³¤Î»þ¤ËȯÀ¸¤¹¤ëÌäÂê¤Ï¥³¥ó¥Ñ¥¤¥ë»þ¤Î¥¨¥é¡¼¤«¤é¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯¡¢
-        ¥Ç¡¼¥¿¤ÎÇ˲õ¤È¤µ¤Þ¤¶¤Þ¤Ç¤¹¡£</para>
-    </warning>
-
-    <indexterm>
-      <primary>Subversion</primary>
-    </indexterm>
-
-    <para><application>Subversion</application>
-      ¤Ï <emphasis>pull</emphasis> Ʊ´ü¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£
-      ¥æ¡¼¥¶ (¤Þ¤¿¤Ï <command>cron</command> ¥¹¥¯¥ê¥×¥È) ¤¬
-      <command>svn</command> ¥×¥í¥°¥é¥à¤òµ¯Æ°¤·¡¢
-      ¥í¡¼¥«¥ë¤Ë¤¢¤ë¥½¡¼¥¹¤òºÇ¿·¾õÂ֤ˤ·¤Þ¤¹¡£
-      ¹¹¿·¾ðÊó¤Ï¤½¤Î»þÅÀ¤ÎºÇ¿·¤Î¤â¤Î¤Ç¤¢¤ê¡¢
-      ¤¤¤Ä¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤«¤Ï¥æ¡¼¥¶¤¬¥³¥ó¥È¥í¡¼¥ë¤¹¤ë¤Î¤Ç¡¢
-      <application>Subversion</application>
-      ¤Ï¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¹¥¤Þ¤·¤¤ÊýË¡¤Ç¤¹¡£
-      ÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤Ë¸ÂÄꤷ¤Æ¹¹¿·¤¹¤ë¤³¤È¤â´Êñ¤Ë¤Ç¤­¤Þ¤¹¡£
-      ¹¹¿·¾ðÊó¤Ï¥µ¡¼¥Ð¤Ë¤è¤Ã¤ÆÁÇÁ᤯À¸À®¤µ¤ì¤Þ¤¹¡£
-      <application>Subversion</application> ¤Ë¤è¤ë¥½¡¼¥¹¤ÎƱ´üÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-      <xref linkend="svn"/> ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-    <para><application>Subversion</application> ¤Ç¤¢¤ì¤Ð¡¢
-      ¤¦¤Ã¤«¤ê¥í¡¼¥«¥ë¤Î¥¢¡¼¥«¥¤¥Ö¤Î°ìÉô¤ò¾Ã¤·¤Æ¤·¤Þ¤Ã¤Æ¤â¡¢
-      ²õ¤ì¤¿Éôʬ¤ò¸¡½Ð¤·¤ÆºÆ¹½ÃÛ¤·¤Æ¤¯¤ì¤Þ¤¹¡£</para>
-  </sect1>
-
   <sect1 xml:id="makeworld">
-    <title>world ¤ÎºÆ¹½ÃÛ</title>
+    <title xml:id="updating-src">¥½¡¼¥¹¤òÍѤ¤¤¿ &os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È</title>
 
-    <indexterm>
-      <primary><quote>world</quote> ¤ÎºÆ¹½ÃÛ</primary>
-    </indexterm>
-    <para>&os.stable;¡¢&os.current; ¤Ê¤É¤Î
-      &os; ¤Î¤É¤ì¤«ÆÃÄê¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤Ä¤¤¤Æ¡¢
-      ¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤òƱ´ü¤µ¤»¤¿¤é¡¢
-      ¤½¤Î¥½¡¼¥¹¥Ä¥ê¡¼¤ò»È¤Ã¤Æ¥·¥¹¥Æ¥à¤òºÆ¹½ÃۤǤ­¤Þ¤¹¡£
-      ¤³¤Î¥×¥í¥»¥¹¤Ï world ¤ÎºÆ¹½ÃۤȸƤФì¤Þ¤¹¡£</para>
+    <para>¥½¡¼¥¹¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ&os; ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëÊýË¡¤Ï¡¢
+      ¥Ð¥¤¥Ê¥ê¤òÍѤ¤¤¿¥¢¥Ã¥×¥Ç¡¼¥È¤ËÈæ¤Ù¡¢¤¤¤¯¤Ä¤â¤ÎÍøÅÀ¤¬¤¢¤ê¤Þ¤¹¡£
+      ÆÃÄê¤Î¥Ï¡¼¥É¥¦¥§¥¢¤ò¤¦¤Þ¤¯ÍøÍѤ¹¤ë¤¿¤á¤Î¥ª¥×¥·¥ç¥ó¤òÀßÄꤷ¤Æ¥³¡¼¥É¤ò¹½ÃۤǤ­¤Þ¤¹¡£
+      ¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤ÎÆÃÄê¤Î²Õ½ê¤ÎÀßÄê¤ò¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄ꤫¤éÊѹ¹¤·¤¿¤ê¡¢
+      ɬÍפ¬¤Ê¤¤Éôʬ¤ò´°Á´¤Ëºï½ü¤·¤Æ¹½ÃÛ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+      ¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ë¤³¤È¤Ë¤è¤ë¥¢¥Ã¥×¥Ç¡¼¥È¤Ï¡¢
+      ¥Ð¥¤¥Ê¥ê¥¢¥Ã¥×¥Ç¡¼¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤À¤±¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ËÈæ¤Ù»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¤¬¡¢
+      ÍøÍѴĶ­¤Ë¹ç¤ï¤»¤¿ &os;
+      ¤òºîÀ®¤¹¤ë¤è¤¦¤Ê´°Á´¤Ê¥«¥¹¥¿¥Þ¥¤¥º¤¬²Äǽ¤Ç¤¹¡£</para>
 
-    <para>world ¤òºÆ¹½ÃÛ¤¹¤ë<emphasis>Á°</emphasis>¤Ë¡¢
-      °Ê²¼¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <sect2 xml:id="updating-src-quick-start">
+      <title>¥¯¥£¥Ã¥¯¥¹¥¿¡¼¥È</title>
 
-    <procedure>
-      <title>world ¤Î¹½ÃÛ<emphasis>Á°</emphasis>¤Ë¹Ô¤¦ºî¶È</title>
+      <para>°Ê²¼¤Ï¡¢&os; ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¥½¡¼¥¹¤ò¹½ÃÛ¤¹¤ë¤³¤È¤Ë¤è¤ê¹Ô¤¦Åµ·¿Åª¤ÊÊýË¡¤Î¥¯¥¤¥Ã¥¯¥ê¥Õ¥¡¥ì¥ó¥¹¤Ç¤¹¡£
+	¤½¤Î¸å¤ÎÀá¤Ç¤Ï¡¢¤³¤Î¥×¥í¥»¥¹¤Ë¤Ä¤¤¤Æ¤è¤ê¾ÜºÙ¤ËÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-      <step>
-	<para>½ÅÍפʥǡ¼¥¿¤ò¾¤Î¥·¥¹¥Æ¥à¤ä¥ê¥à¡¼¥Ð¥Ö¥ë¥á¥Ç¥£¥¢¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¡¢
-	  ¤­¤Á¤ó¤È¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬ºîÀ®¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤¿¤é¡¢
-	  µ¯Æ°²Äǽ¤Ê¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤òÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¥·¥¹¥Æ¥à¤òºÆ¹½ÃÛ¤¹¤ë<emphasis>Á°¤Ë</emphasis>¡¢
-	  ¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤¹¤ë¤³¤È¤Î½ÅÍ×À­¤Ï¡¢
-	  ¤¤¤¯¤é¶¯Ä´¤·¤Æ¤â¤·²á¤®¤ë¤È¸À¤¦¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	  ¥·¥¹¥Æ¥àÁ´ÂΤκƹ½ÃÛ¤ÏÆñ¤·¤¤ºî¶È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¤¬¡¢
-	  ¤É¤ó¤Ê¤ËÃí°Õ¤·¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢<!-- hrs:2000/01/12 inevitably -->
-	  ¥½¡¼¥¹¥Ä¥ê¡¼¤½¤Î¤â¤Î¤Ë¼ê°ã¤¤¤¬¤¢¤Ã¤¿»þ¤Ë¤Ï¡¢
-	  ¥·¥¹¥Æ¥à¤¬µ¯Æ°¤·¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤¦¾õÂ֤ˤʤ뤳¤È¤¬¤¢¤ë¤Î¤Ç¤¹¡£
-	  ¿ʬ¡¢¤½¤ì¤ò»È¤¦¤³¤È¤Ï¤Ê¤¤¤È»×¤¤¤Þ¤¹¤¬¡¢
-	  ¤¢¤È¤Ç¸å²ù¤¹¤ë¤³¤È¤Î¤Ê¤¤¤è¤¦¡¢Ç°¤Î¤¿¤áÍÑ°Õ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦!</para>
-      </step>
-
-      <step>
-	<indexterm><primary>¥á¡¼¥ê¥ó¥°¥ê¥¹¥È</primary></indexterm>
-	<para>Äɤ¤¤«¤±¤Æ¤¤¤ë¥Ö¥é¥ó¥Á¤Ë±þ¤¸¤Æ¡¢
-	  &a.stable.name; ¤â¤·¤¯¤Ï &a.current.name;
-	  ¤ÎºÇ¶á¤Î¥¨¥ó¥È¥ê¤òÄ´¤Ù¤Æ¡¢
-	  ´ûÃΤÎÌäÂê¤ä±Æ¶Á¤ò¼õ¤±¤ë¥·¥¹¥Æ¥à¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ´ûÃΤÎÌäÂ꤬Ʊ´ü¤·¤Æ¤¤¤ë¥Ð¡¼¥¸¥ç¥ó¤Î¥³¡¼¥É¤Ë±Æ¶Á¤¹¤ë¾ì¹ç¤Ï¡¢
-	  ¤½¤ÎÌäÂ꤬²ò·è¤µ¤ì¤¿¤³¤È¤òÊó¹ð¤¹¤ë
-	  <quote>ÌäÂê²ò·è (all clear)</quote>
-	  ¤Î¥¢¥Ê¥¦¥ó¥¹¤¬Åê¹Æ¤µ¤ì¤ë¤Þ¤ÇÂԤäƤ«¤é¡¢¥½¡¼¥¹¤òƱ´ü¤·¤Æ¡¢
-	  ¥í¡¼¥«¥ë¤Î¥½¡¼¥¹¤ËɬÍפʽ¤Àµ¤òÆþ¤ì¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </step>
-    
-      <step>
-	<para><filename>/usr/src/UPDATING</filename> ¤òÆɤߡ¢
-	  Ʊ´ü¤·¤Æ¤¤¤ë¥½¡¼¥¹¤Î¥Ð¡¼¥¸¥ç¥ó¤ÇɬÍפȤʤ륹¥Æ¥Ã¥×¤¬¤Ê¤¤¤«¤É¤¦¤«¤òÄ´¤Ù¤Æ²¼¤µ¤¤¡£
-	  ¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤ÏÀøºßŪ¤ÊÌäÂê¤äÆÃÄê¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë½çÈ֤ʤɤνÅÍפʾðÊ󤬴ޤޤì¤Æ¤¤¤Þ¤¹¡£
-	  Â礭¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤Ï¡¢world
-	  ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤ËÆÃÄê¤Î¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÊѹ¹¤·¤¿¤ê¡¢
-	  ºï½ü¤¹¤ë¤È¤¤¤Ã¤¿¡¢ÆÃÊ̤ʥ¹¥Æ¥Ã¥×¤¬ÄɲäÇɬÍפȤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	  ¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ë¤Ï¡¢
-	  ¸½ºß¿ä¾©¤µ¤ì¤Æ¤¤¤ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¼ê½ç¤¬¾Ü¤·¤¯Àµ³Î¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	  ¤â¤·¡¢<filename>UPDATING</filename> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤¬¡¢
-	  ¤³¤ÎÀá¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¤â¤Î¤ÈÌ·½â¤·¤Æ¤¤¤¿¤é¡¢
-	  <filename>UPDATING</filename> ¤Î¼ê½ç¤òºÎÍѤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-      </step>
-    </procedure>
-
-    <warning>
-      <title><command>make world</command> ¤Ï»È¤ï¤Ê¤¤¤³¤È</title>
-
-      <para>¸Å¤¤¥É¥­¥å¥á¥ó¥È¤ÎÃæ¤Ë¤Ï¡¢
-	<command>make world</command> ¤ò»È¤¦¤³¤È¤òÁ¦¤á¤Æ¤¤¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
-	¤³¤ì¤Ï¡¢½ÅÍפʼê½ç¤ò¤¤¤¯¤Ä¤«È´¤«¤·¤Æ¤·¤Þ¤¦¤Î¤Ç¡¢
-	¥¨¥­¥¹¥Ñ¡¼¥È¤Ç¤Ê¤±¤ì¤Ð»È¤¦¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	¤Û¤Ü¤¢¤é¤æ¤ë¾ì¹ç¤Ë¤ª¤¤¤Æ¡¢<command>make world</command>
-	¤ò¼Â¹Ô¤¹¤ë¤Î¤Ï´Ö°ã¤Ã¤Æ¤ª¤ê¡¢
-	¤³¤³¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¼ê½ç¤òÍѤ¤¤ë¤Ù¤­¤Ç¤¹¡£</para>
-    </warning>
-
-    <sect2 xml:id="canonical-build">
-      <title>¥·¥¹¥Æ¥à¹¹¿·¤Î³µÍ×</title>
-
-      <para>world ¤Î¹½ÃۤǤϡ¢<xref linkend="synching"/>
-	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤ÇÆþ¼ê¤·¤¿¥½¡¼¥¹¤òÍѤ¤¤Æ¡¢
-	¸Å¤¤ &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
-
-      <para>&os; ¤Ç¤Ï¡¢<quote>world</quote> ¤Ï¡¢
-	¥«¡¼¥Í¥ë¡¢¥³¥¢¥·¥¹¥Æ¥à¤Î¥Ð¥¤¥Ê¥ê¡¢
-	¥é¥¤¥Ö¥é¥ê¡¢¥×¥í¥°¥é¥ß¥ó¥°¥Õ¥¡¥¤¥ë¡¢ÁȤ߹þ¤ß¤Î¥³¥ó¥Ñ¥¤¥é¤ò°ÕÌ£¤·¤Þ¤¹¡£
-	¤³¤ì¤é¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¹½ÃÛ¤ª¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤Î½çÈ֤ϽÅÍפǤ¹¡£</para>
-
-      <para>Î㤨¤Ð¡¢¸Å¤¤¥³¥ó¥Ñ¥¤¥é¤Ï¡¢
-	¥Ð¥°¤ò´Þ¤ß¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤Ç¤­¤Ê¤¤²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	¤½¤Î¤¿¤á¡¢
-	¿·¤·¤¤¥«¡¼¥Í¥ë¤Ï¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤ò»È¤Ã¤Æ¹½ÃÛ¤·¤Ê¤±¤ì¤Ð¤Ê¤é¤º¡¢
-	¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤Î¹½ÃÛ¤¬É¬ÍפȤʤê¤Þ¤¹¡£
-	¤¿¤À¤·¡¢É¬¤º¤·¤â¡¢
-	¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
-
-      <para>¿·¤·¤¤ world ¤Ï¡¢
-	¿·¤·¤¤¥«¡¼¥Í¥ë¤Îµ¡Ç½¤Ë°Í¸¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç¡¢
-	¿·¤·¤¤ world ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ë¡¢
-	¿·¤·¤¤¥«¡¼¥Í¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	¸Å¤¤ world ¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤Ç¤ÏÀµ¤·¤¯Æ°¤«¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó¡£
-	¤½¤Î¤¿¤á¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢
-	ľ¤Á¤Ë¿·¤·¤¤ world ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>ÀßÄê¤ÎÃæ¤Ë¤Ï¡¢¿·¤·¤¤ world
-	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤ËÊѹ¹¤¹¤Ù¤­¤â¤Î¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
-	¸Å¤¤ world ¤ò²õ¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	¤½¤Î¤¿¤á¡¢ÀßÄê¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ï 2 ¤Ä¤Î¼ê½ç¤Ç¹Ô¤ï¤ì¤Þ¤¹¡£
-	¿¤¯¤Î¾ì¹ç¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤Î¥×¥í¥»¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤¿¤ê¡¢
-	ÄɲäΤߤò¹Ô¤¤¡¢¸Å¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤»¤ó¡£
-	¤³¤Î¤³¤È¤¬ÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢
-	<filename>/usr/src/UPDATING</filename> ¤Ë¤Ï¡¢
-	¼êÆ°¤Çºï½ü¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤ò¤É¤Î¥¹¥Æ¥Ã¥×¤Çºï½ü¤¹¤Ù¤­¤«¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <para>¤³¤ì¤é¤òÇÛθ¤·¤¿·ë²Ì¡¢°Ê²¼¤ÇÀâÌÀ¤¹¤ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¿ä¾©¼ê½ç¤¬ºî¤é¤ì¤Þ¤·¤¿¡£</para>
-
-      <note>
-	<para><command>make</command> ¤ò¼Â¹Ô¤·¤¿¤È¤­¤Î½ÐÎϤϡ¢
-	  ¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ë¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£
-	  ²¿¤«¾ã³²¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¤Ï¡¢¥¨¥é¡¼¥á¥Ã¥»¡¼¥¸¤Î¥³¥Ô¡¼¤ò
-	  &os; ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<para>¥Õ¥¡¥¤¥ë¤ËÊݸ¤¹¤ëºÇ¤â´Êñ¤ÊÊýË¡¤Ï¡¢
-	  °ú¿ô¤È¤·¤Æ½ÐÎϤÎÊݸÀè¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Æ
-	  <command>script</command> ¥³¥Þ¥ó¥É¤ò»È¤¦¤³¤È¤Ç¤¹¡£
-	  <filename>/tmp</filename> ¤Ï¡¢
-	  ºÆµ¯Æ°¤ò¤¹¤ë¤Èºï½ü¤µ¤ì¤Æ¤·¤Þ¤¦²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç¡¢
-	  ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï½ÐÎϤòÊݸ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ½ÐÎϤÎÊݸ¤Ë¤Ï <filename>/var/tmp</filename> ¤¬Å¬¤·¤Æ¤¤¤Þ¤¹¡£
-	  ¼¡¤Î¥³¥Þ¥ó¥É¤ò world ¤Î¹½ÃÛ¤ÎľÁ°¤Ë¼Â¹Ô¤·¡¢ºÆ¹½ÃÛ¤¬½ªÎ»¤·¤¿¤é
-	  <userinput>exit</userinput> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	<screen>&prompt.root; <userinput>script <replaceable>/var/tmp/mw.out</replaceable></userinput>
-Script started, output file is /var/tmp/mw.out</screen>
-      </note>
-
       <procedure>
-	<title>world ¤Î¹½ÃÛ¥×¥í¥»¥¹¤Î³µÍ×</title>
-
-	<para>world ¤Î¹½ÃÛ¥×¥í¥»¥¹¤ÇÍѤ¤¤é¤ì¤ë¥³¥Þ¥ó¥É¤Ï¡¢
-	  ¤³¤³¤Ç¼¨¤µ¤ì¤Æ¤¤¤ë½çÈ֤Ǽ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤³¤ÎÀá¤Ç¤Ï³Æ¥³¥Þ¥ó¥É¤Îµ¡Ç½¤Ë¤Ä¤¤¤Æ¤Þ¤È¤á¤Þ¤¹¡£</para>
-
 	<step>
-	  <para>¥·¥¹¥Æ¥à¾å¤Ç world ¤Î¹½ÃÛ¤¬°ìÅ٤Ǥâ¹Ô¤ï¤ì¤Æ¤¤¤ë¤È¡¢
-	    Á°²ó¤Î¹½ÃۤκݤΥ³¥Ô¡¼¤¬
-	    <filename>/usr/obj</filename>
-	    ¤Ë¸ºß¤¹¤ë¤Ï¤º¤Ç¤¹¡£
-	    ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤·¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-	    ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤¹¤ë¤³¤È¤Ç
-	    <command>make buildworld</command> ¤Î¹ÔÄø¤Ë¤«¤«¤ë»þ´Ö¤òû½Ì¤·¡¢
-	    °Í¸ÌäÂê¤ËǺ¤Þ¤µ¤ì¤ë¤è¤¦¤Ê¥È¥é¥Ö¥ë¤ò²óÈò¤Ç¤­¤Þ¤¹¡£</para>
+	  <title>¥¢¥Ã¥×¥Ç¡¼¥È¤ª¤è¤Ó¥Ó¥ë¥É</title>
 
-	  <screen>&prompt.root; <userinput>chflags -R noschg /usr/obj/*</userinput>
-&prompt.root; <userinput>rm -rf /usr/obj</userinput></screen>
-	</step>
+	  <screen>&prompt.root; <userinput>svn update /usr/src</userinput>  <co xml:id="updating-src-qs-svnup"/>
+<emphasis>check <filename>/usr/src/UPDATING</filename></emphasis>  <co xml:id="updating-src-qs-review-updating"/>
+&prompt.root; <userinput>cd /usr/src</userinput>          <co xml:id="updating-src-qs-cd"/>
+&prompt.root; <userinput>make -j<replaceable>4</replaceable> buildworld</userinput>  <co xml:id="updating-src-qs-buildworld"/>
+&prompt.root; <userinput>make -j<replaceable>4</replaceable> kernel</userinput>      <co xml:id="updating-src-qs-kernel"/>
+&prompt.root; <userinput>shutdown -r now</userinput>      <co xml:id="updating-src-qs-reboot"/>
+&prompt.root; <userinput>cd /usr/src</userinput>          <co xml:id="updating-src-qs-cd2"/>
+&prompt.root; <userinput>make installworld</userinput>    <co xml:id="updating-src-qs-installworld"/>
+&prompt.root; <userinput>mergemaster -Ui</userinput>      <co xml:id="updating-src-qs-mergemaster"/>
+&prompt.root; <userinput>shutdown -r now</userinput>      <co xml:id="updating-src-qs-shutdown"/></screen>
 
-	<step>
-	  <para>¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤È´ØÏ¢¥Ä¡¼¥ë¤òºÇ½é¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¡¢
-	    ¤½¤Î¸å¡¢¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤Ç¡¢
-	    ¿·¤·¤¤ world ¤Î»Ä¤ê¤ÎÉôʬ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
-	    ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¤â¤Î¤Ï¡¢
-	    <filename>/usr/obj</filename> ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£</para>
+	  <calloutlist>
+	    <callout arearefs="updating-src-qs-svnup">
+	      <para>ºÇ¿·ÈǤΥ½¡¼¥¹¤òÆþ¼ê¤·¤Æ¤¯¤À¤µ¤¤¡£
+		¥½¡¼¥¹¤ÎÆþ¼ê¤ª¤è¤Ó¥¢¥Ã¥×¥Ç¡¼¥È¤Ë´Ø¤¹¤ë¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï
+		<xref linkend="updating-src-obtaining-src"/>
+		¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildworld</userinput></screen>
-	</step>
+	    <callout arearefs="updating-src-qs-review-updating">
+	      <para>¥½¡¼¥¹¤Î¹½ÃÛ¤ÎÁ°¸å¤ÇɬÍפȤʤë¼êÆ°¤Îºî¶È¤Ë¤Ä¤¤¤Æ¡¢
+		<filename>/usr/src/UPDATING</filename>
+		¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	<step>
-	  <para>¥³¥ó¥Ñ¥¤¥é¤È¥«¡¼¥Í¥ë¤Î¥ß¥¹¥Þ¥Ã¥Á¤òËɤ°¤¿¤á¡¢
-	    <filename>/usr/obj</filename>
-	    ¤Ë¤¢¤ë¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤òÍѤ¤¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤Þ¤¹¡£
-	    ºÆ¹½Ãۤϡ¢¤¢¤ë¼ï¤Î¥á¥â¥ê¹½Â¤ÂΤ¬Êѹ¹¤µ¤ì¤¿¤è¤¦¤Ê¾ì¹ç¤Ë¤Ïɬ¿Ü¤Ç¡¢
-	    <command>ps</command> ¤ä <command>top</command>
-	    ¤Î¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Ï¡¢
-	    ¥«¡¼¥Í¥ë¤È¥½¡¼¥¹¥³¡¼¥É¤Î¥Ð¡¼¥¸¥ç¥ó¤¬°ìÃפ·¤Ê¤¤¤ÈÀµ¾ï¤ËÆ°ºî¤·¤Ê¤¤¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	    <callout arearefs="updating-src-qs-cd">
+	      <para>¥½¡¼¥¹¤¬ÃÖ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
-	</step>
+	    <callout arearefs="updating-src-qs-buildworld">
+	      <para>world (¥«¡¼¥Í¥ë¤ò½ü¤¯¤¹¤Ù¤Æ)
+		¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	<step>
-	  <para>¿·¤·¤¯¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥«¡¼¥Í¥ë¤Çµ¯Æ°¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-	    ¿·¤·¤¤¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¥Ç¥£¥¹¥¯¾å¤ËÇÛÃÖ¤·¤Þ¤¹¡£
-	    <varname>kern.securelevel</varname> ¤ò 1 ¤è¤êÂ礭¤¯¤·¤Æ¤¤¤Æ¡¢
-	    <emphasis>¤«¤Ä</emphasis> ¥«¡¼¥Í¥ë¤Î¥Ð¥¤¥Ê¥ê¥Õ¥¡¥¤¥ë¤Ë
-	    <literal>noschg</literal> ¤Î¤è¤¦¤Ê¥Õ¥é¥°¤òÀßÄꤷ¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-	    ¤Þ¤º¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤½¤ì°Ê³°¤Î¾ì¹ç¤Ï¡¢
-	    ¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ç¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤òÌäÂê¤Ê¤¯Æ°¤«¤»¤ë¤Ï¤º¤Ç¤¹¡£
-	    <varname>kern.securelevel</varname> ¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï
-	    &man.init.8;¡¢¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¤µ¤Þ¤¶¤Þ¤Ê¥Õ¥é¥°¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï
-	    &man.chflags.1; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	    <callout arearefs="updating-src-qs-kernel">
+	      <para>¥«¡¼¥Í¥ë¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+		¤³¤³¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥³¥Þ¥ó¥É¤Ï¡¢<command>make buildkernel
+		  installkernel</command>
+		¤ÈƱ¤¸¤Ç¤¹¡£</para>
+	    </callout>
 
-	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
-	</step>
+	    <callout arearefs="updating-src-qs-reboot">
+	      <para>¿·¤·¤¤¥«¡¼¥Í¥ë¤ò»È¤¦¤¿¤á¡¢
+		¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
- 	<step>
-	  <para>¤¹¤Ç¤Ë¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÝ¤ÎÌäÂê¤òºÇ¾®¸Â¤Ë¤¹¤ë¤¿¤á¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
-	    ¿·¤·¤¤¥«¡¼¥Í¥ë¾å¤Ç¸Å¤¤ world
-	    ¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤ÎÌäÂê¤òºÇ¾®¸Â¤Ë¤·¤Þ¤¹¡£</para>
+	    <callout arearefs="updating-src-qs-cd2">
+	      <para>¥½¡¼¥¹¤¬ÃÖ¤«¤ì¤Æ¤¤¤ë¥Ç¥£¥ì¥¯¥È¥ê¤Ë°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
+	    <callout arearefs="updating-src-qs-installworld">
+	      <para>world ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	  <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤¿¤é¡¢UFS
-	    ¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	    °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    <callout arearefs="updating-src-qs-mergemaster">
+	      <para><filename>/etc/</filename>
+		¤ËÃÖ¤«¤ì¤Æ¤¤¤ëÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤¿¤ê¥Þ¡¼¥¸¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
 
-	  <screen>&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput>
-&prompt.root; <userinput>swapon -a</userinput></screen>
-
-	  <para>¤â¤·¥·¥¹¥Æ¥à¤¬ ZFS ¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
-	    °Ê²¼¤Î 2 ¤Ä¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
-	    ¤³¤ÎÎã¤Ç¤Ï¡¢zpool ¤Î̾Á°¤Ï <literal>zroot</literal>
-	    ¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ¤¤¤Þ¤¹¡£</para>
-
-	  <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
-&prompt.root; <userinput>zfs mount -a</userinput></screen>
+	    <callout arearefs="updating-src-qs-shutdown">
+	      <para>¿·¤·¤¯¹½ÃÛ¤µ¤ì¤¿ world ¤ª¤è¤Ó¥«¡¼¥Í¥ë¤òÍøÍѤ¹¤ë¤¿¤á¡¢
+		¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </callout>
+	  </calloutlist>
 	</step>
-
- 	<step>
-	  <para>¥ª¥×¥·¥ç¥ó: ¤â¤·¡¢¥Ç¥Õ¥©¥ë¥È¤Î US English
-	    °Ê³°¤Î¥­¡¼¥Ü¡¼¥É¥Þ¥Ã¥×¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
-	    &man.kbdmap.1; ¤ÇÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	  <screen>&prompt.root; <userinput>kbdmap</userinput></screen>
-	</step>
-
-	<step>
-	  <para>¤½¤Î¸å¡¢¤É¤Á¤é¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤â¡¢
-	    <acronym>CMOS</acronym> ¥¯¥í¥Ã¥¯¤¬ÃÏ°è»þ´Ö¤ËÀßÄꤵ¤ì¤Æ¤¤¤Æ
-	    GMT ¤Ç¤Ï¤Ê¤¤¾ì¹ç
-	    (&man.date.1; ¤¬Àµ¤·¤¤»þ´Ö¤ÈÃÏ°è¤òɽ¼¨¤·¤Ê¤¤¤Ê¤éÅö¤Æ¤Ï¤Þ¤ê¤Þ¤¹)
-	    ¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
-	</step>
-
-	<step>
-	  <para>¥·¥¹¥Æ¥à¤ÎºÆ¹½ÃۤǤϡ¢
-	    <filename>/etc</filename>,
-	    <filename>/var</filename> ¤ä
-	    <filename>/usr</filename>
-	    ¤È¤¤¤Ã¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Ë¿·µ¬¤ËƳÆþ¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ä¡¢
-	    Êѹ¹¤µ¤ì¤¿ÀßÄê¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ë¹¹¿·¤Ï¹Ô¤Ê¤ï¤ì¤Þ¤»¤ó¡£
-	    ¼¡¤Ë¡¢¿·¤·¤¤ world
-	    ¤ËÂФ¹¤ë <filename>/etc</filename>
-	    ¤ÎºÇ½é¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¤¤Þ¤¹¡£
-	    °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï
-	    <buildtarget>installworld</buildtarget>
-	    ¤òÀ®¸ù¤¹¤ë¤¿¤á¤ËËܼÁŪ¤Ê¥Õ¥¡¥¤¥ë¤Î¤ß¤òÈæ³Ó¤·¤Þ¤¹¡£
-	    ¤¿¤È¤¨¤Ð¡¢
-	    ¤³¤Î¥¹¥Æ¥Ã¥×¤Ç¤Ï¡¢ºÇ¸å¤Î¥¢¥Ã¥×¥Ç¡¼¥È¸å¤Ë &os; ¤ËÄɲ䵤줿¡¢
-	    ¿·¤·¤¤¥°¥ë¡¼¥×¤ä¿·¤·¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¡¢
-	    ¤â¤·¤¯¤Ï¥¹¥¿¡¼¥È¥¢¥Ã¥×¥¹¥¯¥ê¥×¥È¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	    ¼¡¤Î¥³¥Þ¥ó¥É¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	    <xref linkend="mergemaster"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	  <screen>&prompt.root; <userinput>mergemaster -iF</userinput></screen>
-	</step>
-
-	<step>
-	  <para><filename>/usr/obj</filename>
-	    ¤Ë¤¢¤ë¿·¤·¤¤ world
-	    ¤ª¤è¤Ó¥·¥¹¥Æ¥à¤Î¥Ð¥¤¥Ê¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
-
-	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make installworld</userinput></screen>
-	</step>
-
-	<step>
-	  <para>»Ä¤ê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
-
-	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
-	</step>
-
-	<step>
-	  <para>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£
-	    ¤â¤·»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥¹¥¯¤Ë»Ä¤Ã¤Æ¤¤¤ë¤È¡¢
-	    ÌäÂ꤬µ¯¤­¤ë²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ç½ÅÍפʺî¶È¤Ç¤¹¡£</para>
-
-	  <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
-	</step>
-
-	<step>
-	  <para>ºÆµ¯Æ°¤ò¹Ô¤¤¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¡¢
-	    world ¤½¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</para>
-
-	  <screen>&prompt.root; <userinput>reboot</userinput></screen>
-	</step>
-
-	<step>
-	  <para>¸Å¤¤¥é¥¤¥Ö¥é¥ê¤òºï½ü¤¹¤ëÁ°¤Ë¡¢
-	    <xref linkend="ports-upgrading"/>
-	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¡¢
-	    ¤¹¤Ù¤Æ¤Î ports ¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	    ºÆ¹½ÃÛ¤¬½ª¤ï¤Ã¤¿¤é¡¢¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤È¶¥¹ç¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤á¡¢
-	    »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤òºï½ü¤·¤Þ¤¹¡£
-	    ¤³¤Î²áÄø¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ï¡¢<xref linkend="make-delete-old"/>
-	    ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
-
-	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
-	</step>
       </procedure>
-
-     <indexterm><primary>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É</primary></indexterm>
-
-      <para>¤â¤·¥·¥¹¥Æ¥à¤¬¥À¥¦¥ó¥¿¥¤¥à¤ò»ý¤Ä¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-	¥·¥¹¥Æ¥à¤Î¥³¥ó¥Ñ¥¤¥ë¤ò¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ç¤ª¤³¤Ê¤¤¡¢
-	¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Ë¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤¹¤ë¤È¤¤¤¦ÊýË¡¤Ç¤Ï¤Ê¤¯¡¢
-	¥³¥ó¥Ñ¥¤¥ë¤ò¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ç¹Ô¤¦¤³¤È¤ò¹Í¤¨¤Æ¤¯¤À¤µ¤¤¡£
-	¥·¥¹¥Æ¥à¤ÎºÆ¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤Ï¡¢¤¿¤¯¤µ¤ó¤Î½ÅÍפʥ·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¡¢
-	¤¹¤Ù¤Æ¤Îɸ½àŪ¤Ê¥·¥¹¥Æ¥à¥Ð¥¤¥Ê¥ê¡¢¥é¥¤¥Ö¥é¥ê¡¢
-	¥¤¥ó¥¯¥ë¡¼¥É¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤ë¤Î¤Ç¡¢
-	¼ÂºÝ¤ËÆ°ºî¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ë¤ª¤¤¤Æ¡¢
-	Æä˥¢¥¯¥Æ¥£¥Ö¤Ê¥æ¡¼¥¶¤Ï¡¢¥È¥é¥Ö¥ë¤Ë¸«Éñ¤ï¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£</para>
     </sect2>
 
-    <sect2 xml:id="src-updating">
-      <title>ÀßÄê¥Õ¥¡¥¤¥ë</title>
+    <sect2 xml:id="updating-src-preparing">
+      <title>¥½¡¼¥¹¤òÍѤ¤¤¿¥¢¥Ã¥×¥Ç¡¼¥È¤Î¤¿¤á¤Î½àÈ÷</title>
 
-      <indexterm>
-        <primary><filename>make.conf</filename></primary>
-      </indexterm>
-
-      <para>world
-	¤Î¹½ÃÛ¥×¥í¥»¥¹¤Ç¤Ï¡¢¤¤¤¯¤Ä¤«¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤¬»È¤ï¤ì¤Þ¤¹¡£</para>
-
-      <para><filename>/usr/src</filename> ¤ËÃÖ¤«¤ì¤Æ¤¤¤ë
-	<filename>Makefile</filename> ¤Ë¤Ï¡¢
-	&os; ¤ò¹½À®¤¹¤ë¥×¥í¥°¥é¥à¤Î¹½ÃÛÊýË¡¤ä¡¢
-	¤É¤¦¤¤¤¦½çÈ֤Ǥ½¤ì¤é¤ò¹½ÃÛ¤¹¤Ù¤­¤«¤È¤¤¤Ã¤¿»Ø¼¨¤¬µ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
-
-      <para><command>make</command> ¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤Ï¡¢
-	&man.make.conf.5; ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢
-	<filename>/usr/share/examples/etc/make.conf</filename> ¤Ë¤Ï¡¢
-	Îɤ¯»È¤ï¤ì¤ëÎ㤬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-	¤³¤ì¤é¤ÎÀßÄê¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ乤ë¤È¡¢
-	<command>make</command> ¤Î¼Â¹Ô¤ä¥×¥í¥°¥é¥à¤Î¹½ÃÛÊýË¡¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
-	¤³¤ì¤é¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢
-	<command>make</command> ¤¬»È¤ï¤ì¤ëºÝ¤Ë¤Ï¾ï¤ËÍ­¸ú¤È¤Ê¤ë¤¿¤á¡¢
-	Ports Collection ¤Ç¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥³¥ó¥Ñ¥¤¥ë»þ¡¢
-	¥æ¡¼¥¶¤¬½ñ¤¤¤¿ C ¥×¥í¥°¥é¥à¤ä &os;
-	¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤ò¹½ÃÛ¤¹¤ëºÝ¤Ë¤â±Æ¶Á¤òµÚ¤Ü¤·¤Þ¤¹¡£
-	¤¢¤ëÀßÄê¤òÊѹ¹¤·¤¿¤³¤È¤Ë¤è¤ê¡¢±Æ¶Á¤¬¹­¤¤ÈϰϤˤª¤è¤Ó¡¢
-	¶Ã¤¯¤Ù¤­·ë²Ì¤ò¤â¤¿¤é¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	ξÊý¤Î¥Õ¥¡¥¤¥ë¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¥³¥á¥ó¥È¤òÆɤळ¤È¤È¡¢
-	¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ï¡¢¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤È°ÂÁ´À­¤Î´ÑÅÀ¤«¤éÁª¤Ð¤ì¤Æ¤¤¤ë¤³¤È¤ò³Ð¤¨¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <indexterm>
-	<primary><filename>src.conf</filename></primary>
-      </indexterm>
-
-      <para><filename>/etc/src.conf</filename> ¤Ï¡¢
-	¥½¡¼¥¹¥³¡¼¥É¤òÍѤ¤¤¿¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¹½ÃÛ¤ò¥³¥ó¥È¥í¡¼¥ë¤·¤Þ¤¹¡£
-	<filename>/etc/make.conf</filename> ¤È¤Ï°Û¤Ê¤ê¡¢
-	<filename>/etc/src.conf</filename> ¤Ë½ñ¤«¤ì¤¿ÀßÄê¤Ï¡¢
-	&os; ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤½¤Î¤â¤Î¤ò¹½ÃÛ¤¹¤ë¤È¤­¤Ë¤Î¤ß±Æ¶Á¤·¤Þ¤¹¡£
-	¤³¤Î¥Õ¥¡¥¤¥ë¤ÇÀßÄê²Äǽ¤Ê¿¤¯¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	&man.src.conf.5; ¤Ëµ­½Ò¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	°ì¸«¤·¤¿¤È¤³¤í̵¸ú¤Ë¤µ¤ì¤Æ¤¤¤ë¡¢
-	»È¤ï¤ì¤Æ¤¤¤Ê¤¤¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ä¥Ó¥ë¥É¥ª¥×¥·¥ç¥ó¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤È¤­¤É¤­Í½´ü¤·¤Ê¤«¤Ã¤¿¤ê¡¢¤ï¤º¤«¤Ê±Æ¶Á¤òÍ¿¤¨¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+      <para><filename>/usr/src/UPDATING</filename> ¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£
+	¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢
+	¥¢¥Ã¥×¥Ç¡¼¥È¤ÎÁ°¸å¤ÇɬÍפȤʤë¼êÆ°¤Îºî¶È¤Ë¤Ä¤¤¤Æ½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
     </sect2>
 
-    <sect2 xml:id="make-buildworld">
-      <title>ÊÑ¿ô¤È¥¿¡¼¥²¥Ã¥È</title>
+    <sect2 xml:id="updating-src-obtaining-src">
+      <title>¥½¡¼¥¹¥³¡¼¥É¤Î¥¢¥Ã¥×¥Ç¡¼¥È</title>
 
-      <para><command>make</command> ¤Î»ÈÍѤˤª¤±¤ë°ìÈÌŪ¤Ê½ñ¼°¤Ï¡¢
-	¼¡¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
+      <para>&os; ¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï
+	<filename>/usr/src/</filename> ¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤³¤Î¥½¡¼¥¹¥³¡¼¥É¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¤Ï¡¢
+	<application>Subversion</application>
+	¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤òÍøÍѤ¹¤ëÊýË¡¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¤Þ¤º¡¢
+	¥½¡¼¥¹¥³¡¼¥É¤¬¥Ð¡¼¥¸¥ç¥ó´ÉÍý²¼¤Ë¤¢¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>make -<replaceable>x</replaceable> -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>svn info /usr/src</userinput>
+Path: /usr/src
+Working Copy Root Path: /usr/src
+...</screen>
 
-      <para>¤³¤ÎÎã¤Ç¤Ï¡¢<option>-<replaceable>x</replaceable></option> ¤¬
-	<command>make</command> ¤ËÅϤµ¤ì¤ë¥ª¥×¥·¥ç¥ó¤Ë¤Ê¤ê¤Þ¤¹¡£
-	ÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢&man.make.1;
-	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>¤³¤Î·ë²Ì¤Ï¡¢<filename>/usr/src/</filename>
+	¤¬¥Ð¡¼¥¸¥ç¥ó´ÉÍý²¼¤Ë¤¢¤ê¡¢&man.svn.1;
+	¤ò»È¤Ã¤Æ¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <para>ÊÑ¿ô¤òÅϤ¹¤Ë¤Ï¡¢ÊÑ¿ô¤Î̾Á°¤ò
-	<option>-D<replaceable>VARIABLE</replaceable></option>
-	¤Î¤è¤¦¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤ÎÊÑ¿ô¤Ï <filename>Makefile</filename> ¤ÎÆ°ºî¤ò¥³¥ó¥È¥í¡¼¥ë¤·¤Þ¤¹¡£
-	ÊÑ¿ô¤Î»ØÄê¤Ï¡¢<filename>/etc/make.conf</filename> ¤ÇÀßÄꤹ¤ë¤«¡¢
-	<command>make</command> ¤Î¼Â¹Ô»þ¤Ë»ØÄꤹ¤ë¤«¤Î¤É¤Á¤é¤«¤Ç¹Ô¤¤¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢°Ê²¼¤ÎÊÑ¿ô¤Ï¡¢¥×¥í¥Õ¥¡¥¤¥ëÈǤΥ饤¥Ö¥é¥ê¤ò¹½ÃÛ¤·¤Ê¤¤¤³¤È¤ò»ØÄꤷ¤Þ¤¹¡£</para>
+      <screen xml:id="synching">&prompt.root; <userinput>svn update /usr/src</userinput></screen>
 
-      <screen>&prompt.root; <userinput>make -DNO_PROFILE <replaceable>target</replaceable></userinput></screen>
+      <para>¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¤¤Ê¤¤´ü´Ö¤¬Ä¹¤¤¤È¡¢
+	¥¢¥Ã¥×¥Ç¡¼¥È¤Î¥×¥í¥»¥¹¤Ë¤Ï»þ´Ö¤¬¤«¤«¤ê¤Þ¤¹¡£
+	¤³¤Î¥×¥í¥»¥¹¤¬½ª¤ï¤ë¤È¡¢¥½¡¼¥¹¥³¡¼¥É¤ÏºÇ¿·¤È¤Ê¤ê¡¢
+	¼¡Àá°Ê¹ß¤ÇÀâÌÀ¤¹¤ë¹½ÃÛ¤Î¥×¥í¥»¥¹¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>¤³¤ì¤Ï¡¢<filename>/etc/make.conf</filename>
-	¤ÎÃæ¤Ç°Ê²¼¤Î¤è¤¦¤ËÀßÄꤹ¤ë¤³¤È¤ËÂбþ¤·¤Þ¤¹¡£</para>
+      <note xml:id="updating-src-obtaining-src-checkout">
+	<title>¥½¡¼¥¹¥³¡¼¥É¤ÎÆþ¼ê</title>
 
-      <programlisting>NO_PROFILE=    true     #    Avoid compiling profiled libraries</programlisting>
+	<para><literal>'/usr/src' is not a working copy</literal>
+	  ¤È¤¤¤¦½ÐÎϤ¬½Ð¤¿¾ì¹ç¤Ë¤Ï¡¢
+	  ¥Õ¥¡¥¤¥ë¤¬¤Ê¤«¤Ã¤¿¤ê¡¢Ê̤ÊÊýË¡¤Ë¤è¤ê¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
+	  ¿·¤·¤¯¥½¡¼¥¹¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
 
-      <para><replaceable>target</replaceable> ¤Ï¡¢<command>make</command> ¤Ë
-	¤É¤Î¤è¤¦¤ËÆ°ºî¤¹¤ë¤Î¤«¤ò»Ø¼¨¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-	<filename>Makefile</filename> ¤ÏÍøÍѲÄǽ¤Ê¥¿¡¼¥²¥Ã¥È¤òÄêµÁ¤·¤Æ¤¤¤Þ¤¹¡£
-	¥¿¡¼¥²¥Ã¥È¤Ë¤Ï¡¢
-	¥·¥¹¥Æ¥à¤ÎºÆ¹½ÃÛ¤ËɬÍפÊÃʳ¬¤ò¡¢
-	¿¤¯¤Î¤µ¤é¤ËºÙ¤«¤¤Ãʳ¬¤Ëʬ³ä¤¹¤ë¤¿¤á¡¢
-	¹½ÃۤβáÄø¤ÇÍøÍѤµ¤ì¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	<table xml:id="updating-src-obtaining-src-repopath">
+	  <title>&os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ª¤è¤Ó¥ê¥Ý¥¸¥È¥ê¥Ñ¥¹</title>
 
-      <para>ÁªÂò»è¤¬Ê¬¤±¤é¤ì¤Æ¤¤¤ë¤³¤È¤Ï¡¢Æó¤Ä¤ÎÍýͳ¤«¤éÍ­ÍѤǤ¹¡£
-	¤Þ¤ºÂè°ì¤Ë¡¢¹½ÃÛºî¶È¤Ï²ÔƯÃæ¤Î¥·¥¹¥Æ¥à¤Ë¤Þ¤Ã¤¿¤¯±Æ¶Á¤òÍ¿¤¨¤Þ¤»¤ó¡£
-	¤½¤Î¤¿¤á¡¢¥Þ¥ë¥Á¥æ¡¼¥¶¥â¡¼¥É¤Ç²ÔƯÃæ¤Î¥·¥¹¥Æ¥à¤Ç¤â¡¢°ÂÁ´¤Ë
-	<buildtarget>buildworld</buildtarget> ¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
-	¤¿¤À¤·¡¢<buildtarget>installworld</buildtarget> ¤Ï
-	¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ç¹Ô¤Ê¤¦¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£</para>
+	  <tgroup cols="3">
+	    <thead>
+	      <row>
+		<entry><command>uname -r</command> ¤Î½ÐÎÏ</entry>
+		<entry>¥ê¥Ý¥¸¥È¥ê¥Ñ¥¹</entry>
+		<entry>ÀâÌÀ</entry>
+	      </row>
+	    </thead>
 
-      <para>ÂèÆó¤Ë¡¢<acronym>NFS</acronym> ¥Þ¥¦¥ó¥È¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢<xref
-	  linkend="small-lan"/> ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢
-	¥Í¥Ã¥È¥ï¡¼¥¯¾å¤ÎÊ£¿ô¤Î¥Þ¥·¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬²Äǽ¤ÊÅÀ¤¬¤¢¤²¤é¤ì¤Þ¤¹¡£</para>
+	    <tbody>
+	      <row>
+		<entry><literal><replaceable>X.Y</replaceable>-RELEASE</literal></entry>
+		<entry><literal>base/releng/</literal><replaceable>X.Y</replaceable></entry>
+		<entry>¤³¤Î¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤ËÂФ¹¤ë½ÅÂç¤Ê¥»¥­¥å¥ë¥Æ¥£¤Ø¤ÎÂбþ¤ª¤è¤Ó¥Ð¥°¤Î½¤Àµ¥Ñ¥Ã¥Á¤Î¤ß¤¬Å¬ÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£
+		  ¤³¤Î¥Ö¥é¥ó¥Á¤Ï¡¢¤Û¤È¤ó¤É¤Î¥æ¡¼¥¶¤Ë¿ä¾©¤µ¤ì¤Þ¤¹¡£</entry>
+	      </row>
 
-      <para><command>make</command> ¤Ë
-	<option>-j</option> ¤ò¤Ä¤±¤ë¤È¡¢
-	Ʊ»þ¤ËÊ£¿ô¤Î¥×¥í¥»¥¹¤òÀ¸À®¤Ç¤­¤Þ¤¹¡£
-	¹½ÃÛ²áÄø¤ÎÂçÉôʬ¤Ç¤Ï <acronym>CPU</acronym> À­Ç½¤Î¸Â³¦¤è¤ê
-	<acronym>I/O</acronym> À­Ç½¤Î¸Â³¦¤ÎÊý¤¬ÌäÂê¤È¤Ê¤ë¤¿¤á¡¢
-	¥·¥ó¥°¥ë <acronym>CPU</acronym> ¤È¥Þ¥ë¥Á <acronym>CPU</acronym>
-	¥Þ¥·¥ó¤ÎξÊý¤Ë¸ú²Ì¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	      <row xml:id="STABLE">
+		<entry><literal><replaceable>X.Y</replaceable>-STABLE</literal></entry>
+		<entry><literal>base/stable/</literal><replaceable>X</replaceable></entry>
+		<entry>
+		  <para>¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤ËÂФ·¡¢
+		    ¤½¤Î¥Ö¥é¥ó¥Á¤Ë¤ª¤±¤ë¤¹¤Ù¤Æ¤Î³«È¯¤ÎÀ®²Ì¤¬È¿±Ç¤µ¤ì¤¿¤â¤Î¤Ç¤¹¡£
+		    <emphasis>STABLE</emphasis> ¤Ï¡¢
+		    Applications Binary Interface
+		    (<acronym>ABI</acronym>)
+		    ¤¬Êѹ¹¤µ¤ì¤Ê¤¤¤³¤È¤ò°ÕÌ£¤·¤Æ¤ª¤ê¡¢
+		    ¤³¤Î¥Ö¥é¥ó¥Á¤Î°ÊÁ°¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
+		    ¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤â¼Â¹Ô¤Ç¤­¤ë¤³¤È¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£
+		    ¤¿¤È¤¨¤Ð¡¢&os; 10.1
+		    ¤Ç¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥½¥Õ¥È¥¦¥§¥¢¤Ï¡¢
+		    &os; 10-STABLE ¤Ë¤ª¤¤¤Æ¤â¼Â¹Ô¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>ÉáÄ̤Υ·¥ó¥°¥ë <acronym>CPU</acronym> ¥Þ¥·¥ó¤Ç°Ê²¼¤Î¥³¥Þ¥ó¥É
-	¤ò¼Â¹Ô¤¹¤ë¤È¡¢ºÇÂç 4 ¸Ä¤Þ¤Ç¤Î¥×¥í¥»¥¹¤òƱ»þ¤Ë¼Â¹Ô¤·¤Þ¤¹¡£
-	¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤ËÅê¹Æ¤µ¤ì¤¿·Ð¸³Åª¤ÊÊó¹ð¤Ë¤è¤ë¤È¡¢
-	4 ¸Ä¤È¤¤¤¦»ØÄ꤬ºÇ¤âÎɤ¤¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò¼¨¤¹¤è¤¦¤Ç¤¹¡£</para>
+		  <para>STABLE ¥Ö¥é¥ó¥Á¤Ï¡¢
+		    »þ´ü¤Ë¤è¤Ã¤Æ¤Ï¥æ¡¼¥¶¤Ë±Æ¶Á¤¹¤ë¤è¤¦¤Ê¥Ð¥°¤äÈó¸ß´¹À­¤ò»ý¤Ä¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
+		    ¤³¤ì¤é¤ÏÄ̾魯¤°¤Ë½¤Àµ¤µ¤ì¤Þ¤¹¡£</para>
+		</entry>
+	      </row>
 
-      <screen>&prompt.root; <userinput>make -j4 buildworld</userinput></screen>
+	      <row>
+		<entry><literal><replaceable>X</replaceable>-CURRENT</literal></entry>
+		<entry><literal>base/head/</literal></entry>
+		<entry>¥ê¥ê¡¼¥¹¤¬¹Ô¤ï¤ì¤Æ¤¤¤Ê¤¤ºÇ¿·¤Î &os;
+		  ¤Î³«È¯¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
+		  CURRENT ¥Ö¥é¥ó¥Á¤ÏÂ礭¤Ê¥Ð¥°¤äÈó¸ß´¹¤¬¤¢¤ë¤³¤È¤â¤¢¤ë¤Î¤Ç¡¢
+		  ¹âÅÙ¤ÊÃ챤ò»ý¤Ã¤¿¥æ¡¼¥¶¤Î¤ß»ÈÍѤ¬¿ä¾©¤µ¤ì¤Þ¤¹¡£</entry>
+	      </row>
+	    </tbody>
+	  </tgroup>
+	</table>
 
-      <para>¥Þ¥ë¥Á <acronym>CPU</acronym> ¥Þ¥·¥ó¤Ç¤Ï¡¢
-	<literal>6</literal> ¤«¤é <literal>10</literal> ¤Î´Ö¤ÎÃͤòÀßÄꤷ¡¢
-	®ÅÙ¤¬¤É¤ì¤¯¤é¤¤¸þ¾å¤¹¤ë¤«³Îǧ¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<para>&man.uname.1; ¤ò»È¤Ã¤Æ &os;
+	  ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <indexterm>
-	<primary><quote>world</quote> ¤ÎºÆ¹½ÃÛ</primary>
-	<secondary>»þ´Ö</secondary>
-      </indexterm>
+	<screen>&prompt.root; <userinput>uname -r</userinput>
+10.3-RELEASE</screen>
 
-      <note>
-	<para><command>make buildworld</command>
-	  ¤ËÊÑ¿ô¤ò»ØÄꤷ¤¿¾ì¹ç¤Ï¡¢Æ±¤¸»ØÄê¤ò
-          <command>make installworld</command> ¤Ë¤â»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
-	  ¤¿¤À¤· <buildtarget>installworld</buildtarget>
-	  ¤Ç¤Ï¡¢<option>-j</option> ¤ò
-	  <emphasis>ÀäÂФ˻ȤäƤϤ¤¤±¤Þ¤»¤ó</emphasis>¡£</para>
+	<para><xref linkend="updating-src-obtaining-src-repopath"/>
+	  ¤«¤éʬ¤«¤ë¤è¤¦¤Ë¡¢<literal>10.3-RELEASE</literal>
+	  ¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Î¤¿¤á¤Î¥½¡¼¥¹¥³¡¼¥É¤Î¥Ñ¥¹¤Ï¡¢
+	  <literal>base/releng/10.3</literal> ¤Ç¤¹¡£
+	  ¤³¤Î¥Ñ¥¹¤Ï¡¢¥½¡¼¥¹¥³¡¼¥É¤ò¥Á¥§¥Ã¥¯¥¢¥¦¥È¤¹¤ë»þ¤Ë»È¤¤¤Þ¤¹¡£</para>
 
-	<para>¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿¤Ê¤é¡¢</para>
+	<screen>&prompt.root; <userinput>mv /usr/src /usr/src.bak</userinput>  <co xml:id="updating-src-obtaining-src-mv"/>
+&prompt.root; <userinput>svn checkout https://svn.freebsd.org/base/<replaceable>releng/10.3</replaceable> /usr/src</userinput>  <co xml:id="updating-src-obtaining-src-checkout-cmd"/></screen>
 
-	<screen>&prompt.root; <userinput>make -DNO_PROFILE buildworld</userinput></screen>
+	<calloutlist>
+	  <callout arearefs="updating-src-obtaining-src-mv">
+	    <para>¤³¤Î¸Å¤¤¥Ç¥£¥ì¥¯¥È¥ê¤ò¡¢
+	      ¼ÙËâ¤Ë¤Ê¤é¤Ê¤¤¤è¤¦¤Ë°ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£
+	      ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ËÂФ·¤ÆÊѹ¹¤ò¹Ô¤Ã¤Æ¤Ê¤±¤ì¤Ð¡¢
+	      ºï½ü¤·¤Æ¤â¹½¤ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
+	  </callout>
 
-	<para>°Ê²¼¤Î¤è¤¦¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
-
-	<screen>&prompt.root; <userinput>make -DNO_PROFILE installworld</userinput></screen>
-
-	<para>¤â¤·¤½¤¦¤·¤Ê¤«¤Ã¤¿¾ì¹ç¡¢2 ÈÖÌܤΥ³¥Þ¥ó¥É¤Ï¡¢
-          <command>make buildworld</command>
-	  ¤ÎÃʳ¬¤Ç¹½ÃÛ¤µ¤ì¤Æ¤¤¤Ê¤¤¥×¥í¥Õ¥¡¥¤¥ëÈǥ饤¥Ö¥é¥ê¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Æ¤·¤Þ¤¦¤Ç¤·¤ç¤¦¡£</para>
+	  <callout arearefs="updating-src-obtaining-src-checkout-cmd">
+	    <para>¥ê¥Ý¥¸¥È¥ê¤Î <acronym>URL</acronym> ¤Ë
+	      <xref linkend="updating-src-obtaining-src-repopath"/>
+	      ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤ë¥Ñ¥¹¤òÄɲä·¤Þ¤¹¡£
+	      3 ÈÖÌܤΥѥé¥á¡¼¥¿¤Ë¤Ï¡¢
+	      ¥í¡¼¥«¥ë¥·¥¹¥Æ¥à¾å¤Ç¥½¡¼¥¹¥³¡¼¥É¤¬ÃÖ¤«¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£</para>
+	  </callout>
+	</calloutlist>
       </note>
     </sect2>
 
-    <sect2 xml:id="mergemaster">
-      <info>
-	<title>ÀßÄê¥Õ¥¡¥¤¥ë¤ÎƱ´ü</title>
+    <sect2 xml:id="updating-src-building">
+      <title>¥½¡¼¥¹¤«¤é¤Î¹½ÃÛ</title>
 
-	<authorgroup>
-	  <author>
-	    <personname>
-	      <firstname>Tom</firstname>
-	      <surname>Rhodes</surname>
-	    </personname>
-	    <contrib>´ó¹Æ: </contrib>
-	  </author>
-	</authorgroup>
-      </info>
-      
-      <indexterm>
-	<primary>
-	  <command>mergemaster</command>
-	</primary>
-      </indexterm>
+      <para>¤Þ¤ººÇ½é¤Ë <emphasis>world</emphasis>
+	(¥«¡¼¥Í¥ë¤ò½ü¤¯¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¤¹¤Ù¤Æ) ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
+	¤³¤Î¥¹¥Æ¥Ã¥×¤òºÇ½é¤Ë¼Â¹Ô¤¹¤ë¤Î¤Ï¡¢
+	¥«¡¼¥Í¥ë¤Î¹½ÃÛ¤òºÇ¿·¤Î¥Ä¡¼¥ë¤ò»È¤Ã¤Æ¹Ô¤¦¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£
+	¤³¤Î¥¹¥Æ¥Ã¥×¤¬½ª¤ï¤Ã¤¿¤é¡¢¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
 
-      <para>&os; ¤Î &man.mergemaster.8; Bourne ¥·¥§¥ë¥¹¥¯¥ê¥×¥È¤Ï¡¢
-	<filename>/etc</filename> ¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤È¡¢
-	<filename>/usr/src/etc</filename>
-	¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤ò³Îǧ¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£
-	¥·¥¹¥Æ¥à¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¥½¡¼¥¹¥Ä¥ê¡¼¤Ë¤¢¤ëÀßÄê¥Õ¥¡¥¤¥ë¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Ë¤Ï¡¢
-        ¤³¤ÎÊýË¡¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput>
+&prompt.root; <userinput>make buildkernel</userinput></screen>
 
-      <para><command>mergemaster</command> ¤ò»È¤¦Á°¤Ë¡¢
-	´û¸¤Î <filename>/etc</filename>
-	¤ò¤É¤³¤«°ÂÁ´¤Ê¾ì½ê¤Ë¥³¥Ô¡¼¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡£
-	ºÆµ¢Åª¤Ê¥³¥Ô¡¼¤ò¹Ô¤Ê¤¦ <option>-R</option> ¤È¡¢
-	¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ´Ö¤ä½êÍ­¼Ô¤Ê¤É¤òÊݸ¤¹¤ë
-	<option>-p</option> ¤È¶¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥³¡¼¥É¤Ï
+	<filename>/usr/obj</filename> ¤Ë½ñ¤­½Ð¤µ¤ì¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>cp -Rp /etc /etc.old</userinput></screen>
+      <para>¤³¤ì¤Ï´ðËܤΥ¹¥Æ¥Ã¥×¤Ç¤¹¡£
+	¹½ÃÛ¤ò¥³¥ó¥È¥í¡¼¥ë¤¹¤ëÄɲäΥª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	°Ê²¼¤ÇÀâÌÀ¤·¤Þ¤¹¡£</para>
 
-      <para><command>mergemaster</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
-	<filename>/</filename> ¤òµ¯ÅÀ¤È¤·¤¿°ì»þŪ¤Ê¥ë¡¼¥È´Ä¶­¤ò¹½ÃÛ¤·¡¢
-	¤µ¤Þ¤¶¤Þ¤Ê¥·¥¹¥Æ¥àÀßÄê¥Õ¥¡¥¤¥ë¤ò
-	(ÌõÃí: ¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï <filename>/var/tmp/temproot</filename> ¤Ë)
-	ÃÖ¤¤¤Æ¤¤¤­¤Þ¤¹¡£
-	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¸½ºß¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ÈÈæ³Ó¤µ¤ì¤Þ¤¹¡£
-	°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¤Ï &man.diff.1; ·Á¼°¤Ç¼¨¤µ¤ì¡¢
-	<option>+</option> ¤Îµ­¹æ¤ÏÄɲäޤ¿¤ÏÊѹ¹¤µ¤ì¤¿¹Ô¤òɽ¤·¡¢
-	<option>-</option> ¤Ï´°Á´¤Ëºï½ü¤µ¤ì¤¿¤«¿·¤·¤¯ÃÖ¤­´¹¤¨¤é¤ì¤¿¹Ô¤òɽ¤·¤Þ¤¹¡£
-	¥Õ¥¡¥¤¥ë¤Î°ã¤¤¤Îɽ¼¨ÊýË¡¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï¡¢
-	&man.diff.1; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <sect3 xml:id="updating-src-building-clean-build">
+	<title>¥¯¥ê¡¼¥ó¥Ó¥ë¥É¤Î¼Â¹Ô</title>
 
-      <para>¼¡¤Ë <command>mergemaster</command>
-	¤Ï°ã¤¤¤Î¤¢¤ë¥Õ¥¡¥¤¥ë¤ò¤½¤ì¤¾¤ì¼¨¤·¡¢
-	ÁªÂò²Äǽ¤Ê¥ª¥×¥·¥ç¥ó¤òɽ¼¨¤·¤Þ¤¹¡£
-	¤³¤³¤Ç¤Ï¡¢°ì»þ¥Õ¥¡¥¤¥ë¤È¸Æ¤Ð¤ì¤ë¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¡¢
-	°ì»þ¥Õ¥¡¥¤¥ë¤ò¤½¤Î¤Þ¤Þ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢
-	°ì»þ¥Õ¥¡¥¤¥ë¤È¸½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤òÅý¹ç¤¹¤ë¤«¡¢
-	¤â¤·¤¯¤Ï·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¤«¡¢
-	¤È¤¤¤Ã¤¿¥ª¥×¥·¥ç¥ó¤«¤éÁªÂò¤Ç¤­¤Þ¤¹¡£</para>
+	<para>&os; ¥Ó¥ë¥É¥·¥¹¥Æ¥à¤Î¤¤¤¯¤Ä¤«¤Î¥Ð¡¼¥¸¥ç¥ó¤Ï¡¢
+	  ¥ª¥Ö¥¸¥§¥¯¥È¤¬°ì»þŪ¤ËÃÖ¤«¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê
+	  <filename>/usr/obj</filename>
+	  ¤ËÁ°²ó¤Î¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥³¡¼¥É¤ò»Ä¤·¤Þ¤¹¡£
+	  ¤³¤ì¤Ë¤è¤ê¡¢Êѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¥³¡¼¥É¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤»¤º¤Ë¤¹¤à¤Î¤Ç¡¢
+	  ¤½¤Î¸å¤Î¹½ÃÛ»þ´Ö¤òû½Ì¤Ç¤­¤Þ¤¹¡£
+	  ¤¹¤Ù¤Æ¤òºÆ¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢¹½ÃÛ¤ò³«»Ï¤¹¤ëÁ°¤Ë¡¢
+	  <buildtarget>cleanworld</buildtarget> ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>°ì»þ¥Õ¥¡¥¤¥ë¤Îºï½ü¤òÁª¤Ö¤È¡¢<command>mergemaster</command>
-	¤Ï¸½ºß¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Ê¤¤¤Ç¿·¤·¤¤¥Ð¡¼¥¸¥ç¥ó¤òºï½ü¤·¤Þ¤¹¡£
-	¤³¤ÎÁªÂò¤Ï¡¢¤ª´«¤á¤Ç¤­¤Þ¤»¤ó¡£
-	<command>mergemaster</command>
-	¤Î¥×¥í¥ó¥×¥È¤Ç <keycap>?</keycap> ¤È¥¿¥¤¥×¤¹¤ì¤Ð¡¢
-	¤¤¤Ä¤Ç¤â¥Ø¥ë¥×¤¬¸«¤é¤ì¤Þ¤¹¡£
-	¥Õ¥¡¥¤¥ë¤Î¥¹¥­¥Ã¥×¤òÁª¤Ö¤È¡¢Â¾¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò½ª¤¨¤¿¤¢¤È¡¢
-	¤â¤¦°ìÅÙ¤½¤Î¥Õ¥¡¥¤¥ë¤¬Ä󼨤µ¤ì¤Þ¤¹¡£</para>
+	<screen>&prompt.root; <userinput>make cleanworld</userinput></screen>
+      </sect3>
 
-      <para>°ì»þ¥Õ¥¡¥¤¥ë¤ò¤½¤Î¤Þ¤Þ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤òÁª¤Ö¤È¡¢
-	¸½ºß¤Î¥Õ¥¡¥¤¥ë¤ò¿·¤·¤¤¥Õ¥¡¥¤¥ë¤ÇÃÖ¤­´¹¤¨¤Þ¤¹¡£
-	¤Û¤È¤ó¤É¤Î¼ê¤ò²Ã¤¨¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ï¡¢
-	¤³¤ì¤¬°ìÈ֤褤ÁªÂò¤Ç¤¹¡£</para>
+      <sect3 xml:id="updating-src-building-jobs">
+	<title>¥¸¥ç¥Ö¤Î¿ô¤ÎÀßÄê</title>
 
-      <para>¥Õ¥¡¥¤¥ë¤ÎÅý¹ç¤òÁª¤ó¤À¾ì¹ç¡¢
-	¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿¤¬µ¯Æ°¤µ¤ì¡¢Î¾Êý¤Î¥Õ¥¡¥¤¥ë¤ÎÃæ¿È¤¬Ä󼨤µ¤ì¤Þ¤¹¡£
-	²èÌ̾å¤ËʤÖξÊý¤Î¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë¤¿¤á¤ËξÊý¤«¤éɬÍפÊÉôʬ¤òÁªÂò¤·¡¢
-	2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤òÅý¹ç¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	ʤó¤Ç¤¤¤ë¥Õ¥¡¥¤¥ë¤òÈæ³Ó¤¹¤ë¤È¤­¡¢
-	<keycap>l</keycap> ¤Çº¸Â¦¤ÎÃæ¿È¤òÁªÂò¤·¡¢
-	<keycap>r</keycap> ¤Ç±¦Â¦¤ÎÃæ¿È¤òÁªÂò¤·¤Þ¤¹¡£
-	ºÇ½ª½ÐÎϤϺ¸±¦Î¾Êý¤ÎÉôʬ¤Ç¤Ç¤­¤¿¥Õ¥¡¥¤¥ë¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
-	¤³¤Î¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¤¿¤¤¤Æ¤¤¡¢¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¥æ¡¼¥¶¤¬ÀßÄê¤òÊѹ¹¤·¤¿¥Õ¥¡¥¤¥ë¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
+	<para>¥Þ¥ë¥Á¥³¥¢¥×¥í¥»¥Ã¥µ¤òÅëºÜ¤¹¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	  ¹½ÃۤΤ¿¤á¤Î¥¸¥ç¥Ö¤Î¿ô¤òÁý¤ä¤¹¤³¤È¤Ç¡¢
+	  ¹½Ãۤˤ«¤«¤ë»þ´Ö¤òû½Ì¤Ç¤­¤Þ¤¹¡£
+	  <command>sysctl hw.ncpu</command> ¤ò»È¤Ã¤Æ¡¢
+	  ¥³¥¢¤Î¿ô¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¥¸¥ç¥Ö¤Î¿ô¤¬¤É¤Î¤è¤¦¤Ë¹½Ãۤή¤µ¤Ë±Æ¶Á¤¹¤ë¤«¤ò³Î¼Â¤ËÃΤë¤Ë¤Ï¡¢
+	  ¥×¥í¥»¥Ã¥µ¤Ë¤è¤ê°Û¤Ê¤ê¤Þ¤¹¤·¡¢&os;
+	  ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤ê»ÈÍѤµ¤ì¤ë¥Ó¥ë¥É¥·¥¹¥Æ¥à¤âÊѤï¤ë¤¿¤á¡¢
+	  ¼ÂºÝ¤Ë»î¤·¤Æ¤ß¤ë¤·¤«ÊýË¡¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	  »î¤·¤Æ¤ß¤ëºÇ½é¤Î¥¸¥ç¥Ö¤Î¿ô¤Î¸õÊä¤È¤·¤Æ¤Ï¡¢
+	  ¥³¥¢¤Î¿ô¤ÎȾʬ¤«¤éÇܤοô¤Î´Ö¤Ç¸¡Æ¤¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
+	  ¥¸¥ç¥Ö¤Î¿ô¤Ï¡¢<option>-j</option> ¤ò»È¤Ã¤Æ»ØÄꤷ¤Þ¤¹¡£</para>
 
-      <para>·ë²Ì¤ò¤â¤¦°ìÅÙ¸«¤ë¡¢¤òÁªÂò¤¹¤ë¤È¡¢
-	¥Õ¥¡¥¤¥ë¤ÎÁê°ÛÅÀ¤ò¤â¤¦°ìÅÙ¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	<example xml:id="updating-src-building-jobs-example">
+	  <title>¹½ÃۤΥ¸¥ç¥Ö¤Î¿ô¤òÁý¤ä¤¹</title>
 
-      <para><command>mergemaster</command>
-	¤¬¥·¥¹¥Æ¥à¥Õ¥¡¥¤¥ë¤ÎÈæ³Ó¤ò½ª¤¨¤¿¤¢¤È¡¢
-	¾¤Î¥ª¥×¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤Î¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢
-	¥Ñ¥¹¥ï¡¼¥É¥Õ¥¡¥¤¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
-	ºÇ¸å¤Ë»Ä¤Ã¤¿°ì»þ¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¤«¤É¤¦¤«¤ò¿Ò¤Í¤Æ½ªÎ»¤·¤Þ¤¹¡£</para>
+	  <para>°Ê²¼¤Ï 4 ¤Ä¤Î¥¸¥ç¥Ö¤Ç world ¤È¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤¹¤ëÎã¤Ç¤¹¡£</para>
 
-<!--
-Probably not needed as changes should be minimal and mergemaster does
-a good job of merging.
-      <tip>
-	<title>¿·¤·¤¤ root ¥Ç¥£¥ì¥¯¥È¥ê
-	  (<filename>/var/tmp/root</filename>) ¤Î̾Á°¤Ë
-          ¥¿¥¤¥à¥¹¥¿¥ó¥×¤òÉÕ¤±¤Æ¤ª¤¯¤È¡¢
-          °Û¤Ê¤ë¥Ð¡¼¥¸¥ç¥ó´Ö¤ÎÈæ³Ó¤ò³Ú¤Ë¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</title>
+	  <screen>&prompt.root; <userinput>make -j4 buildworld buildkernel</userinput></screen>
+	</example>
+      </sect3>
 
-	<para>ÉÑÈˤ˥·¥¹¥Æ¥à¤ÎºÆ¹½ÃÛ¤ò¹Ô¤Ê¤¦¤È¤¤¤¦¤³¤È¤Ï¡¢
-	  <filename>/etc</filename> ¤Î¹¹¿·¤â¤Þ¤¿¡¢
-	  ÉÑÈˤ˹Ԥ¦É¬Íפ¬¤¢¤ë¤È¤¤¤¦¤³¤È¤Ç¤¹¡£
-	  ¤³¤ì¤Ï¤Á¤ç¤Ã¤È¼ê´Ö¤Î¤«¤«¤ëºî¶È¤Ç¤¹¡£</para>
+      <sect3 xml:id="updating-src-building-only-kernel">
+	<title>¥«¡¼¥Í¥ë¤Î¤ß¤ò¹½ÃÛ¤¹¤ë</title>
 
-	<para>¤³¤Îºî¶È¤Ï¡¢¤¢¤Ê¤¿¤¬ <filename>/etc</filename>
-	  ¤Ë¥Þ¡¼¥¸¤·¤¿¡¢
-          ¿·¤·¤¯Êѹ¹¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ÎºÇ¿·¤Î¥»¥Ã¥È¤Î¥³¥Ô¡¼¤òÊݸ¤·¤Æ¤ª¤¯¤³¤È¤Ç
-          ÁÇÁ᤯¹Ô¤Ê¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	<para>¥½¡¼¥¹¥³¡¼¥É¤¬Êѹ¹¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
+	  <buildtarget>buildworld</buildtarget> ¤ò´°Î»¤·¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
+	  ¤½¤Î¸å¡¢¤¤¤Ä¤Ç¤â
+	  <buildtarget>buildkernel</buildtarget> ¤Ç¥«¡¼¥Í¥ë¤ò¹½ÃۤǤ­¤Þ¤¹¡£
+	  ¥«¡¼¥Í¥ë¤À¤±¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<procedure>
-	  <step>
-	    <para>ÉáÄÌ¤Ë make world ¤·¤Þ¤¹¡£
-	      <filename>/etc</filename> ¤ä
-	      ¾¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò¹¹¿·¤·¤¿¤¯¤Ê¤Ã¤¿¤È¤­¤Ï¡¢¥¿¡¼¥²¥Ã¥È
-	      ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¡¢¤½¤Î¤È¤­¤ÎÆüÉդ˴ð¤Å¤¯Ì¾Á°¤ò¤Ä¤±¤Æ¤¯¤À¤µ¤¤¡£</para>
+	<screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildkernel</userinput></screen>
+      </sect3>
 
-	      <screen>&prompt.root; <userinput>mkdir /var/tmp/root-20130214</userinput>
-&prompt.root; <userinput>cd /usr/src/etc</userinput>
-&prompt.root; <userinput>make DESTDIR=/var/tmp/root-20130214 \
-    distrib-dirs distribution</userinput></screen>
-	  </step>
+      <sect3 xml:id="updating-src-building-custom-kernel">
+	<title>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¹½ÃÛ</title>
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-doc-all mailing list