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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Sun Jun 8 13:19:32 UTC 2014


Author: ryusuke
Date: Sun Jun  8 13:19:31 2014
New Revision: 45031
URL: http://svnweb.freebsd.org/changeset/doc/45031

Log:
  - Merge the following from the English version:
  
  	r44736 -> r44774	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 Jun  8 08:17:34 2014	(r45030)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Sun Jun  8 13:19:31 2014	(r45031)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44736
+     Original revision: r44774
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -279,10 +279,22 @@ MergeChanges /etc/ /var/named/etc/ /boot
     </sect2>
 
     <sect2 xml:id="freebsdupdate-security-patches">
-      <title>¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á</title>
+      <title>¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤ÎŬÍÑ</title>
+
+      <para>&os; ¤Î¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤òŬÍѤ¹¤ë²áÄø¤Ï´Êñ¤Ë¤Ê¤ê¡¢
+	´ÉÍý¼Ô¤Ï <command>freebsd-update</command> ¤ò»È¤Ã¤Æ¡¢
+	¥·¥¹¥Æ¥à¤ò´°Á´¤Ë¥Ñ¥Ã¥Á¤¬¤¢¤¿¤Ã¤¿¾õÂÖ¤ËÊݤĻö¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
+	&os; ¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	<link xlink:href="&url.books.arch-handbook.en;/security-advisories.html">&os; ¥»¥­¥å¥ê¥Æ¥£´«¹ð</link>
+	<!-- <xref linkend="security-advisories"/> -->
+	¤ÎÀá¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢&os;
-	¤Î¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
+	¤Î¥»¥­¥å¥ê¥Æ¥£¥Ñ¥Ã¥Á¤¬¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¡¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£
+	ºÇ½é¤Î¥³¥Þ¥ó¥É¤Ï¡¢Ì¤Âбþ¤Î¥Ñ¥Ã¥Á¤¬¤¢¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤Þ¤¹¡£
+	¤â¤·Ì¤Âбþ¤Î¥Ñ¥Ã¥Á¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï¡¢
+	¥Ñ¥Ã¥Á¤¬Åö¤Æ¤é¤ì¤¿ºÝ¤ËÊѹ¹¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤¬ºîÀ®¤µ¤ì¤Þ¤¹¡£
+	2 ÈÖÌܤΥ³¥Þ¥ó¥É¤Ï¥Ñ¥Ã¥Á¤òŬÍѤ·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>freebsd-update fetch</userinput>
 &prompt.root; <userinput>freebsd-update install</userinput></screen>
@@ -290,39 +302,38 @@ MergeChanges /etc/ /var/named/etc/ /boot
       <para>¥¢¥Ã¥×¥Ç¡¼¥È¤Ë¤è¤Ã¤Æ¥«¡¼¥Í¥ë¤Ë¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
 	¥Ñ¥Ã¥Á¤¬Åö¤¿¤Ã¤¿¥«¡¼¥Í¥ë¤Çµ¯Æ°¤¹¤ë¤è¤¦¤Ë¡¢
 	¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	¤â¤·¤¯¤Ï¡¢¥·¥¹¥Æ¥à¤Ë¥Ñ¥Ã¥Á¤¬Åö¤Æ¤é¤ì¡¢
-	ËèÈդΠ&man.cron.8; ¥¸¥ç¥Ö¤È¤·¤Æ¡¢<command>freebsd-update</command>
-	¤ò¼Â¹Ô¤¹¤ë¤è¤¦¤Ë¡¢
+	¤â¤·¡¢¼Â¹ÔÃæ¤Î¥Ð¥¤¥Ê¥ê¤Ë¥Ñ¥Ã¥Á¤¬Åö¤Æ¤é¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
+	¥Ñ¥Ã¥Á¤ÎÅö¤Æ¤é¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤Î¥Ð¥¤¥Ê¥ê¤¬»È¤ï¤ì¤ë¤è¤¦¤Ë¡¢
+	±Æ¶Á¤Î¤¢¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£</para>
+
+      <para>ËèÆü°ìÅÙ¥¢¥Ã¥×¥Ç¡¼¥È¤¬¤Ê¤¤¤«¤É¤¦¤«¤ò¼«Æ°Åª¤Ë³Îǧ¤¹¤ë¤è¤¦¤ËÀßÄꤹ¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¥¨¥ó¥È¥ê¤ò <filename>/etc/crobntab</filename>
 	¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
       <programlisting>@daily                                  root    freebsd-update cron</programlisting>
 
