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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Jun 13 12:05:03 UTC 2014


Author: ryusuke
Date: Fri Jun 13 12:05:03 2014
New Revision: 45049
URL: http://svnweb.freebsd.org/changeset/doc/45049

Log:
  - Merge the following from the English version:
  
  	r44774 -> r44775	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 10:26:42 2014	(r45048)
+++ head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml	Fri Jun 13 12:05:03 2014	(r45049)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r44774
+     Original revision: r44775
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook"
@@ -285,7 +285,7 @@ MergeChanges /etc/ /var/named/etc/ /boot
 	´ÉÍý¼Ô¤Ï <command>freebsd-update</command> ¤ò»È¤Ã¤Æ¡¢
 	¥·¥¹¥Æ¥à¤ò´°Á´¤Ë¥Ñ¥Ã¥Á¤¬¤¢¤¿¤Ã¤¿¾õÂÖ¤ËÊݤĻö¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
 	&os; ¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-	<link xlink:href="&url.books.arch-handbook.en;/security-advisories.html">&os; ¥»¥­¥å¥ê¥Æ¥£´«¹ð</link>
+	<link xlink:href="&url.books.handbook.en;/security-advisories.html">&os; ¥»¥­¥å¥ê¥Æ¥£´«¹ð</link>
 	<!-- <xref linkend="security-advisories"/> -->
 	¤ÎÀá¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
@@ -342,12 +342,15 @@ Uninstalling updates... done.</screen>
 	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤Þ¤¹¡£</para>
 
       <note>
-	<para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¡¢¾ï¤Ë <filename>/boot/GENERIC</filename>
-	  ¤ËÃÖ¤¤¤Æ¤ª¤¯¤³¤È¤ÏÎɤ¤¹Í¤¨¤Ç¤¹¡£
+	<para><filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¡¢
+	  ¾ï¤Ë <filename>/boot/GENERIC</filename> ¤ËÃÖ¤¤¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£
 	  ¤µ¤Þ¤¶¤Þ¤ÊÌäÂê¤ò²ò·è¤¹¤ëºÝ¤ä¡¢
-	  <xref linkend="freebsdupdate-upgrade"/> ¤ËÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¡¢
-	  <command>freebsd-update</command>
-	  ¤òÍѤ¤¤Æ¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Ë½õ¤±¤È¤Ê¤ê¤Þ¤¹¡£</para>
+	  ¥Ð¡¼¥¸¥ç¥ó¤ò¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ëºÝ¤Ë½õ¤±¤È¤Ê¤ê¤Þ¤¹¡£
+	  <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤òÍÑ°Õ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <xref
+	    linkend="freebsd-update-custom-kernel-9x"/> ¤Þ¤¿¤Ï <xref
+	    linkend="freebsd-update-custom-kernel-8x"/>
+	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </note>
 
       <para><filename>/etc/freebsd-update.conf</filename>
@@ -384,8 +387,22 @@ Uninstalling updates... done.</screen>
 	&os; 9.X ¤«¤é &os; 10.X ¤Ø¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤È¤¤¤Ã¤¿¡¢
 	&os; ¤Î¥á¥¸¥ã¡¼¥Ð¡¼¥¸¥ç¥ó¤¬ÊѤï¤ë¤è¤¦¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¤³¤È¤Ç¤¹¡£
 	¤É¤Á¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤â¥ê¥ê¡¼¥¹ÈÖ¹æ¤Î¥¿¡¼¥²¥Ã¥È¤ò»ØÄꤹ¤ë»ö¤Ç¡¢
-	<command>freebsd-update</command> ¤Ë¤è¤Ã¤Æ¹Ô¤¦»ö¤¬¤Ç¤­¤Þ¤¹¡£
-	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢&os; 9.0
+	<command>freebsd-update</command> ¤Ë¤è¤Ã¤Æ¹Ô¤¦»ö¤¬¤Ç¤­¤Þ¤¹¡£</para>
+
+      <note>
+	<para>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
+	  ¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤¦Á°¤Ë
+	  <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬¡¢
+	  <filename>/boot/GENERIC</filename>
+	  ¤ËÃÖ¤«¤ì¤Æ¤¤¤ë»ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	  <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤òÍÑ°Õ¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <xref
+	    linkend="freebsd-update-custom-kernel-9x"/> ¤Þ¤¿¤Ï <xref
+	    linkend="freebsd-update-custom-kernel-8x"/>
+	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      </note>
+
+      <para>°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢&os; 9.0
 	¤Î¥·¥¹¥Æ¥à¤ò &os; 9.1 ¤Ë¥¢¥Ã¥×¥°¥ì¡¼¥É¤·¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update -r 9.1-RELEASE upgrade</userinput></screen>
