A little face lifting of the "USB Storage Devices" to avoid the split

between ehci(4) and o/uchi(4) which comes from a time when USB 2.X
support was "young".  Let's mention usbconfig(8).  This section is now
8.X, 7.X and 6.X compliant.

en_US.ISO8859-1/books/handbook/disks/chapter.sgml

@@ -745,6 +745,7 @@ device da
 device pass
 device uhci
 device ohci
+device ehci
 device usb
 device umass</programlisting>
 
@@ -752,8 +753,10 @@ device umass</programlisting>
 	to the USB storage devices, your USB device will be seen as a
 	SCSI device by the system.  Depending on the USB chipset on
 	your motherboard, you only need either <literal>device
-	uhci</literal> or <literal>device ohci</literal>, however
+	uhci</literal> or <literal>device ohci</literal> for USB 1.X support, however
-	having both in the kernel configuration file is harmless.  Do
+	having both in the kernel configuration file is harmless.
+	Support for USB 2.0 controllers is provided by the
+	&man.ehci.4; driver (the <literal>device ehci</literal> line).  Do
 	not forget to compile and install the new kernel if you added
 	any lines.</para>
 
@@ -768,15 +771,6 @@ device umass</programlisting>
 	  &man.atapicam.4; should not be used in the kernel
 	  configuration.</para>
       </note>
-
-      <para>Support for USB 2.0 controllers is provided on
-	&os;; however, you must add:</para>
-
-      <programlisting>device ehci</programlisting>
-
-      <para>to your configuration file for USB 2.0 support.  Note
-	&man.uhci.4; and &man.ohci.4; drivers are still needed if you
-	want USB 1.X support.</para>
     </sect2>
 
     <sect2>
@@ -891,7 +885,7 @@ umass0: detached</screen>
 	Disks</link> and <link linkend="mount-unmount">Mounting and
 	Unmounting File Systems</link> sections, reading various
 	manual pages may be also useful: &man.umass.4;,
-	&man.camcontrol.8;, and &man.usbdevs.8;.</para>
+	&man.camcontrol.8;, and &man.usbconfig.8; under &os;&nbsp; 8.X or &man.usbdevs.8; under earlier versions of &os;.</para>
     </sect2>
   </sect1>