-      <para>¤³¤Î¥¨¥ó¥È¥ê¤Ï¡¢ËèÆü°ìÅÙ <command>freebsd-update</command>
-	¤ò¼Â¹Ô¤¹¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
-	<option>cron</option> ¤È¶¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢
-	<command>freebsd-update</command>
-	¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤¬Â¸ºß¤¹¤ë¤È¤­¤À¤±³Îǧ¤·¤Þ¤¹¡£
-	¥Ñ¥Ã¥Á¤¬Â¸ºß¤¹¤ë¤È¡¢
-	¼«Æ°Åª¤Ë¥í¡¼¥«¥ë¥Ç¥£¥¹¥¯¤Ë¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤¹¤¬¡¢Å¬ÍѤϤµ¤ì¤Þ¤»¤ó¡£
-	¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥Á¤ò³Îǧ¤·¡¢¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפΤ¢¤ë¤³¤È¤¬¡¢
-	<systemitem class="username">root</systemitem>
-	°¸¤Æ¤Ë¥á¡¼¥ë¤ÇÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
+      <para>¥Ñ¥Ã¥Á¤¬Â¸ºß¤¹¤ë¤È¡¢
+	¼«Æ°Åª¤Ë¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤Þ¤¹¤¬¡¢Å¬ÍѤϤµ¤ì¤Þ¤»¤ó¡£
+	<systemitem class="username">root</systemitem>°¸¤Æ¤Ë¥á¡¼¥ë¤Ç¡¢
+	¥À¥¦¥ó¥í¡¼¥É¤µ¤ì¤¿¥Ñ¥Ã¥Á¤ò³Îǧ¤·¡¢
+	<command>freebsd-update install</command>
+	¤È¤È¤â¤Ë¼êÆ°¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפΤ¢¤ë¤³¤È¤¬ÄÌÃΤµ¤ì¤Þ¤¹¡£</para>
 
       <para>¤¦¤Þ¤¯¹Ô¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢<command>freebsd-update</command>
 	¤ò°Ê²¼¤Î¤è¤¦¤Ë¼Â¹Ô¤¹¤ë¤È¡¢ºÇ¸å¤ÎÊѹ¹¤Þ¤Ç¥í¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤¹¡£</para>
 
-      <screen>&prompt.root; <userinput>freebsd-update rollback</userinput></screen>
+      <screen>&prompt.root; <userinput>freebsd-update rollback</userinput>
+Uninstalling updates... done.</screen>
 
       <para>¥«¡¼¥Í¥ë¤Þ¤¿¤Ï¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤¬¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢
-	´°Î»¸å¤Ë¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤Îºî¶È¤Ë¤è¤Ã¤Æ¡¢&os; ¤¬¥Ð¥¤¥Ê¥ê¤ò¥á¥â¥ê¤ËÆɤ߹þ¤ß¤Þ¤¹¡£</para>
+	´°Î»¸å¤Ë¤â¤¦°ìÅÙ¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¤Æ¡¢
+	±Æ¶Á¤Î¤¢¤Ã¤¿¥Ð¥¤¥Ê¥ê¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <para><command>freebsd-update</command>
 	¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬¼«Æ°Åª¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¥«¡¼¥Í¥ë¤Ï
 	<filename>GENERIC</filename> ¤Î¤ß¤Ç¤¹¡£
 	¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤¬¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
-	<command>freebsd-update</command> ¤¬Â¾¤ÎÉôʬ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¡¢
+	<command>freebsd-update</command> ¤¬¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¸å¡¢
 	¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤·¡¢¤â¤¦°ìÅÙ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	¤·¤«¤·¤Ê¤¬¤é¡¢<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
 	<filename>/boot/GENERIC</filename> ¤Ë¸ºß¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢
@@ -346,7 +357,6 @@ MergeChanges /etc/ /var/named/etc/ /boot
 	¿·¤·¤¤¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ÎºÆ¹½ÃۤȺƥ¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢
 	Ä̾ïÄ̤ê¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-      <note>
 	<para><command>freebsd-update</command> ¤Ï¡¢
 	  ¾ï¤Ë¥«¡¼¥Í¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
 	  <command>freebsd-update install</command>