@@ -457,7 +474,6 @@ before running "/usr/sbin/freebsd-update
 	</note>
 
 	<para>¥Ñ¥Ã¥Á¤ÏºÇ½é¤Ë¥«¡¼¥Í¥ë¤È¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤ËÂФ·¤ÆÅö¤Æ¤é¤ì¤Þ¤¹¡£
-	  ¤³¤³¤Ç¥³¥ó¥Ô¥å¡¼¥¿¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 	  ¥·¥¹¥Æ¥à¤¬¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
 	  &man.nextboot.8; ¤ò»È¤Ã¤Æ¼¡²ó¤ÎºÆµ¯Æ°»þ¤Î¥«¡¼¥Í¥ë¤ò¡¢
 	  ¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤¿ <filename>/boot/GENERIC</filename>
@@ -487,8 +503,9 @@ before running "/usr/sbin/freebsd-update
 	<para>¥·¥¹¥Æ¥à¤¬¥ª¥ó¥é¥¤¥ó¤ËÌá¤Ã¤¿¤é¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»È¤Ã¤Æ
 	  <command>freebsd-update</command> ¤òºÆ¤Ó¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
 	  ¥¢¥Ã¥×¥Ç¡¼¥È¥×¥í¥»¥¹¤Î¾õÂÖ¤ÏÊݸ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
-	  <command>freebsd-update</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢ºÇ½é¤«¤é¤Ç¤Ï¤Ê¤¯¡¢
-	  ¸Å¤¤¶¦Í­¥é¥¤¥Ö¥é¥ê¤È¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë¥×¥í¥»¥¹¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£</para>
+	  <command>freebsd-update</command> ¤ò¼Â¹Ô¤¹¤ë¤È¡¢
+	  ºÇ½é¤«¤é¤Ç¤Ï¤Ê¤¯¡¢¼¡¤Î¥¹¥Æ¥Ã¥×¤Ë¿Ê¤ß¡¢
+	  ¸Å¤¤¶¦Í­¥é¥¤¥Ö¥é¥ê¤È¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹¡£</para>
 
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
@@ -501,39 +518,35 @@ before running "/usr/sbin/freebsd-update
 	  ¤â¤·¥á¥¸¥ã¡¼¥¢¥Ã¥×¥°¥ì¡¼¥É¤ò¹Ô¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢
 	  <xref linkend="freebsdupdate-portsrebuild"/>
 	  ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë¤¹¤Ù¤Æ¤Î ports ¤ª¤è¤Ó package
-	  ¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£
-	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»È¤Ã¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤Ç¤Ï¡¢
-	  ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎÊýË¡¤Ë¤Ä¤¤¤Æ¡¢<xref
-	    linkend="freebsd-update-custom-kernel-9x"/> ¤Þ¤¿¤Ï <xref
-	    linkend="freebsd-update-custom-kernel-8x"/>
-	  ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  ¤òºÆ¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<sect3 xml:id="freebsd-update-custom-kernel-9x">
 	  <title>&os; 9.X °Ê¹ß¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë¥«¥¹¥¿¥à¥«¡¼¥Í¥ë</title>
 
-	  <itemizedlist>
-	    <listitem>
-	      <para>¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
+	  <para><command>freebsd-update</command> ¤ò»È¤¦Á°¤Ë¡¢
+	    <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤¬
+	    <filename>/boot/GENERIC</filename>
+	    ¤ËÃÖ¤«¤ì¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	    ¤¿¤À°ìÅÙ¤À¤±¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
 		<filename>/boot/kernel.old</filename>
 		¤Ï <filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤½¤Î¤â¤Î¤Ç¤¹¡£
 		¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î̾Á°¤ò
 		<filename>/boot/kernel</filename>
 		¤Ø¤ÈÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
 
