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

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Feb 7 12:41:09 UTC 2014


Author: ryusuke
Date: Fri Feb  7 12:41:09 2014
New Revision: 43821
URL: http://svnweb.freebsd.org/changeset/doc/43821

Log:
  - Merge the following from the English version:
  
  	r42925 -> r43800	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	Fri Feb  7 12:04:46 2014	(r43820)
+++ head/ja_JP.eucJP/books/handbook/kernelconfig/chapter.xml	Fri Feb  7 12:41:09 2014	(r43821)
@@ -3,7 +3,7 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r42925
+     Original revision: r43800
      $FreeBSD$
 -->
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="kernelconfig">
@@ -151,10 +151,10 @@
       ¤¿¤È¤¨¤Ð¡¢&man.ath.4;
       ¥ï¥¤¥ä¥ì¥¹¥¤¡¼¥µ¥Í¥Ã¥È¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ë¤Ï°Ê²¼¤Î¤è¤¦¤Êµ­½Ò¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-    <programlisting>Alternatively, to load the driver as a module at boot time, place the
+    <screen>Alternatively, to load the driver as a module at boot time, place the
 following line in &man.loader.conf.5;:
 
-    if_ath_load="YES"</programlisting>
+    if_ath_load="YES"</screen>
 
     <para><filename>/boot/loader.conf</filename> ¤Ë
       <literal>if_ath_load="YES"</literal> ¤òÄɲ乤ë¤È¡¢
@@ -203,10 +203,10 @@ following line in &man.loader.conf.5;:
       ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¹Ô¤Ï¡¢&man.psm.4;
       ¥É¥é¥¤¥Ð¤¬¥Þ¥¦¥¹¤ò¸¡½Ð¤·¤¿¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
-    <programlisting>psm0: <PS/2 Mouse> irq 12 on atkbdc0
+    <screen>psm0: <PS/2 Mouse> irq 12 on atkbdc0
 psm0: [GIANT-LOCKED]
 psm0: [ITHREAD]
-psm0: model Generic PS/2 mouse, device ID 0</programlisting>
+psm0: model Generic PS/2 mouse, device ID 0</screen>
 
     <para>¤³¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Ï¥·¥¹¥Æ¥à¤Ë¸ºß¤¹¤ë¤Î¤Ç¡¢
       ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤«¤é¤³¤Î¥É¥é¥¤¥Ð¤ò³°¤µ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
@@ -219,12 +219,12 @@ psm0: model Generic PS/2 mouse, device I
       ¤è¤ê¾éĹ¤Ê½ÐÎϤò¹Ô¤¦ &man.pciconf.8; ¤Ç¤¹¡£
       ¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
-    <programlisting><command>pciconf -lv</command>
-    ath0 at pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
+    <screen>&prompt.user; pciconf -lv
+ath0 at pci0:3:0:0:        class=0x020000 card=0x058a1014 chip=0x1014168c rev=0x01 hdr=0x00
     vendor     = 'Atheros Communications Inc.'
     device     = 'AR5212 Atheros AR5212 802.11abg wireless'
     class      = network
-    subclass   = ethernet</programlisting>
+    subclass   = ethernet</screen>
 
     <para>¤³¤Î½ÐÎϤϡ¢<filename>ath</filename>
       ¥É¥é¥¤¥Ð¤¬¥ï¥¤¥ä¥ì¥¹¥¤¡¼¥µ¥Í¥Ã¥È¥Ç¥Ð¥¤¥¹¤Ë¤¢¤ë¤³¤È¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£</para>
@@ -240,9 +240,9 @@ psm0: model Generic PS/2 mouse, device I
 ath_hal(4)               - Atheros Hardware Access Layer (HAL)</programlisting>
 
     <para>¥Ï¡¼¥É¥¦¥§¥¢¤Î°ìÍ÷¤òºîÀ®¤·¤¿¤é¡¢
