From 5e14d4b7170eb5d3629dd4402d02b8f8631c6f8c Mon Sep 17 00:00:00 2001
From: Doug White <dwhite@FreeBSD.org>
Date: Fri, 28 May 1999 00:31:25 +0000
Subject: [PATCH] Obliterate references to the nonfunctional SBC_* kernel
 options.  Also repoint sound documentation reference to the directory and not
 the pre-pcm era file.  Readme.cards is particuarly useful for the pcm driver.

Suggested by: "Cambria, Mike" <mcambria@lucent.com>
---
 en/handbook/kernelconfig/chapter.sgml                  | 10 ++++------
 .../books/handbook/kernelconfig/chapter.sgml           | 10 ++++------
 .../books/handbook/kernelconfig/chapter.sgml           | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/en/handbook/kernelconfig/chapter.sgml b/en/handbook/kernelconfig/chapter.sgml
index fc7f47510e..b7dc62b9ac 100644
--- a/en/handbook/kernelconfig/chapter.sgml
+++ b/en/handbook/kernelconfig/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.15 1999-05-16 13:29:08 nik Exp $
+     $Id: chapter.sgml,v 1.16 1999-05-28 00:31:25 dwhite Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -1438,8 +1438,7 @@
 	      <para>If your SoundBlaster is on a different IRQ (such as 5),
 		change <literal>irq 7</literal> to, for example, <literal>irq
 		  5</literal> and remove the <literal>conflicts</literal>
-		keyword. Also, you must add the line: <literal>options
-		  "SBC_IRQ=5"</literal></para>
+		keyword. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1453,8 +1452,7 @@
 	    <note>
 	      <para>If your SB16 is on a different 16-bit DMA channel (such as
 		6 or 7), change the <literal>drq 5</literal> keyword
-		appropriately, and then add the line: <literal>options
-		  "SB16_DMA=6"</literal></para>
+		appropriately.</para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1543,7 +1541,7 @@
       
       <note>
 	<para>There is some additional documentation in
-	  <filename>/usr/src/sys/i386/isa/sound/sound.doc</filename>. Also, if
+	  <filename>/usr/src/sys/i386/isa/sound/</filename>. Also, if
 	  you add any of these devices, be sure to create the sound <link
 	    linkend="kernelconfig-nodes">device nodes</link>.</para>
       </note>
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
index fc7f47510e..b7dc62b9ac 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.15 1999-05-16 13:29:08 nik Exp $
+     $Id: chapter.sgml,v 1.16 1999-05-28 00:31:25 dwhite Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -1438,8 +1438,7 @@
 	      <para>If your SoundBlaster is on a different IRQ (such as 5),
 		change <literal>irq 7</literal> to, for example, <literal>irq
 		  5</literal> and remove the <literal>conflicts</literal>
-		keyword. Also, you must add the line: <literal>options
-		  "SBC_IRQ=5"</literal></para>
+		keyword. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1453,8 +1452,7 @@
 	    <note>
 	      <para>If your SB16 is on a different 16-bit DMA channel (such as
 		6 or 7), change the <literal>drq 5</literal> keyword
-		appropriately, and then add the line: <literal>options
-		  "SB16_DMA=6"</literal></para>
+		appropriately.</para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1543,7 +1541,7 @@
       
       <note>
 	<para>There is some additional documentation in
-	  <filename>/usr/src/sys/i386/isa/sound/sound.doc</filename>. Also, if
+	  <filename>/usr/src/sys/i386/isa/sound/</filename>. Also, if
 	  you add any of these devices, be sure to create the sound <link
 	    linkend="kernelconfig-nodes">device nodes</link>.</para>
       </note>
diff --git a/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml b/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
index fc7f47510e..b7dc62b9ac 100644
--- a/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
+++ b/en_US.ISO_8859-1/books/handbook/kernelconfig/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $Id: chapter.sgml,v 1.15 1999-05-16 13:29:08 nik Exp $
+     $Id: chapter.sgml,v 1.16 1999-05-28 00:31:25 dwhite Exp $
 -->
 
 <chapter id="kernelconfig">
@@ -1438,8 +1438,7 @@
 	      <para>If your SoundBlaster is on a different IRQ (such as 5),
 		change <literal>irq 7</literal> to, for example, <literal>irq
 		  5</literal> and remove the <literal>conflicts</literal>
-		keyword. Also, you must add the line: <literal>options
-		  "SBC_IRQ=5"</literal></para>
+		keyword. </para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1453,8 +1452,7 @@
 	    <note>
 	      <para>If your SB16 is on a different 16-bit DMA channel (such as
 		6 or 7), change the <literal>drq 5</literal> keyword
-		appropriately, and then add the line: <literal>options
-		  "SB16_DMA=6"</literal></para>
+		appropriately.</para>
 	    </note>
 	  </listitem>
 	</varlistentry>
@@ -1543,7 +1541,7 @@
       
       <note>
 	<para>There is some additional documentation in
-	  <filename>/usr/src/sys/i386/isa/sound/sound.doc</filename>. Also, if
+	  <filename>/usr/src/sys/i386/isa/sound/</filename>. Also, if
 	  you add any of these devices, be sure to create the sound <link
 	    linkend="kernelconfig-nodes">device nodes</link>.</para>
       </note>