-	    <listitem>
-	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
-		°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¡¢¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é
-		<filename>GENERIC</filename>
+	      <para>¤â¤·¡¢2 ²ó°Ê¾å¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿¸å¤Ç¤¢¤Ã¤¿¤ê¡¢
+		¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò¹½ÃÛ¤·¤¿²ó¿ô¤¬¤ï¤«¤é¤Ê¤±¤ì¤Ð¡¢
+		¸½ºß¤Î¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Î¥Ð¡¼¥¸¥ç¥ó¤Î
+		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤òÆþ¼ê¤·¤Æ¤¯¤À¤µ¤¤¡£
+		¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
+		¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é <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>¾åµ­¤ÎÊýË¡¤Ë¼ºÇÔ¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢
+	      <para>Ê̤ÊÊýË¡¤È¤·¤Æ¤Ï¡¢
 		<filename>GENERIC</filename> ¥«¡¼¥Í¥ë¤ò¥½¡¼¥¹¤«¤éºÆ¹½ÃÛ¤·¤Æ¡¢
 		¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
@@ -545,34 +558,20 @@ before running "/usr/sbin/freebsd-update
 		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
 		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
 		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-	  </itemizedlist>
 
-	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
+	  <para><command>freebsd-update</command> ¤Ï¡¢
+	    <filename>/boot/GENERIC</filename>
+	    ¤¬Â¸ºß¤¹¤ë»ö¤À¤±¤òɬÍפȤ¹¤ë¤Î¤Ç¡¢
+	    <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>
+	  <para>&os; 8.X ¥·¥¹¥Æ¥à¤Ç¤Ï¡¢<filename>GENERIC</filename>
+	    ¥«¡¼¥Í¥ë¤òÆþ¼ê¤¹¤ëÊýË¡¤ä¹½ÃÛ¤ÎÊýË¡¤¬¾¯¤·°Û¤Ê¤ê¤Þ¤¹¡£</para>
 
-	    <listitem>
 	      <para>¥³¥ó¥Ô¥å¡¼¥¿¤Ø¤ÎʪÍýŪ¤Ê¥¢¥¯¥»¥¹¤¬²Äǽ¤Ç¤¢¤ì¤Ð¡¢
 		°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ç¡¢
 		¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤«¤é <filename>GENERIC</filename>
@@ -584,16 +583,13 @@ before running "/usr/sbin/freebsd-update
 
 	      <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>
+	      <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>
@@ -605,10 +601,8 @@ before running "/usr/sbin/freebsd-update
 		<filename>GENERIC</filename> ¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ï¡¢
 		¤È¤Ë¤«¤¯Êѹ¹¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
 		¤Þ¤¿¡¢ÆÃÊ̤ʥª¥×¥·¥ç¥ó¤ò»ØÄꤷ¤Ê¤¤¤Ç¹½ÃÛ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-	    </listitem>
-	  </itemizedlist>
 
-	  <para>¤³¤Î»þÅÀ¤Ç <filename>GENERIC</filename>
+	  <para><filename>GENERIC</filename>
 	    ¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ëɬÍפϤ¢¤ê¤Þ¤»¤ó¡£</para>
 	</sect3>
 
@@ -636,7 +630,7 @@ before running "/usr/sbin/freebsd-update
 	¤³¤Î¿¶¤ëÉñ¤¤¤ò¤ä¤á¡¢¥Ç¥Õ¥©¥ë¥È¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
 	¾åµ­¤Î¥³¥Þ¥ó¥É¤Ë <option>-G</option> ¤ò´Þ¤á¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-	<para>¤³¤Îºî¶È¤Î½ªÎ»¸å¡¢ºÇ¸å¤Ë¤â¤¦°ìÅÙ
+	<para>¥½¥Õ¥È¥¦¥§¥¢¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¤¬½ª¤ï¤Ã¤¿¤é¡¢ºÇ¸å¤Ë¤â¤¦°ìÅÙ
 	  <command>freebsd-update</command>
 	  ¤ò¼Â¹Ô¤·¤Æ¡¢
 	  ¤¹¤Ù¤Æ¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É¥×¥í¥»¥¹¤Î¤ä¤ê»Ä¤·ºî¶È¤ò¹Ô¤¤¡¢
@@ -645,8 +639,9 @@ before running "/usr/sbin/freebsd-update
 	<screen>&prompt.root; <userinput>freebsd-update install</userinput></screen>
 
 	<para><filename>GENERIC</filename>
