From 19e717e27875736da1902f5488f2d411722bdac4 Mon Sep 17 00:00:00 2001
From: Ben Smithurst <ben@FreeBSD.org>
Date: Sun, 16 Jul 2000 20:39:43 +0000
Subject: [PATCH] Update a couple of kernel config file extracts to the latest
 form ("device" in place of "controller").  The older text is left there too
 for people running older versions.

---
 en_US.ISO8859-1/books/faq/book.sgml  | 19 ++++++++++++++++++-
 en_US.ISO_8859-1/books/faq/book.sgml | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 1e66672ead..99886a3ddc 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.70 2000/07/11 21:36:22 ben Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.71 2000/07/16 18:06:44 ben Exp $</pubdate>
 
     <abstract>
       <para>This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X.  All entries
@@ -2317,6 +2317,15 @@ those that claim to be AST compatible.</para>
         <para>Add the following lines to your kernel configuration file,
           and rebuild the kernel.</para>
 
+	<programlisting>
+device  uhci
+device  ohci
+device  usb
+device  ukbd
+options KBD_INSTALL_CDEV</programlisting>
+
+        <para>In versions of FreeBSD before 4.0, use this instead:</para>
+
         <programlisting>
 controller      uhci0
 controller      ohci0
@@ -2573,6 +2582,14 @@ man page for details.</para>
 	<para>Add the following lines to your kernel configuration file,
 	  and rebuild the kernel.</para>
 
+	<programlisting>
+device  uhci
+device  ohci
+device  usb
+device  ums</programlisting>
+
+        <para>In versions of FreeBSD before 4.0, use this instead:</para>
+
 	<programlisting>
 controller	uhci0
 controller	ohci0
diff --git a/en_US.ISO_8859-1/books/faq/book.sgml b/en_US.ISO_8859-1/books/faq/book.sgml
index 1e66672ead..99886a3ddc 100644
--- a/en_US.ISO_8859-1/books/faq/book.sgml
+++ b/en_US.ISO_8859-1/books/faq/book.sgml
@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.70 2000/07/11 21:36:22 ben Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO_8859-1/books/faq/book.sgml,v 1.71 2000/07/16 18:06:44 ben Exp $</pubdate>
 
     <abstract>
       <para>This is the FAQ for FreeBSD versions 2.X, 3.X, and 4.X.  All entries
@@ -2317,6 +2317,15 @@ those that claim to be AST compatible.</para>
         <para>Add the following lines to your kernel configuration file,
           and rebuild the kernel.</para>
 
+	<programlisting>
+device  uhci
+device  ohci
+device  usb
+device  ukbd
+options KBD_INSTALL_CDEV</programlisting>
+
+        <para>In versions of FreeBSD before 4.0, use this instead:</para>
+
         <programlisting>
 controller      uhci0
 controller      ohci0
@@ -2573,6 +2582,14 @@ man page for details.</para>
 	<para>Add the following lines to your kernel configuration file,
 	  and rebuild the kernel.</para>
 
+	<programlisting>
+device  uhci
+device  ohci
+device  usb
+device  ums</programlisting>
+
+        <para>In versions of FreeBSD before 4.0, use this instead:</para>
+
 	<programlisting>
 controller	uhci0
 controller	ohci0