svn commit: r42041 - head/ja_JP.eucJP/books/handbook/kernelconfig

[Ryusuke SUZUKI]

Author: ryusuke
Date: Tue Jun 25 15:40:54 2013
New Revision: 42041
URL: http://svnweb.freebsd.org/changeset/doc/42041

Log:
  - Merge the following from the English version:
  
  	r41434 -> r42014	head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

Modified:
  head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml

Modified: head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Tue Jun 25 15:16:34 2013	(r42040)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Tue Jun 25 15:40:54 2013	(r42041)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41434
+     Original revision: r42014
      $FreeBSD$
 -->
 
@@ -306,7 +306,7 @@ following line in &man.loader.conf.5;:
 	¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¶õ¤Ç¤¢¤ì¤Ð¡¢
 	¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 	¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ï¡¢<xref
-	  linkend="synching"></xref> ¤ÇÀâÌÀ¤·¤¿
+	  linkend="svn"/> ¤ÇÀâÌÀ¤·¤¿
 	<application>svn</application> ¤òÍѤ¤¤ëÊýË¡¤Ç¤¹¡£
 	°Ê²¼¤Î¤è¤¦¤Ë¡¢<filename>/usr/src/sys/</filename>
 	¤Ø¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤âºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -642,7 +642,7 @@ cpu          I686_CPU</programlisting>
     <para>¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥«¡¼¥Í¥ë¤Î¥¢¥¯¥»¥¹À©¸æ¥ê¥¹¥È
       (<acronym>ACL</acronym>) ¤Î¥µ¥Ý¡¼¥È¤òÍ­¸ú¤Ë¤·¤Þ¤¹¡£
       ¤³¤Îµ¡Ç½¤Ï³Èĥ°À­¤ª¤è¤Ó <acronym>UFS2</acronym> ¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤Ë°Í¸¤·¡¢
-      <xref linkend="fs-acl"></xref> ¤Çµ¡Ç½¤ÎÀâÌÀ¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
+      <xref linkend="fs-acl"/> ¤Çµ¡Ç½¤ÎÀâÌÀ¤¬¹Ô¤ï¤ì¤Æ¤¤¤Þ¤¹¡£
       <acronym>ACL</acronym> ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇÍ­¸ú¤Ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤â¤·¡¢¤³¤ì¤Þ¤Ç¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÇÍ­¸ú¤Ë¤·¤Æ¤¤¤¿¤Î¤Ç¤¢¤ì¤Ð¡¢
       ¥«¡¼¥Í¥ë¤ÎÃæ¤Ç̵¸ú¤Ë¤¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
@@ -810,29 +810,6 @@ options          NFS_ROOT          # NFS
 	class="directory">/dev</filename>
       ¤ËºîÀ®¤¹¤ë¤Ë¤Ï¤³¤Î¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹¡£</para>
 
-    <programlisting>options          ADAPTIVE_GIANT    # Giant mutex is adaptive.</programlisting>
-
-    <para>Giant ¤Ï¡¢¥«¡¼¥Í¥ë»ñ¸»¤Î¹­¤¤ÈϰϤò¥×¥í¥Æ¥¯¥È¤¹¤ë
-      mutex ÇÓ¾¥á¥«¥Ë¥º¥à (sleep mutex) ¤Î̾Á°¤Ç¤¹¡£
-      ¤³¤Î¥á¥«¥Ë¥º¥à¤Ï¡¢º£Æü¤Ç¤Ï¼õ¤±Æþ¤ì¤¬¤¿¤¤¤Û¤É¤Ë¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤Î¥Ü¥È¥ë¥Í¥Ã¥¯¤È¤Ê¤Ã¤Æ¤ª¤ê¡¢
-      ¸Ä¡¹¤Î»ñ¸»¤ò¥×¥í¥Æ¥¯¥È¤¹¤ë¥í¥Ã¥¯µ¡¹½¤Ë°Ü¹Ô¤·¤Æ¤¤¤Þ¤¹¡£
-      <literal>ADAPTIVE_GIANT</literal> ¥ª¥×¥·¥ç¥ó¤Ï¡¢
-      ¥¹¥Ô¥ó¤·¤Æ¤¤¤ëŬ±þ·¿ mutex ¤Î¥»¥Ã¥È¤Ë Giant ¤òÄɲä·¤Þ¤¹¡£
-      ¥¹¥ì¥Ã¥É¤¬ Giant mutex ¤ò¥í¥Ã¥¯¤·¤è¤¦¤È¤¹¤ëºÝ¡¢
-      ¾¤Î CPU ¾å¤Î¥¹¥ì¥Ã¥É¤Ë¤è¤Ã¤Æ¤¹¤Ç¤Ë¥í¥Ã¥¯¤µ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ë¤Ï¡¢
-      ºÇ½é¤Î¥¹¥ì¥Ã¥É¤Ï¼Â¹Ô¾õÂ֤Τޤޥí¥Ã¥¯¤¬²ò½ü¤µ¤ì¤ë¤Î¤òÂÔ¤Á¤Þ¤¹¡£
-      Ä̾¥¹¥ì¥Ã¥É¤Ï¼Â¹Ô¤Îµ¡²ñ¤ò¥¹¥ê¡¼¥×¾õÂÖ¤ÇÂÔ¤Á¤Þ¤¹¡£
-      ¤â¤·¡¢¤è¤¯¤ï¤«¤é¤Ê¤¤¤Î¤Ç¤¢¤ì¤Ð¡¢¤½¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-    <note>
-      <para>&os; 8.0-RELEASE ¤«¤é¤Ï¡¢
-	(<literal>NO_ADAPTIVE_MUTEXES</literal>
-	¥ª¥×¥·¥ç¥ó¤Ç¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤Ã¤ÆÈóŬ¹ç·¿¤Ë¤¹¤ë¤Î¤Ç¤Ê¤±¤ì¤Ð)
-	¤¹¤Ù¤Æ¤Î mutex ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÇŬ¹ç·¿¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
-	¸½ºß¤Î Giant ¤ÏŬ¹ç·¿¤Ê¤Î¤Ç¡¢<literal>ADAPTIVE_GIANT</literal>
-	¥ª¥×¥·¥ç¥ó¤Ï¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¤«¤é³°¤µ¤ì¤Þ¤·¤¿¡£</para>
-    </note>
-
     <indexterm>
       <primary>¥«¡¼¥Í¥ë¥ª¥×¥·¥ç¥ó</primary>
       <secondary>SMP</secondary>