-	  ¥«¡¼¥Í¥ë¤ò°ì»þŪ¤ËÆɤ߹þ¤ó¤Ç¤¤¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
-	  ¤³¤³¤Ç¡¢Ä̾ï¤ÎÊýË¡¤òÍѤ¤¤Æ¿·¤·¤¤¥«¥¹¥¿¥à¤ò¹½ÃÛ¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	  ¥«¡¼¥Í¥ë¤ò°ì»þŪ¤ËÆɤ߹þ¤ó¤Ç¤¤¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢<xref
+	    linkend="kernelconfig"/> ¤Ë½ñ¤«¤ì¤Æ¤¤¤ë¼ê½ç¤Ë½¾¤Ã¤Æ¡¢
+	  ¿·¤·¤¤¥«¥¹¥¿¥à¤ò¹½ÃÛ¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
 	<para>¥³¥ó¥Ô¥å¡¼¥¿¤òºÆµ¯Æ°¤·¡¢¿·¤·¤¤ &os; ¤òΩ¤Á¾å¤²¤Æ¤¯¤À¤µ¤¤¡£
 	  ¤³¤ì¤Ç¥¢¥Ã¥×¥°¥ì¡¼¥É¤Î¥×¥í¥»¥¹¤Ï´°Î»¤Ç¤¹¡£</para>
@@ -659,16 +654,15 @@ before running "/usr/sbin/freebsd-update
       <para><command>freebsd-update</command> ¤òÍѤ¤¤Æ¡¢
 	¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë &os; ¤Î¾õÂ֤ȡ¢
 	Àµ¤·¤¯Æ°ºî¤¹¤ë¤³¤È¤¬Ê¬¤«¤Ã¤Æ¤¤¤ë¾õÂ֤ȤòÈæ³Ó¤Ç¤­¤Þ¤¹¡£
-	¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥·¥¹¥Æ¥à¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¢¥é¥¤¥Ö¥é¥ê¡¢
-	ÀßÄê¥Õ¥¡¥¤¥ë¤òɾ²Á¤·¤Þ¤¹¡£
-	Èæ³Ó¤ò¹Ô¤¦¤Ë¤Ï¡¢°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <screen>&prompt.root; <userinput>freebsd-update IDS >> outfile.ids</userinput></screen>
+	¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢¸½ºß¤Î¥·¥¹¥Æ¥à¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¢¥é¥¤¥Ö¥é¥ê¡¢
+	ÀßÄê¥Õ¥¡¥¤¥ë¤òɾ²Á¤¹¤ë¤Î¤Ç¡¢
+	ÁȤ߹þ¤ß¤Î¿¯Æþ¸¡ÃÎ¥·¥¹¥Æ¥à (<acronym>IDS</acronym>)
+	¤È¤·¤Æ»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <warning>
-	<para>¥³¥Þ¥ó¥É¥é¥¤¥ó̾¤Ï <acronym>IDS</acronym> ¤Ç¤¹¤¬¡¢
-	  <package>security/snort</package>
-	  ¤Î¤è¤¦¤Ê¿¯Æþ¸¡ÃÎ¥·¥¹¥Æ¥à¤ÎËÜÅö¤ÎÃÖ¤­´¹¤¨¤Ë¤Ê¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
+	<para>¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢<package>security/snort</package>
+	  ¤Î¤è¤¦¤ÊËÜÅö¤Î <acronym>IDS</acronym>
+	  ¤ÎÃÖ¤­´¹¤¨¤Ë¤Ê¤ë¤â¤Î¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
 	  <command>freebsd-update</command> ¤Ï¥Ç¡¼¥¿¤ò¥Ç¥£¥¹¥¯¤ËÊݸ¤¹¤ë¤Î¤Ç¡¢
 	  ÉÔÀµ¤ÊÊѹ¹¤¬¹Ô¤ï¤ì¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
 	  <varname>kern.securelevel</varname> ¤È¡¢
@@ -678,13 +672,22 @@ before running "/usr/sbin/freebsd-update
 	  ¤è¤ê¤è¤¤²ò·èÊýË¡¤Ï¡¢
 	  <acronym>DVD</acronym>
 	  ¤Þ¤¿¤Ï°ÂÁ´¤ËÊݸ¤µ¤ì¤Æ¤¤¤ë³°Éô <acronym>USB</acronym>
