* Re-arrange/modify a few sentences for consistency

* Join multiple programlisting entries into one

1 files changed, 34 insertions, 43 deletions

diff --git a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
index 0f46d6bc9d..0a47a77442 100644
--- a/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml,v 1.16 2001/08/22 05:37:50 murray Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml,v 1.17 2001/09/12 20:26:59 chern Exp $
 -->
 
 <chapter id="sound">
@@ -125,30 +125,28 @@
       <title>Creative, Advance, and ESS Sound Cards</title>
 
       <para>If you have one of the above cards, you will need to
-	add</para>
+	add:</para>
 	
       <programlisting>device pcm</programlisting>
 
-      <para>to your kernel.  If you have a PnP ISA card, you will also
-	need to add</para>
+      <para>to your kernel configuration file.  If you have a PnP ISA
+	card, you will also need to add:</para>
 
       <programlisting>device sbc</programlisting>
 
-      <para>to your kernel.  For a non-PnP ISA card, add</para>
+      <para>For a non-PnP ISA card, add:</para>
 
-      <programlisting>device pcm</programlisting>
-      
-      <para>and</para>
-
-      <programlisting>device sbc0 at isa? port0x220 irq 5 drq 1 flags 0x15</programlisting>
+      <programlisting>device pcm
+device sbc0 at isa? port0x220 irq 5 drq 1 flags 0x15</programlisting>
 
-      <para>to your kernel.  Those are the default settings.  You may
-	need to change the IRQ, etc.  See the &man.sbc.4; manual page for
-	more information.</para>
+      <para>to your kernel configuration file.  The settings shown
+	above are the defaults.  You may need to change the IRQ or the
+	other settings to match your card.  See the &man.sbc.4; manual
+	page for more information.</para>
 
       <note>
 	<para>The Sound Blaster Live is not supported under FreeBSD 4.0
-	  without a patch, which this document will not cover.  It is
+	  without a patch, which this section will not cover.  It is
 	  recommended that you update to the latest -STABLE before
 	  trying to use this card.</para>
       </note>
@@ -157,56 +155,49 @@
     <sect2>
       <title>Gravis UltraSound Cards</title>
 
-      <para>For a PnP ISA card, you will need to add</para>
-
-      <programlisting>device pcm</programlisting>
-
-      <para>and</para>
-
-      <programlisting>device gusc</programlisting>
+      <para>For a PnP ISA card, you will need to add:</para>
 
-      <para>to your kernel.  If you have a non-PnP ISA card, you will
-	need to add</para>
+      <programlisting>device pcm
+device gusc</programlisting>
 
-      <programlisting>device pcm</programlisting>
-
-      <para>and</para>
+      <para>to your kernel configuration file.  If you have a non-PnP ISA card, you will
+	need to add:</para>
 
-      <programlisting>device gus0 at isa? port 0x220 irq 5 drq 1 flags 0x13</programlisting>
+      <programlisting>device pcm
+device gus0 at isa? port 0x220 irq 5 drq 1 flags 0x13</programlisting>
 
-      <para>to your kernel.  You may need to change the IRQ, etc.  See
-	the &man.gusc.4; manual page for more information.</para>
+      <para>to your kernel configuration file.  You may need to change
+	the IRQ or the other settings to match your card. See the
+	&man.gusc.4; manual page for more information.</para>
     </sect2>
 
     <sect2>
       <title>Crystal Sound Cards</title>
 
-      <para>For Crystal cards, you will need both</para>
-
-      <programlisting>device pcm</programlisting>
-
-      <para>and</para>
+      <para>For Crystal cards, you will need to add:</para>
 
-      <programlisting>device csa</programlisting>
+      <programlisting>device pcm
+device csa</programlisting>
 
-      <para>in your kernel.</para>
+      <para>to your kernel configuration file.</para>
     </sect2>
 
     <sect2>
       <title>Generic Support</title>
 
-      <para>For PnP ISA or PCI cards, you will need to add</para>
+      <para>For PnP ISA or PCI cards, you will need to add:</para>
 
       <programlisting>device pcm</programlisting>
 
-      <para>to your kernel configuration.  If you have a non-PnP ISA
+      <para>to your kernel configuration file.  If you have a non-PnP ISA
 	sound card that does not have a bridge driver, you will need
-	to add</para>
+	to add:</para>
 
       <programlisting>device pcm0 at isa? irq 10 drq 1 flags 0x0</programlisting>
 
-      <para>to your kernel configuration.  You may need to change the
-	IRQ, etc., to match your hardware configuration.</para>
+      <para>to your kernel configuration file.  You may need to change
+	the IRQ or the other settings to match your card.</para>
+
     </sect2>
   </sect1>
 
@@ -214,7 +205,7 @@
     <title>Recompiling the Kernel</title>
 
     <para>After adding the driver(s) you need to your kernel
-      configuration, you will need to recompile your kernel.  Please see
+      configuration file, you will need to recompile your kernel.  Please see
       <xref linkend="kernelconfig-building"> of the handbook for
       more information.</para>
   </sect1>
@@ -309,7 +300,7 @@ pcm0: &lt;Aureal Vortex 8830&gt; at memory 0xfeb40000 irq 5 (4p/1r +channels dup
     </informaltable>
 
     <para>If all goes well, you should now have a functioning sound
-      card.  If you do not, see the next section.</para>
+      card.  If you do not, read the next section.</para>
   </sect1>
 
   <sect1>