svn commit: r43144 - head/ja_JP.eucJP/books/handbook/multimedia

Ryusuke SUZUKI ryusuke at FreeBSD.org
Fri Nov 8 15:56:48 UTC 2013


Author: ryusuke
Date: Fri Nov  8 15:56:47 2013
New Revision: 43144
URL: http://svnweb.freebsd.org/changeset/doc/43144

Log:
  - Merge the following from the English version:
  
  	r41815 -> r42797	head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml

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

Modified: head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml
==============================================================================
--- head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Fri Nov  8 09:01:12 2013	(r43143)
+++ head/ja_JP.eucJP/books/handbook/multimedia/chapter.xml	Fri Nov  8 15:56:47 2013	(r43144)
@@ -3,9 +3,10 @@
      The FreeBSD Documentation Project
      The FreeBSD Japanese Documentation Project
 
-     Original revision: r41815
+     Original revision: r42797
      $FreeBSD$
 -->
+
 <chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="multimedia">
   <info><title>¥Þ¥ë¥Á¥á¥Ç¥£¥¢</title>
     <authorgroup>
@@ -13,44 +14,31 @@
     </authorgroup>
   </info>
 
-  
   <sect1 xml:id="multimedia-synopsis">
     <title>¤³¤Î¾Ï¤Ç¤Ï</title>
 
