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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Mar 14 10:38:27 UTC 2014


Author: ryusuke
Date: Fri Mar 14 10:38:26 2014
New Revision: 44233
URL: http://svnweb.freebsd.org/changeset/doc/44233

Log:
  - Merge the following from the English version:
  
  	r43795 -> r43796	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 Mar 14 05:32:26 2014	(r44232)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Fri Mar 14 10:38:26 2014	(r44233)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r43795
+     Original revision: r43796
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -1558,7 +1558,8 @@ before running "/usr/sbin/freebsd-update
 	¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤ÇÆþ¼ê¤·¤¿¥½¡¼¥¹¤òÍѤ¤¤Æ¡¢
 	¸Å¤¤ &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para><quote>world</quote> ¤Ï¡¢&os; ¤Î¥«¡¼¥Í¥ë¡¢¥³¥¢¥·¥¹¥Æ¥à¤Î¥Ð¥¤¥Ê¥ê¡¢
+      <para>&os; ¤Ç¤Ï¡¢<quote>world</quote> ¤Ï¡¢
+	¥«¡¼¥Í¥ë¡¢¥³¥¢¥·¥¹¥Æ¥à¤Î¥Ð¥¤¥Ê¥ê¡¢
 	¥é¥¤¥Ö¥é¥ê¡¢¥×¥í¥°¥é¥ß¥ó¥°¥Õ¥¡¥¤¥ë¡¢ÁȤ߹þ¤ß¤Î¥³¥ó¥Ñ¥¤¥é¤ò°ÕÌ£¤·¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥³¥ó¥Ý¡¼¥Í¥ó¥È¤Î¹½ÃÛ¤ª¤è¤Ó¥¤¥ó¥¹¥È¡¼¥ë¤Î½çÈ֤ϽÅÍפǤ¹¡£</para>
 
@@ -1582,179 +1583,130 @@ before running "/usr/sbin/freebsd-update
 	    ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤ËÊѹ¹¤¹¤Ù¤­¤â¤Î¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
 	    ¸Å¤¤ world ¤ò²õ¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	    ¤½¤Î¤¿¤á¡¢°ìÈÌŪ¤ËÀßÄê¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ï¡¢
-	    2 ¤Ä¤Î¼ê½ç¤¬É¬ÍפǤ¹¡£
+	    2 ¤Ä¤Î¼ê½ç¤¬»È¤ï¤ì¤Þ¤¹¡£
 	    ¿¤¯¤Î¾ì¹ç¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤Î¥×¥í¥»¥¹¤Ï¡¢¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤¿¤ê¡¢
 	    ÄɲäΤߤò¹Ô¤¤¡¢¸Å¤¤¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤»¤ó¡£
-	    ¤³¤Î¤³¤È¤¬ÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	    ¤½¤Î¤¿¤á¡¢¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¤ª¤¤¤Æ¤Ï¡¢
-	    ¼êÆ°¤Çºï½ü¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤³¤È¤ò¡¢
-	    ÆÃÄê¤Î¥¹¥Æ¥Ã¥×¤Ç»ØÄꤹ¤ë¤³¤È¤â¤¢¤ê¤Þ¤¹¡£</para>
+	    ¤³¤Î¤³¤È¤¬ÌäÂê¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¡¢
+	    <filename>/usr/src/UPDATING</filename> ¤Ë¤Ï¡¢
+	    ¼êÆ°¤Çºï½ü¤¹¤Ù¤­¥Õ¥¡¥¤¥ë¤ò¤É¤Î¥¹¥Æ¥Ã¥×¤Çºï½ü¤¹¤Ù¤­¤«¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-      <para>¤³¤ì¤é¤òÇÛθ¤·¡¢°Ê²¼¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¿ä¾©¼ê½ç¤¬ºî¤é¤ì¤Þ¤·¤¿¡£</para>
+      <para>¤³¤ì¤é¤òÇÛθ¤·¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¿ä¾©¼ê½ç¤¬ºî¤é¤ì¤Þ¤·¤¿¡£</para>
       <procedure>
 	<title>world ¤Î¹½ÃÛ¥×¥í¥»¥¹¤Î³µÍ×</title>
 
 	<para>world ¤Î¹½ÃÛ¥×¥í¥»¥¹¤ÇÍѤ¤¤é¤ì¤ë¥³¥Þ¥ó¥É¤Ï¡¢
 	  ¤³¤³¤Ç¼¨¤µ¤ì¤Æ¤¤¤ë½çÈ֤Ǽ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¤³¤ÎÀá¤Ç¤Ï³Æ¥³¥Þ¥ó¥É¤Îµ¡Ç½¤Ë¤Ä¤¤¤Æ¤Þ¤È¤á¤Þ¤¹¡£</para>