-      ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë»þ¤Ë¡¢
       ¤³¤Î°ìÍ÷¤òÍøÍѤ·¤Æ¡¢
-      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤¬ºï½ü¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤Î¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Æ¤¤¤ë»þ¤Ë¡¢
+      ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¥Ï¡¼¥É¥¦¥§¥¢¤Î¥É¥é¥¤¥Ð¤¬ºï½ü¤µ¤ì¤Æ¤¤¤Ê¤¤¤³¤È¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
   </sect1>
 
   <sect1 xml:id="kernelconfig-config">
@@ -267,13 +267,8 @@ ath_hal(4)               - Atheros Hardw
 	¤¬Â¸ºß¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¤ê¡¢¶õ¤Ç¤¢¤ì¤Ð¡¢
 	¥«¡¼¥Í¥ë¤Î¥½¡¼¥¹¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£
 	<xref linkend="svn"/> ¤ÇÀâÌÀ¤·¤¿
-	<application>svn</application> ¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
-	¤Þ¤¿¡¢&man.sysinstall.8; ¤ò»È¤Ã¤Æ¡¢
-	<literal>src</literal>
-	¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
-	¤³¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ï¡¢&man.sysinstall.8; ¤Ç
-	<literal>Configuration</literal> ¤òÁªÂò¤·¡¢
-	<literal>Distributions</literal> ¥á¥Ë¥å¡¼¤«¤éÁªÂò¤Ç¤­¤Þ¤¹¡£</para>
+	<application>Subversion</application>
+	¤ò»È¤Ã¤Æ¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
     <para>¥½¡¼¥¹¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤é¡¢<filename>/usr/src/sys</filename> ¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£
       ¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤Ï¡¢¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬¤¤¤¯¤Ä¤â¤¢¤ê¤Þ¤¹¡£
@@ -374,7 +369,7 @@ options         IPDIVERT
       <para>ÍøÍѲÄǽ¤Ê¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤ò´Þ¤à¥Õ¥¡¥¤¥ë¤ò¹½ÃÛ¤¹¤ë¤Ë¤Ï¡¢
 	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò <systemitem class="username">root</systemitem> ¸¢¸Â¤Ç¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/src/sys/i386/conf && make LINT</userinput></screen>
+      <screen>&prompt.root; <userinput>cd /usr/src/sys/<replaceable>arch</replaceable>/conf && make LINT</userinput></screen>
     </note>
 
     <indexterm>
@@ -552,12 +547,13 @@ options          NFS_ROOT          # NFS
 
     <programlisting>options          SCSI_DELAY=5000  # Delay (in ms) before probing SCSI</programlisting>
 
-    <para>¤³¤Î¹Ô¤Ï¡¢¥«¡¼¥Í¥ë¤¬¤½¤ì¤¾¤ì¤Î SCSI µ¡´ï¤ò¸¡½Ð¤¹¤ëÁ°¤Ë
-      5 ÉôÖÂԤĤ褦¤Ë¤·¤Þ¤¹¡£
-      ¥·¥¹¥Æ¥à¤¬ IDE ¥É¥é¥¤¥Ö¤·¤«»ý¤¿¤Ê¤¤¤Ê¤é̵»ë¤¹¤ë¤«¡¢
-      µ¯Æ°»þ´Ö¤òû¤¯¤¹¤ë¤¿¤á¤Ë¡¢¤³¤Î¿ô»ú¤ò¾®¤µ¤¯Êѹ¹¤Ç¤­¤Þ¤¹¡£
-      ¤â¤·¡¢&os; ¤¬ SCSI
-      µ¡´ï¤òǧ¼±¤·¤Ê¤¯¤Ê¤Ã¤Æ¤·¤Þ¤Ã¤¿¤é¡¢¤â¤¦°ìÅÙ¿ô»ú¤òÁý¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+    <para>¤³¤Î¹Ô¤Ï¡¢¥«¡¼¥Í¥ë¤¬¤½¤ì¤¾¤ì¤Î <acronym>SCSI</acronym>
+      µ¡´ï¤ò¸¡½Ð¤¹¤ëÁ°¤Ë 5 ÉôÖÂԤĤ褦¤Ë¤·¤Þ¤¹¡£
+      ¤â¤·¡¢<acronym>SCSI</acronym> µ¡´ï¤¬Ç§¼±¤µ¤ì¤Ê¤±¤ì¤Ð¡¢
+      ¤³¤Î¿ô»ú¤òÁý¤ä¤·¤Æ¤¯¤À¤µ¤¤¡£
+      ¥·¥¹¥Æ¥à¤¬ <acronym>SCSI</acronym> ¥É¥é¥¤¥Ö¤ò»ý¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢
+      ̵»ë¤¹¤ë¤«¡¢¤³¤Î¿ô»ú¤ò¾®¤µ¤¯Êѹ¹¤·¤Æµ¯Æ°»þ´Ö¤òû¤¯¤Ç¤­¤Þ¤¹¡£
+</para>
 
     <programlisting>options          KTRACE            # ktrace(1) support</programlisting>
 