@@ -359,161 +369,24 @@ MergeChanges /etc/ /var/named/etc/ /boot
 	  <command>uname -r</command> ¤¬ <literal>-p</literal>
 	  ¤Çɽ¼¨¤¹¤ë»þ¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤¬»²¾È¤µ¤ì¤Þ¤¹¡£
 	  ¤½¤Î¤¿¤á¡¢²¿¤âÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤â¡¢¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òºÆ¹½ÃÛ¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
-	  &man.uname.1; ¤¬¥·¥¹¥Æ¥à¤ÎÀµ³Î¤Ê¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤òÊó¹ð¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+	  <command>uname</command> ¤¬¥·¥¹¥Æ¥à¤ÎÀµ³Î¤Ê¥Ñ¥Ã¥Á¥ì¥Ù¥ë¤òÊó¹ð¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 	  ³Æ¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥Ã¥×¥Ç¡¼¥È¤ò¤¹¤Ð¤ä¤¯ÇÄ°®¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ë¤Î¤Ç¡¢
 	  ÆäËÊ£¿ô¤Î¥·¥¹¥Æ¥à¤ò´ÉÍý¤¹¤ë¤È¤­¤Ë½õ¤±¤È¤Ê¤ê¤Þ¤¹¡£</para>
-      </note>
     </sect2>
 
     <sect2 xml:id="freebsdupdate-upgrade">
-      <title>¥á¥¸¥ã¡¼¤ª¤è¤Ó¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
+      <title>¥á¥¸¥ã¡¼¤ª¤è¤Ó¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¦</title>
 
       <para>&os; ¤Î¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó´Ö¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¡¢
 	¤¿¤È¤¨¤Ð¡¢&os; 9.0 ¤«¤é &os; 9.1 ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï¡¢
 	<emphasis>¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó</emphasis> ¥¢¥Ã¥×¥°¥ì¡¼¥É¤È¸Æ¤Ð¤ì¤Þ¤¹¡£
-	Ä̾ï¤Ï¡¢¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿¸å¤Ç¤â¡¢
-	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÏÌäÂê¤Ê¤¯Æ°¤­¤Þ¤¹¡£</para>
-
-      <para><emphasis>¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó</emphasis> ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï¡¢
-	&os; 8.X ¤«¤é &os; 9.X ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤È¤¤¤Ã¤¿¡¢
+	<emphasis>¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó</emphasis> ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï¡¢
+	&os; 9.X ¤«¤é &os; 10.X ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤È¤¤¤Ã¤¿¡¢
 	&os; ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤¬ÊѤï¤ë¤è¤¦¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤³¤È¤Ç¤¹¡£