-	<step>
+
+	  <step>
 	  <para>¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤È´ØÏ¢¥Ä¡¼¥ë¤òºÇ½é¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¡¢
 	    ¤½¤Î¸å¡¢¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤Ç¡¢
 	    ¿·¤·¤¤ world ¤Î»Ä¤ê¤ÎÉôʬ¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤¹¡£
 	    ¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¤â¤Î¤Ï¡¢
-	    <filename>/usr/obj</filename> ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£</para>
+	    <filename class="directory">/usr/obj</filename>
+	    ¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£</para>
+
+	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      buildkernel</command></para>
+	  <para>¥³¥ó¥Ñ¥¤¥é¤È¥«¡¼¥Í¥ë¤Î¥ß¥¹¥Þ¥Ã¥Á¤òËɤ°¤¿¤á¡¢
+	    <filename class="directory">/usr/obj</filename>
+	    ¤Ë¤¢¤ë¿·¤·¤¤¥³¥ó¥Ñ¥¤¥é¤òÍѤ¤¤Æ¿·¤·¤¤¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤Þ¤¹¡£</para>
 
-	  <para>¤³¤³¤Ç¤Ï¡¢
-	    <filename>/usr/obj</filename> ¤Ë¤¢¤ë
-	    <emphasis>¿·¤·¤¤</emphasis> ¥³¥ó¥Ñ¥¤¥é¤¬ÍѤ¤¤é¤ì¤Þ¤¹¡£
-	    ¤³¤ì¤Ë¤è¤ê¡¢¥³¥ó¥Ñ¥¤¥é¤È¥«¡¼¥Í¥ë¤Î¥ß¥¹¥Þ¥Ã¥Á¤òËɤ°¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+	  <screen>&prompt.root; <userinput>make buildkernel</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make installkernel</command></para>
-
 	  <para>¿·¤·¤¯¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¥«¡¼¥Í¥ë¤Çµ¯Æ°¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-	    ¿·¤·¤¤¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¥Ç¥£¥¹¥¯¾å¤ËÇÛÃÖ¤·¤Þ¤¹¡£
-	   </para>
+	    ¿·¤·¤¤¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ò¥Ç¥£¥¹¥¯¾å¤ËÇÛÃÖ¤·¤Þ¤¹¡£</para>
+
+	  <screen>&prompt.root; <userinput>make installkernel</userinput></screen>
 	</step>
 