-    <para>FreeBSD ¤Ï¿ô¿¤¯¤Î¼ïÎà¤Î¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
-      ¥³¥ó¥Ô¥å¡¼¥¿¤Ç¸¶²»¤ËÃé¼Â¤Ê½ÐÎϤò³Ú¤·¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-      ¤³¤ì¤Ë¤ÏÏ¿²»µ¡Ç½¤È¡¢MPEG Layer 3 Audio (MP3) ¤ä WAV, Ogg Vorbis
+    <para>&os; ¤Ï¿ô¿¤¯¤Î¼ïÎà¤Î¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÂбþ¤·¤Æ¤ª¤ê¡¢
+      &os; ¥·¥¹¥Æ¥à¤Ç¸¶²»¤ËÃé¼Â¤Ê½ÐÎϤò³Ú¤·¤à¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+      ¤³¤ì¤Ë¤ÏÏ¿²»µ¡Ç½¤È¡¢MPEG Audio Layer 3 (<acronym>MP3</acronym>)
+      ¤ä Waveform Audio File (<acronym>WAV</acronym>, Ogg Vorbis
       ¤Ê¤É¤ò¤Ï¤¸¤á¤È¤·¤¿Â¿¤¯¤Î·Á¼°¤Î²»³Ú¤ÎºÆÀ¸µ¡Ç½¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
-      ²Ã¤¨¤Æ FreeBSD ¤Î Ports Collection ¤Ë¤Ï¡¢Ï¿²»¤·¤¿²»³Ú¤ò
-      ÊÔ½¸¤·¤¿¤ê¡¢²»¶Á¸ú²Ì¤ò²Ã¤¨¤¿¤ê¡¢Àܳ¤µ¤ì¤¿
+      ²Ã¤¨¤Æ &os; ¤Î Ports Collection ¤Ë¤Ï¡¢
+      Ï¿²»¤·¤¿²»³Ú¤òÊÔ½¸¤·¤¿¤ê¡¢²»¶Á¸ú²Ì¤ò²Ã¤¨¤¿¤ê¡¢Àܳ¤µ¤ì¤¿
       MIDI µ¡´ï¤òÀ©¸æ¤¹¤ë¤¿¤á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-    <para>¿¤¯¤Î»î¤ß¤Ë¤è¤Ã¤Æ¡¢&os; ¤Ç¤Ï¥Ó¥Ç¥ª¥Õ¥¡¥¤¥ë¤ª¤è¤Ó DVD ¤Î
-      ºÆÀ¸¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£¤µ¤Þ¤¶¤Þ¤Ê¥Ó¥Ç¥ª¥á¥Ç¥£¥¢¤ò¥¨¥ó¥³¡¼¥É¡¢
-      ÊÑ´¹¡¢ºÆÀ¸¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿ô¤Ï¡¢
-      ²»À¼ÍѤΥ¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Û¤É½¼¼Â¤·¤Æ¤¤¤Þ¤»¤ó¡£
-      ¤³¤Îʸ½ñ¤ò¼¹É®¤·¤Æ¤¤¤ë»þÅÀ¤Ç¤Ï¡¢¤¿¤È¤¨¤Ð
-      <package>audio/sox</package>
-      ¤Î¤è¤¦¤Ê¥Õ¥¡¥¤¥ë·Á¼°¤òÊÑ´¹¤¹¤ë¤¿¤á¤Î¤¹¤°¤ì¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï
-      Ports Collection ¤Ë¤¢¤ê¤Þ¤»¤ó¡£¤·¤«¤·¤Ê¤¬¤é¡¢
-      ¤³¤ÎʬÌî¤Î¥½¥Õ¥È¥¦¥§¥¢¤Î¾õ¶·¤ÏµÞ®¤ËÊѤï¤ê¤Ä¤Ä¤¢¤ê¤Þ¤¹¡£</para>
-
-    <para>¤³¤Î¾Ï¤Ç¤Ï¥µ¥¦¥ó¥É¥«¡¼¥É¤òÀßÄꤹ¤ë¤¿¤á¤ËɬÍפÊÊýË¡¤òÀâÌÀ¤·¤Þ¤¹
-      (¤¿¤À¤·¡¢¹â²»¼Á¤ÇºÆÀ¸¤¹¤ë¤¿¤á¤Ë¤Ï¼ã´³¤ÎÈùÄ´À°¤¬É¬Íפ«¤â¤·¤ì¤Þ¤»¤ó)¡£
-      ¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥Ï¡¼¥É¥¦¥§¥¢¤Ë´Ø¤¹¤ëÌäÂê¤Ï¡¢
-      X11 (<xref linkend="x11"/>)
-      ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤ÈÀßÄê¤Ë¤ª¤¤¤Æ¤¹¤Ç¤Ë°·¤¤¤Þ¤·¤¿¤Î¤Ç¡¢
-      ¤½¤Á¤é¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+    <para>&os; ¤Ç¤Ï¥Ó¥Ç¥ª¥Õ¥¡¥¤¥ë¤ª¤è¤Ó DVD ¤ÎºÆÀ¸¤â¤Ç¤­¤Þ¤¹¡£
+      &os; ¤Î Ports Collection ¤Ë¤Ï¡¢¤µ¤Þ¤¶¤Þ¤Ê¥Ó¥Ç¥ª¥á¥Ç¥£¥¢¤ò¥¨¥ó¥³¡¼¥É¡¢
+      ÊÑ´¹¡¢ºÆÀ¸¤¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+
+    <para>¤³¤Î¾Ï¤Ç¤Ï &os; ¾å¤Ç¥µ¥¦¥ó¥É¥«¡¼¥É¡¢¥Ó¥Ç¥ª¤ÎºÆÀ¸¡¢TV ¥Á¥å¡¼¥Ê¥«¡¼¥É¡¢
+      ¥¹¥­¥ã¥Ê¤òÀßÄꤹ¤ëÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹
+      ¤³¤ì¤é¤Î¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤¿¤á¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë¤Ä¤¤¤Æ¤âÀâÌÀ¤ò¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¤³¤Î¾Ï¤òÆɤà¤È¡¢°Ê²¼¤Î¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£</para>
 
     <itemizedlist>
       <listitem>
-        <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤òǧ¼±¤µ¤»¤ë¤¿¤á¤Ë¥·¥¹¥Æ¥à¤òÀßÄꤹ¤ëÊýË¡</para>
-      </listitem>
-
-      <listitem>
-        <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤¬¤¦¤Þ¤¯Æ°ºî¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¥Æ¥¹¥È¤¹¤ëÊýË¡</para>
+        <para>&os; ¤Ç¤Î¥µ¥¦¥ó¥É¥«¡¼¥É¤ÎÀßÄêÊýË¡</para>
       </listitem>
 
       <listitem>
@@ -62,25 +50,24 @@
       </listitem>
 
       <listitem>
-        <para>X ¥µ¡¼¥Ð¤Ç
-	  ¤É¤Î¤è¤¦¤Ë¥Ó¥Ç¥ª¤ËÂбþ¤·¤Æ¤¤¤ë¤«</para>
+        <para>&os; ¥·¥¹¥Æ¥à¤Ç¤Î¥Ó¥Ç¥ª¤ÎºÆÀ¸¤Î½àÈ÷</para>
       </listitem>
 
       <listitem>
-        <para>¥Ó¥Ç¥ª¤òºÆÀ¸¡¢¥¨¥ó¥³¡¼¥É¤¹¤ë¤Î¤ËÌò¤ËΩ¤Ä ports</para>
+        <para>DVD, <filename>.mpg</filename> ¤ª¤è¤Ó
+          <filename>.avi</filename> ¥Õ¥¡¥¤¥ë¤òºÆÀ¸¤¹¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
-        <para>DVD ¤Î <filename>.mpg</filename> ¥Õ¥¡¥¤¥ë¤ª¤è¤Ó
-          <filename>.avi</filename> ¥Õ¥¡¥¤¥ë¤òºÆÀ¸¤¹¤ëÊýË¡</para>
+        <para>CD ¤ª¤è¤Ó DVD ¤Î¾ðÊó¤ò¥Õ¥¡¥¤¥ë¤ËÃê½Ð¤¹¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
-        <para>CD ¤ª¤è¤Ó DVD ¤Î¾ðÊó¤òÃê½Ð¤¹¤ëÊýË¡</para>
+	<para>TV ¥«¡¼¥É¤ÎÀßÄêÊýË¡</para>
       </listitem>
 
       <listitem>
-	<para>TV ¥«¡¼¥É¤ÎÀßÄêÊýË¡</para>
+	<para>MythTV ¤ò &os; ¤Ë¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·ÀßÄꤹ¤ëÊýË¡</para>
       </listitem>
 
       <listitem>
@@ -96,11 +83,9 @@
     </itemizedlist>
 
     <warning>
-      <para>¥ª¡¼¥Ç¥£¥ª CD ¤ò &man.mount.8;
-        ¤Ç¥Þ¥¦¥ó¥È¤·¤è¤¦¤È¤¹¤ë¤È¡¢¾¯¤Ê¤¯¤È¤â¥¨¥é¡¼¤Ë¤Ê¤ê¤Þ¤¹¡£
-        ºÇ°­¤Î¾ì¹ç¡¢<emphasis>¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯</emphasis>¤¬È¯À¸¤¹¤ë¤Ç¤·¤ç¤¦¡£
-        ¤³¤ì¤é¤Î¥á¥Ç¥£¥¢¤ÏÄ̾ï¤Î ISO ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢
-        ÆÃÊ̤ʥ¨¥ó¥³¡¼¥É¤¬»Ü¤µ¤ì¤Æ¤¤¤ë¤«¤é¤Ç¤¹¡£</para>
+      <para>¥ª¡¼¥Ç¥£¥ª CD ¤ÏÄ̾ï¤Î ISO ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤Ï°Û¤Ê¤ê¡¢
+	ÆÃÊ̤ʥ¨¥ó¥³¡¼¥É¤¬»Ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+	¤½¤Î¤¿¤á¡¢¤³¤ì¤é¤ò &man.mount.8; ¤Ç¥Þ¥¦¥ó¥È¤·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£</para>
     </warning>
   </sect1>
 
@@ -114,44 +99,41 @@
       </authorgroup>
     </info>
 
-    
     <sect2 xml:id="sound-device">
       <title>¥·¥¹¥Æ¥à¤òÀßÄꤹ¤ë</title>
 
       <indexterm><primary>PCI</primary></indexterm>
-      <indexterm><primary>ISA</primary></indexterm>
       <indexterm><primary>¥µ¥¦¥ó¥É¥«¡¼¥É</primary></indexterm>
-
-      <para>ÀßÄê¤ò¤Ï¤¸¤á¤ëÁ°¤Ë¡¢¤¢¤Ê¤¿¤¬»ý¤Ã¤Æ¤¤¤ë¥«¡¼¥É¤Î¥â¥Ç¥ë¡¢
-	¤½¤Î¥«¡¼¥É¤¬»ÈÍѤ·¤Æ¤¤¤ë¥Á¥Ã¥×¡¢¤½¤·¤Æ PCI, ISA
-	¤É¤Á¤é¤Î¥«¡¼¥É¤Ê¤Î¤«¤ò³Îǧ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	FreeBSD ¤Ï PCI ¤ª¤è¤Ó ISA ¤ÎξÊý¤Î¥«¡¼¥É¤ËÉý¹­¤¯Âбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	»ÈÍѤ·¤Æ¤¤¤ë¥«¡¼¥É¤¬Âбþ¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ï¡¢
+      <para>ÀßÄê¤ò¤Ï¤¸¤á¤ëÁ°¤Ë¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥â¥Ç¥ë¡¢
+	¤½¤Î¥«¡¼¥É¤¬»ÈÍѤ·¤Æ¤¤¤ë¥Á¥Ã¥×¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
+	&os; ¤Ï ¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÉý¹­¤¯Âбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	»ÈÍѤ·¤Æ¤¤¤ë¥«¡¼¥É¤¬Âбþ¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¡¢
+	¤É¤Î &os; ¥É¥é¥¤¥Ð¤ò»È¤¦¤«¤Ë¤Ä¤¤¤Æ¡¢
 	<link xlink:href="&rel.current.hardware;">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</link>
-	¤ÎÂбþ¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
-	¤³¤Î¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È¤Ë¤Ï¡¢
-	¥«¡¼¥É¤ËÂФ·¤Æ¤É¤Î¥É¥é¥¤¥Ð¤òÍøÍѤ¹¤ì¤Ð¤è¤¤¤«¤Ë¤Ä¤¤¤Æ¤â¸ÀµÚ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	¤ÎÂбþ¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <indexterm>
 	<primary>¥«¡¼¥Í¥ë</primary>
 	<secondary>ÀßÄê</secondary>
       </indexterm>
 
-      <para>¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤¿¤á¤Ë¡¢
+      <para>¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤ò»È¤¦¤¿¤á¤Ë¤Ï¡¢
 	ŬÀڤʥǥХ¤¥¹¥É¥é¥¤¥Ð¤òÆɤ߹þ¤Þ¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó¡£
 	¤³¤ì¤Ë¤ÏÆó¤Ä¤ÎÊýË¡¤Î¤É¤Á¤é¤«¤Ç¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£
 	¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤Ï &man.kldload.8;
-	¤ò»È¤Ã¤Æ¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤òñ¤ËÆɤ߹þ¤à¤³¤È¤Ç¤¹¡£
-	¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼Â¸½¤Ç¤­¤Þ¤¹¡£</para>
+	¤ò»È¤Ã¤Æ¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥«¡¼¥Í¥ë¥â¥¸¥å¡¼¥ë¤òÆɤ߹þ¤à¤³¤È¤Ç¤¹¡£
+	¼¡¤ÎÎã¤Ï¡¢Creative &soundblaster; Live!
+	¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥É¥é¥¤¥Ð¤òÆɤ߹þ¤àÎã¤Ç¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>kldload snd_emu10k1</userinput></screen>
-      <para>¤Þ¤¿¤Ï <filename>/boot/loader.conf</filename>
-	¥Õ¥¡¥¤¥ë¤Ë¤³¤Î¤è¤¦¤ÊŬÀڤʹԤò²Ã¤¨¤Æ¼Â¸½¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
+
+      <para>¤³¤Î¥É¥é¥¤¥Ð¤òµ¯Æ°»þ¤ËÆɤ߹þ¤à¤è¤¦¤ËÀßÄꤹ¤ë¤¿¤á¤Ë¤Ï¡¢
+	<filename>/boot/loader.conf</filename> ¤Ë¥É¥é¥¤¥Ð¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£
+	¤³¤Î¥É¥é¥¤¥Ð¤Î¾ì¹ç¤Ï°Ê²¼¤Î¹Ô¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
       <programlisting>snd_emu10k1_load="YES"</programlisting>
 
-      <para>°Ê¾å¤Ï Creative &soundblaster; Live! ¥µ¥¦¥ó¥É¥«¡¼¥É¤ÎÎã¤Ç¤¹¡£
-	¾¤ËÍøÍѲÄǽ¤ÊÆɤ߹þ¤ß²Äǽ¤Ê¥µ¥¦¥ó¥É¥â¥¸¥å¡¼¥ë¤Ï
+      <para>¾¤ËÍøÍѲÄǽ¤ÊÆɤ߹þ¤ß²Äǽ¤Ê¥µ¥¦¥ó¥É¥â¥¸¥å¡¼¥ë¤Ï
 	<filename>/boot/defaults/loader.conf</filename>
 	¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤É¤Î¥É¥é¥¤¥Ð¤òÍøÍѤ¹¤ì¤Ð¤¤¤¤¤«³Î¤«¤Ç¤Ê¤±¤ì¤Ð¡¢
@@ -162,41 +144,33 @@
 
       <para><filename>snd_driver</filename> ¥â¥¸¥å¡¼¥ë¤Ï¡¢
 	°ìÈ̤˻ÈÍѤµ¤ì¤ë¥«¡¼¥É¤ËÂбþ¤·¤¿¥É¥é¥¤¥Ð¤ò¤Þ¤È¤á¤Æ°ìÅÙ¤ËÆɤ߹þ¤à¥á¥¿¥É¥é¥¤¥Ð¤Ç¤¹¡£
-	¤³¤Î¥É¥é¥¤¥Ð¤ò»ÈÍѤ¹¤ì¤Ð¡¢Â®¤ä¤«¤ËÀµ¤·¤¤¥É¥é¥¤¥Ð¤òõ¤·½Ð¤¹¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£
+	¤³¤Î¥É¥é¥¤¥Ð¤ò»ÈÍѤ¹¤ì¤Ð¡¢Â®¤ä¤«¤ËÀµ¤·¤¤¥É¥é¥¤¥Ð¤òõ¤·½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	<filename>/boot/loader.conf</filename> ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¡¢
 	¤¹¤Ù¤Æ¤Î¥µ¥¦¥ó¥É¥É¥é¥¤¥Ð¤òÆɤ߹þ¤à¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
-    <para><filename>snd_driver</filename> ¥á¥¿¥É¥é¥¤¥Ð¤ÎÆɤ߹þ¤ß¸å¤Ë¡¢
-      ¤É¤Î¥É¥é¥¤¥Ð¤¬¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÁªÂò¤µ¤ì¤¿¤Î¤«¤òÃΤꤿ¤¤¤Î¤Ê¤é
-      <command>cat /dev/sndstat</command> ¥³¥Þ¥ó¥É¤Ç
-      <filename>/dev/sndstat</filename> ¥Õ¥¡¥¤¥ë¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£</para>
-
-      <para>Æó¤ÄÌܤÎÊýË¡¤Ï¡¢
-	¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥É¥é¥¤¥Ð¤ò¥«¡¼¥Í¥ë¤ØÀÅŪ¤ËÁȤ߹þ¤à¤³¤È¤Ç¤¹¡£
-	°Ê²¼¤ÎÀá¤Ç¤Ï¡¢¤³¤ÎÊýË¡¤Ç¥Ï¡¼¥É¥¦¥§¥¢¤òÂбþ¤µ¤»¤ëÊýË¡¤òÀâÌÀ¤·¤Þ¤¹¡£
+      <para><filename>snd_driver</filename> ¥á¥¿¥É¥é¥¤¥Ð¤ÎÆɤ߹þ¤ß¸å¤Ë¡¢
+	¤É¤Î¥É¥é¥¤¥Ð¤¬¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÁªÂò¤µ¤ì¤¿¤Î¤«¤òÃΤë¤Ë¤Ï¡¢
+	<command>cat /dev/sndstat</command> ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£</para>
+
+      <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥É¥é¥¤¥Ð¤ò¥«¡¼¥Í¥ë¤ØÀÅŪ¤ËÁȤ߹þ¤à¤Ë¤Ï¡¢
+	¼¡¤ÎÀá¤Î¼ê½ç¤Ë½¾¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 	¥«¡¼¥Í¥ëºÆ¹½Ãۤξܺ٤Ï
 	<xref linkend="kernelconfig"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <sect3>
 	<title>¥µ¥¦¥ó¥É¤ËÂбþ¤·¤¿¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤òÀßÄꤹ¤ë</title>
 
-	<para>¤Ï¤¸¤á¤Ë¡¢¥ª¡¼¥Ç¥£¥ª¥Õ¥ì¡¼¥à¥ï¡¼¥¯¥É¥é¥¤¥Ð
-	  &man.sound.4; ¤ò¥«¡¼¥Í¥ë¤ËÄɲä·¤Þ¤¹¡£
-	  ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	<para>¥µ¥¦¥ó¥É¤ËÂбþ¤·¤¿¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ò»È¤¦¤È¤­¤Ë¤Ï¡¢
+	  ¥ª¡¼¥Ç¥£¥ª¥Õ¥ì¡¼¥à¥ï¡¼¥¯¥É¥é¥¤¥Ð¤ò¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ËÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-	<programlisting>device sound</programlisting>
+    <programlisting>device sound</programlisting>
 
-	<para>¼¡¤Ë¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÂбþ¤·¤¿¥É¥é¥¤¥Ð¤òÄɲä·¤Þ¤¹¡£
-	  ¤½¤ì¤Ë¤Ï¡¢¤É¤Î¥É¥é¥¤¥Ð¤¬¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤ë¤«¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-	  »ÈÍѤ·¤Æ¤¤¤ë¥«¡¼¥É¤ËÂФ¹¤ëÀµ¤·¤¤¥É¥é¥¤¥Ð¤ò·èÄꤹ¤ë¤¿¤á¤Ë¡¢
-	  <link xlink:href="&rel.current.hardware;">¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</link>
-	  ¤ÎÂбþ¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤Î°ìÍ÷¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
-	  ¤¿¤È¤¨¤Ð¡¢Creative &soundblaster; Live! ¥µ¥¦¥ó¥É¥«¡¼¥É¤Ï
-	  &man.snd.emu10k1.4; ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤¤¤Þ¤¹¡£
-	  ¤³¤Î¥«¡¼¥É¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¢
-	  ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+    <para>¼¡¤Ë¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤ËÂбþ¤·¤¿¥É¥é¥¤¥Ð¤òÄɲä·¤Þ¤¹¡£
+      ¤½¤ì¤Ë¤Ï¡¢¤É¤Î¥É¥é¥¤¥Ð¤¬¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤ë¤«¤òÃΤëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+      Á°Àá¤Î Creative &soundblaster; Live! ¥µ¥¦¥ó¥É¥«¡¼¥É¤ÎÎã¤Ç¤Ï¡¢
+      ¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
-	<programlisting>device snd_emu10k1</programlisting>
+      <programlisting>device snd_emu10k1</programlisting>
 
 	<para>¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤òÆɤó¤Ç¡¢
 	  Äɲ乤٤­¹½Ê¸¤òÄ´¤Ù¤Æ¤¯¤À¤µ¤¤¡£
@@ -204,24 +178,25 @@
 	  <filename>/usr/src/sys/conf/NOTES</filename>
 	  ¤Ë¤â¤¢¤ê¤Þ¤¹¡£</para>
 
-	<para>¤¹¤Ù¤Æ¤Î PnP ÈóÂбþ¤Î ISA ¥«¡¼¥É¤ËÅö¤Æ¤Ï¤Þ¤ë¤è¤¦¤Ë¡¢
-	  PnP ÈóÂбþ¤Î ISA ¥µ¥¦¥ó¥É¥«¡¼¥É¤Ç¤Ï¡¢
-	  ¥«¡¼¥Í¥ë¤Ë¥«¡¼¥É¤¬»ÈÍѤ¹¤ë»ñ¸»
-	  (IRQ, I/O ¥Ý¡¼¥È¤Ê¤É) ¤òÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-	  ¤³¤Î¾ì¹ç¤Ï¡¢<filename>/boot/device.hints</filename>
-	  ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
+	<para>PnP ÈóÂбþ¤Î ISA ¥µ¥¦¥ó¥É¥«¡¼¥É¤Ç¤Ï¡¢
+	  IRQ ¤ª¤è¤Ó I/O ¥Ý¡¼¥È¤ÎÀßÄê¤ò
+	  <filename>/boot/device.hints</filename>¡¡
+	  ¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 	  ¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤Ë¡¢&man.loader.8;
 	  ¤Ï¤³¤Î¥Õ¥¡¥¤¥ë¤òÆɤߡ¢ÀßÄê¾ðÊó¤ò¥«¡¼¥Í¥ë¤ËÅϤ·¤Þ¤¹¡£
 	  ¤¿¤È¤¨¤Ð¡¢PnP ÈóÂбþ¤Î¸Å¤¤ Creative &soundblaster; 16 (ISA Àܳ)
-	  ¤Ë¤Ï <literal>snd_sb16</literal> ¤È¤È¤â¤Ë &man.snd.sbc.4; ¥É¥é¥¤¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£
+	  ¤Ë¤Ï <literal>snd_sb16</literal> ¤È¤È¤â¤Ë
+	  &man.snd.sbc.4; ¥É¥é¥¤¥Ð¤ò»ÈÍѤ·¤Þ¤¹¡£
 	  ¤³¤Î¥«¡¼¥É¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢
-	  ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ乤ë¤ÈƱ»þ¤Ë¡¢</para>
+	  ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	<programlisting>device snd_sbc
 device snd_sb16</programlisting>
 
-	<para><filename>/boot/device.hints</filename>
-	  ¥Õ¥¡¥¤¥ë¤Ë°Ê²¼¤Î¥¨¥ó¥È¥ê¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
+	<para>¤â¤·¥«¡¼¥É¤¬ <literal>0x220</literal> I/O port ¤È
+	  IRQ <literal>5</literal> ¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢
+	  <filename>/boot/device.hints</filename>
+	  ¤Ë°Ê²¼¤Î¹Ô¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
 	<programlisting>hint.sbc.0.at="isa"
 hint.sbc.0.port="0x220"
@@ -234,32 +209,30 @@ hint.sbc.0.flags="0x15"</programlisting>
 	  IRQ ¤Ë <literal>5</literal> ¤ò»ÈÍѤ·¤Þ¤¹¡£</para>
 
 	<para><filename>/boot/device.hints</filename>
-	  ¥Õ¥¡¥¤¥ë¤ËÍѤ¤¤ë¤Ù¤­¹½Ê¸¤Ï¡¢
-	  &man.sound.4; ¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¡¢¤ª¤è¤Ó¡¢
-	  ³Æ¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	  ¤ËÍѤ¤¤ë¤Ù¤­¹½Ê¸¤Ï¡¢&man.sound.4; ¤ª¤è¤Ó¡¢
+	  ¥µ¥¦¥ó¥É¥«¡¼¥É¤Î³Æ¥É¥é¥¤¥Ð¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
-	<para>½é´üÀßÄê¤Ï°Ê¾å¤ÎÄ̤ê¤Ç¤¹¡£
+	<para>¤³¤ì¤Þ¤Ç¤ÎÀßÄê¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¤â¤Î¤Ç¤¹¡£
 	  ¥«¡¼¥É¤ò»ÈÍѤ¹¤ë¾õ¶·¤Ë¤è¤Ã¤Æ¤Ï¡¢
 	  IRQ ¤ä¤½¤Î¾¤ÎÀßÄê¤òÊѹ¹¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 	  ¤³¤Î¥«¡¼¥É¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï¡¢
-	  &man.snd.sbc.4; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+	  &man.snd.sbc.4; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </sect3>
     </sect2>
 
     <sect2 xml:id="sound-testing">
       <title>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥Æ¥¹¥È</title>
 
-      <para>¥«¡¼¥Í¥ë¤òÊѹ¹¤·¤ÆºÆµ¯Æ°¤¹¤ë¤«¡¢É¬ÍפȤʤë¥â¥¸¥å¡¼¥ë¤òÆɤ߹þ¤à¤È¡¢
-	¥·¥¹¥Æ¥à¤Î¥á¥Ã¥»¡¼¥¸¥Ð¥Ã¥Õ¥¡ (&man.dmesg.8;)
-	¤Ë¥µ¥¦¥ó¥É¥«¡¼¥É¤¬Ç§¼±¤µ¤ì¤¿¤³¤È¤¬¼¨¤µ¤ì¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢¼¡¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬½ÐÎϤµ¤ì¤Þ¤¹¡£</para>
+      <para>¥«¥¹¥¿¥à¥«¡¼¥Í¥ë¤ÇºÆµ¯Æ°¤¹¤ë¤«¡¢É¬ÍפȤʤë¥â¥¸¥å¡¼¥ë¤òÆɤ߹þ¤à¤È¡¢
+	¥·¥¹¥Æ¥à¤Î¥á¥Ã¥»¡¼¥¸¥Ð¥Ã¥Õ¥¡¤Ë¥µ¥¦¥ó¥É¥«¡¼¥É¤¬Ç§¼±¤µ¤ì¤¿¤³¤È¤¬¼¨¤µ¤ì¤Þ¤¹¡£
+	&man.dmesg.8;¤ò¼Â¹Ô¤·¤Æ¡¢¼¡¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤òõ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>pcm0: <Intel ICH3 (82801CA)> port 0xdc80-0xdcbf,0xd800-0xd8ff irq 5 at device 31.5 on pci0
 pcm0: [GIANT-LOCKED]
 pcm0: <Cirrus Logic CS4205 AC97 Codec></screen>
 
-      <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¾õÂ֤ϡ¢<filename>/dev/sndstat</filename>
-	¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ³Îǧ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
+      <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¾õÂ֤ϡ¢
+	°Ê²¼¤Î¥³¥Þ¥ó¥É¤ò»ÈÍѤ·¤Æ³Îǧ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cat /dev/sndstat</userinput>
 FreeBSD Audio Driver (newpcm)
@@ -267,30 +240,29 @@ Installed devices:
 pcm0: <Intel ICH3 (82801CA)> at io 0xd800, 0xdc80 irq 5 bufsz 16384
 kld snd_ich (1p/2r/0v channels duplex default)</screen>
 
-      <para>¤³¤Î½ÐÎϤϥ·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ°Û¤Ê¤ë¤Ç¤·¤ç¤¦¡£
+      <para>¤³¤Î½ÐÎϤϥ·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ°Û¤Ê¤ê¤Þ¤¹¡£
 	<filename>pcm</filename> ¥Ç¥Ð¥¤¥¹¤¬¤Ê¤±¤ì¤Ð¡¢
-	º£¤Þ¤Ç¤Î¼ê½ç¤ò¿¶¤êÊ֤äƤߤƤ¯¤À¤µ¤¤¡£
-	¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò¤â¤¦°ìÅÙ¸«Ä¾¤·¤Æ¡¢
+	¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò¸«Ä¾¤·¤Æ¡¢
 	Àµ¤·¤¤¥Ç¥Ð¥¤¥¹¥É¥é¥¤¥Ð¤òÁªÂò¤·¤Æ¤¤¤ë¤«¤É¤¦¤«³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
 	¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤Ï <xref linkend="troubleshooting"/>
 	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
-      <para>¤¹¤Ù¤Æ¤¦¤Þ¤¯¤¤¤±¤Ð¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤¬µ¡Ç½¤¹¤ë¤Ç¤·¤ç¤¦¡£
-	CD-ROM ¤Þ¤¿¤Ï
-	DVD-ROM ¥É¥é¥¤¥Ö¤Î¥ª¡¼¥Ç¥£¥ª½ÐÎÏü»Ò¤¬¥µ¥¦¥ó¥É¥«¡¼¥É¤ÈŬÀÚ¤ËÀܳ¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢
-	&man.cdcontrol.1; ¤ò»È¤Ã¤Æ¥É¥é¥¤¥ÖÆâ¤Î CD ¤òºÆÀ¸¤Ç¤­¤Þ¤¹¡£</para>
+      <para>¤¹¤Ù¤Æ¤¦¤Þ¤¯¤¤¤±¤Ð¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤¬ &os; ¤Çµ¡Ç½¤¹¤ë¤Ç¤·¤ç¤¦¡£
+	CD-ROM ¤Þ¤¿¤Ï DVD-ROM
+	¥É¥é¥¤¥Ö¤Î¥ª¡¼¥Ç¥£¥ª½ÐÎÏü»Ò¤¬¥µ¥¦¥ó¥É¥«¡¼¥É¤ÈŬÀÚ¤ËÀܳ¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢
+	&man.cdcontrol.1; ¤ò»È¤Ã¤Æ¥É¥é¥¤¥ÖÆâ¤Î¥ª¡¼¥Ç¥£¥ª
+	CD ¤òºÆÀ¸¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.user; <userinput>cdcontrol -f /dev/acd0 play 1</userinput></screen>
 
-      <para><package>audio/workman</package>
-	¤Î¤è¤¦¤Ë¡¢¤è¤ê¤è¤¤¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ë¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
-	MP3 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤òÄ°¤¯¤¿¤á¤Ë
-	<package>audio/mpg123</package>
-	¤Î¤è¤¦¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤è¤¦¤È»×¤¦¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+      <para><package>audio/workman</package> ¤Î¤è¤¦¤Ë¡¢
+	¤è¤ê¤è¤¤¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÄ󶡤¹¤ë¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤¬¤¢¤ê¤Þ¤¹¡£
+	<package>audio/mpg123</package> port
+	¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ MP3 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤òʹ¤¯¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <para>¼ê¤Ã¼è¤êÁ᤯¥«¡¼¥É¤ò¥Æ¥¹¥È¤¹¤ë¤Ë¤Ï¡¢
-	<filename>/dev/dsp</filename> ¥Ç¥Ð¥¤¥¹¤Ë¥Ç¡¼¥¿¤òÁ÷¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£
-	¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+	<filename>/dev/dsp</filename>
+	¥Ç¥Ð¥¤¥¹¤Ë¥Ç¡¼¥¿¤òÁ÷¤Ã¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.user; <userinput>cat filename > /dev/dsp</userinput></screen>
 
@@ -300,15 +272,14 @@ kld snd_ich (1p/2r/0v channels duplex de
 	¤³¤ì¤Ë¤è¤ê¡¢¥µ¥¦¥ó¥É¥«¡¼¥É¤¬¼ÂºÝ¤ËÆ°ºî¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤Ç¤­¤Þ¤¹¡£</para>
 
     <note>
-      <para>¥Ç¥Ð¥¤¥¹¥Î¡¼¥É <filename>/dev/dsp*</filename> ¤Ï¡¢
-	ɬÍפȤµ¤ì¤ë»þ¤Ë¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
+      <para><filename>/dev/dsp*</filename> ¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤Ï¡¢
+	ɬÍפ˱þ¤¸¤Æ¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤Þ¤¹¡£
 	¥Ç¥Ð¥¤¥¹¥Î¡¼¥É¤¬»ÈÍѤµ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ë¤Ï¸ºß¤»¤º¡¢
 	&man.ls.1; ¤Î½ÐÎϤËɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£</para>
     </note>
 
-	<para>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥ß¥­¥µ¥ì¥Ù¥ë¤Ï
-	  &man.mixer.8; ¥³¥Þ¥ó¥É¤ÇÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	  ¾ÜºÙ¤Ï &man.mixer.8; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+    <para>¥µ¥¦¥ó¥É¥«¡¼¥É¤Î¥ß¥­¥µ¥ì¥Ù¥ë¤Ï &man.mixer.8; ¥³¥Þ¥ó¥É¤ÇÊѹ¹¤Ç¤­¤Þ¤¹¡£
+      ¾ÜºÙ¤Ï &man.mixer.8; ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
       <sect3 xml:id="troubleshooting">
 	<title>¤è¤¯¤¢¤ëÌäÂê</title>
@@ -363,7 +334,7 @@ kld snd_ich (1p/2r/0v channels duplex de
 	<acronym>HDMI</acronym> ¤äÎà»÷¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤òÍøÍѤ¹¤ë¤¿¤á¡¢
 	¥°¥é¥Õ¥£¥Ã¥¯¥«¡¼¥É¼«¿È¤¬¥µ¥¦¥ó¥É¥«¡¼¥É¤ò»ý¤Ä¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡£
 	¤³¤Î¤è¤¦¤Ê¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤Ë¤Ï¡¢
-	»þ¤È¤·¤ÆËÜÅö¤Î¥µ¥¦¥ó¥É¥«¡¼¥É¤è¤ê¼ã¤¤Èֹ椬ÉÕ¤±¤é¤ì¤ë¤³¤È¤¬¤¢¤ê¡¢
+	»þ¤È¤·¤Æ¥µ¥¦¥ó¥É¥«¡¼¥É¤è¤ê¼ã¤¤Èֹ椬ÉÕ¤±¤é¤ì¤ë¤³¤È¤¬¤¢¤ê¡¢
 	¤½¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¢
 	¥µ¥¦¥ó¥É¥«¡¼¥É¤ò¥Ç¥Õ¥©¥ë¥È¥×¥ì¥¤¥Ð¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤ÆÍøÍѤǤ­¤Þ¤»¤ó¡£
 	¤³¤Î¤³¤È¤¬¸¶°ø¤«¤É¤¦¤«¤ò³Îǧ¤¹¤ë¤Ë¤Ï¡¢<application>dmesg</application> ¤ò¼Â¹Ô¤·¤Æ
@@ -392,7 +363,7 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
 	¤Ë¤Ï¡¢¥µ¥¦¥ó¥É¥«¡¼¥É (<literal>Realtek ALC889</literal>)
 	¤è¤ê¼ã¤¤Èֹ椬ÉÕ¤±¤é¤ì¤Æ¤¤¤Þ¤¹¡£
 	¥µ¥¦¥ó¥É¥«¡¼¥É¤ò¥Ç¥Õ¥©¥ë¥È¤Î¥×¥ì¥¤¥Ð¥Ã¥¯¥Ç¥Ð¥¤¥¹¤È¤·¤ÆÍøÍѤ¹¤ë¤Ë¤Ï¡¢
-	°Ê²¼¤Î¤è¤¦¤Ë <literal>hw.snd.default_unit</literal>
+	<literal>hw.snd.default_unit</literal>
 	¤ò¥×¥ì¥¤¥Ð¥Ã¥¯¤Ç»ÈÍѤ¹¤ë¥æ¥Ë¥Ã¥ÈÈÖ¹æ¤ËÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>sysctl hw.snd.default_unit=n</userinput></screen>
@@ -400,7 +371,7 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
       <para>¤³¤³¤Ç¡¢<literal>n</literal> ¤Ï»ÈÍѤ¹¤ë¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤ÎÈÖ¹æ¤Ç¤¹¡£
 	¤³¤ÎÎã¤Ç¤Ï <literal>4</literal> ¤Ç¤¹¡£
         <filename>/etc/sysctl.conf</filename> ¤Ë°Ê²¼¤Î¹Ô¤òÆþ¤ì¤ë¤È¡¢
-	¾ï¤ËÀßÄê¤ÎÊѹ¹¤¬È¿±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
+	ÀßÄê¤ÎÊѹ¹¤¬¾ï¤ËÈ¿±Ç¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</para>
 
       <programlisting>hw.snd.default_unit=<replaceable>4</replaceable></programlisting>
       </sect3>
@@ -412,22 +383,15 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
 	  <author><personname><firstname>Munish</firstname><surname>Chopra</surname></personname><contrib>´ó¹Æ: </contrib></author>
 	</authorgroup>
       </info>
-      
-
-      <para>ÆÃÄê¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤Î¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤Î¶¦ÍѤËÂбþ¤·¤Æ¤¤¤Ê¤¤»þ¡¢
-	<application>esound</application> ¤Þ¤¿¤Ï
-	<application>artsd</application> ¤Î¤è¤¦¤Ë
-	Ʊ»þ¤ËºÆÀ¸¤¹¤ë¤³¤È¤Î¤Ç¤­¤ë²»¸»¤òÊ£¿ô¼ÂÁõ¤·¤Æ¤¤¤ë¤³¤È¤Ï¡¢
-	¿¤¯¤Î¾ì¹ç˾¤Þ¤·¤¤¤³¤È¤Ç¤¹¡£</para>
 
-      <para>FreeBSD ¤Ç¤Ï¡¢
-	<emphasis>²¾ÁÛ¥µ¥¦¥ó¥É¥Á¥ã¥Í¥ë</emphasis>
+      <para>Ʊ»þ¤ËºÆÀ¸¤¹¤ë¤³¤È¤Î¤Ç¤­¤ë²»¸»¤òÊ£¿ô¼ÂÁõ¤·¤Æ¤¤¤ë¤³¤È¤Ï¡¢
+	¿¤¯¤Î¾ì¹ç˾¤Þ¤·¤¤¤³¤È¤Ç¤¹¡£
+	&os; ¤Ç¤Ï¡¢<emphasis>²¾ÁÛ¥µ¥¦¥ó¥É¥Á¥ã¥Í¥ë</emphasis>
 	¤ò»È¤Ã¤Æ¤³¤ì¤ò¼Â¸½¤Ç¤­¡¢&man.sysctl.8; ¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£
 	²¾ÁÛ¥Á¥ã¥Í¥ë¤Ï¥«¡¼¥Í¥ëÆâ¤Ç¥µ¥¦¥ó¥É¤ò¹çÀ®¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
 	¥µ¥¦¥ó¥É¥«¡¼¥É¤ÎºÆÀ¸¤ò¿½Å²½¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
-      <para>²¾ÁÛ¥Á¥ã¥Í¥ë¤Î¿ô¤ò·è¤á¤ë¤Î¤Ë»°¤Ä¤Î sysctl ÊÑ¿ô¤òÀßÄê¤Ç¤­¤Þ¤¹¡£
-	<systemitem class="username">root</systemitem> ¥æ¡¼¥¶¤Ç°Ê²¼¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+      <para>²¾ÁÛ¥Á¥ã¥Í¥ë¤Î¿ô¤ò·è¤á¤ë¤Î¤Ë»°¤Ä¤Î sysctl ÊÑ¿ô¤òÀßÄê¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>sysctl dev.pcm.0.play.vchans=4</userinput>
 &prompt.root; <userinput>sysctl dev.pcm.0.rec.vchans=4</userinput>
@@ -439,21 +403,19 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
 	<varname>dev.pcm.0.rec.vchans=4</varname> ¤Ï¡¢
 	<filename>pcm0</filename>
 	¤¬ºÆÀ¸¤äÏ¿²»¤Î¤¿¤á¤Ë»ý¤Ã¤Æ¤¤¤ë²¾ÁÛ¥Á¥ã¥Í¥ë¤Î¿ô¤Ç¡¢
-	°ìÅ٥ǥХ¤¥¹¤¬¼è¤êÉÕ¤±¤é¤ì¤ë¤ÈÀßÄê¤Ç¤­¤Þ¤¹¡£
+	¥Ç¥Ð¥¤¥¹¤¬¼è¤êÉÕ¤±¤é¤ì¤¿¸å¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£
 	<literal>hw.snd.maxautovchans</literal> ¤Ï¡¢
 	&man.kldload.8;
 	¤òÍѤ¤¤Æǧ¼±¤µ¤ì¤¿¿·¤·¤¤¥Ç¥Ð¥¤¥¹¤Î²¾ÁÛ¥Á¥ã¥Í¥ë¿ô¤Ç¤¹¡£
 	<filename>pcm</filename>
 	¥â¥¸¥å¡¼¥ë¤Ï¥Ï¡¼¥É¥¦¥§¥¢¥É¥é¥¤¥Ð¤È¤ÏÆÈΩ¤·¤ÆÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤ë¤Î¤Ç¡¢
-	¸å¤Ç¤É¤ó¤Ê¤Ë¥Ç¥Ð¥¤¥¹¤òǧ¼±¤·¤Æ¤â
 	<varname>hw.snd.maxautovchans</varname>
-	¤Ï²¾ÁÛ¥Á¥ã¥Í¥ë¤ò³ÊǼ¤Ç¤­¤Þ¤¹¡£
-	¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï &man.pcm.4;
-	¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+	¤Ï¡¢¥Ç¥Ð¥¤¥¹¤¬¼è¤êÉÕ¤±¤é¤ì¤¿»þ¤Ë¡¢
+	¥Ç¥Ð¥¤¥¹¤ËÍ¿¤¨¤é¤ì¤ë²¾ÁÛ¥Á¥ã¥Í¥ë¤Î¿ô¤òɽ¤·¤Æ¤¤¤Þ¤¹¡£
+	¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï &man.pcm.4; ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <note>
-	<para>¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ·¤Æ¤¤¤ë¤È¤­¤Ë
-	  ²¾ÁÛ¥Á¥ã¥ó¥Í¥ë¤Î¿ô¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
+	<para>¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ·¤Æ¤¤¤ë¤È¤­¤Ë²¾ÁÛ¥Á¥ã¥ó¥Í¥ë¤Î¿ô¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£
 	  ¤Þ¤º¡¢¥ß¥å¡¼¥¸¥Ã¥¯¥×¥ì¡¼¥ä¤ä¥µ¥¦¥ó¥É¥Ç¡¼¥â¥ó¤È¤¤¤Ã¤¿
 	  ¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ·¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î¥×¥í¥°¥é¥à¤ò½ªÎ»¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
       </note>
@@ -472,22 +434,20 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
 	</authorgroup>
       </info>
 
-      
-
       <para>³Æ¥ß¥­¥µ¥Á¥ã¥Í¥ë¤Î½é´üÃͤÏ
 	&man.pcm.4; ¥É¥é¥¤¥Ð¤Î¥½¡¼¥¹¤Ë¥Ï¡¼¥É¥³¡¼¥Ç¥£¥ó¥°¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	µ¯Æ°»þ¤Ëµ­Ï¿¤µ¤ì¤Æ¤¤¤¿Ãͤò¥ß¥­¥µ¤ËÀßÄꤹ¤ë
 	¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ä¥Ç¡¼¥â¥ó¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
 	¤¢¤Þ¤ê¤è¤¤²ò·èÊýË¡¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-	ŬÀÚ¤ÊÃͤò <filename>/boot/device.hints</filename>
-	¥Õ¥¡¥¤¥ë¤Ëµ­½Ò¤¹¤ë¤³¤È¤Ë¤è¤ê¡¢
-	¥É¥é¥¤¥Ð¥ì¥Ù¥ë¤Ç¥ß¥­¥µ¤Î½é´üÃͤòÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð¡¢°Ê²¼¤Î¤è¤¦¤Ê¹Ô¤òÄɲä·¤Þ¤¹¡£</para>
+	°Ê²¼¤ÎÎã¤Î¤è¤¦¤Ë¡¢Å¬ÀÚ¤ÊÃͤò <filename>/boot/device.hints</filename>
+	¥Õ¥¡¥¤¥ë¤Ëµ­½Ò¤¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢
+	¥É¥é¥¤¥Ð¥ì¥Ù¥ë¤Ç¥ß¥­¥µ¤Î½é´üÃͤòÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£</para>
 
       <programlisting>hint.pcm.0.vol="50"</programlisting>
 
       <para>¤³¤ÎÎã¤Ç¤Ï¡¢&man.pcm.4; ¤¬Æɤ߹þ¤Þ¤ì¤¿¤ÈƱ»þ¤Ë¡¢
-	¥Ü¥ê¥å¡¼¥à¥Á¥ã¥Í¥ë¤Î½é´üÃͤò 50 ¤ËÀßÄꤷ¤Þ¤¹¡£</para>
+	¥Ü¥ê¥å¡¼¥à¥Á¥ã¥Í¥ë¤Î½é´üÃͤò <literal>50</literal>
+	¤ËÀßÄꤷ¤Þ¤¹¡£</para>
     </sect2>
   </sect1>
 
@@ -496,22 +456,19 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
       <authorgroup>
 	<author><personname><firstname>Chern</firstname><surname>Lee</surname></personname><contrib>´ó¹Æ: </contrib></author>
       </authorgroup>
-      
     </info>
 
-    
-
-    <para>MP3 (MPEG Layer 3 Audio) ¤Ï
-      CD ¤ËɤŨ¤¹¤ë²»¼Á¤Ç¥µ¥¦¥ó¥É¤òºÆÀ¸¤Ç¤­¤Þ¤¹¡£¤¢¤Ê¤¿¤Î FreeBSD
-      ¥ï¡¼¥¯¥¹¥Æ¡¼¥·¥ç¥ó¤Ë¤³¤Î¥×¥ì¥¤¥ä¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Ê¤¤Íýͳ¤Ï¤Ê¤¤¤Ç¤·¤ç¤¦¡£</para>
+    <para>¤³¤ÎÀá¤Ç¤Ï¡¢&os; ¤ÇÍøÍѤǤ­¤ë <acronym>MP3</acronym>
+      ¥×¥ì¥¤¥ä¤ä¡¢¥ª¡¼¥Ç¥£¥ª CD ¥È¥é¥Ã¥¯¤òµÛ¤¤½Ð¤¹ÊýË¡¡¢
+      ¤ª¤è¤Ó <acronym>MP3</acronym> ¤Î¥¨¥ó¥³¡¼¥É¡¢
+      ¥Ç¥³¡¼¥É¤ÎÊýË¡¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£</para>
 
     <sect2 xml:id="mp3-players">
       <title>MP3 ¥×¥ì¥¤¥ä</title>
 
-      <para><application>XMMS</application> (X Multimedia System) ¤Ï
-        ¤È¤Æ¤â¿Íµ¤¤Î¤¢¤ë X11 ¥Ù¡¼¥¹¤Î MP3 ¥×¥ì¥¤¥ä¤Ç¤¹¡£
-	<application>XMMS</application>
-        ¤Î¥°¥é¥Õ¥£¥«¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï
+      <para><application>XMMS</application> ¤Ï
+        ¿Íµ¤¤Î¤¢¤ë¥°¥é¥Õ¥£¥«¥ë¤Ê <acronym>MP3</acronym> ¥×¥ì¥¤¥ä¤Ç¤¹¡£
+	<application>XMMS</application> ¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï
         Nullsoft ¤Î <application>Winamp</application>
         ¤È¤Û¤È¤ó¤ÉƱ°ì¤Ê¤Î¤Ç¡¢<application>Winamp</application>
         ¤Î¥¹¥­¥ó¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
@@ -528,15 +485,17 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digi
         <application>Winamp</application> ¤ò»È¤¤¤Ê¤ì¤Æ¤¤¤ë¿Í¤Ï
 	´Êñ¤Ë <application>XMMS</application> ¤ò»È¤¨¤ë¤Ç¤·¤ç¤¦¡£</para>
 
-      <para><package>audio/mpg123</package>
-        ¤Ï¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤ÎÂåÂؤȤʤë MP3 ¥×¥ì¥¤¥ä¤Î port ¤Ç¤¹¡£</para>
+      <para><package>audio/mpg123</package> port
+	¤ÏÂåÂØ¤È¤Ê¤ë ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î <acronym>MP3</acronym>
+	¥×¥ì¥¤¥ä¤Ç¤¹¡£</para>
 
       <para><application>mpg123</application>
-	¤Ï¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤È MP3 ¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤Æ¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
-	<filename>/dev/dsp1.0</filename> ¥Ç¥Ð¥¤¥¹¤ò»ÈÍѤ·¤Æ
-	MP3 ¥Õ¥¡¥¤¥ë <replaceable>Foobar-GreatestHits.mp3</replaceable>
-	¤òºÆÀ¸¤¹¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£
-      </para>
+	¤Ï¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹¤È <acronym>MP3</acronym>
+	¥Õ¥¡¥¤¥ë¤ò¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é»ØÄꤹ¤ë¤³¤È¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£
+	¥ª¡¼¥Ç¥£¥ª¥Ç¥Ð¥¤¥¹¤¬ <filename>/dev/dsp1.0</filename>¡¢
+	<acronym>MP3</acronym> ¥Õ¥¡¥¤¥ë¤¬
+	<replaceable>Foobar-GreatestHits.mp3</replaceable>
+	¤È¤¹¤ë¤È¡¢¥Õ¥¡¥¤¥ë¤òºÆÀ¸¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¤è¤¦¤Ë¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
       <screen>&prompt.root; <userinput>mpg123 -a /dev/dsp1.0 Foobar-GreatestHits.mp3</userinput>
 High Performance MPEG 1.0/2.0/2.5 Audio Player for Layer 1, 2 and 3.
@@ -556,67 +515,66 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
     <sect2 xml:id="rip-cd">
       <title>CD ²»À¼¥È¥é¥Ã¥¯¤ÎÃê½Ð</title>
 
-      <para>CD Á´ÂΤޤ¿¤Ï CD ¥È¥é¥Ã¥¯¤ò MP3 ¤ËÊÑ´¹¤¹¤ëÁ°¤Ë¡¢CD
-        ¾å¤Î¥ª¡¼¥Ç¥£¥ª¥Ç¡¼¥¿¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¾å¤ËÃê½Ð¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-        ¤³¤ì¤Ë¤Ï raw CDDA (CD Digital Audio) ¥Ç¡¼¥¿¤ò WAV
-        ¥Õ¥¡¥¤¥ë¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£</para>
+      <para>CD Á´ÂΤޤ¿¤Ï CD ¥È¥é¥Ã¥¯¤ò <acronym>MP3</acronym>
+	¤ËÊÑ´¹¤¹¤ëÁ°¤Ë¡¢CD
+	¾å¤Î¥ª¡¼¥Ç¥£¥ª¥Ç¡¼¥¿¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¾å¤ËÃê½Ð¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+	¤³¤ì¤Ë¤Ï raw CD Digital Audio (<acronym>CDDA</acronym>) ¥Ç¡¼¥¿¤ò
+	<acronym>WAV</acronym> ¥Õ¥¡¥¤¥ë¤Ë¥³¥Ô¡¼¤·¤Þ¤¹¡£</para>
 
       <para><package>sysutils/cdrtools</package>
-        ¥¹¥¤¡¼¥È¤Î°ìÉô¤Ç¤¢¤ë <command>cdda2wav</command> ¥Ä¡¼¥ë¤Ï
+        ¥¹¥¤¡¼¥È¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë <command>cdda2wav</command> ¥Ä¡¼¥ë¤Ï
         CD ¤«¤é¥ª¡¼¥Ç¥£¥ª¥Ç¡¼¥¿¤òÃê½Ð¤·¤¿¤ê¡¢
 	¾ðÊó¤ò´Ø·¸¤Å¤±¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
 
       <para>CD ¤ò¥É¥é¥¤¥Ö¤Ë¤¤¤ì¤Æ¼¡¤Î¥³¥Þ¥ó¥É¤ò
-        (<systemitem class="username">root</systemitem>¤Ç) ¼Â¹Ô¤·¤Æ¡¢
-        CD Á´ÂΤò (¥È¥é¥Ã¥¯¤´¤È¤Ë) ¸Ä¡¹¤Î WAV ¥Õ¥¡¥¤¥ë¤ËÃê½Ð¤Ç¤­¤Þ¤¹¡£</para>
+	<systemitem class="username">root</systemitem> ¸¢¸Â¤Ç¼Â¹Ô¤¹¤ë¤È¡¢
+	CD Á´ÂΤò (¥È¥é¥Ã¥¯¤´¤È¤Ë) ¸Ä¡¹¤Î
+	<acronym>WAV</acronym> ¥Õ¥¡¥¤¥ë¤ËÃê½Ð¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cdda2wav -D 0,1,0 -B</userinput></screen>
 
-      <para><application>cdda2wav</application>
-        ¤Ï ATAPI (IDE) CDROM ¥É¥é¥¤¥Ö¤Ë¤âÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-        IDE ¥É¥é¥¤¥Ö¤«¤éÃê½Ð¤¹¤ë¤Ë¤Ï¡¢
-        SCSI ¥æ¥Ë¥Ã¥ÈÈÖ¹æ¤ò¥Ç¥Ð¥¤¥¹Ì¾¤ËÃÖ¤­´¹¤¨¤Æ»ØÄꤷ¤Þ¤¹¡£
-	¤¿¤È¤¨¤Ð IDE ¥É¥é¥¤¥Ö¤«¤é¼·ÈÖÌܤΥȥé¥Ã¥¯¤òÃê½Ð¤¹¤ë¤Ë¤Ï¡¢
-        ¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
-
-      <screen>&prompt.root; <userinput>cdda2wav -D /dev/acd0 -t 7</userinput></screen>
-
       <para><option>-D <replaceable>0,1,0</replaceable></option> ¤Ï
 	SCSI ¥Ç¥Ð¥¤¥¹ <filename>0,1,0</filename> ¤òɽ¤·¤Þ¤¹¡£
 	¤³¤ì¤Ï <command>cdrecord -scanbus</command>
         ¤Î½ÐÎϤ˰ìÃפ·¤Þ¤¹¡£</para>
 
+      <para><application>cdda2wav</application>
+	¤Ï ATAPI (IDE) CDROM ¥É¥é¥¤¥Ö¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
+	IDE ¥É¥é¥¤¥Ö¤«¤éÃê½Ð¤¹¤ë¤Ë¤Ï¡¢
+	SCSI ¥æ¥Ë¥Ã¥ÈÈÖ¹æ¤ò¥Ç¥Ð¥¤¥¹Ì¾¤ËÃÖ¤­´¹¤¨¤Æ»ØÄꤷ¤Þ¤¹¡£
+	¤¿¤È¤¨¤Ð IDE ¥É¥é¥¤¥Ö¤«¤é¼·ÈÖÌܤΥȥé¥Ã¥¯¤òÃê½Ð¤¹¤ë¤Ë¤Ï¡¢
+	¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
+
+      <screen>&prompt.root; <userinput>cdda2wav -D /dev/acd0 -t 7</userinput></screen>
+
       <para>¸Ä¡¹¤Î¥È¥é¥Ã¥¯¤òÃê½Ð¤¹¤ë¤Ë¤Ï¡¢
-	¼¡¤Î¤è¤¦¤Ë <option>-t</option> ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£</para>
+	¼¡¤Î¤è¤¦¤Ë <option>-t</option> ¤ò»ÈÍѤ·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cdda2wav -D 0,1,0 -t 7</userinput></screen>
 
       <para>¾åµ­¤ÎÎã¤Ï¥ª¡¼¥Ç¥£¥ª CDROM ¤Î¼·ÈÖÌܤΥȥé¥Ã¥¯¤òÃê½Ð¤·¤Þ¤¹¡£
         ÈϰϤò»ØÄꤷ¤Æ¡¢
-        ¤¿¤È¤¨¤Ð°ìÈÖÌܤ«¤é¼·ÈÖÌܤΥȥé¥Ã¥¯¤Þ¤ÇÃê½Ð¤·¤¿¤¤¾ì¹ç¡¢
+	°ìÈÖÌܤ«¤é¼·ÈÖÌܤΥȥé¥Ã¥¯¤Þ¤ÇÃê½Ð¤·¤¿¤¤¾ì¹ç¡¢
         ¼¡¤Î¤è¤¦¤Ë¤·¤Þ¤¹¡£</para>
 
       <screen>&prompt.root; <userinput>cdda2wav -D 0,1,0 -t 1+7</userinput></screen>
 
-      <para>&man.dd.1; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤â ATAPI
-        ¥É¥é¥¤¥Ö¾å¤Î¥ª¡¼¥Ç¥£¥ª¥È¥é¥Ã¥¯¤òŸ³«¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£
-        ²¿¤¬¤Ç¤­¤ë¤«¾Ü¤·¤¤¤³¤È¤Ï
-        ¥ª¡¼¥Ç¥£¥ª CD ¤ÎÊ£À½¤Ë¤Ä¤¤¤Æ
-        <xref linkend="duplicating-audiocds"/>
-	¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <para>&man.dd.1; ¤â <xref linkend="duplicating-audiocds"/> ¤Ë
+	ÀâÌÀ¤µ¤ì¤Æ¤¤¤ë¤è¤¦¤Ë ATAPI
+        ¥É¥é¥¤¥Ö¾å¤Î¥ª¡¼¥Ç¥£¥ª¥È¥é¥Ã¥¯¤òŸ³«¤¹¤ë¤Î¤Ë»È¤ï¤ì¤Þ¤¹¡£</para>
 
     </sect2>
 
     <sect2 xml:id="mp3-encoding">
       <title>MP3 ¤Î¥¨¥ó¥³¡¼¥É</title>
 
-      <para>¸½ºß¡¢°ìÈ̤˹¥¤Þ¤ì¤Æ¤¤¤ë MP3 ¥¨¥ó¥³¡¼¥À¤Ï
-	<application>lame</application> ¤Ç¤¹¡£
-	<application>lame</application> ¤Ï Ports Collection ¤Î
+      <para><application>lame</application> ¤Ï¡¢
+	¥Ý¥Ô¥å¥é¡¼¤Ê <acronym>MP3</acronym> ¥¨¥ó¥³¡¼¥À¤Ç¤¹¡£
 	<package>audio/lame</package>
-	¤Ë¼ýÏ¿¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+	port ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£
+	¥é¥¤¥»¥ó¥¹¤ÎÀ©¸Â¤Ë¤è¤ê¡¢package ¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£</para>
 
-      <para>¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢Ãê½Ð¤·¤¿ WAV ¥Õ¥¡¥¤¥ë
+      <para>¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤È¡¢Ãê½Ð¤·¤¿ <acronym>WAV</acronym> ¥Õ¥¡¥¤¥ë
 	<filename>audio01.wav</filename> ¤ò»È¤Ã¤Æ
 	<filename>audio01.mp3</filename> ¤ËÊÑ´¹¤·¤Þ¤¹¡£</para>
 
@@ -629,28 +587,30 @@ MPEG 1.0 layer III, 128 kbit/s, 44100 Hz
 --tg "¥¸¥ã¥ó¥ë" \
 audio01.wav audio01.mp3</userinput></screen>
 
-      <para>128 kbits ¤¬É¸½à¤Î¥Ó¥Ã¥È¥ì¡¼¥È¤Î¤è¤¦¤Ç¤¹¡£
-	¿¤¯¤Î¿Í¤Ï¤µ¤é¤Ë¹â²»¼Á¤Î 160 kbits ¤Þ¤¿¤Ï 192 kbits
-        ¤ò¹¥¤à¤Ç¤·¤ç¤¦¡£
+      <para>128 kbits ¤¬ <acronym>MP3</acronym>
+	¤Îɸ½à¤Î¥Ó¥Ã¥È¥ì¡¼¥È¤Ç¤¹¡£
+	160 kbits ¤Þ¤¿¤Ï 192 kbits ¤Î¥Ó¥Ã¥È¥ì¡¼¥È¤Ï¡¢
+	¤µ¤é¤Ë¹â²»¼Á¤òÄ󶡤·¤Þ¤¹¡£
         ¥Ó¥Ã¥È¥ì¡¼¥È¤¬¹â¤¯¤Ê¤ë¤Ë¤Ä¤ì¤ÆºîÀ®¤µ¤ì¤ë
-	MP3 ¥Õ¥¡¥¤¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯Îΰè¤ò¾ÃÈñ¤·¤Þ¤¹¤¬¡¢¤è¤ê¹â²»¼Á¤È¤Ê¤ê¤Þ¤¹¡£
+	<acronym>MP3</acronym> ¥Õ¥¡¥¤¥ë¤Ï¿¤¯¤Î¥Ç¥£¥¹¥¯Îΰè¤ò¾ÃÈñ¤·¤Þ¤¹¡£
 	<option>-h</option> ¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¤È
         <quote>Ä㮹âÉʼÁ</quote> ¥â¡¼¥É¤È¤Ê¤ê¤Þ¤¹¡£
         <option>--t</option> ¤Ç¤Ï¤¸¤Þ¤ë¥ª¥×¥·¥ç¥ó¤Ï ID3 ¥¿¥°¤òÀßÄꤷ¤Þ¤¹¡£
         ¤³¤Î¥¿¥°¤Ë¤Ï¤¿¤¤¤Æ¤¤¶Ê¤Î¾ðÊ󤬴ޤޤì¤Æ¤ª¤ê¡¢
-        MP3 ¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
-	<application>lame</application>
-	¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤¹¤ì¤Ð¾¤Î¥ª¥×¥·¥ç¥ó¤¬¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£</para>
+        <acronym>MP3</acronym> ¥Õ¥¡¥¤¥ë¤Ë³ÊǼ¤µ¤ì¤Þ¤¹¡£
+	<application>Lame</application>	¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È¤¹¤ì¤Ð¡¢
+	¾¤Î¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¥ª¥×¥·¥ç¥ó¤¬¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£</para>
     </sect2>
 
     <sect2 xml:id="mp3-decoding">
       <title>MP3 ¤Î¥Ç¥³¡¼¥É</title>
 
-      <para>MP3 ¤«¤é¥ª¡¼¥Ç¥£¥ª CD ¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢
-        MP3 ·Á¼°¤òÈó°µ½Ì WAV ·Á¼°¤ËÊÑ´¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
+      <para><acronym>MP3</acronym> ¤«¤é¥ª¡¼¥Ç¥£¥ª CD ¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢
+        ¤Þ¤ºÈó°µ½Ì <acronym>WAV</acronym> ·Á¼°¤ËÊÑ´¹¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£
         <application>XMMS</application> ¤È
 	<application>mpg123</application> ¤ÎξÊý¤¬
-        MP3 ¤«¤éÈ󰵽̥ե¡¥¤¥ë·Á¼°¤Ø¤Î½ÐÎϤËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
+	<acronym>MP3</acronym>
+	¤«¤éÈ󰵽̥ե¡¥¤¥ë·Á¼°¤Ø¤Î½ÐÎϤËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
       <para><application>XMMS</application>
         ¤Ç¥Ç¥£¥¹¥¯¤Ø½ñ¤­½Ð¤¹ÊýË¡¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</para>
@@ -667,7 +627,7 @@ audio01.wav audio01.mp3</userinput></scr
 
 	<step>
 	  <para><literal>Options</literal>
-            ¤«¤é <literal>Preference</literal> ¤òÁªÂò¤·¤Þ¤¹¡£</para>
+	    ¤«¤é <literal>Preferences</literal> ¤òÁªÂò¤·¤Þ¤¹¡£</para>
 	</step>
 
 	<step>
@@ -680,26 +640,26 @@ audio01.wav audio01.mp3</userinput></scr
 	</step>
 
 	<step>
-	  <para>È󰵽̥ե¡¥¤¥ë¤ò½ñ¤­½Ð¤¹¥Ç¥£¥ì¥¯¥È¥ê¤òÆþÎÏ
-            (¤Þ¤¿¤ÏÁªÂò) ¤·¤Þ¤¹¡£</para>
+	  <para>È󰵽̥ե¡¥¤¥ë¤ò½ñ¤­½Ð¤¹¥Ç¥£¥ì¥¯¥È¥ê¤òÆþÎÏ¡¢
+	    ¤Þ¤¿¤ÏÁªÂò¤·¤Þ¤¹¡£</para>
 	</step>
 
 	<step>
 	  <para>ÉáÃÊÄ̤ê <application>XMMS</application>
-            ¤Ø MP3 ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
+	    ¤Ø <acronym>MP3</acronym> ¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
             ²»ÎÌ¤Ï 100% ¤Ç ¥¤¥³¥é¥¤¥¶¤ÎÀßÄê¤Ï¥ª¥Õ¤Ë¤·¤Þ¤¹¡£</para>
 	</step>
 
 	<step>
-	  <para><literal>Play</literal> ¤ò²¡¤·¤Þ¤¹—
+	  <para><literal>Play</literal> ¤ò²¡¤·¤Þ¤¹¡£
 	    <application>XMMS</application>
-            ¤Ï MP3 ¤òºÆÀ¸¤·¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ëɽ¼¨¤·¤Þ¤¹¤¬¡¢
+            ¤Ï <acronym>MP3</acronym> ¤òºÆÀ¸¤·¤Æ¤¤¤ë¤«¤Î¤è¤¦¤Ëɽ¼¨¤·¤Þ¤¹¤¬¡¢
             ²»À¼¤Ï¤­¤³¤¨¤Þ¤»¤ó¡£
-            ¼ÂºÝ¤Ë¤Ï MP3 ¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ·¤Æ¤¤¤Þ¤¹¡£</para>
+            ¼ÂºÝ¤Ë¤Ï <acronym>MP3</acronym> ¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ·¤Æ¤¤¤Þ¤¹¡£</para>
 	</step>
 
 	<step>
-	  <para>ºÆ¤Ó MP3 ¤òÄ°¤±¤ë¤è¤¦¤Ë
+	  <para>½ªÎ»¤·¤¿¤é¡¢ºÆ¤Ó <acronym>MP3</acronym> ¤òÄ°¤±¤ë¤è¤¦¤Ë
 	    Output Plugin ¤ò°ÊÁ°¤Î¤è¤¦¤Ë¸µ¤ËÌ᤹¤Î¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£</para>
 	</step>
       </procedure>
@@ -715,23 +675,24 @@ audio01.wav audio01.mp3</userinput></scr
       </procedure>
 
       <para><application>XMMS</application>
-        ¤Ï WAV ·Á¼°¤Ç¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤·¤Þ¤¹¤¬¡¢
+        ¤Ï <acronym>WAV</acronym> ·Á¼°¤Ç¥Õ¥¡¥¤¥ë¤Ë½ñ¤­½Ð¤·¤Þ¤¹¤¬¡¢
         <application>mpg123</application> ¤Ï
-	MP3 ¤ò PCM ¥ª¡¼¥Ç¥£¥ª¥Ç¡¼¥¿¤ËÊÑ´¹¤·¤Þ¤¹¡£
+	<acronym>MP3</acronym> ¤ò raw PCM ¥ª¡¼¥Ç¥£¥ª¥Ç¡¼¥¿¤ËÊÑ´¹¤·¤Þ¤¹¡£
         ξ·Á¼°¤Ï <application>cdrecord</application>
         ¤ò»È¤Ã¤Æ¥ª¡¼¥Ç¥£¥ª CD ¤òºîÀ®¤¹¤ë¤Î¤ËÍøÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-	&man.burncd.8; ¤ò»È¤¦¾ì¹ç¤Ï raw PCM ¥Ç¡¼¥¿¤¬É¬ÍפǤ¹¡£
-	WAV ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢
+	&man.burncd.8; ¤ò»È¤¦¾ì¹ç¤Ï raw Pulse-Code Modulation
+	(<acronym>PCM</acronym>) ¤¬É¬ÍפǤ¹¡£
+	<acronym>WAV</acronym> ¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢
         ¤½¤ì¤¾¤ì¤Î¥È¥é¥Ã¥¯¤ÎÀèƬ¤Ë¾®¤µ¤Ê¥Î¥¤¥º¤¬Æþ¤ë¤Î¤Ëµ¤¤Å¤¯¤Ç¤·¤ç¤¦¡£
-        ¤³¤ì¤Ï WAV ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¾ðÊó¤Ç¤¹¡£
+	¤³¤ì¤Ï <acronym>WAV</acronym> ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¾ðÊó¤Ç¤¹¡£
+	<package>audio/sox</package> ¤Î port ¤Þ¤¿¤Ï package
+	¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤ë
 	<application>SoX</application>
-	(<package>audio/sox</package> ¤Î port ¤Þ¤¿¤Ï package
-        ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹)
-        ¤ò»È¤¦¤È´Êñ¤Ë WAV ¥Õ¥¡¥¤¥ë¤Î¥Ø¥Ã¥À¾ðÊó¤òºï½ü¤Ç¤­¤Þ¤¹¡£</para>
+        ¤ò»È¤¦¤È´Êñ¤Ë¥Ø¥Ã¥À¾ðÊó¤òºï½ü¤Ç¤­¤Þ¤¹¡£</para>
 
       <screen>&prompt.user; <userinput>sox -t wav -r 44100 -s -w -c 2 track.wav track.raw</userinput></screen>
 
-      <para>FreeBSD ¤Ç¤Î CD ºîÀ®¤Î¾Ü¤·¤¤¾ðÊó¤Ï
+      <para>&os; ¤Ç¤Î CD ºîÀ®¤Î¾Ü¤·¤¤¾ðÊó¤Ï
         <xref linkend="creating-cds"/> ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
     </sect2>
   </sect1>
@@ -741,47 +702,43 @@ audio01.wav audio01.mp3</userinput></scr
       <authorgroup>
 	<author><personname><firstname>Ross</firstname><surname>Lippert</surname></personname><contrib>´ó¹Æ: </contrib></author>
       </authorgroup>
-      
     </info>
 
-    
-
-    <para>¥Ó¥Ç¥ªºÆÀ¸¤Ïº£¤Þ¤µ¤ËÀ®Ä¹Ãæ¤Î¿·¤·¤¤¥¢¥×¥ê¥±¡¼¥·¥ç¥óʬÌî¤Ç¤¹¡£
-      ¿ÉÊú¶¯¤¯¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ²»À¼¤Î¤è¤¦¤Ë¤¹¤Ù¤Æ¤¬½çÄ´¤Ë¤¤¤¯¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£</para>
-
-    <para>ÀßÄê¤ò¤Ï¤¸¤á¤ëÁ°¤Ë¡¢¤¢¤Ê¤¿¤¬»ý¤Ã¤Æ¤¤¤ë¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥â¥Ç¥ë¡¢
+    <para>¥Ó¥Ç¥ªºÆÀ¸¤Î¤¿¤á¤ÎÀßÄê¤ò¤Ï¤¸¤á¤ëÁ°¤Ë¡¢¥Ó¥Ç¥ª¥«¡¼¥É¤Î¥â¥Ç¥ë¡¢
       ¤½¤Î¥«¡¼¥É¤¬»ÈÍѤ·¤Æ¤¤¤ë¥Á¥Ã¥×¤ò³Îǧ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
       <application>&xorg;</application>
       ¤Ï¤µ¤Þ¤¶¤Þ¤Ê¥Ó¥Ç¥ª¥«¡¼¥É¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¤¬¡¢
       ¥Ó¥Ç¥ªºÆÀ¸¤Ë¿½¤·Ê¬¤Î¤Ê¤¤À­Ç½¤òȯ´ø¤Ç¤­¤ë¥«¡¼¥É¤Ï¤ï¤º¤«¤Ç¤¹¡£
-      ¤¢¤Ê¤¿¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤ÎÍøÍѤ·¤Æ¤¤¤ë X
+      ÍøÍѤ·¤Æ¤¤¤ë¥Ó¥Ç¥ª¥«¡¼¥É¤Î <application>&xorg;</application>
       ¥µ¡¼¥Ð¤¬Âбþ¤·¤Æ¤¤¤ë³ÈÄ¥µ¡Ç½¤Î¥ê¥¹¥È¤òÆÀ¤ë¤Ë¤Ï¡¢
-      X11 ¤ò¼Â¹ÔÃæ¤Ë &man.xdpyinfo.1; ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
+      <application>&xorg;</application> ¤ò¼Â¹ÔÃæ¤Ë
+      &man.xdpyinfo.1; ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
     <para>¤µ¤Þ¤¶¤Þ¤Ê¥×¥ì¥¤¥ä¤ä¥ª¥×¥·¥ç¥ó¤ò»î¤¹¤Î¤Ë¡¢
       ¥Æ¥¹¥È¥Õ¥¡¥¤¥ë¤È¤·¤Æ¾®¤µ¤Ê MPEG ¥Õ¥¡¥¤¥ë¤òÍÑ°Õ¤·¤Æ¤ª¤¯¤Î¤Ï¤è¤¤¹Í¤¨¤Ç¤¹¡£
-      ¤¤¤¯¤Ä¤«¤Î DVD ¥×¥ì¥¤¥ä¤Ï DVD ¥á¥Ç¥£¥¢¤ò
-      <filename>/dev/dvd</filename> ¤È¤·¤Æ
-      ½é´üÀßÄꤷ¤Æ¤¤¤ë¤«¡¢¥Ï¡¼¥É¥³¡¼¥Ç¥£¥ó¥°¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢
+      ¤¤¤¯¤Ä¤«¤Î DVD ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï DVD ¥á¥Ç¥£¥¢¤ò
+      <filename class="directory">/dev/dvd</filename>
+      ¤È¤·¤Æ½é´üÀßÄꤷ¤Æ¤¤¤ë¤«¡¢¥Ï¡¼¥É¥³¡¼¥Ç¥£¥ó¥°¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
       ¼¡¤Î¤è¤¦¤ËŬÀڤʥǥХ¤¥¹¤Ë¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òÄ¥¤Ã¤Æ¤ª¤¯¤ÈÊØÍø¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
 
     <screen>&prompt.root; <userinput>ln -sf /dev/acd0 /dev/dvd</userinput>
 &prompt.root; <userinput>ln -sf /dev/acd0 /dev/rdvd</userinput></screen>
 
     <para>&man.devfs.5; ¤Î»ÅÍͤˤè¤ê¡¢
-      ¤³¤Î¤è¤¦¤Ë¼êÆ°¤ÇºîÀ®¤µ¤ì¤¿¥ê¥ó¥¯¤ÏºÆµ¯Æ°¤¹¤ë¤È¾Ã¤¨¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
+      ¤³¤Î¤è¤¦¤Ë¼êÆ°¤ÇºîÀ®¤µ¤ì¤¿¥ê¥ó¥¯¤Ï¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤¹¤ë¤È¾Ã¤¨¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
       ¥·¥¹¥Æ¥à¤Îµ¯Æ°»þ¤Ë¤³¤ì¤é¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¼«Æ°Åª¤ËºîÀ®¤¹¤ë¤Ë¤Ï¡¢
-      <filename>/etc/devfs.conf</filename> ¤Ë²¼µ­¤ÎÀßÄê¤òÄɲä·¤Þ¤¹¡£</para>
+      <filename>/etc/devfs.conf</filename>
+      ¤Ë²¼µ­¤ÎÀßÄê¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£</para>
 
     <programlisting>link acd0 dvd
 link acd0 rdvd</programlisting>
 
-    <para>²Ã¤¨¤Æ¡¢ÆÃÊÌ¤Ê DVD-ROM µ¡Ç½¤òɬÍפȤ¹¤ë DVD ²òÆɤϡ¢
+    <para>ÆÃÊÌ¤Ê DVD-ROM µ¡Ç½¤òɬÍפȤ¹¤ë DVD ¤Î¥ê¥Ã¥Ô¥ó¥°¤Ç¤Ï¡¢
       DVD ¥Ç¥Ð¥¤¥¹¤Ø¤Î½ñ¤­¹þ¤ß¸¢¸Â¤¬É¬ÍפǤ¹¡£</para>
 
-    <para>¶¦Í­¥á¥â¥ê X11 ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò²þÁ±¤¹¤ë¤¿¤á¤Ë¡¢
-      ¤¤¤¯¤Ä¤«¤Î &man.sysctl.8; ÊÑ¿ô¤ÎÃͤòÁý¤ä¤¹¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+    <para><application>&xorg;</application>
+      ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î»È¤¦¶¦Í­¥á¥â¥ê¤ò³ÈÄ¥¤¹¤ë¤¿¤á¤Ë¡¢
+      °Ê²¼¤Î &man.sysctl.8; ÊÑ¿ô¤ÎÃͤòÁý¤ä¤¹¤³¤È¤¬¿ä¾©¤µ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <programlisting>kern.ipc.shmmax=67108864
 kern.ipc.shmall=32768</programlisting>
@@ -793,31 +750,33 @@ kern.ipc.shmall=32768</programlisting>
       <indexterm><primary>SDL</primary></indexterm>
       <indexterm><primary>DGA</primary></indexterm>
 
-      <para>X11 ¤Ë¤ª¤¤¤Æ¥Ó¥Ç¥ªÉ½¼¨À­Ç½¤ò²þÁ±¤¹¤ëÊýË¡¤Ï¤¤¤¯¤Ä¤«¤¢¤ë¤È»×¤ï¤ì¤Þ¤¹¡£
-	¤Á¤ã¤ó¤ÈÆ°ºî¤¹¤ë¤«¤É¤¦¤«¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤ËÂ礭¤¯°Í¸¤·¤Æ¤¤¤Þ¤¹¡£
+      <para><application>&xorg;</application>
+	¤Ë¤ª¤¤¤Æ¥Ó¥Ç¥ªÉ½¼¨À­Ç½¤ò²þÁ±¤¹¤ëÊýË¡¤Ï¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£
+	Àµ¤·¤¯Æ°ºî¤¹¤ë¤«¤É¤¦¤«¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤ËÂ礭¤¯°Í¸¤·¤Æ¤¤¤Þ¤¹¡£
 	²¼µ­¤ËÀâÌÀ¤·¤¿¤É¤ÎÊýË¡¤Ç¤â¡¢
-	¥Ï¡¼¥É¥¦¥§¥¢¤¬ÊѤï¤ë¤ÈÉʼÁ¤¬ÊѤï¤ë¤Ç¤·¤ç¤¦¡£
-	Æó¤ÄÌܤˡ¢X11
-	¤Ç¤Î¥Ó¥Ç¥ª¥ì¥ó¥À¥ê¥ó¥°¤ÏºÇ¶á¿¤¯¤ÎÃíÌܤò½¸¤á¤ë¥È¥Ô¥Ã¥¯¤Ç¤¹¡£
-	¤½¤·¤Æ <application>&xorg;</application>
-	¤Î¥Ð¡¼¥¸¥ç¥ó¤òÄɤ¦¤´¤È¤Ë¡¢Ãø¤·¤¯²þÎɤµ¤ì¤Æ¤¤¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
+	¥Ï¡¼¥É¥¦¥§¥¢¤¬ÊѤï¤ë¤ÈÉʼÁ¤¬ÊѤï¤ë¤Ç¤·¤ç¤¦¡£</para>
 
       <para>¤è¤¯ÃΤé¤ì¤¿¥Ó¥Ç¥ª¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¼¡¤ÎÄ̤ê¤Ç¤¹¡£</para>
 
       <orderedlist>
 	<listitem>
-	  <para>X11: ¶¦Í­¥á¥â¥ê¤òÍѤ¤¤¿Ä̾ï¤Î X11 ½ÐÎÏ</para>
+	  <para><application>&xorg;</application>:
+	    ¶¦Í­¥á¥â¥ê¤òÍѤ¤¤¿Ä̾ï¤Î½ÐÎÏ</para>
 	</listitem>
+
 	<listitem>
-	  <para>XVideo: X11 drawable Æâ¤Ç¤Î¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤·¤¿
-	    X11 ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î³ÈÄ¥µ¡Ç½</para>
+	  <para>XVideo: drawable ¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤Î¥Ó¥Ç¥ªºÆÀ¸¤ËÂбþ¤·¤¿
+	    <application>&xorg;</application> ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Î³ÈÄ¥µ¡Ç½</para>
 	</listitem>
+
 	<listitem>
-	  <para>SDL: Simple Directmedia Layer</para>
+	  <para><acronym>SDL</acronym>: Simple Directmedia Layer</para>
 	</listitem>
+
 	<listitem>
-	  <para>DGA: Direct Graphics Access</para>
+	  <para><acronym>DGA</acronym>: Direct Graphics Access</para>
 	</listitem>
+
 	<listitem>
 	  <para>SVGAlib: Äã¥ì¥Ù¥ë¥³¥ó¥½¡¼¥ë¥°¥é¥Õ¥£¥Ã¥¯¥ì¥¤¥ä</para>
 	</listitem>
@@ -827,19 +786,19 @@ kern.ipc.shmall=32768</programlisting>
 	<title>XVideo</title>
 
 	<para><application>&xorg;</application> ¤Ë¤Ï
-	  <emphasis>XVideo</emphasis> (¤Þ¤¿¤Ï Xvideo, Xv, xv)
-	  ¤È¸Æ¤Ð¤ì¤ë³ÈÄ¥µ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£
-	  ¤³¤ì¤ÏÆÃÊ̤ʥ¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤Ë¤è¤Ã¤Æ drawable ¥ª¥Ö¥¸¥§¥¯¥È
-	  ¤ËľÀܥӥǥª¤òɽ¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+	  <emphasis>XVideo</emphasis>¡¢¤Þ¤¿¤Ï Xvideo, Xv, xv
+	  ¤È¤â¸Æ¤Ð¤ì¤ë³ÈÄ¥µ¡Ç½¤¬¤¢¤ê¤Þ¤¹¡£
+	  ¤³¤ì¤ÏÆÃÊ̤ʥ¢¥¯¥»¥é¥ì¡¼¥·¥ç¥ó¤Ë¤è¤Ã¤Æ drawable
+	  ¥ª¥Ö¥¸¥§¥¯¥È¤ËľÀܥӥǥª¤òɽ¼¨¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
 	  ¤³¤Î³ÈÄ¥µ¡Ç½¤Ë¤è¤Ã¤Æ¡¢
-	  Ä㮤ʥޥ·¥ó¤Ç¤â¡¢¤È¤Æ¤â¤¹¤°¤ì¤¿ÉʼÁ¤ÎºÆÀ¸¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£</para>
+	  Ä㮤ʥޥ·¥ó¤Ç¤â¡¢¤¹¤°¤ì¤¿ÉʼÁ¤ÎºÆÀ¸¤¬²Äǽ¤È¤Ê¤ê¤Þ¤¹¡£</para>
 
 	<para>¤³¤Î³ÈÄ¥µ¡Ç½¤¬Æ°ºî¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤òÄ´¤Ù¤ë¤Ë¤Ï¡¢
 	  <command>xvinfo</command> ¤ò»È¤¤¤Þ¤¹¡£</para>
 
         <screen>&prompt.user; <userinput>xvinfo</userinput></screen>
 
-	<para>°Ê²¼¤Î¤è¤¦¤Ê·ë²Ì¤¬ÆÀ¤é¤ì¤¿¤Ê¤é¤Ð¡¢¤¢¤Ê¤¿¤Î¥«¡¼¥É¤Ï
+	<para>°Ê²¼¤Î¤è¤¦¤Ê·ë²Ì¤¬ÆÀ¤é¤ì¤¿¤Ê¤é¤Ð¡¢¥«¡¼¥É¤Ï
 	  XVideo ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
 	<screen>X-Video Extension version 2.2
@@ -911,7 +870,7 @@ screen #0
         depth: 1
         red, green, blue masks: 0x0, 0x0, 0x0</screen>
 
-	<para>¥ê¥¹¥È¤Ë¤¢¤ë·Á¼° (YUV2, YUV12 ¤Ê¤É) ¤¬ XVideo
+	<para>¥ê¥¹¥È¤Ë¤¢¤ë·Á¼°¡¢YUV2, YUV12 ¤Ê¤É¤¬ XVideo
 	  ¤Î¤¹¤Ù¤Æ¤Î¼ÂÁõ¤Ç¸ºß¤¹¤ë¤È¤Ï¸Â¤ê¤Þ¤»¤ó¡£
 	  Âбþ¤·¤Æ¤¤¤ë·Á¼°¤¬¾¯¤Ê¤¤¤¿¤á¤Ë¡¢¤¢¤ë¥×¥ì¥¤¥ä¤Ç¤Ï°­±Æ¶Á¤¬½Ð¤ë
 	  ¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤Ë¤âÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
@@ -921,17 +880,11 @@ screen #0
 screen #0
 no adaptors present</screen>
 
-	<para>¤¢¤Ê¤¿¤Î¥«¡¼¥É¤Ï¤ª¤½¤é¤¯
-	  XVideo ¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£</para>
-
-	<para>¤¢¤Ê¤¿¤Î¥«¡¼¥É¤¬ XVideo ¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¤È¤·¤Æ¤â¡¢
-	  ¤³¤Î¤³¤È¤Ï¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥×¥ì¥¤¤Ç¥Ó¥Ç¥ª¤òɽ¼¨¤¹¤ë¤Î¤Ë¡¢
-	  ·×»»¾å¤ÎÍ×µá¤òËþ¤¿¤¹¤³¤È¤¬¤è¤êº¤Æñ¤Ë¤Ê¤ë¤À¤±¤Î¤³¤È¤Ç¤¹¡£
-	  ¤·¤«¤·¤Ê¤¬¤é¡¢¤¢¤Ê¤¿¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤ª¤è¤Ó¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ¤Ï¡¢
-	  ¤½¤ì¤Ç¤âËþ­¤Î¤¤¤¯À­Ç½¤¬ÆÀ¤é¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-	  À­Ç½¤ò¸þ¾å¤µ¤»¤ë¤Ë¤Ï
-	  <xref linkend="video-further-reading"/>
-	  ¤ò¤è¤¯Æɤà¤È¤è¤¤¤Ç¤·¤ç¤¦¡£</para>
+	<para>¥«¡¼¥É¤Ï¤ª¤½¤é¤¯ XVideo ¤ËÂбþ¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¤·¤ç¤¦¡£
+	  ¤³¤Î¤³¤È¤Ï¥Ç¥£¥¹¥×¥ì¥¤¤Ç¥Ó¥Ç¥ª¤òɽ¼¨¤¹¤ë¤Î¤Ë¡¢
+	  ·×»»¾å¤ÎÍ×µá¤òËþ¤¿¤¹¤³¤È¤¬¤è¤êº¤Æñ¤Ë¤Ê¤ë¤³¤È¤ò°ÕÌ£¤·¤Þ¤¹¡£
+	  ¥Ó¥Ç¥ª¥«¡¼¥É¤ª¤è¤Ó¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ¤Ï¡¢
+	  ¤½¤ì¤Ç¤âËþ­¤Î¤¤¤¯À­Ç½¤¬ÆÀ¤é¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
 
       </sect3>
 
@@ -944,25 +897,27 @@ no adaptors present</screen>
 	  ¥¯¥í¥¹¥×¥é¥Ã¥È¥Û¡¼¥à¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò
 	  ³«È¯¤¹¤ë¤³¤È¤òÌÜŪ¤È¤·¤¿¥ì¥¤¥ä¤Ç¤¹¡£
 	  SDL ¥ì¥¤¥ä¤Ï¥Ï¡¼¥É¥¦¥§¥¢¤ËÂФ¹¤ëÄã¥ì¥Ù¥ë¤ÎÃê¾ÝŪ³µÇ°¤òÄ󶡤·¡¢
-	  »þ¤Ë¤Ï X11 ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ÈÍѤ¹¤ë¤è¤ê¤â¸ú²ÌŪ¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
+	  »þ¤Ë¤Ï <application>&xorg;</application>
+	  ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ÈÍѤ¹¤ë¤è¤ê¤â¸ú²ÌŪ¤Ê¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-	<para>SDL ¤Ï <package>devel/sdl12</package>
-	  ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
+	<para><application>SDL</application> ¤Ï
+	  <package>devel/sdl12</package> package ¤Þ¤¿¤Ï
+	  port ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤¹¡£</para>
 
       </sect3>
 
       <sect3 xml:id="video-interface-DGA">
 	<title>Direct Graphics Access</title>
 
-	<para>Direct Graphics Access ¤Ï¡¢
-	  ¥×¥í¥°¥é¥à¤¬ X ¥µ¡¼¥Ð¤ò²ð¤»¤º
-	  ľÀܥե졼¥à¥Ð¥Ã¥Õ¥¡¤òÊѹ¹¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë X11 ¤Î³ÈÄ¥µ¡Ç½¤Ç¤¹¡£
-	  ¶¦Í­¥á¥â¥ê¤ò»ÈÍѤ¹¤ë¤¿¤á¤Ë
+	<para><acronym>DGA</acronym> ¤Ï¡¢
+	  ¥×¥í¥°¥é¥à¤¬ <application>&xorg;</application> ¥µ¡¼¥Ð¤ò²ð¤»¤º
+	  ľÀܥե졼¥à¥Ð¥Ã¥Õ¥¡¤òÊѹ¹¤¹¤ë¤³¤È¤ò²Äǽ¤Ë¤¹¤ë
+	  <application>&xorg;</application> ¤Î³ÈÄ¥µ¡Ç½¤Ç¤¹¡£
 	  Äã¥ì¥Ù¥ë¤Î¥á¥â¥ê¥Þ¥Ã¥Ô¥ó¥°¤¬¼Â¹Ô¤Ç¤­¤ë¤³¤È¤ò´üÂÔ¤·¤Æ¤¤¤ë¤Î¤Ç¡¢
 	  ¤³¤Îµ¡Ç½¤ò»È¤¦¥×¥í¥°¥é¥à¤Ï <systemitem class="username">root</systemitem>
 	  ¸¢¸Â¤Ç¼Â¹Ô¤µ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£</para>
 
-	<para>DGA µ¡Ç½³ÈÄ¥¤Ï &man.dga.1;
+	<para><acronym>DGA</acronym> µ¡Ç½³ÈÄ¥¤Ï &man.dga.1;
 	  ¤Ë¤è¤Ã¤Æ¥Æ¥¹¥È¤È¥Ù¥ó¥Á¥Þ¡¼¥¯¤¬¤Ç¤­¤Þ¤¹¡£
 	  <command>dga</command>
 	  ¼Â¹ÔÃæ¤Ï¥­¡¼¥Ü¡¼¥É¤ò²¡¤»¤Ð¤¤¤Ä¤Ç¤â¥Ç¥£¥¹¥×¥ì¥¤¿§¤¬Êѹ¹¤µ¤ì¤Þ¤¹¡£
@@ -979,15 +934,12 @@ no adaptors present</screen>
       <indexterm><primary>¥Ó¥Ç¥ª packages</primary></indexterm>
 
       <para>¤³¤ÎÀá¤Ç¤Ï Ports Collection ¤ÇÍøÍѲÄǽ¤Ê¡¢
-	¥Ó¥Ç¥ª¤ÎºÆÀ¸¤Ë»ÈÍѤǤ­¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ä¤¤¤ÆÏÀ¤¸¤Þ¤¹¡£
-	¥Ó¥Ç¥ªºÆÀ¸¤ÏÂçÊѳèȯ¤Ê¥½¥Õ¥È³«È¯Ê¬Ìî¤Ç¡¢
-	¤µ¤Þ¤¶¤Þ¤Ê¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îµ¡Ç½¤Ï¡¢
-	¤³¤³¤Ç¤ÎÀâÌÀ¤«¤é¾Ê¤«¤¶¤ë¤ò¤¨¤Þ¤»¤ó¡£</para>
+	¥Ó¥Ç¥ª¤ÎºÆÀ¸¤Ë»ÈÍѤǤ­¤ë¥½¥Õ¥È¥¦¥§¥¢¤Ë¤Ä¤¤¤Æ¾Ò²ð¤·¤Þ¤¹¡£</para>
 
-      <para>¤Ï¤¸¤á¤Ë¡¢FreeBSD ¤Ç¼Â¹Ô¤Ç¤­¤ë¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤Ï¡¢
-	Linux ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ³«È¯¤µ¤ì¤¿¤È¤¤¤¦¤³¤È¤òÃΤ뤳¤È¤Ï½ÅÍפǤ¹¡£
+      <para>&os; ¤Ç¼Â¹Ô¤Ç¤­¤ë¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤Ï¡¢
+	&linux; ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤È¤·¤Æ³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
 	¤³¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤Ï¤Þ¤À¥Ù¡¼¥¿ÈǤÎÉʼÁ¤Ç¤¹¡£
-	FreeBSD ¤Ç¤³¤ì¤é¤Î¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò»ÈÍѤ¹¤ëºÝ¤Ë¡¢
+	&os; ¤Ç¤³¤ì¤é¤Î¥Ó¥Ç¥ª¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò»ÈÍѤ¹¤ëºÝ¤Ë¡¢
 	°Ê²¼¤Î¤è¤¦¤ÊÌäÂ꤬µ¯¤³¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£</para>
 
       <orderedlist>
@@ -1025,11 +977,11 @@ no adaptors present</screen>
 
       </orderedlist>
 
-      <para>¤³¤ì¤é¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤Ï¤µ¤é¤Ë
-	<quote>Linux ¼çµÁ</quote> ¤ò¼çÄ¥¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
-	¤¹¤Ê¤ï¤Á¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îºî¼Ô¤¬²¾Äꤷ¤¿¡¢
-	Linux ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç¤Î¤ß¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë
-	¤¢¤ëɸ½à¥é¥¤¥Ö¥é¥ê¤Î»ÈÍÑÊýË¡¤ä
+      <para>¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¿¤¯¤Ï¤µ¤é¤Ë
+	<quote>&linux; ¼çµÁ</quote> ¤ò¼çÄ¥¤¹¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
+	¤¹¤Ê¤ï¤Á¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Îºî¼Ô¤¬²¾Äꤷ¤¿
+	&linux; ¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ç¤Î¤ß¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¡¢
+	¤¢¤ëɸ½à¥é¥¤¥Ö¥é¥ê¤Î»ÈÍÑÊýË¡¤ä¡¢
 	Linux ¥«¡¼¥Í¥ë¤ÎÆÃÄê¤Îµ¡Ç½¤Ëµ¯°ø¤¹¤ëÌäÂ꤬À¸¤¸¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡£
 	ɬ¤º¤·¤â port ÊݼéôÅö¼Ô¤¬¤³¤ì¤é¤ÎÌäÂê¤òÇÄ°®¤·¤Æºî¶È¤·¤Æ¤¤¤ë¤È¤Ï¸Â¤é¤º¡¢
 	¼¡¤Î¤è¤¦¤ÊÌäÂ꤬ȯÀ¸¤¹¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
@@ -1048,29 +1000,19 @@ no adaptors present</screen>
 	</listitem>
 
 	<listitem>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-doc-all mailing list