-	¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ç¤Ï¡¢
-	¸Å¤¤¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤ä¥é¥¤¥Ö¥é¥ê¤¬ºï½ü¤µ¤ì¡¢
-	¤³¤ì¤é¤Ë°Í¸¤¹¤ë¿¤¯¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë±Æ¶Á¤òÍ¿¤¨¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
-	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î ports ¤òºï½ü¤·¤ÆºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¡¢
-	¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¸å¡¢
-	<package>ports-mgmt/portmaster</package>
-	¤È¤¤¤Ã¤¿¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Ö¥ë¡¼¥È¥Õ¥©¡¼¥¹Åª¤ÊºÆ¹½Ãۤϡ¢
-	°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ë¤è¤ê¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
-
-      <para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¤¹¤Ù¤Æ¤Î ports ¤òŬÀڤ˺ƥ¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È¤·¤Þ¤¹¡£
-	<varname>BATCH</varname> ´Ä¶­ÊÑ¿ô¤ò
-	<literal>yes</literal> ¤ËÀßÄꤷ¤Æ¤ª¤¯¤È¡¢
-	¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥»¥¹¤ÎÅÓÃæ¤Î¼ÁÌä¤ËÂФ·
-	<literal>yes</literal> ¤ÈÅú¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Î¤Ç¡¢
-	¥Ó¥ë¥É¥×¥í¥»¥¹¤Ç¤Î¼êÆ°Áàºî¤ò¾Êά¤Ç¤­¤Þ¤¹¡£</para>
-
-      <sect3 xml:id="freebsd-update-custom-kernel">
-	<title>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¼è¤ê°·¤¤</title>
-
-	<para>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¥×¥í¥»¥¹¤Ï¡¢
-	  ´öʬʣ»¨¤È¤Ê¤ê¤Þ¤¹¡£
-	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¼ê½ç¤Ï &os; ¤Î¥Ð¡¼¥¸¥ç¥ó¤Ë¤è¤Ã¤ÆÊѤï¤ê¤Þ¤¹¡£</para>
-
-	<sect4 xml:id="freebsd-update-custom-kernel-8x">
-	  <title>&os; 8.X ¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
-
-	  <para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
-	    <filename>/boot/GENERIC</filename>
-	    ¤ËÃÖ¤«¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	    ¤â¤· <filename>GENERIC</filename>
-	    ¥«¡¼¥Í¥ë¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ 
-	    °Ê²¼¤Î¤É¤ì¤«¤ÎÊýË¡¤ÇÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	  <itemizedlist>
-	    <listitem>
-	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-		<filename>/boot/kernel.old</filename>
-		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
-		¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
-		<filename>/boot/GENERIC</filename>
-		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-		°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ç¡¢
-		¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
-		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
-	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
-&prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
-
-	      <para>¤³¤³¤Ç <filename
-		  class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
-		¤ò¼ÂºÝ¤Î¥ê¥ê¡¼¥¹ÈÖ¹æ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
-		<filename>GENERIC</filename> ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç <filename>/boot/GENERIC</filename>
-		¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>¾åµ­¤ÎÊýË¡¤¬¤¹¤Ù¤Æ¼ºÇÔ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¤Æ¡¢
-		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput>
-&prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput>
-&prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen>
-
-	      <para><command>freebsd-update</command> ¤Ï¡¢¤³¤Î¥«¡¼¥Í¥ë¤ò
-		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤È¤·¤Æ°·¤¤¤Þ¤¹¡£
-		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
-		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-	  </itemizedlist>
-
-	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
-	    ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
-	</sect4>
-
-	<sect4 xml:id="freebsd-update-custom-kernel-9x">
-	  <title>&os; 9.X °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
-
-	  <itemizedlist>
-	    <listitem>
-	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-		<filename>/boot/kernel.old</filename>
-		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
-		¤¿¤Àñ¤Ë¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
-		<filename>/boot/kernel</filename>
-		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-		°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é
-		<filename>GENERIC</filename>
-		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
-
-	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cd /cdrom/usr/freebsd-dist</userinput>
-&prompt.root; <userinput>tar -C/ -xvf kernel.txz boot/kernel/kernel</userinput></screen>
-	    </listitem>
-
-	    <listitem>
-	      <para>¾åµ­¤ÎÊýË¡¤¬¼ºÇÔ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
-		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¤Æ¡¢
-		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
-
-	      <para><command>freebsd-update</command> ¤Ï¡¢¤³¤Î¥«¡¼¥Í¥ë¤ò
-		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤È¤·¤Æ°·¤¤¤Þ¤¹¡£
-		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
-		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
-		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-	  </itemizedlist>
-
-	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
-	    ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
-	</sect4>
-      </sect3>
-
-      <sect3 xml:id="freebsdupdate-using">
-	<title>¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¦</title>
-
-	<para><command>freebsd-update</command>
-	  ¤Ë¤è¤ë¥á¥¸¥ã¡¼¡¢¤Þ¤¿¤Ï¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤Ï¡¢
-	  ¥ê¥ê¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¤ò¥¿¡¼¥²¥Ã¥È¤Ë¤·¤Æ¼Â¹Ô¤·¤Þ¤¹¡£
-	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢&os; 9.1 ¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£</para>
+	¤É¤Á¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤â¥ê¥ê¡¼¥¹ÈÖ¹æ¤Î¥¿¡¼¥²¥Ã¥È¤ò»ØÄꤹ¤ë»ö¤Ç¡¢
+	<command>freebsd-update</command> ¤Ë¤è¤Ã¤Æ¹Ô¤¦»ö¤¬¤Ç¤­¤Þ¤¹¡£
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢&os; 9.0
+	¤Î¥·¥¹¥Æ¥à¤ò &os; 9.1 ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update -r 9.1-RELEASE upgrade</userinput></screen>
 