-	<step>
-	  <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤ÇºÆµ¯Æ°</para>
+ 	<step>
+	  <para>¤¹¤Ç¤Ë¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÝ¤ÎÌäÂê¤òºÇ¾®¸Â¤Ë¤¹¤ë¤¿¤á¡¢¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤Þ¤¹¡£
+	  ¤Þ¤¿¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¾å¤Ç¸Å¤¤ world
+	  ¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤ÎÌäÂê¤âºÇ¾®¸Â¤Ë¤·¤Þ¤¹¡£</para>
+
+	  <screen>&prompt.root; <userinput>shutdown now</userinput></screen>
+
+	  <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ë°Ü¹Ô¤·¤¿¤é¡¢UFS
+	    ¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	    °Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>mount -u /</userinput>
+&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
+
+      <para>¤â¤·¥·¥¹¥Æ¥à¤¬ ZFS ¤Ç¥Õ¥©¡¼¥Þ¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
+	°Ê²¼¤Î 2 ¤Ä¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
+	¤³¤ÎÎã¤Ç¤Ï¡¢zpool ¤Î̾Á°¤Ï <literal>zroot</literal>
+	¤Ç¤¢¤ë¤È²¾Äꤷ¤Þ¤¹¡£</para>
 
-	  <para>¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤Ï¡¢
-	    ¤¹¤Ç¤Ë¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÝ¤ÎÌäÂê¤òºÇ¾®¸Â¤Ë¤·¤Þ¤¹¡£
-	    ¤Þ¤¿¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¾å¤Ç¸Å¤¤ world ¤¬¼Â¹Ô¤µ¤ì¤ëºÝ¤ÎÌäÂê¤âºÇ¾®¸Â¤Ë¤·¤Þ¤¹¡£</para>
+      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
+&prompt.root; <userinput>zfs mount -a</userinput></screen>
+	  </step>
+
+ 	<step>
+	  <para>¤½¤Î¸å¡¢¤É¤Á¤é¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤â¡¢
+	    °Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	  <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>mergemaster -p</command></para>
-
-	  <para>¿·¤·¤¤ world ¤Ë¤ª¤±¤ëºÇ½é¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¤¤Þ¤¹¡£
-	    ¤¿¤È¤¨¤Ð¡¢¿·¤·¤¤¥æ¡¼¥¶¥°¥ë¡¼¥×¤ò¥·¥¹¥Æ¥à¤ËÄɲä·¤¿¤ê¡¢
-	    ¥Ñ¥¹¥ï¡¼¥É¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÂФ·¡¢¿·¤·¤¤¥æ¡¼¥¶Ì¾¤òÄɲ乤뤫¤â¤·¤ì¤Þ¤»¤ó¡£
-	    Á°²ó¤Î¥¢¥Ã¥×¥Ç¡¼¥È¸å¤Ë¡¢
-	    ¿·¤·¤¤¥°¥ë¡¼¥×¤äÆÃÊ̤Υ·¥¹¥Æ¥à¤Î¥æ¡¼¥¶¥¢¥«¥¦¥ó¥È¤¬Äɲ䵤줿¾ì¹ç¤Ë¡¢
+	  <para>¼¡¤Ë¡¢¿·¤·¤¤ world
+	    ¤Ë¤ª¤±¤ëºÇ½é¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤ò¹Ô¤¤¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢
+	    ¤³¤Î¥¹¥Æ¥Ã¥×¤Ç¤Ï¡¢ºÇ¸å¤Î¥¢¥Ã¥×¥Ç¡¼¥È¸å¤Ë &os; ¤ËÄɲ䵤줿¡¢
+	    ¿·¤·¤¤¥°¥ë¡¼¥×¤ä¿·¤·¤¤¥·¥¹¥Æ¥à¥¢¥«¥¦¥ó¥È¤ò¤ò¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£
 	    <buildtarget>installworld</buildtarget> ¤Î¥¹¥Æ¥Ã¥×¤Ç¡¢
-	    ¿·¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥·¥¹¥Æ¥à¤Î¥æ¡¼¥¶¤Þ¤¿¤Ï¥·¥¹¥Æ¥à¤Î¥°¥ë¡¼¥×̾¤òÌäÂê¤Ê¤¯»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-	    ¤³¤Îºî¶È¤¬¤È¤­¤É¤­É¬ÍפȤʤê¤Þ¤¹¡£</para>
+	    ¿·¤·¤¯¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥·¥¹¥Æ¥à¤Î¥æ¡¼¥¶¤ª¤è¤Ó¥·¥¹¥Æ¥à¤Î¥°¥ë¡¼¥×̾¤òÌäÂê¤Ê¤¯»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
+	    ¤³¤Îºî¶È¤¬É¬ÍפȤʤ뤳¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+
+	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make installworld</command></para>
+	  <para><filename class="directory">/usr/obj</filename>
+	    ¤Ë¤¢¤ë¿·¤·¤¤ world ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£</para>
 