@@ -612,7 +608,7 @@ options          NFS_ROOT          # NFS
       <literal>options SMP</literal> ¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
     <note>
-      <para>¤³¤Î¥Ç¥Ð¥¤¥¹¤Ï i386 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤Î¤ß¸ºß¤·¤Þ¤¹¡£
+      <para>¤³¤Î¥Ç¥Ð¥¤¥¹¤Ï &i386; ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤Î¤ß¸ºß¤·¤Þ¤¹¡£
 	¾¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï¡¢¤³¤Î¹Ô¤ò´Þ¤Þ¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
     </note>
 
@@ -779,8 +775,7 @@ device          atkbdc     # AT keyboard
 
     <para>&man.vga.4; ¥Ó¥Ç¥ª¥«¡¼¥É¥É¥é¥¤¥Ð¤Ç¤¹¡£</para>
 
-    <programlisting>
-device          splash     # Splash screen and screen saver support</programlisting>
+    <programlisting>device          splash     # Splash screen and screen saver support</programlisting>
 
     <para>µ¯Æ°»þ¤Î¥¹¥×¥é¥Ã¥·¥å¥¹¥¯¥ê¡¼¥ó¤ª¤è¤Ó¥¹¥¯¥ê¡¼¥ó¥»¡¼¥Ð¤¬É¬ÍפȤ·¤Þ¤¹¡£</para>
 
@@ -962,7 +957,8 @@ device          xe         # Xircom pcca
 
     <para>ISA ¥¤¡¼¥µ¥Í¥Ã¥È¥É¥é¥¤¥Ð¤Ç¤¹¡£
       ¤É¤Î¥«¡¼¥É¤¬¤É¤Î¥É¥é¥¤¥Ð¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤ë¤«¤Î¾ÜºÙ¤Ï¡¢
-      <filename>/usr/src/sys/i386/conf/NOTES</filename> ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
+      ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
 
     <programlisting># Wireless NIC cards
 device          wlan            # 802.11 support</programlisting>
@@ -1100,7 +1096,7 @@ device          fwe           # Ethernet
     <para>Firewire ¥Ç¥Ð¥¤¥¹¤Î¥µ¥Ý¡¼¥È¤Ç¤¹¡£</para>
 
     <para>¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤È¡¢&os; ¤Ë¤è¤ê¥µ¥Ý¡¼¥È¤µ¤ì¤ë¾¤Î¥Ç¥Ð¥¤¥¹¤Ë¤Ä¤¤¤Æ¤Ï
-      <filename>/usr/src/sys/i386/conf/NOTES</filename>
+      <filename>/usr/src/sys/<replaceable>arch</replaceable>/conf/NOTES</filename>
       ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£</para>
 
       <sect2>


More information about the svn-doc-all mailing list