@@ -539,7 +412,7 @@ The following components of FreeBSD do n
 kernel/generic world/catpages world/dict world/doc world/games
 world/proflibs
 
-Does this look reasonable (y/n)? y</screen>
+Does this look reasonable (y/n)? <userinput>y</userinput></screen>
 
 	<para>¤³¤³¤Ç¡¢<command>freebsd-update</command>
 	  ¤Ï¥¢¥Ã¥×¥°¥ì¡¼¥É¤ËɬÍפʤ¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Þ¤¹¡£
@@ -623,20 +496,145 @@ before running "/usr/sbin/freebsd-update
 	  <para>»ÈÍѤ·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥ê¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ÎÉÕ¤±¤é¤ìÊý¤Ë¤è¤Ã¤Æ¡¢
 	    3 ¤Ä¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Õ¥§¡¼¥º¤¬ 2 ¤Ä¤Ë¤Ê¤ë¾ì¹ç¤â¤¢¤ê¤Þ¤¹¡£</para>
 	</note>
-      </sect3>
+
+	<para>¥¢¥Ã¥×¥°¥ì¡¼¥É¤Ï¤³¤ì¤Ç½ªÎ»¤Ç¤¹¡£
+	  ¤â¤·¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
+	  <xref linkend="freebsdupdate-portsrebuild"/>
+	  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¤¹¤Ù¤Æ¤Î ports ¤ª¤è¤Ó package
+	  ¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎÊýË¡¤Ë¤Ä¤¤¤Æ¡¢<xref
+	    linkend="freebsd-update-custom-kernel-9x"/> ¤Þ¤¿¤Ï <xref
+	    linkend="freebsd-update-custom-kernel-8x"/>
+	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	<sect3 xml:id="freebsd-update-custom-kernel-9x">
+	  <title>&os; 9.X °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
+		<filename>/boot/kernel.old</filename>
+		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
+		¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
+		<filename>/boot/kernel</filename>
+		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
+		°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é
+		<filename>GENERIC</filename>
+		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+
+	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
+&prompt.root; <userinput>cd /cdrom/usr/freebsd-dist</userinput>
+&prompt.root; <userinput>tar -C/ -xvf kernel.txz boot/kernel/kernel</userinput></screen>
+	    </listitem>
+
+	    <listitem>
+	      <para>¾åµ­¤ÎÊýË¡¤Ë¼ºÇÔ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¤Æ¡¢
+		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput></screen>
+
+	      <para><command>freebsd-update</command> ¤¬¤³¤Î¥«¡¼¥Í¥ë¤ò
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤È¤·¤Æǧ¼±¤¹¤ë¤¿¤á¤Ë¡¢
+		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
+		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
+		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
+	    ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
+	</sect3>
+
+	<sect3 xml:id="freebsd-update-custom-kernel-8x">
+	  <title>&os; 8.X ¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
+
+	  <para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
+	    <filename>/boot/GENERIC</filename>
+	    ¤ËÃÖ¤«¤ì¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	    ¤â¤· <filename>GENERIC</filename>
+	    ¥«¡¼¥Í¥ë¤¬¥·¥¹¥Æ¥à¤Ë¸ºß¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï¡¢ 
+	    °Ê²¼¤Î¤É¤ì¤«¤ÎÊýË¡¤ÇÍÑ°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	  <itemizedlist>
+	    <listitem>
+	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
+		<filename>/boot/kernel.old</filename>
+		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
+		¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
+		<filename>/boot/GENERIC</filename>
+		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
+		°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ç¡¢
+		¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
+		¥«¡¼¥Í¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+
+	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
+&prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
+&prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
+
+	      <para>¤³¤³¤Ç <filename
+		  class="directory"><replaceable>X.Y-RELEASE</replaceable></filename>
+		¤ò¼ÂºÝ¤Î¥ê¥ê¡¼¥¹ÈÖ¹æ¤ËÃÖ¤­´¹¤¨¤Æ¤¯¤À¤µ¤¤¡£
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤Ï¡¢
+		¥Ç¥Õ¥©¥ë¥È¤Ç <filename>/boot/GENERIC</filename>
+		¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡£</para>
+	    </listitem>
+
+	    <listitem>
+	      <para>¾åµ­¤ÎÊýË¡¤¬¤¹¤Ù¤Æ¼ºÇÔ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¤Æ¡¢
+		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+	      <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>env DESTDIR=/boot/GENERIC make kernel __MAKE_CONF=/dev/null SRCCONF=/dev/null</userinput>
+&prompt.root; <userinput>mv /boot/GENERIC/boot/kernel/* /boot/GENERIC</userinput>
+&prompt.root; <userinput>rm -rf /boot/GENERIC/boot</userinput></screen>
+
+	      <para><command>freebsd-update</command> ¤¬¡¢¤³¤Î¥«¡¼¥Í¥ë¤ò
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤È¤·¤Æ°·¤¦¤è¤¦¤Ë¡¢
+		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
+		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
+		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	    </listitem>
+	  </itemizedlist>
+
+	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
+	    ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
+	</sect3>
 
       <sect3 xml:id="freebsdupdate-portsrebuild">
 	<title>¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¥°¥ì¡¼¥É¸å¤Î ports ¤ÎºÆ¹½ÃÛ</title>
 
-	<para>¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿¸å¤Ç¤Ï¡¢
-	  ¤¹¤Ù¤Æ¤Î¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆ¹½ÃÛ¤·¡¢
-	  ºÆ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	  ¤³¤Îºî¶È¤¬É¬ÍפʤΤϡ¢¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥½¥Õ¥È¥¦¥§¥¢¤¬¡¢
-	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎºÝ¤Ëºï½ü¤µ¤ì¤¿¥é¥¤¥Ö¥é¥ê¤Ë°Í¸¤·¤Æ¤¤¤ë²ÄǽÀ­¤¬¤¢¤ë¤¿¤á¤Ç¤¹¡£
-	  <package>ports-mgmt/portupgrade</package>
-	  ¤Ï¡¢¤³¤Î¥×¥í¥»¥¹¤ò¼«Æ°²½¤·¤Þ¤¹¡£</para>
+	<para>°ìÈÌŪ¤Ë¡¢¥Þ¥¤¥Ê¡¼¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¸å¤Ç¤Ï¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢ÌäÂê¤Ê¤¯Æ°ºî¤¹¤ë¤Ç¤·¤ç¤¦¡£
+	  ¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤¬°Û¤Ê¤ë¤È¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¥Ð¥¤¥Ê¥ê¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹
+	  (<acronym>ABI</acronym>) ¤¬°Û¤Ê¤ë¤¿¤á¡¢
+	  ¥µ¡¼¥É¥Ñ¡¼¥Æ¥£À½¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤ÏÆ°ºî¤·¤Ê¤¯¤Ê¤ë¤Ç¤·¤ç¤¦¡£
+	  ¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿¸å¤Ç¤Ï¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î packages, ports ¤ò
+	  <package>ports-mgmt/portmaster</package>
+	  ¤Î¤è¤¦¤Ê¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»È¤Ã¤Æ¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	  °Ê²¼¤Î¥³¥Þ¥ó¥É¤òÍѤ¤¤Æ¡¢
+	  ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òºÆ¹½ÃۤǤ­¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
 
-	<screen>&prompt.root; <userinput>portmaster -af</userinput></screen>
+      <para>¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	ÀßÄê¤òÊѹ¹¤¹¤ë¥ª¥×¥·¥ç¥ó¤ò»ý¤Ä¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï¡¢
+	ÀßÄêÊѹ¹¤Î¥¹¥¯¥ê¡¼¥ó¤òɽ¼¨¤·¡¢
+	¥æ¡¼¥¶¤«¤é¤Î»Ø¼¨ÂÔ¤Á¤Î¾õÂÖ¤ÇÄä»ß¤·¤Þ¤¹¡£
+	¤³¤Î¿¶¤ëÉñ¤¤¤ò¤ä¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
+	¾åµ­¤Î¥³¥Þ¥ó¥É¤Ë <option>-G</option> ¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<para>¤³¤Îºî¶È¤Î½ªÎ»¸å¡¢ºÇ¸å¤Ë¤â¤¦°ìÅÙ
 	  <command>freebsd-update</command>


More information about the svn-doc-all mailing list