-	  <para>world ¤ò <filename>/usr/obj</filename> ¤«¤é¥³¥Ô¡¼¤·¤Þ¤¹¡£
-	    ¤³¤ì¤Ç¡¢¥Ç¥£¥¹¥¯¤Ë¤Ï¿·¤·¤¤¥«¡¼¥Í¥ë¤È world ¤¬ÃÖ¤«¤ì¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+	  <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make installworld</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>mergemaster</command></para>
+	  <para>»Ä¤ê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
 
-	  <para>¥Ç¥£¥¹¥¯¤Ë¿·¤·¤¤ world ¤¬ÃÖ¤«¤ì¤¿¤Î¤Ç¡¢
-	    »Ä¤ê¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
+	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      delete-old</command></para>
-
-	  <para>¤³¤Î¥¿¡¼¥²¥Ã¥È¤Ï (»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿) ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£
+	  <para>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£
 	    ¤â¤·»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë¤¬¥Ç¥£¥¹¥¯¤Ë»Ä¤Ã¤Æ¤¤¤ë¤È¡¢
-	    ÌäÂ꤬µ¯¤­¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á½ÅÍפʺî¶È¤Ç¤¹¡£
-	    ¤¿¤È¤¨¤Ð¡¢¸Å¤¤ <filename>utmp.h</filename> ¤¬»Ä¤Ã¤Æ¤¤¤ë¤È¡¢
-	    ¿·¤·¤¤ <filename>utmpx.h</filename> ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤È¤­¤Ë¡¢
-	    ÌäÂ꤬µ¯¤­¤ë ports ¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	    ÌäÂ꤬µ¯¤­¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á½ÅÍפʺî¶È¤Ç¤¹¡£</para>
+
+	  <screen>&prompt.root; <userinput>make delete-old</userinput></screen>
 	</step>
 
 	<step>
-	  <para>ºÆµ¯Æ°</para>
+	  <para>ºÆµ¯Æ°¤ò¹Ô¤¤¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¡¢
+	    world ¤½¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£</para>
 
-	  <para>¿·¤·¤¤¥«¡¼¥Í¥ë¡¢world ¤½¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤¬¥í¡¼¥É¤µ¤ì¤¿¤Î¤Ç¡¢
-	    ºÆµ¯Æ°¤¬É¬ÍפǤ¹¡£</para>
+	  <screen>&prompt.root; <userinput>reboot</userinput></screen>
 	</step>
 
 	<step>
-	  <para><command>make
-	      delete-old-libs</command></para>
+	  <para>¸Å¤¤¥é¥¤¥Ö¥é¥ê¤òºï½ü¤¹¤ëÁ°¤Ë¡¢
+	    <xref linkend="ports-upgrading"/>
+	    ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¡¢
+	    ¤¹¤Ù¤Æ¤Î ports ¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	    ºÆ¹½ÃÛ¤¬½ª¤ï¤Ã¤¿¤é¡¢¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤È¶¥¹ç¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤á¡¢
+	    »È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤òºï½ü¤·¤Þ¤¹¡£</para>
 
-	  <para>»È¤ï¤ì¤Ê¤¯¤Ê¤Ã¤¿¥é¥¤¥Ö¥é¥ê¤¬¿·¤·¤¤¥é¥¤¥Ö¥é¥ê¤È¶¥¹ç¤¹¤ë¤³¤È¤òÈò¤±¤ë¤¿¤áºï½ü¤·¤Þ¤¹¡£
-	  ¸Å¤¤¥é¥¤¥Ö¥é¥ê¤òºï½ü¤¹¤ëÁ°¤Ë¤¹¤Ù¤Æ¤Î ports ¤òºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+	  <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen>
 	</step>
       </procedure>