-	  ¥Ç¥£¥¹¥¯¤Î¤è¤¦¤Ê°ÂÁ´¤Ê¥Ç¥£¥¹¥¯¤È¥·¥¹¥Æ¥à¤òÈæ³Ó¤¹¤ë¤³¤È¤Ç¤¹¡£</para>
+	  ¥Ç¥£¥¹¥¯¤Î¤è¤¦¤Ê°ÂÁ´¤Ê¥Ç¥£¥¹¥¯¤È¥·¥¹¥Æ¥à¤òÈæ³Ó¤¹¤ë¤³¤È¤Ç¤¹¡£
+	  ÁȤ߹þ¤Þ¤ì¤Æ¤¤¤ë¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤òÍѤ¤¤¿¡¢Ê̤ÎÊýË¡¤Ë¤è¤ë
+	  <acronym>IDS</acronym> µ¡Ç½¤Ë¤Ä¤¤¤Æ¤Ï¡¢
+	  <link xlink:href="&url.books.handbook.en;/security-intro.html#security-ids">&os; ¥Ð¥¤¥Ê¥ê¤Ë¤è¤ë¸¡½Ð</link>
+	  <!-- <xref linkend="security-ids"/> -->
+	  ¤ÎÀá¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </warning>
 
-      <para>¤³¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢¥·¥¹¥Æ¥à¤Ï¸¡ºº¤µ¤ì¡¢
-	¥ê¥ê¡¼¥¹¥Õ¥¡¥¤¥ë¤Î &man.sha256.1;
-	¥Ï¥Ã¥·¥åÃͤȸ½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥åÃͤ¬¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤È¶¦¤Ë¡¢»ØÄꤷ¤¿
-	<filename>outfile.ids</filename> ¥Õ¥¡¥¤¥ë¤ËÁ÷¤é¤ì¤Þ¤¹¡£</para>
+      <para>Èæ³Ó¤ò¹Ô¤¦¤Ë¤Ï¡¢
+	·ë²Ì¤Î½ÐÎÏÀè¤Î¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <screen>&prompt.root; <userinput>freebsd-update IDS >> outfile.ids</userinput></screen>
+
+      <para>¥·¥¹¥Æ¥à¤Ï¸¡ºº¤µ¤ì¡¢¥ê¥ê¡¼¥¹¥Õ¥¡¥¤¥ë¤Î <acronym>SHA256</acronym>
+	¥Ï¥Ã¥·¥åÃͤȸ½ºß¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¥Ï¥Ã¥·¥åÃͤ¬¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤È¶¦¤Ë¡¢
+	»ØÄꤷ¤¿½ÐÎÏÀè¤Î¥Õ¥¡¥¤¥ë¤ËÁ÷¤é¤ì¤Þ¤¹¡£</para>
 
       <para>¤³¤ì¤é¤Î¹Ô¤Ï¶Ë¤á¤ÆŤ¤¤Î¤Ç¤¹¤¬¡¢½ÐÎÏ·Á¼°¤Ï´Êñ¤Ë¤¹¤°¤Ë²òÀϤǤ­¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢¤³¤ì¤é¤Î¥ê¥ê¡¼¥¹¤Ç°Û¤Ê¤Ã¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤òÃΤꤿ¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢
@@ -701,15 +704,12 @@ before running "/usr/sbin/freebsd-update
 	¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ë¤Ï¡¢±¿ÍÑÃæ¤ËÊѹ¹¤µ¤ì¤ë¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤¹¡£
 	¤¿¤È¤¨¤Ð¡¢<filename>/etc/passwd</filename>
 	¤Ï¥æ¡¼¥¶¤¬¥·¥¹¥Æ¥à¤ËÄɲ䵤ì¤ë¤ÈÊѹ¹¤µ¤ì¤Þ¤¹¡£
-	¤Þ¤¿¡¢¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë¤Ï¡¢
+	¤Þ¤¿¡¢¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤Ï¡¢
 	<command>freebsd-update</command>
 	¤Ë¤è¤ê¥¢¥Ã¥×¥Ç¡¼¥È¤µ¤ì¤ë¤¿¤á¡¢Êѹ¹¤µ¤ì¤Þ¤¹¡£
 	¤³¤Î¤è¤¦¤ÊÆÃÊ̤ʥե¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°¤¹¤ë¤Ë¤Ï¡¢
 	¤½¤ì¤é¤ò <filename>/etc/freebsd-update.conf</filename> ¤Î
 	<literal>IDSIgnorePaths</literal> ¥ª¥×¥·¥ç¥ó¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
-
-      <para>°ÊÁ°¤ËµÄÏÀ¤·¤¿ÊýË¡¤È¤ÏÊ̤ˡ¢
-	¤³¤Î¥·¥¹¥Æ¥à¤òÆþÇ°¤Ê¥¢¥Ã¥×¥°¥ì¡¼¥ÉÊýË¡¤Î°ìÉô¤È¤·¤ÆÍѤ¤¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
     </sect2>
   </sect1>
 


More information about the svn-doc-head mailing list