-
-      <para>¤â¤·¡¢&os; ¤Î¤¢¤ë¥Ö¥é¥ó¥Á¤Î¤¢¤ë¥ê¥ê¡¼¥¹¤«¤é¡¢
-	Ʊ¤¸¥Ö¥é¥ó¥Á¤ÎºÇ¿·¥ê¥ê¡¼¥¹¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð
-	(¤¿¤È¤¨¤Ð 9.0 ¤«¤é 9.1)¡¢
-	¤³¤Î¼ê½ç¤Ë¤·¤¿¤¬¤ï¤Ê¤¯¤Æ¤âÎɤ¤¤Ç¤·¤ç¤¦¡£
-	¤Ê¤¼¤Ê¤é¤Ð¡¢¥³¥ó¥Ñ¥¤¥é¡¢¥«¡¼¥Í¥ë¡¢¥æ¡¼¥¶¥é¥ó¥É¡¢¤½¤·¤ÆÀßÄê¥Õ¥¡¥¤¥ë¤Î´Ö¤Ç¡¢
-	½ÅÅ٤Υߥ¹¥Þ¥Ã¥Á¤¬µ¯¤­¤ë¤³¤È¤Ï¤¢¤Þ¤ê¹Í¤¨¤é¤ì¤Ê¤¤¤¿¤á¤Ç¤¹¡£
-	¥Þ¥¤¥Ê¡¼¤Ê¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤Ï¡¢¿·¤·¤¤¥«¡¼¥Í¥ë¤Î¹½Ãۤȥ¤¥ó¥¹¥È¡¼¥ë¸å¤Ë¡¢
-	¸Å¤¤¥¢¥×¥í¡¼¥Á¤Ç¤¢¤ë
-	<command>make world</command>
-	¤òÍѤ¤¤Æ¤â¤¦¤Þ¤¯¤¤¤¯¤Ç¤·¤ç¤¦¡£</para>
-
-      <para>¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤ò¤Þ¤¿¤¤¤À¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤Ï¡¢
-	¤³¤ÎÊýË¡¤òÍѤ¤¤Ê¤¤¤È¡¢²¿¤é¤«¤ÎÌäÂê¤Ë¤Ö¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£</para>
-
-      <para>¤³¤Î¼ê³¤­¤Ï¡¢
-	³«È¯¼Ô¤¿¤Á¤¬¤¢¤ë¼ï¤Î¥ß¥¹¥Þ¥Ã¥Á¤ò´°Á´¤ËÈò¤±¤ë¤¿¤á¤Ë¡¢Ä¹¤¤Ç¯·î¤ò¤«¤±¤Æ¿Ê²½¤·¤Æ¤­¤Þ¤·¤¿¡£
-	´ê¤ï¤¯¤Ð¡¢¤³¤Î¸½ºß¤Î¼ê½ç¤¬Ä¹¤¤´Ö°ÂÄꤷ¤Æ¤Û¤·¤¤¤â¤Î¤Ç¤¹¡£</para>
-
-      <para>¤Þ¤È¤á¤ë¤È¡¢¸½ºß¡¢¥½¡¼¥¹¤«¤é¤Î &os;
-	¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ë¤ª¤¤¤Æ¿ä¾©¤µ¤ì¤Æ¤¤¤ëÊýË¡¤Ï°Ê²¼¤È¤Ê¤ê¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildworld</userinput>
-&prompt.root; <userinput>make buildkernel</userinput>
-&prompt.root; <userinput>make installkernel</userinput>
-&prompt.root; <userinput>shutdown -r now</userinput></screen>
-
-      <note>
-	<para>¤Þ¤ì¤Ë <buildtarget>buildworld</buildtarget>
-	  ¤ÎÁ°¤Ë <command>mergemaster -p</command>
-	  ¤ò;ʬ¤Ë¼Â¹Ô¤¹¤ë¤³¤È¤¬É¬Íפʾì¹ç¤¬¤¢¤ê¤Þ¤¹¡£¤½¤Î¾ì¹ç¤Ï
-	  <filename>UPDATING</filename> ¤Ë¤½¤¦½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
-	  &os; ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤ò¤Þ¤¿¤¤¤Ç¹¹¿·¤¹¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð¡¢
-	  Ä̾ï¤Ï¤³¤Î¼ê½ç¤ò¾Êά¤·¤Æ¤â¤Ê¤ó¤éÌäÂê¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
-      </note>
-
-      <para><buildtarget>installkernel</buildtarget>
-	¤¬Ìµ»ö¤Ë½ªÎ»¤·¤¿¤é¡¢¥í¡¼¥À¤Î¥×¥í¥ó¥×¥È¤«¤é
-	<command>boot -s</command>
-	¤ò»È¤Ã¤Æ¥·¥ó¥°¥ë¥æ¡¼¥¶¥â¡¼¥É¤ÇΩ¤Á¾å¤²¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>UFS ¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>mount -u /</userinput>
-&prompt.root; <userinput>mount -a -t ufs</userinput></screen>
-
-      <para>ZFS ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤
-	(zpool ¤Î̾Á°¤ò zroot ¤È¤·¤Æ¤¤¤Þ¤¹)¡£</para>
-
-      <screen>&prompt.root; <userinput>zfs set readonly=off zroot</userinput>
-&prompt.root; <userinput>zfs mount -a</userinput></screen>
-
-      <para>¤½¤Î¸å¡¢°Ê²¼¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£:</para>
-
-      <screen>&prompt.root; <userinput>adjkerntz -i</userinput>
-&prompt.root; <userinput>mergemaster -p</userinput>
-&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make installworld</userinput>
-&prompt.root; <userinput>mergemaster</userinput>
-&prompt.root; <userinput>make delete-old</userinput>
-&prompt.root; <userinput>reboot</userinput>
-&prompt.root; <userinput>make delete-old-libs</userinput></screen>
-
-      <warning>
-	<title>¤³¤Î¸å¤ÎÀâÌÀ¤òÆɤó¤Ç¤¯¤À¤µ¤¤</title>
-
-	<para>¤³¤Î¸å¤ÎÀá¤Ç¤Ï¤½¤ì¤¾¤ì¤Î¥¹¥Æ¥Ã¥×¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
-	  Æä˥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òÍøÍѤ¹¤ë¾ì¹ç¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
-      </warning>
     </sect2>
 
     <sect2 xml:id="src-updating">
@@ -1764,6 +1716,9 @@ before running "/usr/sbin/freebsd-update
         <primary><filename>make.conf</filename></primary>
       </indexterm>
 
+      <para>¤³¤Î¸å¤ÎÀá¤Ç¤Ï¤½¤ì¤¾¤ì¤Î¥¹¥Æ¥Ã¥×¤Ë¤Ä¤¤¤Æ¾Ü¤·¤¯ÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£
+	Æä˥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òÍøÍѤ¹¤ë¾ì¹ç¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+
       <para>&man.make.1; ¤Î¥ª¥×¥·¥ç¥ó¤ÎÀâÌÀ¤Ï¡¢&man.make.conf.5; ¤ä
 	<filename>/usr/share/examples/etc/make.conf</filename> ¤Ë¤¢¤ê¤Þ¤¹¡£
 	¤³¤ì¤é¤ÎÀßÄê¤ò <filename>/etc/make.conf</filename> ¤ËÄɲ䷤ơ¢


More information about the svn-doc-all mailing list