Merge with Linux 2.3.99-pre4.

23 files changed, 3402 insertions, 2066 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 08acaf9f3..eb5e4efec 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -59,7 +59,7 @@
 # All this was shamelessly stolen from several different sources. Many
 # thanks to all the contributors. Feel free to use these help texts in
 # your own kernel configuration tools. The texts are copyrighted (c)
-# 1995-1999 by Axel Boldt and many others and are governed by the GNU
+# 1995-2000 by Axel Boldt and many others and are governed by the GNU
 # General Public License.
 
 Prompt for development and/or incomplete code/drivers
@@ -112,18 +112,23 @@ CONFIG_SMP
   Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
   Management" code will be disabled if you say Y here.
 
-  See also: Documentation/SMP.txt, Documentation/smp.tex,
-  Documentation/smp.txt, and Documentation/IO-APIC.txt.  Also see the
+  See also the files Documentation/smp.tex, Documentation/smp.txt,
+  Documentation/IO-APIC.txt, Documentation/nmi_watchdog.txt and the 
   SMP-FAQ on the WWW at http://www.irisa.fr/prive/mentre/smp-faq/ .
   
   If you don't know what to do here, say N.
   
 APIC and IO-APIC Support on Uniprocessors
 CONFIG_X86_UP_IOAPIC
-  This option enables uniprocessor-kernels to switch into IO-APIC mode
-  if there is an IO-APIC in the system. Such a kernel will still boot
-  on IO-APIC-less systems with no slowdown at all. SMP kernels include
-  IO-APIC support unconditionally.
+  APIC (Advanced Programmable Interrupt Controller) is a scheme for
+  delivering hardware interrupt requests to the CPU. It is commonly
+  used on systems with several CPU's. If you have a single-CPU system
+  which uses APIC, you can say Y here to use it. If you say Y here
+  even though your machine doesn't have APIC, then the kernel will
+  still run with now slowdown at all.
+
+  If you have system with several CPU's, you do not need to say Y
+  here: APIC will be used automatically.
 
 Kernel math emulation
 CONFIG_MATH_EMULATION
@@ -140,10 +145,8 @@ CONFIG_MATH_EMULATION
   command line option "no387", which comes handy if your coprocessor
   is broken. Try "man bootparam" or see the documentation of your boot
   loader (lilo or loadlin) about how to pass options to the kernel at
-  boot time. The lilo procedure is also explained in the SCSI-HOWTO,
-  available from http://www.linuxdoc.org/docs.html#howto .) This
-  means that it is a good idea to say Y here if you intend to use this
-  kernel on different machines.
+  boot time.) This means that it is a good idea to say Y here if you
+  intend to use this kernel on different machines.
 
   More information about the internals of the Linux math coprocessor
   emulation can be found in arch/i386/math-emu/README.
@@ -187,9 +190,9 @@ CONFIG_NOHIGHMEM
   If you are compiling a kernel which will never run on a machine
   with more than 1 Gigabyte total physical RAM, answer "off"
   here (default choice).  This will result in the old "3GB/1GB"
-  virtual/physical memory split. 3BG are mapped so as each processus
+  virtual/physical memory split. 3GB are mapped so as each processus
   sees a 3GB virtual memory space.
-  The remaining part of the 4G virtual memory space is used by the
+  The remaining part of the 4GB virtual memory space is used by the
   kernel to 'permanently map' as much physical memory as possible.
   Certain types of applications perform better if there is more
   'permanently mapped' kernel memory.
@@ -277,7 +280,10 @@ CONFIG_BLK_DEV_LOOP
 
   This is useful if you want to check an ISO 9660 file system before
   burning the CD, or if you want to use floppy images without first
-  writing them to floppy.
+  writing them to floppy. Furthermore, some Linux distributions avoid
+  the need for a dedicated Linux partition by keeping their complete
+  root file system inside a DOS FAT file using this loop device
+  driver. 
 
   The loop device driver can also be used to "hide" a file system in a
   disk partition, floppy, or regular file, either using encryption
@@ -289,13 +295,13 @@ CONFIG_BLK_DEV_LOOP
   ftp://verden.pvv.org/pub/linux/kerneli/v2.1/ , and then you need to
   say Y to this option.
 
-  Note that alternative ways to use encrypted file systems are provided
-  by the cfs package, which can be gotten from
+  Note that alternative ways to use encrypted file systems are
+  provided by the cfs package, which can be gotten from
   ftp://ftp.replay.com/pub/crypto/disk/ , and the newer tcfs package,
   available at http://tcfs.dia.unisa.it/ . You do not need to say Y
   here if you want to use one of these. However, using cfs requires
-  saying Y to "NFS file system support" below while using tcfs requires
-  applying a kernel patch.
+  saying Y to "NFS file system support" below while using tcfs
+  requires applying a kernel patch.
 
   To use the loop device, you need the losetup utility and a recent
   version of the mount program, both contained in the util-linux
@@ -341,35 +347,39 @@ CONFIG_BLK_DEV_NBD
 
 ATA/IDE/MFM/RLL support
 CONFIG_IDE
-  If you say Y here, your kernel will be able to manage low cost mass storage
-  units such as ATA/(E)IDE and ATAPI units.
+  If you say Y here, your kernel will be able to manage low cost mass
+  storage units such as ATA/(E)IDE and ATAPI units. The most common
+  cases are IDE hard drives and ATAPI CDROM drives.
 
-  Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard for
-  mass storage units such as hard disks. It was designed by Western Digital
-  and Compaq Computer in 1984. It was then named ST506.
-  Quite a number of disks use IDE interface.  State of the art disks use SCSI
-  interface.
+  If your system is pure SCSI and doesn't use these interfaces, you
+  can say N here.
+ 
+  Integrated Disk Electronics (IDE aka ATA-1) is a connecting standard
+  for mass storage units such as hard disks. It was designed by
+  Western Digital and Compaq Computer in 1984. It was then named
+  ST506. Quite a number of disks use the IDE interface.
 	
-  AT Atachment (ATA) is a subset of the IDE specifications.
+  AT Attachment (ATA) is a subset of the IDE specifications.
   ST506 was also called ATA-1.
 
-  Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is ATA-3. It 
-  provides support for larger disks (up to 8.4GB by means of the LBA standard),
-  more disks (4 instead of 2) and for other mass storage units such as tapes 
-  and cdrom.
-  UDMA/33 (aka UltraDMA/33) is ATA-4 and provides faster (and more CPU friendly)
-  transfer modes than previous PIO (Programmed processor Input/Ouput) from
-  previous ATA/IDE standards by means of fast DMA controlers.
+  Fast-IDE is ATA-2 (also named Fast ATA), Enhanced IDE (EIDE) is
+  ATA-3. It provides support for larger disks (up to 8.4GB by means of
+  the LBA standard), more disks (4 instead of 2) and for other mass
+  storage units such as tapes and cdrom. UDMA/33 (aka UltraDMA/33) is
+  ATA-4 and provides faster (and more CPU friendly) transfer modes
+  than previous PIO (Programmed processor Input/Output) from previous
+  ATA/IDE standards by means of fast DMA controllers.
 
-  ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and CDROM
-  drives, similar in many respects to the SCSI protocol.
+  ATA Packet Interface (ATAPI) is a protocol used by EIDE tape and
+  CDROM drives, similar in many respects to the SCSI protocol.
   
-  SMART IDE (Self Monitoring, Analysis and Reporting Technology) was designed
-  in order to prevent data corruption and disk crash by detecting pre hardware
-  faillure conditions (heat, access time, and the like...). Disks builded since
-  june 1995 may follow this standard. The kernel itself don't manage this;
-  however there are quite a number of user programs such as smart that can
-  query the status of SMART parameters disk.
+  SMART IDE (Self Monitoring, Analysis and Reporting Technology) was
+  designed in order to prevent data corruption and disk crash by
+  detecting pre hardware failure conditions (heat, access time, and
+  the like...). Disks built since June 1995 may follow this
+  standard. The kernel itself don't manage this; however there are
+  quite a number of user programs such as smart that can query the
+  status of SMART parameters disk.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -385,15 +395,15 @@ CONFIG_BLK_DEV_IDE
   If you say Y here, you will use the full-featured IDE driver to
   control up to ten ATA/IDE interfaces, each being able to serve a
   "master" and a "slave" device, for a total of up to twenty ATA/IDE
-  disk/cdrom/tape/floppy drives. People with SCSI-only systems
-  can say N or M here.
+  disk/cdrom/tape/floppy drives.
 
   Useful information about large (>540 MB) IDE disks, multiple
   interfaces, what to do if ATA/IDE devices are not automatically
-  detected, sound card ATA/IDE ports, module support, and other topics, is
-  contained in Documentation/ide.txt. For detailed information about
-  hard drives, consult the Disk-HOWTO and the Multi-Disk-HOWTO,
-  available from http://www.linuxdoc.org/docs.html#howto .
+  detected, sound card ATA/IDE ports, module support, and other
+  topics, is contained in Documentation/ide.txt. For detailed
+  information about hard drives, consult the Disk-HOWTO and the
+  Multi-Disk-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto .
 
   To fine-tune ATA/IDE drive/interface parameters for improved
   performance, look for the hdparm package at
@@ -403,7 +413,7 @@ CONFIG_BLK_DEV_IDE
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt and
   Documentation/ide.txt. The module will be called ide-mod.o. Do not
-  compile this driver as a module if your root filesystem (the one
+  compile this driver as a module if your root file system (the one
   containing the directory /) is located on an IDE device.
 
   If you have one or more IDE drives, say Y or M here. If your system
@@ -428,8 +438,6 @@ CONFIG_BLK_DEV_HD_ONLY
   Disk-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto .
 
-  People with SCSI-only systems can say N here.
-
 Use old disk-only driver on primary interface
 CONFIG_BLK_DEV_HD_IDE
   There are two drivers for MFM/RLL/IDE disks. Most people use just
@@ -446,9 +454,6 @@ CONFIG_BLK_DEV_HD_IDE
   Normally, just say N here; you will then use the new driver for all
   4 interfaces.
 
-  People with SCSI-only systems don't need this and can say N here as
-  well.
-
 Include IDE/ATA-2 DISK support
 CONFIG_BLK_DEV_IDEDISK
   This will include enhanced support for MFM/RLL/IDE hard disks. If
@@ -505,8 +510,8 @@ CONFIG_BLK_DEV_IDETAPE
   to the SCSI protocol. If you have an SCSI tape drive however, you
   can say N here.
 
-  This now includes the OnStream DI-30 tape drive support.
-  Will not work with SCSI protocol, until there is support for the
+  You should also say Y if you have an OnStream DI-30 tape drive; this
+  will not work with the SCSI protocol, until there is support for the
   SC-30 and SC-50 versions.
 
   If you say Y here, the tape drive will be identified at boot time
@@ -547,14 +552,17 @@ CONFIG_BLK_DEV_IDESCSI
   and will allow you to use a SCSI device driver instead of a native
   ATAPI driver.
 
-  Must pass "hdx=scsi" per devices if you want the native EIDE sub-drivers
-  to skip over the native support.  This is required for use of CD-RW's.
-
   This is useful if you have an ATAPI device for which no native
   driver has been written (for example, an ATAPI PD-CD or CDR drive);
   you can then use this emulation together with an appropriate SCSI
   device driver. In order to do this, say Y here and to "SCSI support"
-  and "SCSI generic support", below.
+  and "SCSI generic support", below. You must then provide the kernel
+  command line "hdx=scsi" (try "man bootparam" or see the
+  documentation of your boot loader (lilo or loadlin) about how to
+  pass options to the kernel at boot time) for devices if you want the
+  native EIDE sub-drivers to skip over the native support, so that
+  this SCSI emulation can be used instead. This is required for use of
+  CD-RW's.
 
   Note that this option does NOT allow you to attach SCSI devices to a
   box that doesn't have a SCSI host adapter installed.
@@ -562,12 +570,10 @@ CONFIG_BLK_DEV_IDESCSI
   If both this SCSI emulation and native ATAPI support are compiled
   into the kernel, the native support will be used.
 
-  People with SCSI-only systems can say N here. If unsure, say N.
-
 ISA-PNP EIDE support
 CONFIG_BLK_DEV_ISAPNP
-  If you have an ISA EIDE card that is PnP and requires setup first
-  before scanning for devices, say Y here.
+  If you have an ISA EIDE card that is PnP (Plug and Play) and
+  requires setup first before scanning for devices, say Y here.
 
   If unsure, say N.
 
@@ -587,16 +593,12 @@ CONFIG_BLK_DEV_CMD640
   (VLB) instead of PCI, you must also supply a kernel boot parameter
   to enable the CMD640 bugfix/support: "ide0=cmd640_vlb". (Try "man
   bootparam" or see the documentation of your boot loader about how to
-  pass options to the kernel. The lilo procedure is also explained in
-  the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .)
+  pass options to the kernel.)
 
   The CMD640 chip is also used on add-in cards by Acculogic, and on
   the "CSA-6400E PCI to IDE controller" that some people have. For
   details, read Documentation/ide.txt. 
 
-  People with SCSI-only systems should say N here. If unsure, say Y.
-
 CMD640 enhanced support
 CONFIG_BLK_DEV_CMD640_ENHANCED
   This option includes support for setting/autotuning PIO modes and
@@ -615,16 +617,12 @@ CONFIG_BLK_DEV_RZ1000
   Linux. This may slow disk throughput by a few percent, but at least
   things will operate 100% reliably. 
 
-  People with SCSI-only systems should say N here. If unsure, say Y.
-
 Generic PCI IDE chipset support
 CONFIG_BLK_DEV_IDEPCI
   Say Y here for PCI systems which use IDE drive(s).
   This option helps the IDE driver to automatically detect and
   configure all PCI-based IDE interfaces in your system.
   
-  People with SCSI-only systems should say N here; if unsure say Y.
-
 Support for sharing PCI IDE interrupts
 CONFIG_IDEPCI_SHARE_IRQ
   Some ATA/IDE chipsets have hardware support which allows for
@@ -646,8 +644,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI
   the latest version of the hdparm utility from
   ftp://metalab.unc.edu/pub/Linux/system/hardware/ .
 
-  Read the comments at the beginning of drivers/ide/ide-dma.c and the
-  file Documentation/ide.txt for more information. 
+  Read the comments at the beginning of drivers/ide/ide-dma.c and
+  the file Documentation/ide.txt for more information.
 
   It is safe to say Y to this question.
 
@@ -671,16 +669,14 @@ CONFIG_BLK_DEV_OFFBOARD
   cards (off-board controllers) are relegated to ide2 and ide3.
   Answering Y here will allow you to reverse the situation, with
   off-board controllers on ide0/1 and on-board controllers on ide2/3.
-  This can improve the usability of some boot managers such as LILO
+  This can improve the usability of some boot managers such as lilo
   when booting from a drive on an off-board controller.
 
   If you say Y here, and you actually want to reverse the device scan
   order as explained above, you also need to issue the kernel command
   line option "ide=reverse". (Try "man bootparam" or see the
   documentation of your boot loader (lilo or loadlin) about how to
-  pass options to the kernel at boot time. The lilo procedure is also
-  explained in the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .)
+  pass options to the kernel at boot time.)
 
   Note that, if you do this, the order of the hd* devices will be
   rearranged which may require modification of fstab and other files.
@@ -693,7 +689,7 @@ CONFIG_IDEDMA_PCI_AUTO
   DMA for IDE drives and chipsets which support it. Due to concerns
   about a couple of cases where buggy hardware may have caused damage,
   the default is now to NOT use DMA automatically. To revert to the
-  previous behavior, say Y to this question.
+  previous behaviour, say Y to this question.
 
   If you suspect your hardware is at all flakey, say N here.
   Do NOT email the IDE kernel people regarding this issue!
@@ -703,8 +699,9 @@ CONFIG_IDEDMA_PCI_AUTO
 
 Various ATA, Work(s) In Progress (EXPERIMENTAL)
 CONFIG_IDEDMA_PCI_WIP
-  If you enable this you will be capable of using and testing
-  highly developmental projects.
+  If you enable this you will be able to use and test highly
+  developmental projects. If you say N, this configure script will
+  simply skip those options.
 
   It is SAFEST to say N to this question.
 
@@ -726,8 +723,9 @@ CONFIG_BLK_DEV_AEC6210
   should say Y here, and preferably also to "Use DMA by default when
   available".
 
-  Please read the comments at the top of drivers/ide/aec6210.c
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+  Please read the comments at the top of drivers/ide/aec6210.c If
+  you say Y here, then say Y to "Use DMA by default when available" as
+  well.
 
 AEC6210 Tuning support (WIP)
 CONFIG_AEC6210_TUNING
@@ -736,33 +734,37 @@ CONFIG_AEC6210_TUNING
 
 ALI M15x3 chipset support
 CONFIG_BLK_DEV_ALI15X3
-  This driver ensures (U)DMA support for ALI 1543 and 1543C,
-  1535, 1535D onboard chipsets.  It also tests for Simplex mode and
-  enables normal dual channel support.
+  This driver ensures (U)DMA support for ALI 1533, 1543 and 1543C
+  onboard chipsets.  It also tests for Simplex mode and enables
+  normal dual channel support.
 
+  If you say Y here, you also need to say Y to "Use DMA by default
+  when available", above.
   Please read the comments at the top of drivers/ide/alim15x3.c
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
 
   If unsure, say N.
 
 ALI M15x3 WDC support (DANGEROUS)
 CONFIG_WDC_ALI15X3
-  This allows for UltraDMA support for WDC drives that ignore CRC checking.
-  You are a fool for enabling this option, but there have been requests.
-  DO NOT COMPLAIN IF YOUR DRIVE HAS FS CORUPTION, IF YOU ENABLE THIS!
-  No one will listen, just laugh for ignoring this SERIOUS WARNING.
+  This allows for UltraDMA support for WDC drives that ignore CRC
+  checking. You are a fool for enabling this option, but there have
+  been requests. DO NOT COMPLAIN IF YOUR DRIVE HAS FS CORRUPTION, IF
+  YOU ENABLE THIS! No one will listen, just laugh for ignoring this
+  SERIOUS WARNING.
 
-  Using this option can allow WDC drives to run at ATA-4/5 transfer rates with
-  only an ATA-2 support structure.
+  Using this option can allow WDC drives to run at ATA-4/5 transfer
+  rates with only an ATA-2 support structure.
 
   SAY NO!
 
 AMD7409 chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_AMD7409
-  This driver ensures (U)DMA support for AMD756 Viper chipset.
+  This driver ensures (U)DMA support for the AMD756 Viper chipset.
 
+  If you say Y here, you also need to say Y to "Use DMA by default
+  when available", above.
   Please read the comments at the top of drivers/ide/amd7409.c
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+
   If unsure, say N.
 
 AMD Viper ATA-66 Override support (WIP)
@@ -773,8 +775,8 @@ CONFIG_AMD7409_OVERRIDE
 
 CMD64X chipset support
 CONFIG_BLK_DEV_CMD64X
-  Say Y here if you have an IDE controller which uses any of these chipsets,
-  CMD643, CMD646, or CMD648.
+  Say Y here if you have an IDE controller which uses any of these
+  chipsets: CMD643, CMD646, or CMD648.
 
 CMD64X chipset RAID support (WIP)
 CONFIG_CMD64X_RAID
@@ -786,7 +788,8 @@ CONFIG_BLK_DEV_CY82C693
   This driver adds detection and support for the CY82C693 chipset
   used on Digital's PC-Alpha 164SX boards.
 
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+  If you say Y here, you need to say Y to "Use DMA by default
+  when available" as well.
 
 Cyrix CS5530 MediaGX chipset support
 CONFIG_BLK_DEV_CS5530
@@ -795,6 +798,8 @@ CONFIG_BLK_DEV_CS5530
 
   It is safe to say Y to this question.
 
+  People with SCSI-only systems should say N here. If unsure, say Y.
+
 HPT34X chipset support
 CONFIG_BLK_DEV_HPT34X
   This driver adds up to 4 more EIDE devices sharing a single
@@ -806,38 +811,39 @@ CONFIG_BLK_DEV_HPT34X
 
 HPT34X AUTODMA support (WIP)
 CONFIG_HPT34X_AUTODMA
-  This is a dangerous thing to attempt currently!
-  Please read the comments at the top of drivers/ide/hpt34x.c
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+  This is a dangerous thing to attempt currently! Please read the
+  comments at the top of drivers/ide/hpt34x.c If you say Y here,
+  then say Y to "Use DMA by default when available" as well.
 
   If unsure, say N.
 
 HPT366 chipset support
 CONFIG_BLK_DEV_HPT366
-  This is an Ultra DMA chipset for ATA-66.
+  HPT366 is an Ultra DMA chipset for ATA-66.
   
   This driver adds up to 4 more EIDE devices sharing a single
-  interrupt. The HPT366 chipset in its current form is a non-bootable,
-  without special LILO commands for redirecting the reference to device 0x80.
-  The other solution is to include "CONFIG_BLK_DEV_OFFBOARD" unless your
-  mainboard has the chipset native mounted.  Regardless one should use the
-  fore mentioned option and call at LILO or include in your append-line:
-  "ide=reverse".  This driver requires dynamic tuning of the chipset during
-  the ide-probe at boot. It is reported to support DVD II drives, by the
+  interrupt. 
+
+  The HPT366 chipset in its current form is non-bootable. One solution
+  for this problem are special LILO commands for redirecting the
+  reference to device 0x80. The other solution is to say Y to "Boot
+  off-board chipsets first support" (CONFIG_BLK_DEV_OFFBOARD) unless
+  your mother board has the chipset natively mounted. Regardless one
+  should use the fore mentioned option and call at LILO or include
+  "ide=reverse" in LILO's append-line.
+
+  This driver requires dynamic tuning of the chipset during the
+  ide-probe at boot. It is reported to support DVD II drives, by the
   manufacturer.
 
-  Please read the comments at the top of drivers/ide/hpt366.c
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
-
 HPT366 Fast Interrupts (WIP)
 CONFIG_HPT366_FIP
-
   If unsure, say N.
 
-HPT366 mode three unsupported (WIP)
+HPT366 mode three unsupported (EXPERIMENTAL) (WIP)
 CONFIG_HPT366_MODE3
-  This is an undocumented mode that the HA366 can default to in many cases.
-  If unsure, say N.
+  This is an undocumented mode that the HA366 can default to in many
+  cases. If unsure, say N.
 
 NS87415 support (EXPERIMENTAL)
 CONFIG_BLK_DEV_NS87415
@@ -858,12 +864,14 @@ CONFIG_BLK_DEV_PIIX
   PIO 0-4 mode settings, this allows dynamic tuning of the chipset
   via the standard end-user tool 'hdparm'.
 
-  Please read the comments at the top of drivers/ide/piix.c
+  Please read the comments at the top of drivers/ide/piix.c.
 
-  Should also include "PIIXn Tuning support" CONFIG_PIIX_TUNING
-  If unsure, say Y.
+  If you say Y here, you should also say Y to "PIIXn Tuning support",
+  below.
+
+  If unsure, say N.
 
-PIIXn Tuning support
+PIIXn Tuning support (EXPERIMENTAL)
 CONFIG_PIIX_TUNING
   This driver extension adds DMA mode setting and tuning for all PIIX
   IDE controllers by Intel. Since the BIOS can sometimes improperly
@@ -873,7 +881,7 @@ CONFIG_PIIX_TUNING
   Case 430HX/440FX PIIX3 need speed limits to reduce UDMA to DMA mode
   2 if the BIOS can not perform this task at initialization.
 
-  If unsure, say Y.
+  If unsure, say N.
 
 PROMISE PDC20246/PDC20262 support
 CONFIG_BLK_DEV_PDC202XX
@@ -883,10 +891,10 @@ CONFIG_BLK_DEV_PDC202XX
   interrupt. This add-on card is a bootable PCI UDMA controller. Since
   multiple cards can be installed and there are BIOS ROM problems that
   happen if the BIOS revisions of all installed cards (three-max) do
-  not match, the driver attempts to do dynamic tuning of the chipset at
-  boot-time for max-speed. Ultra33 BIOS 1.25 or newer is required for
-  more than one card. This card may require that you say Y to "Special
-  UDMA Feature (EXPERIMENTAL)".
+  not match, the driver attempts to do dynamic tuning of the chipset
+  at boot-time for max-speed. Ultra33 BIOS 1.25 or newer is required
+  for more than one card. This card may require that you say Y to
+  "Special UDMA Feature (EXPERIMENTAL)".
 
   Promise Ultra66 or PDC20262
 
@@ -896,12 +904,14 @@ CONFIG_BLK_DEV_PDC202XX
   boot-time for max-speed. Note tested limits are UDMA-2. Ultra66 BIOS
   1.11 or newer required.
 
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+  If you say Y here, you need to say Y to "Use DMA by default when
+  available" as well.
+
   Please read the comments at the top of drivers/ide/pdc202xx.c
 
   If unsure, say N.
 
-Special UDMA Feature
+Special UDMA Feature (EXPERIMENTAL)
 CONFIG_PDC202XX_BURST
   For PDC20246 and PDC20262 Ultra DMA chipsets. Designed originally
   for PDC20246/Ultra33 that has BIOS setup failures when using 3 or
@@ -918,6 +928,17 @@ CONFIG_PDC202XX_MASTER
 
   Say N. 
 
+SiS5513 chipset support
+CONFIG_BLK_DEV_SIS5513
+  This driver ensures (U)DMA support for SIS5513 chipset based
+  mainboards. SiS620/530 UDMA mode 4, SiS5600/5597 UDMA mode 2, all
+  other DMA mode 2 limited chipsets are unsupported to date.
+
+  If you say Y here, you need to say Y to "Use DMA by default when
+  available" as well.
+
+  Please read the comments at the top of drivers/ide/sis5513.c
+ 
 Winbond SL82c105 support
 CONFIG_BLK_DEV_SL82C105
   If you have a Winbond SL82c105 IDE controller, say Y here to enable
@@ -933,16 +954,18 @@ CONFIG_BLK_DEV_TRM290
 
 VIA82CXXX chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_VIA82CXXX
-   This allows you to to configure your chipset for a better use while
-   running (U)DMA: it will allow you to enable efficiently the second
-   channel dma usage, as it is may not be set by BIOS. It allows you to
-   run a kernel command line at boot time in order to set fifo config.
-   If no command line is provided, it will try to set fifo configuration
-   at its best. It will allow you to get a proc/ide/via display
-  (while running a "cat") provided you enabled "proc" support.
+  This allows you to to configure your chipset for a better use while
+  running (U)DMA: it will allow you to enable efficiently the second
+  channel dma usage, as it may not be set by BIOS. It allows you to
+  pass a kernel command line at boot time in order to set fifo
+  config. If no command line is provided, it will try to set fifo
+  configuration at its best. It will allow you to get information from
+  /proc/ide/via provided you enabled "proc" support.
+
   Please read the comments at the top of drivers/ide/via82cxxx.c
 
-  If you say Y here, then say Y to "Use DMA by default when available" as well.
+  If you say Y here, then say Y to "Use DMA by default when available"
+  as well.
 
   If unsure, say N.
 
@@ -1045,7 +1068,7 @@ CONFIG_BLK_DEV_BUDDHA
 
 Amiga IDE Doubler support (EXPERIMENTAL)
 CONFIG_BLK_DEV_IDEDOUBLER
-  This driver provides support for the so called `IDE doublers' (made
+  This driver provides support for the so-called `IDE doublers' (made
   by various manufacturers, e.g. Eyetech) that can be connected to the
   builtin IDE interface of some Amiga models. Using such an IDE
   doubler, you can connect up to four instead of two IDE devices on
@@ -1087,11 +1110,6 @@ CONFIG_BLK_DEV_MAC_IDE
   devices (hard disks, CD-ROM drives, etc.) that are connected to the
   builtin IDE interface.
 
-IDE card support
-CONFIG_BLK_DEV_IDE_CARDS
-  On Acorn systems, say Y here if you wish to use an IDE interface
-  expansion card. If you do not or are unsure, say N to this.
-
 ICS IDE interface support
 CONFIG_BLK_DEV_IDE_ICSIDE
   On Acorn systems, say Y here if you wish to use the ICS IDE
@@ -1100,7 +1118,8 @@ CONFIG_BLK_DEV_IDE_ICSIDE
 
 ICS DMA support
 CONFIG_BLK_DEV_IDEDMA_ICS
-  No help for CONFIG_BLK_DEV_IDEDMA_ICS
+  Say Y here if you want to add DMA (Direct Memory Access) support to
+  the ICS IDE driver.
 
 Use ICS DMA by default
 CONFIG_IDEDMA_ICS_AUTO
@@ -1113,10 +1132,6 @@ CONFIG_IDEDMA_ICS_AUTO
   If you suspect your hardware is at all flakey, say N here.
   Do NOT email the IDE kernel people regarding this issue!
 
-RapIDE interface support
-CONFIG_BLK_DEV_IDE_RAPIDE
-  No help for CONFIG_BLK_DEV_IDE_RAPIDE
-
 XT hard disk support
 CONFIG_BLK_DEV_XD
   Very old 8 bit hard disk controllers used in the IBM XT computer
@@ -1133,7 +1148,7 @@ PS/2 ESDI hard disk support
 CONFIG_BLK_DEV_PS2
   Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
   hard disk.
-
+  
   If you want to compile the driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
@@ -1157,7 +1172,7 @@ CONFIG_PARIDE
   your computer's parallel port. Most of them are actually IDE devices
   using a parallel port IDE adapter. This option enables the PARIDE
   subsystem which contains drivers for many of these external drives.
-  Read linux/Documentation/paride.txt for more information.
+  Read Documentation/paride.txt for more information.
 
   If you have said Y to the "Parallel-port support" configuration
   option, you may share a single port between your printer and other
@@ -1199,8 +1214,8 @@ CONFIG_PARIDE_PCD
   system. Among the devices supported by this driver are the
   MicroSolutions backpack CD-ROM drives and the Freecom Power CD. If
   you have such a CD-ROM drive, you should also say Y or M to "ISO
-  9660 CDROM file system support" below, because that's the file system
-  used on CDROMs.
+  9660 CDROM file system support" below, because that's the file
+  system used on CDROMs.
 
 Parallel port ATAPI disks
 CONFIG_PARIDE_PF
@@ -1241,7 +1256,7 @@ CONFIG_PARIDE_PG
   your system.
 
   This driver implements an API loosely related to the generic SCSI
-  driver. See /usr/include/linux/pg.h for details.
+  driver. See include/linux/pg.h for details.
 
   You can obtain the most recent version of cdrecord from
   ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ . Versions 1.6.1a3 and
@@ -1401,9 +1416,13 @@ CONFIG_BLK_DEV_LVM
   to new capacity needs.  Logical volumes are accessed as block
   devices named /dev/VolumeGroupName/LogicalVolumeName.
 
-  For details see /usr/src/linux/Documentaion/LVM-HOWTO.
+  For details see Documentation/LVM-HOWTO. You will need supporting
+  user space software from http://linux.msede.com/lvm .
 
-  To get the newest software see <http://linux.msede.com/lvm>.
+  If you want to compile this support as a module ( = code which can
+  be inserted in and removed from the running kernel whenever you
+  want), say M here and read Documentation/modules.txt. The module
+  will be called lvm-mod.o.
 
 Logical Volume Manager /proc file system information
 CONFIG_LVM_PROC_FS
@@ -1517,37 +1536,30 @@ CONFIG_MD_BOOT
   answer Y here. For lilo and loadlin options see the file
   Documentation/md.txt.
 
-Support for Deskstation RPC44 
-CONFIG_DESKSTATION_RPC44
-  This is a machine with a R4400 100 MHz CPU. To compile a Linux
-  kernel that runs on these, say Y here. For details about Linux
-  on the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  http://oss.sgi.com/mips.
-
 Support for Acer PICA 1 chipset
 CONFIG_ACER_PICA_61
   This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
   kernel that runs on these, say Y here. For details about Linux on
   the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-  http://oss.sgi.com/mips.
+  http://oss.sgi.com/mips .
 
 Support for Algorithmics P4032 (EXPERIMENTAL)
 CONFIG_ALGOR_P4032
   This is an evaluation board of the British company Algorithmics. The
   board uses the R4300 and a R5230 CPUs. For more information about
-  this board see http://www.algor.co.uk.
+  this board see http://www.algor.co.uk .
 
 Support for BAGET MIPS series
 CONFIG_BAGET_MIPS
   This enables support for the Baget, a Russian embedded system.  For 
   more details about the Baget see the Linux/MIPS FAQ on 
-  http://oss.sgi.com/mips.
+  http://oss.sgi.com/mips .
 
 Support for DECstations
 CONFIG_DECSTATION
   This enables support for DEC's MIPS based workstations.  For details
-  see the Linux/MIPS FAQ on http://oss.sgi.com/mips. the 
-  DECstation porting pages on http://decstation.unix-ag.org.
+  see the Linux/MIPS FAQ on http://oss.sgi.com/mips and the 
+  DECstation porting pages on http://decstation.unix-ag.org .
 
   If you have one of the following DECstation Models you definitely
   want to choose R4xx0 for the CPU Type:
@@ -1561,26 +1573,8 @@ CONFIG_DECSTATION
 
 Support for NEC DDB Vrc-5074
 CONFIG_DDB5074
-  This enables support for the VR5000-based NEC DDB Vrc-5074 evaluation
-  board.
-
-IDE card support
-CONFIG_BLK_DEV_IDE_CARDS
-  On Acorn systems, say Y here if you wish to use an IDE interface
-  expansion card. If you do not or are unsure, say N to this.
-
-ICS IDE interface
-CONFIG_BLK_DEV_IDE_ICS
-  On Acorn systems, say Y here if you wish to use the ICS IDE
-  interface card.  This is not required for ICS partition support.
-  If you are unsure, say N to this.
-
-ADFS partition support
-CONFIG_BLK_DEV_PART
-  This allows Linux on Acorn systems to determine its partitions in
-  the 'non-ADFS' partition area of the hard disk - usually located
-  after the ADFS partition.  You are probably using this system, so
-  you should say Y it.
+  This enables support for the VR5000-based NEC DDB Vrc-5074
+  evaluation board.
 
 Support for Mips Magnum 4000
 CONFIG_MIPS_MAGNUM_4000
@@ -1598,9 +1592,9 @@ CONFIG_OLIVETTI_M700
 
 Support for SGI IP22
 CONFIG_SGI_IP22
-  This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM
-  variants like the Tandem CMN B006S.  To compile a Linux kernel that
-  runs on these, say Y here.
+  This are the SGI Indy, Challenge S and Indigo2, as well as certain
+  OEM variants like the Tandem CMN B006S. To compile a Linux kernel
+  that runs on these, say Y here.
 
 Support for SGI IP27
   This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
@@ -1611,7 +1605,7 @@ IP27 N-Mode
 CONFIG_SGI_SN0_N_MODE
   The nodes of Origin 200, Origin 2000 and Onyx 2 systems can be
   configured in either N-Modes which allows for more nodes or M-Mode
-  which allows for more more memory.  Your system is most probly
+  which allows for more more memory.  Your system is most probably
   running in M-Mode, so you should say N here.
 
 MIPS JAZZ onboard SONIC Ethernet support
@@ -1621,26 +1615,26 @@ CONFIG_MIPS_JAZZ_SONIC
 
 MIPS JAZZ FAS216 SCSI support
 CONFIG_JAZZ_ESP
-  This is the driver for the onboard SCSI hostadapter of MIPS Magnum 4000,
-  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.
+  This is the driver for the onboard SCSI host adapter of MIPS Magnum
+  4000, Acer PICA, Olivetti M700-10 and a few other identical OEM
+  systems.
 
 CPU type
 CONFIG_CPU_R3000
-  Please make shure to pick the right CPU type. Linux/MIPS is not
+  Please make sure to pick the right CPU type. Linux/MIPS is not
   designed to be generic, i.e. Kernels compiled for R3000 CPUs will
   *not* work on R4000 Machines and vice versa.
-  However, since most the supported Machines have an R4000 (or similar)
-  CPU R4xx0 might be a safe bet.
+  However, since most the supported Machines have an R4000 (or 
+  similar) CPU, R4xx0 might be a safe bet.
   If the resulting Kernel does not work try to recompile with R3000.
 
 Support for large 64-bit configurations
 CONFIG_MIPS_INSANE_LARGE
   MIPS R10000 does support a 44 bit / 16TB address space as opposed to
-  previous 64-bit processors which only did only support 40 bit / 1TB.  If
-  you need processes of more than 1TB virtual address space activate this.
-  Activating CONFIG_MIPS_INSANE_LARGE results in additional memory usage,
-  so only activate this if you really need.  Very few people will need
-  this.
+  previous 64-bit processors which only supported 40 bit / 1TB. If you
+  need processes of more than 1TB virtual address space, say Y here.
+  This will result in additional memory usage, so it is not
+  recommended for normal users.
 
 Generate little endian code
 CONFIG_CPU_LITTLE_ENDIAN
@@ -1648,11 +1642,6 @@ CONFIG_CPU_LITTLE_ENDIAN
   byte order. These modes require different kernels. Say Y if your
   machine is little endian, N if it's a big endian machine.
 
-Kernel support for IRIX binaries
-CONFIG_BINFMT_IRIX
-  If you say Y here, the kernel will support running of IRIX binaries.
-  You will need IRIX libraries for this to work.
-
 Networking support
 CONFIG_NET
   Unless you really know what you are doing, you should say Y here.
@@ -1675,7 +1664,7 @@ CONFIG_FILTER
   socket and thereby tell the kernel that it should allow or disallow
   certain types of data to get through the socket. Linux Socket
   Filtering works on all socket types except TCP for now. See the text
-  file linux/Documentation/networking/filter.txt for more information.
+  file Documentation/networking/filter.txt for more information.
   If unsure, say N.
 
 Network packet filtering
@@ -1710,7 +1699,7 @@ CONFIG_NETFILTER
   are completely invisible to the outside world, even though they can
   reach the outside and can receive replies. It is even possible to
   run globally visible servers from within a masqueraded local network
-  using a mechanism called port-forwarding. Masquerading is also often
+  using a mechanism called portforwarding. Masquerading is also often
   called NAT (Network Address Translation).
 
   Another use of Netfilter is in transparent proxying: if a machine on
@@ -1720,7 +1709,7 @@ CONFIG_NETFILTER
 
   Various modules exist for netfilter which replace the previous
   masquerading (ipmasqadm), packet filtering (ipchains), transparent
-  proxying, and port-forwarding mechanisms. More information is
+  proxying, and portforwarding mechanisms. More information is
   available from http://netfilter.kernelnotes.org .
  
   Make sure to say N to "Fast switching" below if you intend to say Y
@@ -1729,6 +1718,11 @@ CONFIG_NETFILTER
   Chances are that you should say Y here if you compile a kernel which
   will run as a router and N for regular hosts. If unsure, say N.
  
+Network packet filtering debugging
+CONFIG_NETFILTER_DEBUG
+  You can say Y here if you want to get additional messages useful in
+  debugging the netfilter code. 
+
 IP: connection tracking (required for masq/NAT)
 CONFIG_IP_NF_CONNTRACK
   Connection tracking keeps a record of what packets have passed
@@ -1773,7 +1767,8 @@ CONFIG_IP_NF_IPTABLES
 limit match support
 CONFIG_IP_NF_MATCH_LIMIT
   limit matching allows you to control the rate at which a rule can be
-  matched: mainly useful in combination with the LOG target.
+  matched: mainly useful in combination with the LOG target ("LOG
+  target support", below).
 
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.  If unsure, say `N'.
@@ -1831,7 +1826,6 @@ CONFIG_IP_NF_MATCH_UNCLEAN
 
 Owner match support (EXPERIMENTAL)
 CONFIG_IP_NF_MATCH_OWNER
-
   Packet owner matching allows you to match locally-generated packets
   based on who created them: the user, group, process or session.
 
@@ -1889,7 +1883,7 @@ CONFIG_IP_NF_TARGET_REDIRECT
   REDIRECT is a special case of NAT: all incoming connections are
   mapped onto the incoming interface's address, causing the packets to
   come to the local machine instead of passing through.  This is
-  useful for tranparent proxies.
+  useful for transparent proxies.
 
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.  If unsure, say `N'.
@@ -1914,11 +1908,12 @@ CONFIG_IP_NF_TARGET_TOS
 
 MARK target support
 CONFIG_IP_NF_TARGET_MARK
-  This option adds a `MARK' target, which allows you to create rules in
-  the `mangle' table which alter the netfilter mark (nfmark) field
-  associated with the packet packet prior to routing.  This can change
-  the routing method (see `IP: use netfilter MARK value as routing key')
-  and can also be used by other subsystems to change their behavior.
+  This option adds a `MARK' target, which allows you to create rules
+  in the `mangle' table which alter the netfilter mark (nfmark) field
+  associated with the packet packet prior to routing. This can change
+  the routing method (see `IP: use netfilter MARK value as routing
+  key') and can also be used by other subsystems to change their
+  behavior.
 
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.  If unsure, say `N'.
@@ -1989,11 +1984,6 @@ CONFIG_SYN_COOKIES
   
   If unsure, say Y.
 
-Sun floppy controller support
-CONFIG_BLK_DEV_SUNFD
-  This is support for floppy drives on Sun SPARC workstations. Say Y
-  if you have a floppy drive, otherwise N. Easy.
-
 Alpha system type
 CONFIG_ALPHA_GENERIC
   This is the system type of your hardware.  A "generic" kernel will
@@ -2060,12 +2050,6 @@ CONFIG_ALPHA_SRM
 
   If unsure, say N.
 
-Use SRM PCI setup
-CONFIG_ALPHA_SRM_SETUP
-  This option controls whether or not the PCI configuration set up by
-  SRM is modified.  If you say Y, the existing PCI configuration will
-  be left intact.
-
 Non-standard serial port support
 CONFIG_SERIAL_NONSTANDARD
   Say Y here if you have any non-standard serial boards -- boards
@@ -2128,7 +2112,7 @@ CONFIG_SERIAL_MULTIPORT
 
 SGI PROM Console Support
 CONFIG_SGI_PROM_CONSOLE
-  Enable this if you want to use the PROMs for console I/O.
+  Say Y here if you want to use the PROMs for console I/O.
 
 SGI Zilog85C30 serial support
 CONFIG_SGI_SERIAL
@@ -2144,7 +2128,7 @@ CONFIG_SGI_NEWPORT_GFX
 
 SGI Newport Console support
 CONFIG_SGI_NEWPORT_CONSOLE
-  Enable this if you want the console on the Newport aka XL graphics
+  Say Y here if you want the console on the Newport aka XL graphics
   card of your Indy.  Most people say Y here.
 
 SGI DS1286 RTC support
@@ -2152,51 +2136,131 @@ CONFIG_SGI_DS1286
   If you say Y here and create a character special file /dev/rtc with
   major number 10 and minor number 135 using mknod ("man mknod"), you
   will get access to the real time clock built into your computer.
-  Every SGI has such a clock built in.  It reports status information 
-  via the file /proc/rtc and its behaviour is set by various ioctls on 
+  Every SGI has such a clock built in. It reports status information
+  via the file /proc/rtc and its behaviour is set by various ioctls on
   /dev/rtc.
 
-SGI Vino Video For Linux (EXPERIMENTAL)
-CONFIG_SGI_VIDEO_VINO
-  Support for the SGI Vino Video hardware which is part of the Newport
-  aka XL graphics card.  Most people will say N here.
-
 Support the Bell Technologies HUB6 card
 CONFIG_HUB6
   Say Y here to enable support in the dumb serial driver to support
   the HUB6 card.
 
-Support for hot-pluggable devices
-CONFIG_HOTPLUG
-  Say Y here to enable support for hot plugin of certain hardware such as
-  PCMCIA cards and the like.
-
-  At this moment, few drivers support it, but as they get converted to use the
-  new ressource allocator/manager, their number will increase.
-
 PCMCIA serial device support
 CONFIG_PCMCIA_SERIAL_CS
   Say Y here to enable support for 16-bit PCMCIA serial devices,
   including serial port cards, modems, and the modem functions of
-  multifunction ethernet/modem cards.
+  multi-function ethernet/modem cards. (PCMCIA- or PC-cards are
+  credit-card size devices often used with laptops.)
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called serial_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called serial_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
 CardBus serial device support
 CONFIG_PCMCIA_SERIAL_CB
   Say Y here to enable support for CardBus serial devices, including
-  the modem functions of multifunction ethernet/modem devices.
+  serial port cards, modems, and the modem functions of multi-function
+  ethernet/modem devices. (CardBus cards are the newer and better 
+  version of PCMCIA- or PC-cards: credit card size devices often 
+  used with laptops.)
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called serial_cb.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called serial_cb.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
+/dev/agpgart (AGP Support) (EXPERIMENTAL)
+CONFIG_AGP
+  AGP (Accelerated Graphics Port) is a bus system mainly used to
+  connect graphics cards to the rest of the system. 
+
+  If you have an AGP system and you say Y here, it will be possible to
+  use the AGP features of your 3D rendering video card. This code acts
+  as a sort of "AGP driver" for the motherboard's chipset. The glx
+  module will then be able to program the GART (graphics aperture
+  relocation table) registers with appropriate values to transfer
+  commands to the card.
+
+  If you need more texture memory than you can get with the AGP GART
+  (theoretically up to 256 MB, but in practice usually 64 or 128 MB
+  due to kernel allocation issues), you could use PCI accesses
+  and have up to a couple gigs of texture space.
+
+  Note that this is the only means to have XFree4/GLX use
+  write-combining with MTRR support on the AGP bus. Without it, OpenGL
+  direct rendering will be a lot slower but still faster than PIO.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ , or need to use the 810 Xserver in
+  XFree 3.3.6.
+
+  This driver is available as a module. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt. The module
+  will be called agpgart.o.
+
+Intel 440LX/BX/GX support
+CONFIG_AGP_INTEL
+  This option gives you AGP support for the GLX component of the
+  "soon to be released" XFree86 4.x on Intel 440LX/BX/GX chipsets.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ .
+
+Intel I810/I810 DC100/I810e support
+CONFIG_AGP_I810
+  This option gives you AGP support for the Xserver for the Intel
+  810 chipset boards. This is required to do any useful video
+  modes.
+
+VIA chipset support
+CONFIG_AGP_VIA
+  This option gives you AGP support for the GLX component of the
+  "soon to be released" XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ .
+
+AMD Irongate support
+CONFIG_AGP_AMD
+  This option gives you AGP support for the GLX component of the
+  "soon to be released" XFree86 4.x on Intel AMD Irongate chipset.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ .
+
+Generic SiS support
+CONFIG_AGP_SIS
+  This option gives you AGP support for the GLX component of the "soon
+  to be released" XFree86 4.x on Silicon Integrated Systems [SiS]
+  chipsets.
+
+  Note that 5591/5592 AGP chipsets are NOT supported.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ .
+
+ALI M1541 support
+CONFIG_AGP_ALI
+  This option gives you AGP support for the GLX component of the
+  "soon to be released" XFree86 4.x on the ALi M1541 chipset.
+
+  This chipset can do AGP 1x and 2x, but note that there is an
+  acknowledged incompatibility with Matrox G200 cards. Due to
+  timing issues, this chipset cannot do AGP 2x with the G200.
+  This is a hardware limitation. AGP 1x seems to be fine, though.
+
+  For the moment, you should probably say N, unless you want to test
+  the GLX component for XFree86 3.3.6, which can be downloaded from
+  http://utah-glx.sourceforge.net/ .
+
 PCI support
 CONFIG_PCI
   Find out whether you have a PCI motherboard. PCI is the name of a
@@ -2221,16 +2285,17 @@ CONFIG_PCI_GOBIOS
   devices. If you choose "BIOS", the BIOS will be used, if you choose
   "Direct", the BIOS won't be used, and if you choose "Any", the
   kernel will try the direct access method and falls back to the BIOS
-  if that doesn't work. If unsure, go with the default.
+  if that doesn't work. If unsure, go with the default, which is
+  "Any".
 
 PCI device name database
 CONFIG_PCI_NAMES
   By default, the kernel contains a database of all known PCI device
-  names to make the information in /proc/pci, /proc/ioports and similar
-  files comprehensible to the user. This database increases size of
-  the kernel image by about 80KB, but it gets freed after the system
-  boots up, so it doesn't take up kernel memory. Anyway, if you are
-  building an installation floppy or kernel for an embedded system
+  names to make the information in /proc/pci, /proc/ioports and
+  similar files comprehensible to the user. This database increases
+  size of the kernel image by about 80KB, but it gets freed after the
+  system boots up, so it doesn't take up kernel memory. Anyway, if you
+  are building an installation floppy or kernel for an embedded system
   where kernel image size really matters, you can disable this feature
   and you'll get device ID numbers instead of names.
 
@@ -2343,8 +2408,9 @@ CONFIG_PNP
 
   Say Y here if you would like Linux to configure your Plug and Play
   devices. You should then also say Y to "ISA Plug and Play support",
-  below. Alternatively, you can configure your PnP devices using the
-  user space utilities contained in the isapnptools package.
+  below. Alternatively, you can say N here and configure your PnP 
+  devices using the user space utilities contained in the isapnptools
+  package.
   
   This support is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -2354,7 +2420,8 @@ CONFIG_PNP
 ISA Plug and Play support
 CONFIG_ISAPNP
   Say Y here if you would like support for ISA Plug and Play devices.
-  
+  Some information is in Documentation/isapnp.txt.
+ 
   This support is also available as a module called isapnp.o ( =
   code which can be inserted in and removed from the running kernel
   whenever you want). If you want to compile it as a module, say M
@@ -2362,13 +2429,27 @@ CONFIG_ISAPNP
 
   If unsure, say Y.
 
-PCMCIA/CardBus support
+Support for hot-pluggable devices
+CONFIG_HOTPLUG
+  Say Y here if you want to attach devices to your computer that can
+  be attached and detached while the system is running. The most
+  prominent example of this are PCMCIA- or PC-cards, credit-card size
+  devices such as network cards, modems or hard drives which are
+  plugged into slots found on all modern laptop computers.
+
+PCMCIA/Cardbus support
 CONFIG_PCMCIA
-  Include kernel support for PCMCIA and CardBus devices.  Because
-  PCMCIA support requires additional components that are not part of
-  the kernel (i.e., the pcmcia-cs package), building PCMCIA into the
-  kernel is generally not recommended unless you have a specific
-  need.  If unsure, say N.
+  Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
+  computer. These are credit-card size devices such as network cards,
+  modems or hard drives often used with laptops computers. There are
+  actually two varieties of these cards: the older 16 bit PCMCIA cards
+  and the newer 32 bit CardBus cards. If you want to use CardBus
+  cards, you need to say Y here and also to "CardBus support" below.
+
+  To use your PC-cards, you will need supporting software from David 
+  Hinds' pcmcia-cs package (see the file Documentation/Changes for 
+  location). Please also read the PCMCIA-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -2376,27 +2457,32 @@ CONFIG_PCMCIA
   and ds.o.  If you want to compile it as a module, say M here and
   read Documentation/modules.txt.
 
-  You will also need David Hinds' pcmcia-cs package (see the file
-  Documentation/Changes for location).  For more information, see the
-  PCMCIA-HOWTO.
-
 CardBus support
 CONFIG_CARDBUS
-  There are two types of PCMCIA devices: 16-bit PC Cards, and higher
-  performance 32-bit CardBus devices.  Use this option to include
-  support for CardBus devices.  If unsure, say Y.
+  CardBus is a bus mastering architecture for PC-cards, which allows 
+  for 32 bit PC-cards (the original PCMCIA standard specifies only 
+  a 16 bit wide bus). Many newer PC-cards are actually CardBus cards.
+
+  To use your PC-cards, you will need supporting software from David 
+  Hinds' pcmcia-cs package (see the file Documentation/Changes for 
+  location).
+
+  If unsure, say Y.
 
 i82365/Yenta compatible bridge support
 CONFIG_I82365
-  Include support for PCMCIA and CardBus host bridges that are
-  register compatible with the Intel i82365 and/or the Yenta
+  Say Y here to include support for PCMCIA and CardBus host bridges
+  that are register compatible with the Intel i82365 and/or the Yenta
   specification: this includes virtually all modern PCMCIA bridges.
-  If unsure, say Y.
+  "Bridge" is the name used for the hardware inside your computer that
+  PCMCIA cards are plugged into. If unsure, say Y.
 
 Databook TCIC host bridge support
 CONFIG_TCIC
-  Include support for the Databook TCIC family of PCMCIA host bridges.
-  These are only found on a handful of old systems.  If unsure, say N.
+  Say Y here to include support for the Databook TCIC family of PCMCIA
+  host bridges. These are only found on a handful of old systems.
+  "Bridge" is the name used for the hardware inside your computer that
+  PCMCIA cards are plugged into. If unsure, say N.
 
 System V IPC
 CONFIG_SYSVIPC
@@ -2414,9 +2500,9 @@ CONFIG_SYSVIPC
   http://www.linuxdoc.org/docs.html#guide .
 
   Shared memory is now implemented using a new (minimal) virtual file
-  system, which you need to mount before programs can use shared memory. 
-  To do this automatically at system startup just add the following line 
-  to your /etc/fstab:
+  system, which you need to mount before programs can use shared
+  memory. To do this automatically at system startup just add the
+  following line to your /etc/fstab:
 
   none	/var/shm	shm	defaults	0 0
 
@@ -2451,21 +2537,24 @@ CONFIG_SYSCTL
 
 Kernel core (/proc/kcore) format
 CONFIG_KCORE_ELF
-  If you enabled support for /proc file system then the file /proc/kcore
-  will contain the kernel core image. This can be used in gdb:
+  If you enabled support for /proc file system then the file 
+  /proc/kcore will contain the kernel core image. This can be used 
+  in gdb:
 
   $ cd /usr/src/linux ; gdb vmlinux /proc/kcore
 
-  Selecting ELF will make /proc/kcore appear in ELF core format as defined
-  by the Executable and Linking Format specification. Selecting A.OUT will
-  choose the old "a.out" format which may be necessary for some old versions
+  You have two choices here: ELF and A.OUT. Selecting ELF will make 
+  /proc/kcore appear in ELF core format as defined by the Executable
+  and Linking Format specification. Selecting A.OUT will choose the
+  old "a.out" format which may be necessary for some old versions
   of binutils or on some architectures.
 
-  This is especially useful if you have compiled the kernel with "-g" option
-  to preserve debugging information. It is mainly used for examining kernel
-  data structures on the live kernel so if you don't understand what this
-  means or are not a kernel hacker, just leave it at its default value ELF.
-  
+  This is especially useful if you have compiled the kernel with the 
+  "-g" option to preserve debugging information. It is mainly used 
+  for examining kernel data structures on the live kernel so if you 
+  don't understand what this means or are not a kernel hacker, just 
+  leave it at its default value ELF.
+
 Kernel support for ELF binaries
 CONFIG_BINFMT_ELF
   ELF (Executable and Linkable Format) is a format for libraries and
@@ -2569,10 +2658,10 @@ CONFIG_M386
   all x86 CPU types (albeit not optimally fast), you can specify
   "386" here.
 
-  If you specify one of "486" or "586" or "Pentium" or "PPro", then
-  the kernel will not necessarily run on earlier architectures (e.g. a
-  Pentium optimized kernel will run on a PPro, but not necessarily on
-  a i486).
+  If you specify one of "486" or "586" or "Pentium" or "PPro" or
+  "Athlon", then the kernel will not necessarily run on earlier
+  architectures (e.g. a Pentium optimized kernel will run on a PPro,
+  but not necessarily on a i486).
 
   Here are the settings recommended for greatest speed:
    - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
@@ -2583,11 +2672,11 @@ CONFIG_M386
      UMC U5D or U5S.
    - "586" for generic Pentium CPUs, possibly lacking the TSC 
      (time stamp counter) register.
-   - "Pentium" for the Intel Pentium/Pentium MMX, AMD K5.
+   - "Pentium" for the Intel Pentium/Pentium MMX, and AMD K5.
    - "PPro" for the Cyrix/IBM/National Semiconductor 6x86MX, MII and
-     Intel Pentium II/Pentium Pro.
+     Intel Pentium Pro/Celeron/Pentium II/Pentium III.
    - "K6/II/III" for the AMD K6, K6-II and K6-III (aka K6-3D).
-   - "Athlon" for the AMD Athlon (aka K7)
+   - "Athlon" for the AMD Athlon (K7).
 
   If you don't know what to do, choose "386".
 
@@ -2612,9 +2701,7 @@ CONFIG_VIDEO_SELECT
   "vga=" option from your boot loader (lilo or loadlin) or set
   "vga=ask" which brings up a video mode menu on kernel startup. (Try
   "man bootparam" or see the documentation of your boot loader about
-  how to pass options to the kernel. The lilo procedure is also
-  explained in the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .)
+  how to pass options to the kernel.)
 
   Read the file Documentation/svga.txt for more information about the
   Video mode selection support. If unsure, say N.
@@ -2658,11 +2745,6 @@ CONFIG_FB_ACORN
   hardware found in Acorn RISC PCs and other ARM-based machines.  If
   unsure, say N.
 
-Apollo frame buffer device
-CONFIG_FB_APOLLO
-  This is the frame buffer device driver for the monochrome graphics
-  hardware found in some Apollo workstations.
-
 Amiga native chipset support
 CONFIG_FB_AMIGA
   This is the frame buffer device driver for the builtin graphics
@@ -2769,8 +2851,8 @@ CONFIG_FB_S3TRIO
 
 3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)
 CONFIG_FB_3DFX
-  This driver supports graphics boards with the 3Dfx Banshee/Voodoo3 chips.
-  Say Y if you have such a graphics board.
+  This driver supports graphics boards with the 3Dfx Banshee/Voodoo3
+  chips. Say Y if you have such a graphics board.
 
   The driver is also available as a module ( = code which can be
   inserted and removed from the running kernel whenever you want). The
@@ -2797,17 +2879,18 @@ CONFIG_FB_ATY
   inserted and removed from the running kernel whenever you want). The
   module will be called atyfb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
-
+  
 ATI Rage128 display support (EXPERIMENTAL)
 CONFIG_FB_ATY128
   This driver supports graphics boards with the ATI Rage128 chips.
-  Say Y if you have such a graphics board.
+  Say Y if you have such a graphics board and read
+  Documentation/fb/aty128fb.txt. 
 
   The driver is also available as a module ( = code which can be
   inserted and removed from the running kernel whenever you want). The
   module will be called aty128fb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
-  
+
 PowerMac "control" frame buffer device support
 CONFIG_FB_CONTROL
   This driver supports a frame buffer for the graphics adapter in the
@@ -2828,16 +2911,6 @@ CONFIG_FB_CT65550
   This is the frame buffer device driver for the Chips & Technologies
   65550 graphics chip in PowerBooks.
 
-Mac frame buffer device
-CONFIG_FB_MAC
-  This is the frame buffer device driver for the graphics hardware in
-  m68k Macintoshes.
-
-HP300 frame buffer device
-CONFIG_FB_HP300
-  This is the frame buffer device driver for the Topcat graphics
-  hardware found in HP300 workstations.
-
 TGA frame buffer support
 CONFIG_FB_TGA
   This is the frame buffer device driver for generic TGA graphic
@@ -2853,10 +2926,11 @@ CONFIG_FB_VESA
 VGA 16-color planar support
 CONFIG_FBCON_VGA_PLANES
   This low level frame buffer console driver enable the kernel to use
-  the 16-color planar modes of the old VGA cards where the bits of each
-  pixel are separated into 4 plans.
-  Only answer Y here if you have an (very old) VGA card that isn't
-  VESA 2 compatible.
+  the 16-color planar modes of the old VGA cards where the bits of
+  each pixel are separated into 4 planes. 
+
+  Only answer Y here if you have a (very old) VGA card that isn't VESA
+  2 compatible.
 
 VGA 16-color graphics console
 CONFIG_FB_VGA16
@@ -2870,12 +2944,12 @@ CONFIG_FB_VGA16
 
 Select other compiled-in fonts
 CONFIG_FBCON_FONTS
-  Say Y here if you would like to use fonts other than the default your frame
-  buffer console usually use.
+  Say Y here if you would like to use fonts other than the default
+  your frame buffer console usually use.
 
-  Note that the answer to this question won't directly affect the kernel:
-  saying N will just cause this configure script to skip all the questions
-  about foreign fonts.
+  Note that the answer to this question won't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about foreign fonts.
 
   If unsure, say N (the default choices are safe).
 
@@ -2895,22 +2969,21 @@ CONFIG_FBCON_FONTWIDTH8_ONLY
 
 Sparc console 8x16 font
 CONFIG_FONT_SUN8x16
-  This is the high resolution console font for Sun machines.
-
-  Say Y.
+  This is the high resolution console font for Sun machines. Say Y.
 
 Sparc console 12x22 font (not supported by all drivers)
 CONFIG_FONT_SUN12x22
-  This is the high resolution console font for Sun machines with very big
-  letters (like the letters used in the SPARC PROM). If the standard font
-  is unreadable for you, say Y, otherwise say N.
+  This is the high resolution console font for Sun machines with very
+  big letters (like the letters used in the SPARC PROM). If the
+  standard font is unreadable for you, say Y, otherwise say N.
 
 VGA 8x8 font
 CONFIG_FONT_8x8
   This is the "high resolution" font for the VGA frame buffer (the one
-  provided by the text console 80x50 (and higher) modes.
-  Note this is a poor quality font. The VGA 8x16 font is quite a lot
-  more readable.
+  provided by the text console 80x50 (and higher) modes). 
+
+  Note that this is a poor quality font. The VGA 8x16 font is quite a
+  lot more readable. 
 
   Given the resolution provided by the frame buffer device, answer N
   here is safe.
@@ -2923,7 +2996,6 @@ CONFIG_FB_COMPAT_XPMAC
   (XF68_FBDev).
 
 HGA monochrome support (EXPERIMENTAL)
-Hercules mono graphics console (EXPERIMENTAL)
 CONFIG_FBCON_HGA
   Say Y here if you have a Hercules mono graphics card.
 
@@ -2932,11 +3004,12 @@ CONFIG_FBCON_HGA
   The module will be called hgafb.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
-  As this card technology is 15 years old, most people will answer N here.
+  As this card technology is 15 years old, most people will answer N
+  here.
 
 Matrox unified accelerated driver (EXPERIMENTAL)
 CONFIG_FB_MATROX
-  Say Y here if you have Matrox Millennium, Matrox Millennium II,
+  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
   Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
   Mystique G200, Matrox Millennium G200, Matrox Marvel G200 video or
   Matrox G400 card in your box. At this time, support for the G100,
@@ -2976,49 +3049,51 @@ CONFIG_FB_MATROX_G100
   you select "Advanced lowlevel driver options", you should check 8
   bpp packed pixel, 16 bpp packed pixel, 24 bpp packed pixel and 32
   bpp packed pixel. You can also use font widths different from 8.
-  
-  If you need support for G400 secondary head, you must first enable
-  I2C support and I2C bit-banging support in character devices section,
-  and then Matrox I2C support and G400 secondary head support here
-  in framebuffer section.
+
+  If you need support for G400 secondary head, you must first say Y to
+  "I2C support" and "I2C bit-banging support" in the character devices
+  section, and then to "Matrox I2C support" and "G400 second head
+  support" here in the framebuffer section.
 
 Matrox I2C support
 CONFIG_FB_MATROX_I2C
-  This drivers creates I2C buses which are needed for accessing
-  DDC (I2C) bus present on all Matroxes, I2C bus which interconnects
-  Matrox optional devices, like MGA-TVO on G200 and G400, and
-  secondary head DDC bus, present on G400 only.
+  This drivers creates I2C buses which are needed for accessing the
+  DDC (I2C) bus present on all Matroxes, an I2C bus which
+  interconnects Matrox optional devices, like MGA-TVO on G200 and
+  G400, and the secondary head DDC bus, present on G400 only.
   
   You can say Y or M here if you want to experiment with monitor 
   detection code. You must say Y or M here if you want to use either
   second head of G400 or MGA-TVO on G200 or G400.
   
-  If you compile it as module, it will create module named i2c-matroxfb.o.
+  If you compile it as module, it will create a module named
+  i2c-matroxfb.o.
   
 Matrox G400 second head support
 CONFIG_FB_MATROX_MAVEN
-  Say Y or M here if you want to use secondary head on G400 or MGA-TVO
-  add-on on G200. Secondary head is not compatible with accelerated
-  XFree 3.3.x SVGA servers - secondary head output is blanked while you
-  are in X. With XFree 3.9.17 preview you can use both heads if you use
-  SVGA over fbdev or fbdev driver on first head and fbdev driver on
-  second head.
+  Say Y or M here if you want to use a secondary head (meaning two
+  monitors in parallel) on G400 or MGA-TVO add-on on G200. Secondary
+  head is not compatible with accelerated XFree 3.3.x SVGA servers -
+  secondary head output is blanked while you are in X. With XFree
+  3.9.17 preview you can use both heads if you use SVGA over fbdev or
+  the fbdev driver on first head and the fbdev driver on second head.
   
-  If you compile it as module, two modules are created, matroxfb_crtc2.o
-  and matroxfb_maven.o. Matroxfb_maven is needed for both G200 and G400,
-  matroxfb_crtc2 is needed only by G400. You must also load i2c-matroxfb
-  to get it to run.
+  If you compile it as module, two modules are created,
+  matroxfb_crtc2.o and matroxfb_maven.o. Matroxfb_maven is needed for
+  both G200 and G400, matroxfb_crtc2 is needed only by G400. You must
+  also load i2c-matroxfb to get it to run.
   
-  Driver starts in monitor mode and you must use matroxset tool (available
-  at ftp://platan.vc.cvut.cz/pub/linux/matrox-latest) to switch it to PAL
-  or NTSC or to swap primary and secondary head outputs. Secondary head
-  driver also always start in 640x480 resolution, you must use fbset to
-  change it.
+  The driver starts in monitor mode and you must use the matroxset
+  tool (available at ftp://platan.vc.cvut.cz/pub/linux/matrox-latest)
+  to switch it to PAL or NTSC or to swap primary and secondary head
+  outputs. Secondary head driver also always start in 640x480
+  resolution, you must use fbset to change it.
   
-  Also do not forget that second head supports only 16 and 32 bpp packed
-  pixels, so it is good idea to compile them into kernel too. You can
-  use only some font widths, as driver uses generic painting procedures
-  (secondary head does not use acceleration engine).
+  Also do not forget that second head supports only 16 and 32 bpp
+  packed pixels, so it is a good idea to compile them into the kernel
+  too. You can use only some font widths, as the driver uses generic
+  painting procedures (the secondary head does not use acceleration
+  engine).
   
   There is no need for enabling 'Matrox multihead support' if you have
   only one Matrox card in the box.
@@ -3026,16 +3101,17 @@ CONFIG_FB_MATROX_MAVEN
 Matrox unified driver multihead support
 CONFIG_FB_MATROX_MULTIHEAD
   Say Y here if you have more than one (supported) Matrox device in
-  your computer and you want to use all of them. If you have only one
-  device, you should say N because the driver compiled with Y is
-  larger and a bit slower, especially on ia32 (ix86). 
+  your computer and you want to use all of them for different monitors
+  ("multihead"). If you have only one device, you should say N because
+  the driver compiled with Y is larger and a bit slower, especially on
+  ia32 (ix86).
 
   If you said M to "Matrox unified accelerated driver" and N here, you
-  will still be able to use several Matrox devices simultaneously.
-  This is slightly faster but uses 40 KB of kernel memory per Matrox
-  card. You do this by inserting several instances of the module 
-  matroxfb.o into the kernel with insmod, supplying the parameter
-  "dev=N" where N is 0, 1, etc. for the different Matrox devices.
+  will still be able to use several Matrox devices simultaneously:
+  insert several instances of the module matroxfb.o into the kernel
+  with insmod, supplying the parameter "dev=N" where N is 0, 1, etc.
+  for the different Matrox devices. This method is slightly faster but
+  uses 40 KB of kernel memory per Matrox card.
 
 MDA text console (dual-headed)
 CONFIG_MDA_CONSOLE
@@ -3188,12 +3264,6 @@ CONFIG_FBCON_MAC
   bits per pixel packed pixels on Mac. It supports variable font
   widths for low resolution screens.
   
-#VGA 16-color planar support
-#CONFIG_FBCON_VGA_PLANES
-###
-###What is this?
-###
-
 VGA characters/attributes support
 CONFIG_FBCON_VGA
   This is the low level frame buffer console driver for VGA text mode;
@@ -3266,17 +3336,11 @@ CONFIG_PARPORT_OTHER
   other non-standard types of parallel ports. This causes a
   performance loss, so most people say N.
 
-Sun Ultra/AX-style hardware
-CONFIG_PARPORT_AX
-  Say Y here if you need support for the parallel port hardware on Sun
-  Ultra/AX machines. This code is also available as a module (say M),
-  called parport_ax.o. If in doubt, saying N is the safe plan.
-
 Support IEEE1284 status readback
 CONFIG_PRINTER_READBACK
-  If you have a device on your parallel port that support this protocol,
-  this option'll enable it to report its status.
-  It is safe to say Y.
+  If you have a device on your parallel port that support this
+  protocol, this option will allow the device to report its status. It
+  is safe to say Y.
 
 IEEE1284 transfer modes
 CONFIG_PARPORT_1284
@@ -3366,9 +3430,9 @@ CONFIG_INET
   Internet connected Unix computer; for more information, read
   http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html ).
   
-  If you say Y here and also to "/proc file system support" and "Sysctl
-  support" below, you can change various aspects of the behavior of
-  the TCP/IP code by writing to the (virtual) files in
+  If you say Y here and also to "/proc file system support" and
+  "Sysctl support" below, you can change various aspects of the
+  behavior of the TCP/IP code by writing to the (virtual) files in
   /proc/sys/net/ipv4/*; the options are explained in the file
   Documentation/Networking/ip-sysctl.txt.
 
@@ -3377,7 +3441,7 @@ CONFIG_INET
 IP: multicasting
 CONFIG_IP_MULTICAST
   This is code for addressing several networked computers at once,
-  enlarging your kernel by about 2 kB. You need multicasting if you
+  enlarging your kernel by about 2 KB. You need multicasting if you
   intend to participate in the MBONE, a high bandwidth network on top
   of the Internet which carries audio and video broadcasts. More
   information about the MBONE is on the WWW at
@@ -3502,8 +3566,8 @@ CONFIG_IP_ROUTER
 
     echo "1" > /proc/sys/net/ipv4/ip_forward
 
-  at boot time after the /proc file system has been mounted. You can do
-  that even if you say N here.
+  at boot time after the /proc file system has been mounted. You can
+  do that even if you say N here.
 
   If unsure, say N here.
 
@@ -3511,7 +3575,7 @@ IP: kernel level autoconfiguration
 CONFIG_IP_PNP
   This enables automatic configuration of IP addresses of devices and
   of the routing table during kernel boot, based on either information
-  supplied at the kernel command line or by BOOTP or RARP protocols.
+  supplied on the kernel command line or by BOOTP or RARP protocols.
   You need to say Y only for diskless machines requiring network
   access to boot (in which case you want to say Y to "Root file system
   on NFS" as well), because all other machines configure the network
@@ -3633,16 +3697,7 @@ CONFIG_INET_PCTCP
   saying Y here. Everyone else says N. 
 
   People having problems with NCSA telnet should see the file
-  linux/Documentation/networking/ncsa-telnet.
-
-Assume subnets are local
-CONFIG_INET_SNARL
-  Say Y if you are on a subnetted network with all machines connected
-  by Ethernet segments only, as this option optimizes network access
-  for this special case. If there are other connections, e.g. SLIP
-  links, between machines of your IP network, say N. If in doubt,
-  answer N. The PATH mtu discovery facility will cover most cases
-  anyway.
+  Documentation/networking/ncsa-telnet.
 
 Path MTU Discovery (normally enabled)
 CONFIG_PATH_MTU_DISCOVERY
@@ -3751,6 +3806,20 @@ CONFIG_IPV6_NETLINK
   say Y to "Kernel/User network link driver" and to "Routing
   messages" instead.
   
+Kernel httpd acceleration (EXPERIMENTAL)
+CONFIG_KHTTPD
+  The kernel httpd acceleration daemon (kHTTPd) is a (limited) 
+  web server built into the kernel. It is limited since it can only
+  serve files from the file system. Saying "M" here builds the
+  kHTTPd module; this is NOT enough to have a working kHTTPd. 
+  For safety reasons, the module has to be activated by doing a
+  "echo 1 > /proc/sys/net/khttpd/start" after inserting the module.
+
+  Before using this, read the README in net/khttpd !
+
+  The kHTTPd is experimental. Be careful when using it on a production
+  machine. Also note that kHTTPd doesn't support virtual servers yet.
+
 IPX networking
 CONFIG_IPX
   This is support for the Novell networking protocol, IPX, commonly
@@ -3760,7 +3829,7 @@ CONFIG_IPX
   ftp://metalab.unc.edu/pub/Linux/system/filesystems/ ) or from within
   the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto ). In order to do the
-  former, you'll also have to say Y to "NCP file systems support",
+  former, you'll also have to say Y to "NCP file system support",
   below.
 
   IPX is similar in scope to IP, while SPX, which runs on top of IPX,
@@ -3819,7 +3888,7 @@ CONFIG_SPX
 
   Note that Novell NetWare file sharing does not use SPX; it uses a
   protocol called NCP, for which separate Linux support is available
-  ("NCP file systems support" below for the client side, and the user
+  ("NCP file system support" below for the client side, and the user
   space programs lwared or mars_nwe for the server side).
 
   Say Y here if you have use for SPX; read the IPX-HOWTO at
@@ -3844,7 +3913,7 @@ CONFIG_DECNET
   More detailed documentation is available in the
   Documentation/networking/decnet.txt file.
 
-  Be sure to say Y to "/proc file systems support" and "Sysctl support"
+  Be sure to say Y to "/proc file system support" and "Sysctl support"
   below when using DECnet, since you will need sysctl support to aid
   in configuration at run time.
 
@@ -3865,22 +3934,28 @@ DECnet Router Support (EXPERIMENTAL)
 CONFIG_DECNET_ROUTER
    Add support for turning your DECnet Endnode into a level 1 or 2
    router. This is an unfinished option for developers only. If you do
-   turn it on, then make sure that you also say Y to "Kernel/User
-   network link driver", "Routing messages" and "Network packet 
+   say Y here, then make sure that you also say Y to "Kernel/User
+   network link driver", "Routing messages" and "Network packet
    filtering". The first two are required to allow configuration via
    rtnetlink (currently you need Alexey Kuznetsov's iproute2 package
-   from ftp.inr.ac.ru). The "Network packet filtering" option will
-   be required for the forthcoming routing daemon to work.
+   from ftp://ftp.inr.ac.ru). The "Network packet filtering" option
+   will be required for the forthcoming routing daemon to work.
 
    See Documentation/networking/decnet.txt for more information.
 
+DECnet: use FWMARK value as routing key
+CONFIG_DECNET_ROUTE_FWMARK
+  If you say Y here, you will be able to specify different routes for
+  packets with different FWMARK ("firewalling mark") values
+  (see ipchains(8), "-m" argument).
+
 Appletalk interfaces support
 CONFIG_APPLETALK
   AppleTalk is the way Apple computers speak to each other on a
   network. If your Linux box is connected to such a network and you
   want to join the conversation, say Y.
 
-AppleTalk DDP
+AppleTalk protocol support
 CONFIG_ATALK
   AppleTalk is the way Apple computers speak to each other on a
   network. If your Linux box is connected to such a network and you
@@ -3894,7 +3969,7 @@ CONFIG_ATALK
   supported by Linux.
 
   General information about how to connect Linux, Windows machines and
-  Macs is on the WWW at http://www.eats.com/linux_mac_win.html The
+  Macs is on the WWW at http://www.eats.com/linux_mac_win.html . The
   NET-3-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto , contains valuable
   information as well.
@@ -4401,17 +4476,23 @@ CONFIG_BRIDGE
   Ethernet bridge, which means that the different Ethernet segments it
   is connected to will appear as one Ethernet to the participants.
   Several such bridges can work together to create even larger
-  networks of Ethernets using the IEEE 802.1d spanning tree protocol.
-  As this is a standard, Linux bridges will interwork properly with
+  networks of Ethernets using the IEEE 802.1 spanning tree algorithm.
+  As this is a standard, Linux bridges will cooperate properly with
   other third party bridge products. 
 
   In order to use the ethernet bridge, you'll need the bridge
-  configuration tools available from ftp://openrock.net/bridge. Please
-  read the Bridge mini-HOWTO for more information. Note that if your
-  box acts as a bridge, it probably contains several Ethernet devices,
-  but the kernel is not able to recognize more than one at boot time
-  without help; for details read the Ethernet-HOWTO, available from in
-  http://www.linuxdoc.org/docs.html#howto .
+  configuration tools; see Documentation/networking/bridge.txt for
+  location. Please read the Bridge mini-HOWTO for more information.
+  
+  Note that if your box acts as a bridge, it probably contains several
+  Ethernet devices, but the kernel is not able to recognize more than
+  one at boot time without help; for details read the Ethernet-HOWTO,
+  available from in http://www.linuxdoc.org/docs.html#howto .
+
+  If you want to compile this code as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called bridge.o.
 
   If unsure, say N.
 
@@ -4491,16 +4572,17 @@ CONFIG_ATM
 Classical IP over ATM
 CONFIG_ATM_CLIP
   Classical IP over ATM for PVCs and SVCs, supporting InARP and
-  ATMARP. Typically you will either use LAN Emulation (LANE) or
-  Classical IP to communicate with other IP hosts on your ATM network.
+  ATMARP. If you want to communication with other IP hosts on your ATM
+  network, you will typically either say Y here or to "LAN Emulation
+  (LANE)" below.
 
-Do NOT send ICMP if no neighbor
+Do NOT send ICMP if no neighbour
 CONFIG_ATM_CLIP_NO_ICMP
-  Normally, an "ICMP host unreachable" message is sent if a neighbor
+  Normally, an "ICMP host unreachable" message is sent if a neighbour
   cannot be reached because there is no VC to it in the kernel's
   ATMARP table. This may cause problems when ATMARP table entries are
   briefly removed during revalidation. If you say Y here, packets to
-  such neighbors are silently discarded instead.
+  such neighbours are silently discarded instead.
 
 LAN Emulation (LANE) support
 CONFIG_ATM_LANE
@@ -4524,12 +4606,16 @@ CONFIG_ATM_TCP
 Efficient Networks ENI155P
 CONFIG_ATM_ENI
   Driver for the Efficient Networks ENI155p series and SMC ATM
-  Power155 155 Mbps ATM adapters. Both, the versions with 512kB and
+  Power155 155 Mbps ATM adapters. Both, the versions with 512KB and
   2MB on-board RAM (Efficient calls them "C" and "S", respectively),
   and the FPGA and the ASIC Tonga versions of the board are supported.
   The driver works with MMF (-MF or ...F) and UTP-5 (-U5 or ...D)
   adapters.
 
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called eni.o.
+
 Enable extended debugging
 CONFIG_ATM_ENI_DEBUG
   Extended debugging records various events and displays that list
@@ -4610,6 +4696,10 @@ CONFIG_ATM_ZATM
   Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
   adapters.
 
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called zatm.o.
+
 Enable extended debugging
 CONFIG_ATM_ZATM_DEBUG
   Extended debugging records various events and displays that list
@@ -4632,7 +4722,11 @@ IDT 77201/11 (NICStAR) (ForeRunnerLE)
 CONFIG_ATM_NICSTAR
   The NICStAR chipset family is used in a large number of ATM NICs for
   25 and for 155 Mbps, including IDT cards and the Fore ForeRunnerLE
-  series.
+  series. Say Y if you have one of those.
+
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called nicstar.o.
 
 ForeRunner LE155 PHYsical layer
 CONFIG_ATM_NICSTAR_USE_SUNI
@@ -4717,6 +4811,35 @@ CONFIG_ATM_IA_DEBUG
   speed of the driver, and the size of your syslog files! When
   inactive, they will have only a modest impact on performance.
 
+Linux telephony support
+CONFIG_PHONE
+  Say Y here if you have a telephony card, which for example allows
+  you to use a regular phone for voice-over-IP applications. 
+
+  Note: this has nothing to do with modems. You do not need to say Y
+  here in order to be able to use a modem under Linux.
+
+  This support is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called phonedev.o.
+
+QuickNet Internet LineJack/PhoneJack support
+CONFIG_PHONE_IXJ
+  Say M if you have a telephony card manufactured by Quicknet
+  Technologies, Inc.  These include the Internet PhoneJACK and
+  Internet LineJACK Telephony Cards. You will get a module called
+  ixj.o. 
+
+  For the ISA versions of these products, you can configure the
+  cards using the isapnp tools (pnpdump/isapnp) or you can use the
+  isapnp support.  Please read Documentation/telephony/ixj.txt.
+
+  For more information on these cards, see Quicknet's web site at:
+  http://www.quicknet.net/ .
+
+  If you do not have any Quicknet telephony cards, you can safely
+  say N here.
+
 FORE Systems 200E-series
 CONFIG_ATM_FORE200E
   This is a driver for the FORE Systems 200E-series ATM adapter
@@ -4729,14 +4852,14 @@ CONFIG_ATM_FORE200E
  
 Enable PCA-200E card support on PCI-based hosts
 CONFIG_ATM_FORE200E_PCA
-  Enable this if you want your PCA-200E cards to be probed.
+  Say Y here if you want your PCA-200E cards to be probed.
  
 Use default PCA-200E firmware
 CONFIG_ATM_FORE200E_PCA_DEFAULT_FW
   Use the default PCA-200E firmware data shipped with the driver.
  
   Normal users do not have to deal with the firmware stuff, so
-  this feature is normally enabled.
+  they should say Y here.
  
 Pathname of user-supplied binary firmware
 CONFIG_ATM_FORE200E_PCA_FW
@@ -4744,20 +4867,20 @@ CONFIG_ATM_FORE200E_PCA_FW
   firmware image supplied by the user. This pathname may be
   absolute or relative to the drivers/atm directory.
  
-  The driver comes with an adequate firmware image, so normal users
-  do not have to supply an alternative one. They just enable the use
-  of the default firmware instead.
+  The driver comes with an adequate firmware image, so normal users do
+  not have to supply an alternative one. They just say Y to "Use
+  default PCA-200E firmware" instead.
  
 Enable SBA-200E card support on SBUS-based hosts
 CONFIG_ATM_FORE200E_SBA
-  Enable this if you want your SBA-200E cards to be probed.
+  Say Y here if you want your SBA-200E cards to be probed.
  
 Use default SBA-200E firmware
 CONFIG_ATM_FORE200E_SBA_DEFAULT_FW
   Use the default SBA-200E firmware data shipped with the driver.
  
   Normal users do not have to deal with the firmware stuff, so
-  this feature is normally enabled.
+  they should say Y here.
  
 Pathname of user-supplied binary firmware
 CONFIG_ATM_FORE200E_SBA_FW
@@ -4765,9 +4888,9 @@ CONFIG_ATM_FORE200E_SBA_FW
   firmware image supplied by the user. This pathname may be
   absolute or relative to the drivers/atm directory.
  
-  The driver comes with an adequate firmware image, so normal users
-  do not have to supply an alternative one. They just enable the use
-  of the default firmware instead.
+  The driver comes with an adequate firmware image, so normal users do
+  not have to supply an alternative one. They just say Y to "Use
+  default SBA-200E firmware", above.
  
 Maximum number of tx retries
 CONFIG_ATM_FORE200E_TX_RETRY
@@ -4815,8 +4938,8 @@ CONFIG_SCSI
   The module will be called scsi_mod.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt and
   Documentation/scsi.txt. However, do not compile this as a module if
-  your root file systems (the one containing the directory /) is located
-  on a SCSI device.
+  your root file system (the one containing the directory /) is
+  located on a SCSI device.
 
 SCSI disk support
 CONFIG_BLK_DEV_SD
@@ -4831,15 +4954,15 @@ CONFIG_BLK_DEV_SD
   The module will be called sd_mod.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt and
   Documentation/scsi.txt. Do not compile this driver as a module if
-  your root file systems (the one containing the directory /) is located
-  on a SCSI disk. In this case, do not compile the driver for your
-  SCSI host adapter (below) as a module either.
+  your root file system (the one containing the directory /) is
+  located on a SCSI disk. In this case, do not compile the driver for
+  your SCSI host adapter (below) as a module either.
 
 Extra SCSI Disks
 CONFIG_SD_EXTRA_DEVS
   This controls the amount of additional space allocated in tables for
   drivers that are loaded as modules after the kernel is booted.  In
-  the event that the SCSI core itself was loaded as a module, this this
+  the event that the SCSI core itself was loaded as a module, this
   value is the number of additional disks that can be loaded after the
   first host driver is loaded.
 
@@ -4847,6 +4970,8 @@ CONFIG_SD_EXTRA_DEVS
   involved with resizing the internal arrays on the fly.  Someday this
   flag will go away, and everything will work automatically.
 
+  If you don't understand what's going on, go with the default.
+
 SCSI tape support
 CONFIG_CHR_DEV_ST
   If you want to use a SCSI tape drive under Linux, say Y and read the
@@ -4866,7 +4991,7 @@ CONFIG_BLK_DEV_SR
   If you want to use a SCSI CDROM under Linux, say Y and read the
   SCSI-HOWTO and the CDROM-HOWTO at
   http://www.linuxdoc.org/docs.html#howto . Also make sure to say Y
-  or M to "ISO 9660 CDROM file systems support" later.
+  or M to "ISO 9660 CDROM file system support" later.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -4877,15 +5002,17 @@ CONFIG_BLK_DEV_SR
 Extra SCSI CDROMs
 CONFIG_SR_EXTRA_DEVS
   This controls the amount of additional space allocated in tables for
-  drivers that are loaded as modules after the kernel is booted.  In the
-  event that the SCSI core itself was loaded as a module, this this value
-  is the number of additional CDROMs that can be loaded after the first
-  host driver is loaded.
+  drivers that are loaded as modules after the kernel is booted. In
+  the event that the SCSI core itself was loaded as a module, this
+  value is the number of additional CDROMs that can be loaded after
+  the first host driver is loaded.
 
   Admittedly this isn't pretty, but there are tons of race conditions
   involved with resizing the internal arrays on the fly.  Someday this
   flag will go away, and everything will work automatically.
 
+  If you don't understand what's going on, go with the default.
+
 Enable vendor-specific extensions (for SCSI CDROM)
 CONFIG_BLK_DEV_SR_VENDOR
   This enables the usage of vendor specific SCSI commands. This is
@@ -4899,14 +5026,15 @@ CONFIG_CHR_DEV_SG
   about anything having "SCSI" in its name other than hard disks,
   CDROMs or tapes, say Y here. These won't be supported by the kernel
   directly, so you need some additional software which knows how to
-  talk to these devices using the SCSI protocol. For CD-writers, you
-  would need the program cdwrite, available from
-  ftp://metalab.unc.edu/pub/Linux/utils/disk-management ; for other
-  devices, it's possible that you'll have to write the driver software
-  yourself, so have a look at the SCSI-HOWTO and at the
-  SCSI-Programming-HOWTO, both available from
-  http://www.linuxdoc.org/docs.html#howto . Please read the file
-  Documentation/scsi-generic.txt for more information.
+  talk to these devices using the SCSI protocol. For scanners, look at
+  SANE (www.mostang.com/sane). For CD writer software look at cdrecord
+  (www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private
+  /cdrecord.html) and for burning a "disk at once": cdrdao
+  (www.ping.de/sites/daneb/cdrdao.html). Cdparanoia is a high quality
+  digital reader of audio CDs (www.xiph.org/paranoia).
+  For other devices, it's possible that you'll have to write the driver
+  software yourself. Please read the file Documentation/scsi-generic.txt
+  for more information.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -4916,13 +5044,14 @@ CONFIG_CHR_DEV_SG
 
 Debug new queueing code for SCSI
 CONFIG_SCSI_DEBUG_QUEUES
-  This option turns on a lot of additional consistency checking for the new
-  queueing code.   This will adversely affect performance, but it is likely
-  that bugs will be caught sooner if this is turned on.   This will typically
-  cause the kernel to panic if an error is detected, but it would have probably
-  crashed if the panic weren't there.   Comments/questions/problems to
-  linux-scsi mailing list please.  See http://www.andante.org/scsi_queue.html
-  for more uptodate information.
+  This option turns on a lot of additional consistency checking for
+  the new queueing code. This will adversely affect performance, but
+  it is likely that bugs will be caught sooner if this is turned on.
+  This will typically cause the kernel to panic if an error is
+  detected, but it would have probably crashed if the panic weren't
+  there. Comments/questions/problems to linux-scsi mailing list
+  please. See http://www.andante.org/scsi_queue.html for more
+  up-to-date information.
 
 Probe all LUNs on each SCSI device
 CONFIG_SCSI_MULTI_LUN
@@ -4946,12 +5075,12 @@ CONFIG_SCSI_LOGGING
   of SCSI related problems. 
 
   If you say Y here, no logging output will appear by default, but you
-  can enable logging by saying Y to "/proc file systems support" and
+  can enable logging by saying Y to "/proc file system support" and
   "Sysctl support" below and executing the command
 
      echo "scsi log token [level]" > /proc/scsi/scsi
 
-  at boot time after the /proc file systems has been mounted.
+  at boot time after the /proc file system has been mounted.
 
   There are a number of things that can be used for 'token' (you can
   find them in the source: drivers/scsi/scsi.c), and this allows you
@@ -4982,7 +5111,7 @@ CONFIG_SCSI_AHA152X
 
   It is explained in section 3.3 of the SCSI-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto . You might also want to
-  read the comments at the top of drivers/scsi/aha152x.c.
+  read the file drivers/scsi/README.aha152x.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5129,18 +5258,22 @@ CONFIG_AIC7XXX_RESET_DELAY
   after a bus reset to be ready for the next command, but most hard
   drives and CD-ROM devices are ready in only a few seconds. This
   option has a maximum upper limit of 20 seconds to avoid bad
-  interactions between the aic7xxx driver and the rest of the linux
+  interactions between the aic7xxx driver and the rest of the Linux
   kernel. The default value has been reduced to 5 seconds. If this
   doesn't work with your hardware, try increasing this value.
 
 IBM ServeRAID Support
 CONFIG_SCSI_IPS
   This is support for the IBM ServeRAID hardware RAID controllers.
-  Consult the SCSI-HOWTO, available via anonymous FTP from
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO, and the file
-  README.ips in drivers/scsi for more information.  If this driver
-  does not work correctly without modification please contact the
-  author by email at ipslinux@us.ibm.com.
+  
+  Please consult the SCSI-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto . 
+
+  You can build this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  but only a single instance may be loaded. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt. The
+  module will be called ips.o.
 
 BusLogic SCSI support
 CONFIG_SCSI_BUSLOGIC
@@ -5165,6 +5298,15 @@ CONFIG_SCSI_OMIT_FLASHPOINT
   substantial, so users of MultiMaster Host Adapters may wish to omit
   it.
 
+DMX3191D SCSI support
+CONFIG_SCSI_DMX3191D
+  This is support for Domex DMX3191D SCSI Host Adapters.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called dmx3191d.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 DTC3180/3280 SCSI support
 CONFIG_SCSI_DTC3280
   This is support for DTC 3180/3280 SCSI Host Adapters. Please read
@@ -5528,9 +5670,7 @@ CONFIG_SCSI_IBMMCA
   info like under OS/2, but more informative, by setting
   'ibmmcascsi=display' as an additional kernel parameter. Try "man
   bootparam" or see the documentation of your boot loader about how to
-  pass options to the kernel. The lilo procedure is also explained in
-  the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .
+  pass options to the kernel.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -5857,13 +5997,32 @@ CONFIG_SCSI_SYM53C416
   read Documentation/modules.txt. The module will be called
   sym53c416.o. 
 
+Simple 53c710 SCSI support (Compaq, NCR machines)
+CONFIG_SCSI_SIM710
+  This is a simple driver for NCR53c710 based SCSI host adapters.
+
+  More complex drivers for this chip are available ("NCR53c7,8xx SCSI
+  support", above), but they require that the scsi chip be able to do
+  DMA block moves between memory and on-chip registers, which can
+  cause problems under certain conditions. This driver is designed to
+  avoid these problems and is intended to work with any Intel machines
+  using 53c710 chips, including various Compaq and NCR machines.
+
+  Please read the comments at the top of the file
+  drivers/scsi/sim710.c for more information.
+
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called sim710.o.
+
 Tekram DC390(T) and Am53/79C974 (PCscsi) SCSI support
 CONFIG_SCSI_DC390T
   This driver supports PCI SCSI host adapters based on the Am53C974A
   chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard
   PCscsi/PCnet (Am53/79C974) solutions.
 
-  Documentation can be found in linux/drivers/scsi/README.tmscsim.
+  Documentation can be found in drivers/scsi/README.tmscsim.
   
   Note that this driver does NOT support Tekram DC390W/U/F, which are
   based on NCR/Symbios chips. Use "NCR53C8XX SCSI support" for those.
@@ -5881,7 +6040,7 @@ CONFIG_SCSI_DC390T_NOGENSUPP
   EEPROM to get initial values for its settings, such as speed,
   termination, etc. If it can't find this EEPROM, it will use defaults
   or the user supplied boot/module parameters. For details on driver
-  configuration see linux/drivers/scsi/README.tmscsim.
+  configuration see drivers/scsi/README.tmscsim.
 
   If you say Y here and if no EEPROM is found, the driver gives up and
   thus only supports Tekram DC390(T) adapters. This can be useful if
@@ -6015,21 +6174,28 @@ CONFIG_SCSI_DEBUG
   important data. This is primarily of use to people trying to debug
   the middle and upper layers of the SCSI subsystem. If unsure, say N.
 
-Fibre Channel support
+Fibre Channel support and FC4 SCSI support
 CONFIG_FC4
-  This is an experimental support for storage arrays connected to
-  the system using Fibre Optic and the "X3.269-199X Fibre Channel
-  Protocol for SCSI" specification. You'll also need the generic SCSI
-  support, as well as the drivers for the storage array itself and
-  for the interface adapter such as SOC or SOC+. This subsystem could even
-  serve for IP networking, with some code extensions. If unsure, say N.
+  Fibre Channel is a high speed serial protocol mainly used to
+  connect large storage devices to the computer; it is compatible with
+  and intended to replace SCSI.
+
+  This is an experimental support for storage arrays connected to your
+  computer using optical fibre cables and the "X3.269-199X Fibre
+  Channel Protocol for SCSI" specification. If you want to use this,
+  you need to say Y here and to "SCSI support" as well as to the
+  drivers for the storage array itself and for the interface adapter
+  such as SOC or SOC+. This subsystem could even serve for IP
+  networking, with some code extensions.
+
+  If unsure, say N.
 
 Sun SOC
 CONFIG_FC4_SOC
   Serial Optical Channel is an interface card with one or two Fibre
-  Optic ports, each of which can be connected to a disk array. Note that
-  if you have older firmware in the card, you'll need the microcode from
-  the Solaris driver to make it work.
+  Optic ports, each of which can be connected to a disk array. Note
+  that if you have older firmware in the card, you'll need the
+  microcode from the Solaris driver to make it work.
 
   This support is also available as a module called soc.o ( = code
   which can be inserted in and removed from the running kernel
@@ -6038,11 +6204,11 @@ CONFIG_FC4_SOC
 
 Sun SOC+ (aka SOCAL)
 CONFIG_FC4_SOCAL
-  Serial Optical Channel Plus is an interface card with up to two Fibre
-  Optic ports. This card supports FC Arbitrated Loop (usually A5000 or
-  internal FC disks in E[3-6]000 machines through the Interface Board).
-  You'll probably need the microcode from the Solaris driver to make it
-  work.
+  Serial Optical Channel Plus is an interface card with up to two
+  Fibre Optic ports. This card supports FC Arbitrated Loop (usually
+  A5000 or internal FC disks in E[3-6]000 machines through the
+  Interface Board). You'll probably need the microcode from the
+  Solaris driver to make it work.
 
   This support is also available as a module called socal.o ( = code
   which can be inserted in and removed from the running kernel
@@ -6060,9 +6226,9 @@ CONFIG_SCSI_PLUTO
 
 Sun Enterprise Network Array (A5000 and EX500)
 CONFIG_SCSI_FCAL
-  This driver drives FC-AL disks connected through a Fibre Channel card
-  using the drivers/fc4 layer (currently only SOCAL).
-  The most common is either A5000 array or internal disks in E[3-6]000
+  This driver drives FC-AL disks connected through a Fibre Channel
+  card using the drivers/fc4 layer (currently only SOCAL). The most
+  common is either A5000 array or internal disks in E[3-6]000
   machines.
 
   This support is also available as a module called fcal.o ( = code
@@ -6123,6 +6289,96 @@ CONFIG_SCSI_POWERTECSCSI
   This enables support for the Powertec SCSI card on Acorn systems. If
   you have one of these, say Y. If unsure, say N.
 
+IEEE 1394 (aka FireWire) support
+CONFIG_IEEE1394
+  IEEE 1394 describes a high performance serial bus, which is also
+  known as FireWire(tm) or i.Link(tm) and is used for connecting all
+  sorts of devices (most notably digital video cameras) to your
+  computer.
+
+  If you have FireWire hardware and want to use it, say Y here.  This
+  is the core support only, you will also need to select a driver for
+  your IEEE 1394 adapter.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called ieee1394.o.
+
+TI PCILynx IEEE 1394 support
+CONFIG_IEEE1394_PCILYNX
+  Say Y here if you have a IEEE-1394 controller with the Texas
+  Instruments PCILynx chip.  Note: this driver is written for revision
+  2 of this chip and may not work with revision 0.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called pcilynx.o.
+
+Use local RAM on PCILynx board
+CONFIG_IEEE1394_PCILYNX_LOCALRAM
+  This option makes the PCILynx driver use local RAM available on some
+  PCILynx setups for Packet Control Lists. Local RAM is random access
+  memory which resides on the PCILynx board as opposed to on your
+  computer's motherboard. Local RAM may speed up command processing
+  because no PCI transfers are necessary during use of the Packet
+  Control Lists.
+  
+  Note that there are no known PCILynx systems providing local RAM
+  except for the evaluation boards by Texas Instruments and that the
+  PCILynx does not reliably report missing RAM. This means that it is
+  dangerous to say Y here if you are not absolutely sure that your
+  board provides 64KB of local RAM.
+
+  If unsure, say N.
+
+Adaptec AIC-5800 IEEE 1394 support
+CONFIG_IEEE1394_AIC5800
+  Say Y here if you have a IEEE 1394 controller using the Adaptec
+  AIC-5800 chip. All Adaptec host adapters (89xx series) use this
+  chip, as well as miro's DV boards.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called aic5800.o.
+
+OHCI (Open Host Controller Interface) support
+CONFIG_IEEE1394_OHCI1394
+  Say Y here if you have a IEEE 1394 controller based on OHCI.
+  The current driver was only tested with OHCI chipsets made
+  by Texas Instruments. However, most third-party vendors use
+  TI chips.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called ohci1394.o.
+
+Raw IEEE 1394 I/O support
+CONFIG_IEEE1394_RAWIO
+  Say Y here if you want support for the raw device. This is generally
+  a good idea, so you should say Y here. The raw device enables
+  direct communication of user programs with the IEEE 1394 bus and
+  thus with the attached peripherals.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called raw1394.o.
+
+Excessive debugging output
+CONFIG_IEEE1394_VERBOSEDEBUG
+  If you say Y here, you will get very verbose debugging logs from the
+  subsystem which includes a dump of the header of every sent and
+  received packet.  This can amount to a high amount of data collected
+  in a very short time which is usually also saved to disk by the
+  system logging daemons.
+
+  Say Y if you really want or need the debugging output, everyone else
+  says N.
+
 Network device support?
 CONFIG_NETDEVICES
   You can say N here if you don't intend to connect your Linux box to
@@ -6150,29 +6406,9 @@ CONFIG_NETDEVICES
 
   Make sure to read the NET-3-HOWTO. Eventually, you will have to read
   Olaf Kirch's excellent and free book "Network Administrator's
-  Guide", to be found in ftp://metalab.unc.edu/pub/Linux/docs/LDP . If
+  Guide", to be found in http://www.linuxdoc.org/docs.html#guide . If
   unsure, say Y.
 
-Bonding driver support
-CONFIG_BONDING
-  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
-  Channels together.  This is called 'Etherchannel' by Cisco, 'Trunking'
-  by Sun, and 'Bonding' in Linux.
-
-  If you have two ethernet connections to some other computer, you can
-  make them behave like one double speed connection using this driver.
-  Naturally, this has to be supported at the other end as well, either
-  with a similar Bonding Linux driver, a Cisco 5500 switch or a
-  SunTrunking SunSoft driver.
-
-  This is similar to the EQL driver, but it merge ethernet segments instead
-  of serial lines.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called bonding.o.
-
 Dummy net driver support
 CONFIG_DUMMY
   This is essentially a bit-bucket device (i.e. traffic you send to
@@ -6183,7 +6419,7 @@ CONFIG_DUMMY
   thing often comes in handy, the default is Y. It won't enlarge your
   kernel either. What a deal. Read about it in the Network
   Administrator's Guide, available from
-  http://metalab.unc.edu/mdw/linux.html#guide .
+  http://www.linuxdoc.org/docs.html#guide .
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -6192,6 +6428,26 @@ CONFIG_DUMMY
   time, you need to compile this driver as a module. Instead of
   'dummy', the devices will then be called 'dummy0', 'dummy1' etc.
 
+Bonding driver support
+CONFIG_BONDING
+  Say 'Y' or 'M' if you wish to be able to 'bond' multiple Ethernet
+  Channels together. This is called 'Etherchannel' by Cisco,
+  'Trunking' by Sun, and 'Bonding' in Linux.
+
+  If you have two ethernet connections to some other computer, you can
+  make them behave like one double speed connection using this driver.
+  Naturally, this has to be supported at the other end as well, either
+  with a similar Bonding Linux driver, a Cisco 5500 switch or a
+  SunTrunking SunSoft driver.
+
+  This is similar to the EQL driver, but it merges Ethernet segments
+  instead of serial lines.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called bonding.o.
+
 SLIP (serial line) support
 CONFIG_SLIP
   Say Y if you intend to use SLIP or CSLIP (compressed SLIP) to
@@ -6231,11 +6487,11 @@ CONFIG_SLIP_COMPRESSED
   on both ends. Ask your access provider if you are not sure and
   answer Y, just in case. You will still be able to use plain SLIP. If
   you plan to use SLiRP, the SLIP emulator (available from
-  ftp://metalab.unc.edu/pub/Linux/system/network/serial/ ) which allows
-  you to use SLIP over a regular dial up shell connection, you
+  ftp://metalab.unc.edu/pub/Linux/system/network/serial/ ) which
+  allows you to use SLIP over a regular dial up shell connection, you
   definitely want to say Y here. The NET-3-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto , explains how to
-  configure CSLIP. This won't enlarge your kernel.
+  http://www.linuxdoc.org/docs.html#howto , explains how to configure
+  CSLIP. This won't enlarge your kernel.
 
 Keepalive and linefill
 CONFIG_SLIP_SMART
@@ -6296,6 +6552,7 @@ CONFIG_PPP_ASYNC
   into and removed from the running kernel).  If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
+PPP support for sync tty ports
 CONFIG_PPP_SYNC_TTY
   Say Y (or M) here if you want to be able to use PPP over synchronous
   (HDLC) tty devices, such as the SyncLink adapter. These devices
@@ -6338,10 +6595,20 @@ CONFIG_PPP_BSDCOMP
 Wireless LAN (non-hamradio)
 CONFIG_NET_RADIO
   Support for wireless LANs and everything having to do with radio,
-  but not with amateur radio. Note that the answer to this question
-  won't directly affect the kernel: saying N will just cause this
-  configure script to skip all the questions about radio
-  interfaces. 
+  but not with amateur radio or FM broadcasting.
+
+  Saying Y here also enables the Wireless Extensions (creates
+  /proc/net/wireless and enables ifconfig access). The Wireless
+  Extension is a generic API allowing a driver to expose to the user
+  space configuration and statistics specific to common Wireless LANs.
+  The beauty of it is that a single set of tool can support all the
+  variations of Wireless LANs, regardless of their type (as long as
+  the driver supports Wireless Extension). Another advantage is that
+  these parameters may be changed on the fly without restarting the
+  driver (or Linux). If you wish to use Wireless Extensions with
+  wireless PCMCIA (PC-) cards, you need to say Y here; you can fetch
+  the tools from
+  http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html .
 
   Some user-level drivers for scarab devices which don't require
   special kernel support are available from
@@ -6388,8 +6655,8 @@ CONFIG_WAVELAN
   in the source code drivers/net/wavelan.p.h.
 
   You will also need the wireless tools package available from
-  ftp://hyper.stanford.edu/pub/pcmcia/contrib/ . Please read the man
-  pages contained therein.
+  http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html .
+  Please read the man pages contained therein.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6402,95 +6669,109 @@ CONFIG_ARLAN
   Aironet makes Arlan, a class of wireless LAN adapters. These use the
   www.Telxon.com chip, which is also used on several similar cards.
   This driver is tested on the 655 and IC2200 series cards. Look at
-  http://www.ylenurme.ee/~elmer/655/ for latest information.
+  http://www.ylenurme.ee/~elmer/655/ for the latest information.
   
   The driver is built as two modules, arlan and arlan-proc. The latter
   is the /proc interface and is not needed most of time.
   
-  On some computers the card ends up in non-valid state after some time.
-  Use a ping-reset script to clear it.
+  On some computers the card ends up in non-valid state after some
+  time. Use a ping-reset script to clear it.
 
 Aironet 4500/4800 series adapters
 CONFIG_AIRONET4500
   www.aironet.com (recently bought by Cisco) makes these 802.11 DS
   adapters.  Driver by Elmer Joandi (elmer@ylenurme.ee).
-  Work sponsored by www.spectrumwireless.net and www.vendomar.ee
-  This configuration option enables common code for all devices (PCI, ISA,
-  PCMCIA)
-  module is aironet4500_core
+
+  Say Y here if you have such an adapter, and then say Y below to 
+  the option that applies to your particular type of card (PCI, ISA, 
+  or PCMCIA).
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called aironet4500_core.o. If you want to 
+  compile it as a module, say M here and read 
+  Documentation/modules.txt as well as
+  Documentation/networking/net-modules.txt.
+
   quick config parameters: 
 	SSID=tsunami - "The Password"
 	adhoc=1  	there are no Access Points around
-	master=1 	Adhoc master (the one who creates network sync)
-	slave=1		Adhoc slave(btw, it is still forming own net 
+	master=1 	Adhoc master (the one who creates network 
+                        sync)
+	slave=1		Adhoc slave (btw, it is still forming own net 
 			sometimes, and has problems with firmware...
 			change IbssJoinNetTimeout from /proc...)
 	channel=1..? 	meaningful in adhoc mode
-  all other parameters can be set via /proc interface
-  These parameters belong to .._card module, but alas, they are here
-  if you have problems with screwing up card, both_bap_lock=1 is conservative
-  value (performance hit 15%)
-  for any other configuration options look at ..._proc module
+  
+  If you have problems with screwing up card, both_bap_lock=1 is a
+  conservative value (performance hit 15%).
+
+  All other parameters can be set via the proc interface.
 
 Aironet 4500/4800 ISA/PCI/PNP/365 support
 CONFIG_AIRONET4500_NONCS
-  This is module aironet4500_card, which includes _possibility_ to
-  support for following
-  PCI device
-  ISA device in ISA mode(does not work currently)
-  ISA device in PNP mode
-  PCMCIA device _without_ cardservices, direct 365 chip INIT, 
-	does not work currently
-  PCMCIA _with_ CardServices(normal way) is at another module 
-  radio parameters are currently configurable at ..._core module
+  If you have an ISA, PCI or PCMCIA Aironet 4500/4800 wireless LAN 
+  card, say Y here, and then also to the options below that apply 
+  to you.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called aironet4500_card.o. If you want to 
+  compile it as a module, say M here and read 
+  Documentation/modules.txt
 
 Aironet 4500/4800 PNP support
 CONFIG_AIRONET4500_PNP
-	This option should be enabled for ISA cards, remember to enable
-	PNP jumper on board. 
-	module aironet4500_card
+  If you have an ISA Aironet 4500/4800 card which you want to use in 
+  PNP (Plug and Play) mode, say Y here. This is the recommended mode
+  for ISA cards. Remember however to enable the PNP jumper on the
+  board if you say Y here.
 
 Aironet 4500/4800 PCI support
 CONFIG_AIRONET4500_PCI
-	This option should be enabled for PCI cards
-	module aironet4500_card
+  If you have an PCI Aironet 4500/4800 card, say Y here.
 
 Aironet 4500/4800 ISA broken support (EXPERIMENTAL)
 CONFIG_AIRONET4500_ISA
-	This option enables support for ISA cards in non-PNP mode. 
-	Does not operate correctly by now.
-	module aironet4500_card
+  If you have an ISA Aironet 4500/4800 card which you want to run in
+  non-PNP mode, say Y here. This is not recommended and does not work
+  correctly at this point. Say N.
 
 Aironet 4500/4800 I365 broken support (EXPERIMENTAL)
 CONFIG_AIRONET4500_I365
-	This option enables support for PCMCIA cards on i365 controller 
-	_without_ cardservices. Doesn't have much sense and is not working
-	properly. Comes from times where there was no PCMCIA support in
-	kernel main source tree
+  If you have a PCMCIA Aironet 4500/4800 card which you want to use 
+  without the standard PCMCIA cardservices provided by the pcmcia-cs 
+  package, say Y here. This is not recommended, so say N.
 
 Aironet 4500/4800 PCMCIA support
 CONFIG_AIRONET4500_CS
-	This option enables support for PCMCIA cards to be used with
-	CardServices. 
-	This is not for ISA and PCI adapters.
-	module aironet4500_cs.o
-	The same option is both on:
-		1. PCMCIA netdevices configuring panel
-		2. Wireless netdevices configuring panel
-	Possibility to change this option depends on options set in 2.
+  Say Y here if you have a PCMCIA Aironet 4500/4800 card which you 
+  want to use with the standard PCMCIA cardservices provided by the
+  pcmcia-cs package.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called aironet4500_cs.o. If you want to 
+  compile it as a module, say M here and read 
+  Documentation/modules.txt.
 	
 Aironet 4500/4800 PROC interface
 CONFIG_AIRONET4500_PROC
-	This option enables /proc/sys/aironet4500 interface for 
-	configuring the device.
-	NOTE: it takes lot of memory. Compile it as module and remove
-	after configuration
-	module: aironet4500_proc
-	additional info: look into drivers/net/aironet4500_rids.c
-	this is quite human-readable(no need to know C)
+  If you say Y here (and to the "/proc file system" below), you will 
+  be able to configure your Aironet card via the 
+  /proc/sys/aironet4500 interface.
 
+  Additional info: look in drivers/net/aironet4500_rids.c.
 
- 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called aironet4500_proc.o. If you want to 
+  compile it as a module, say M here and read 
+  Documentation/modules.txt.
+
+  NOTE: the proc interface uses a lot of memory, so it is recommended
+        to compile it as a module and remove the module after 
+        configuration.
 
 LAPB over Ethernet driver
 CONFIG_LAPBETHER
@@ -6520,8 +6801,18 @@ CONFIG_X25_ASY
 
 PCMCIA network device support
 CONFIG_NET_PCMCIA
-  Say Y if you would like to include support for any PCMCIA network
-  adapters.  If unsure, say N.
+  Say Y if you would like to include support for any PCMCIA or CardBus
+  network adapters, then say Y to the driver for your particular card
+  below. PCMCIA- or PC-cards are credit-card size devices often used
+  with laptops computers; CardBus is the newer and faster version of
+  PCMCIA. 
+
+  To use your PC-cards, you will need supporting software from David
+  Hinds' pcmcia-cs package (see the file Documentation/Changes for
+  location). You also want to check out the PCMCIA-HOWTO, available
+  from http://www.linuxdoc.org/docs.html#howto .
+
+  If unsure, say N.
 
 3Com 3c589 PCMCIA support
 CONFIG_PCMCIA_3C589
@@ -6552,8 +6843,8 @@ CONFIG_PCMCIA_FMVJ18X
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called fmvj18x_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called fmvj18x_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
 NE2000 compatible PCMCIA support
@@ -6574,8 +6865,8 @@ CONFIG_PCMCIA_NMCLAN
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called nmclan_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called nmclan_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
 SMC 91Cxx PCMCIA support
@@ -6585,9 +6876,9 @@ CONFIG_PCMCIA_SMC91C92
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called smc91c92_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
-  say N.
+  The module will be called smc91c92_cs.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt. If
+  unsure, say N.
 
 Xircom 16-bit PCMCIA support
 CONFIG_PCMCIA_XIRC2PS
@@ -6596,10 +6887,21 @@ CONFIG_PCMCIA_XIRC2PS
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called xirc2ps_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called xirc2ps_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
+COM20020 ARCnet PCMCIA support
+CONFIG_ARCNET_COM20020_CS
+  Say Y here if you intend to attach this type of ARCnet PCMCIA card
+  to your computer.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called com20020_cs.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt. If
+  unsure, say N.
+
 3Com 3c575 CardBus support
 CONFIG_PCMCIA_3C575
   This driver supports the 3Com 3c575 series of CardBus Fast Ethernet
@@ -6610,20 +6912,36 @@ CONFIG_PCMCIA_3C575
   The module will be called 3c575_cb.o. If you want to do that, say M
   here and read Documentation/modules.txt.  If unsure, say N.
 
-SMC EPIC CardBus support
-CONFIG_PCMCIA_EPIC100
-  This driver supports CardBus Fast Ethernet adapters based on the SMC
-  EPIC chipset.
+Xircom Tulip-like CardBus support
+CONFIG_PCMCIA_XIRTULIP
+  This driver is for the Digital "Tulip" Ethernet CardBus adapters.
+  It should work with most DEC 21*4*-based chips/ethercards, as well
+  as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
+  ASIX.
 
-  This driver can only be compiled as a module ( = code which can be
+  This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called epic100_cb.o. If you want to do that, say
-  M here and read Documentation/modules.txt.  If unsure, say N.
+  The module will be called xircom_tulip_cb.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. If
+  unsure, say N.
+
+Pcmcia Wireless LAN
+CONFIG_NET_PCMCIA_RADIO
+  Say Y here if you would like to use a PCMCIA (PC-card) device to
+  connect to a wireless local area network. Then say Y to the driver
+  for your particular card below.
+
+  To use your PC-cards, you will need supporting software from David
+  Hinds' pcmcia-cs package (see the file Documentation/Changes for
+  location). You also want to check out the PCMCIA-HOWTO, available
+  from http://www.linuxdoc.org/docs.html#howto .
 
 Aviator/Raytheon 2.4MHz wireless support
 CONFIG_PCMCIA_RAYCS
   Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
   (PC-card) wireless Ethernet networking card to your computer.
+  Please read the file Documentation/networking/ray_cs.txt for
+  details.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -6633,13 +6951,13 @@ CONFIG_PCMCIA_RAYCS
 
 Xircom Netwave AirSurfer wireless support
 CONFIG_PCMCIA_NETWAVE
-  Say Y here if you intend to attach a Xircom Netwave AirSurfer PCMCIA
-  (PC-card) wireless Ethernet networking card to your computer.
+  Say Y here if you intend to attach this type of PCMCIA (PC-card)
+  wireless Ethernet networking card to your computer.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called netwave_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called netwave_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
 AT&T/Lucent Wavelan wireless support
@@ -6650,8 +6968,8 @@ CONFIG_PCMCIA_WAVELAN
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called wavelan_cs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
+  The module will be called wavelan_cs.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt. If unsure,
   say N.
 
 PLIP (parallel port) support
@@ -6814,17 +7132,6 @@ CONFIG_ECONET_NATIVE
   Say Y here if you have a native Econet network card installed in
   your computer.
 
-Wan interfaces support
-CONFIG_WAN
-  Wide Area Networks (WANs), such as X.25, frame relay and leased
-  lines, are used to interconnect Local Area Networks (LANs) over vast
-  distances with data transfer rates significantly higher than those
-  achievable with commonly used asynchronous modem connections.
-
-  Say Y here if you want to use such interconnections.
-
-  It is safe to say N. Most people won't need it.
-
 WAN Router
 CONFIG_WAN_ROUTER
   Wide Area Networks (WANs), such as X.25, frame relay and leased
@@ -6850,18 +7157,6 @@ CONFIG_WAN_ROUTER
 
   If unsure, say N.
 
-WAN router drivers
-CONFIG_WAN_ROUTER_DRIVERS
-  Wide Area Networks (WANs), such as X.25, frame relay and leased
-  lines, are used to interconnect Local Area Networks (LANs) over vast
-  distances with data transfer rates significantly higher than those
-  achievable with commonly used asynchronous modem connections.
-  Usually, a quite expensive external device called a `WAN router' is
-  needed to connect to a WAN.
-
-  Say Y here will enable the kernel to a??? as a WAN router betwenn LAN by
-  means of WAN adapters.
-
 Fast switching (read help!)
 CONFIG_NET_FASTROUTE
   Saying Y here enables direct NIC-to-NIC (NIC = Network Interface
@@ -6917,9 +7212,15 @@ CONFIG_NET_SCHED
   That package also contains some documentation; for more, check out
   http://snafu.freedom.org/linux2.2/iproute-notes.html .
 
-  If you say Y here and to "/proc file system support" below, you will
-  be able to read status information about packet schedulers from the
-  file /proc/net/psched.
+  This Quality of Service (QoS) support will enable you to use
+  Differentiated Services (diffserv) and Resource Reservation Protocol
+  (RSVP) on your Linux router if you also say Y to "QoS support",
+  "Packet classifier API" and to some classifiers below. Documentation
+  and software is at http://icawwww1.ipfl.ch/linux/diffserv/ .
+
+  If you say Y here and to "/proc file system" below, you will be able
+  to read status information about packet schedulers from the file
+  /proc/net/psched.
   
   The available schedulers are listed in the following questions; you
   can say Y to as many as you like. If unsure, say N now.
@@ -7030,12 +7331,23 @@ CONFIG_NET_SCH_TBF
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
+### Add these
+#+tristate '  GRED queue' CONFIG_NET_SCH_GRED
+#+tristate '  Diffserv field marker' CONFIG_NET_SCH_DSMARK
+#+tristate '  Ingress Qdisc' CONFIG_NET_SCH_INGRESS
+
 QoS support
 CONFIG_NET_QOS
   Say Y here if you want to include Quality Of Service scheduling
   features, which means that you will be able to request certain
   rate-of-flow limits for your network devices.
 
+  This Quality of Service (QoS) support will enable you to use
+  Differentiated Services (diffserv) and Resource Reservation Protocol
+  (RSVP) on your Linux router if you also say Y to "Packet classifier
+  API" and to some classifiers below. Documentation and software is at
+  http://icawwww1.ipfl.ch/linux/diffserv/ .
+
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
   the questions about QoS support.
@@ -7054,8 +7366,16 @@ CONFIG_NET_CLS
   choice of several different packet classifiers with the following
   questions.
 
+  This will enable you to use Differentiated Services (diffserv) and
+  Resource Reservation Protocol (RSVP) on your Linux router.
+  Documentation and software is at
+  http://icawwww1.ipfl.ch/linux/diffserv/ .
+
+### Add
+#tristate '    TC index classifier' CONFIG_NET_CLS_TCINDEX
+
 Routing tables based classifier
-CONFIG_NET_CLS_ROUTE
+CONFIG_NET_CLS_ROUTE4
   If you say Y here, you will be able to classify outgoing packets
   according to the route table entry they matched. If unsure, say Y.
 
@@ -7114,7 +7434,7 @@ CONFIG_NET_CLS_RSVP6
   here and read Documentation/modules.txt
 
 #
-# Ingres traffic policing
+# Traffic policing (needed for in/egress)
 # CONFIG_NET_CLS_POLICE
 ###
 ### Some expert please fill these in
@@ -7127,6 +7447,22 @@ CONFIG_NET_PROFILE
   performance will be written to /proc/net/profile. If you don't know
   what it is about, you don't need it: say N.
 
+Wan interfaces support
+CONFIG_WAN
+  Wide Area Networks (WANs), such as X.25, frame relay and leased
+  lines, are used to interconnect Local Area Networks (LANs) over vast
+  distances with data transfer rates significantly higher than those
+  achievable with commonly used asynchronous modem connections.
+  Usually, a quite expensive external device called a `WAN router' is
+  needed to connect to a WAN.
+
+  As an alternative, a relatively inexpensive WAN interface card can
+  allow your Linux box to directly connect to a WAN. If you have one
+  of those cards and wish to use it under Linux, say Y here and also
+  to the WAN driver for your card, below.
+
+  If unsure, say N.
+
 Comtrol Hostess SV-11 support
 CONFIG_HOSTESS_SV11
   This is a network card for low speed synchronous serial links, at
@@ -7158,16 +7494,24 @@ CONFIG_COSA
 
 Fibre Channel driver support
 CONFIG_NET_FC
-  Say Y here provide support for storage arrays connected to
-  the system using Fibre Optic and the "X3.269-199X Fibre Channel
-  Protocol for SCSI" specification. You'll also need the generic SCSI
-  support, as well as the drivers for the storage array itself and
-  for the interface adapter such as SOC or SOC+. This subsystem could even
-  serve for IP networking, with some code extensions. If unsure, say N.
+  Fibre Channel is a high speed serial protocol mainly used to connect
+  large storage devices to the computer; it is compatible with and
+  intended to replace SCSI. 
 
-# Interphase 5526 Tachyon chipset based adaptor support
-# CONFIG_IPHASE5526
+  If you intend to use Fibre Channel, you need to have a Fibre channel
+  adaptor card in your computer; say Y here and to the driver for your
+  adaptor below. You also should have said Y to "SCSI support" and
+  "SCSI generic support".
 
+Interphase 5526 Tachyon chipset based adaptor support
+CONFIG_IPHASE5526
+  Say Y here if you have a Fibre Channel adaptor of this kind.
+
+  The driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called iph5526.o. For general information about
+  modules read Documentation/modules.txt.
+  
 Red Creek Hardware VPN (EXPERIMENTAL)
 CONFIG_RCPCI
   This is a driver for hardware which provides a Virtual Private
@@ -7178,43 +7522,46 @@ CONFIG_RCPCI
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
   
-SBNI Leased Line Adapters
+SBNI12-xx support
 CONFIG_SBNI
-  This is a driver for ISA SBNI12-xx cards that is a low cost
-  alternative to leased line modems. Say Y if you want to insert
-  driver into kernel or say M to compile driver as a module. 
+  This is a driver for ISA SBNI12-xx cards which are low cost
+  alternatives to leased line modems. Say Y if you want to insert
+  the driver into the kernel or say M to compile it as a module (the
+  module will be called sbni.o). 
   
   You can find more information and last versions of drivers and 
-  utilities at http://www.granch.ru. If you have any question you
-  can mail to sbni@granch.ru.
+  utilities at http://www.granch.ru . If you have any question you
+  can send email to sbni@granch.ru.
   
   Say N if unsure.
-  
-WAN Drivers
-CONFIG_WAN_DRIVERS
-  Say Y to this option if your Linux box contains a WAN card and you
-  are planning to use the box as a WAN ( = Wide Area Network) router 
-  ( = device used to interconnect local area networks over wide area
-  communication links, such as leased lines or public data networks,
-  e.g. X.25 or frame relay) and you will be offered a list of drivers
-  for WAN cards currently available. For more information, read
-  Documentation/networking/wan-router.txt.
+
+WAN router drivers
+CONFIG_WAN_ROUTER_DRIVERS
+  If you have a WAN interface card and you want your Linux box to act
+  as a WAN router, thereby connecting you Local Area Network to the
+  outside world over the WAN connection, say Y here and then to the
+  driver for your card below. In addition, you need to say Y to "Wan
+  Router".
+
+  You will need the wan-tools package which is available from
+  ftp://ftp.sangoma.com . Read Documentation/networking/wan-router.txt
+  for more information.
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
-  the questions about WAN card drivers. If unsure, say N.
+  the questions about WAN router drivers. If unsure, say N.
 
 Sangoma WANPIPE(tm) multiprotocol cards
 CONFIG_VENDOR_SANGOMA
-  WANPIPE from Sangoma Technologies Inc. (http://www.sangoma.com ) is a
-  family of intelligent multiprotocol WAN adapters with data transfer
-  rates up to T1 (1.544 Mbps). They are also known as Synchronous Data
-  Link Adapters (SDLA) and designated S502E(A), S503 or S508. These
-  cards support the X.25, Frame Relay, and PPP protocols. If you have
-  one or more of these cards, say Y to this option; you may then also
-  want to read the file Documentation/networking/wanpipe.txt. The next
-  questions will ask you about the protocols you want the driver to
-  support.
+  WANPIPE from Sangoma Technologies Inc. (http://www.sangoma.com ) is
+  a family of intelligent multiprotocol WAN adapters with data
+  transfer rates up to T1 (1.544 Mbps). They are also known as
+  Synchronous Data Link Adapters (SDLA) and designated S502E(A), S503
+  or S508. These cards support the X.25, Frame Relay, and PPP
+  protocols. If you have one or more of these cards, say Y to this
+  option; you may then also want to read the file
+  Documentation/networking/wanpipe.txt. The next questions will ask
+  you about the protocols you want the driver to support.
 
   The driver will be compiled as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7229,6 +7576,13 @@ CONFIG_WANPIPE_CARDS
   re-compiling the driver, but remember that in this case you'll waste
   some kernel memory (about 1K per card).
 
+WANPIPE Cisco HDLC support
+CONFIG_WANPIPE_CHDLC
+  Say Y to this option if you are planning to connect a WANPIPE card
+  to a connection which uses the synchronous Cisco HDLC (High-level
+  Data Link Control) protocol. This protocol is often used on
+  high-speed leased lines like T1/E1.
+
 WANPIPE X.25 support
 CONFIG_WANPIPE_X25
   Say Y to this option if you are planning to connect a WANPIPE card
@@ -7255,13 +7609,13 @@ CONFIG_WANPIPE_PPP
 
 MultiGate/COMX support
 CONFIG_COMX
-  Say Y if you want to use any board from the MultiGate (COMX) family. 
-  These boards are synchronous serial adapters for the PC, manufactured 
-  by ITConsult-Pro Co, Hungary. 
+  Say Y if you want to use any board from the MultiGate (COMX) family.
+  These boards are synchronous serial adapters for the PC,
+  manufactured by ITConsult-Pro Co, Hungary.
 
-  Read linux/Documentation/networking/comx.txt  for help on configuring 
-  and using COMX interfaces. Further info on these cards can be found at 
-  http://www.itc.hu or <info@itc.hu>.
+  Read linux/Documentation/networking/comx.txt for help on configuring
+  and using COMX interfaces. Further info on these cards can be found
+  at http://www.itc.hu or <info@itc.hu>.
 
   If you want to compile this as a module, say M and read
   Documentation/modules.txt. The module will be called comx.o.
@@ -7279,30 +7633,34 @@ CONFIG_COMX_HW_COMX
 
 LoCOMX board support
 CONFIG_COMX_HW_LOCOMX
-  Hardware driver for the 'LoCOMX' board from the MultiGate family. Say Y
-  if you have a board like this. 
+  Hardware driver for the 'LoCOMX' board from the MultiGate family.
+  Say Y if you have a board like this.
 
   If you want to compile this as a module, say M and read
-  Documentation/modules.txt. The module will be called comx-hw-locomx.o.
+  Documentation/modules.txt. The module will be called
+  comx-hw-locomx.o.
 
 MixCOM board support
 CONFIG_COMX_HW_MIXCOM
-  Hardware driver for the 'MixCOM' board from the MultiGate family. Say Y
-  if you have a board like this.
+  Hardware driver for the 'MixCOM' board from the MultiGate family.
+  Say Y if you have a board like this.
 
   If you want to use the watchdog device on this card, you should
   select it in the Watchdog Cards section of the Character Devices
-  configuration. The ISDN interface of this card is Teles 16.3 compatible,
-  you should enable it in the ISDN configuration menu. The driver for the 
-  flash ROM of this card is available separately on ftp://ftp.itc.hu/.
+  configuration. The ISDN interface of this card is Teles 16.3
+  compatible, you should enable it in the ISDN configuration menu. The
+  driver for the flash ROM of this card is available separately on
+  ftp://ftp.itc.hu/.
 
   If you want to compile this as a module, say M and read
-  Documentation/modules.txt. The module will be called comx-hw-mixcom.o.
+  Documentation/modules.txt. The module will be called
+  comx-hw-mixcom.o.
 
 MultiGate Cisco-HDLC and synchronous PPP protocol support
 CONFIG_COMX_PROTO_PPP
-  Cisco-HDLC and synchronous PPP protocol driver for all MultiGate boards. 
-  Say Y if you want to use either protocol on your MultiGate boards.
+  Cisco-HDLC and synchronous PPP protocol driver for all MultiGate
+  boards. Say Y if you want to use either protocol on your MultiGate
+  boards.
 
   If you want to compile this as a module, say M and read
   Documentation/modules.txt. The module will be called 
@@ -7314,7 +7672,8 @@ CONFIG_COMX_PROTO_LAPB
   want to use this protocol on your MultiGate boards.
 
   If you want to compile this as a module, say M and read
-  Documentation/modules.txt. The module will be called comx-proto-lapb.o.
+  Documentation/modules.txt. The module will be called
+  comx-proto-lapb.o.
 
 MultiGate Frame Relay protocol support
 CONFIG_COMX_PROTO_FR
@@ -7322,7 +7681,8 @@ CONFIG_COMX_PROTO_FR
   want to use this protocol on your MultiGate boards.
 
   If you want to compile this as a module, say M and read
-  Documentation/modules.txt. The module will be called comx-proto-fr.o.
+  Documentation/modules.txt. The module will be called
+  comx-proto-fr.o.
 
 Cyclom 2X(tm) multiprotocol cards (EXPERIMENTAL)
 CONFIG_CYCLADES_SYNC
@@ -7343,7 +7703,7 @@ CONFIG_CYCLADES_SYNC
   Feel free to contact me or the cycsyn-devel mailing list at
   acme@conectiva.com.br and cycsyn-devel@bazar.conectiva.com.br for
   additional details, I hope to have documentation available as soon
-  as possible (Cyclades Brazil is writing the Documentation).
+  as possible. (Cyclades Brazil is writing the Documentation).
 
   The driver will be compiled as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -7383,22 +7743,6 @@ CONFIG_NET_ETHERNET
   kernel: saying N will just cause this configure script to skip all
   the questions about Ethernet network cards. If unsure, say N.
 
-Sun LANCE Ethernet support
-CONFIG_SUN_LANCE
-  This is support for lance Ethernet cards on Sun workstations such as
-  the SPARCstation IPC (any SPARC with a network interface 'le0' under
-  SunOS basically). 
-
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called lance.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
-
-Sun Intel Ethernet support
-CONFIG_SUN_INTEL
-  This is support for the Intel Ethernet cards on some Sun
-  workstations (all those with a network interface 'ie0' under SunOS).
-
 Western Digital/SMC cards
 CONFIG_NET_VENDOR_SMC
   If you have a network (Ethernet) card belonging to this class, say Y
@@ -7494,19 +7838,6 @@ CONFIG_NE2K_PCI
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-PCI DM9102(A)/DM9132/DM9801 support 
-CONFIG_DM9102
-  This driver is for DM9102 compatible PCI cards from Davicom 
-  (http://www.davicom.com.tw) including models DM9132 & DM9801.
-  If you have a PCI DM9102, DM9132 or DM9801 network (Ethernet)
-  card, say Y.
-
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called dmfe.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt as well as
-  Documentation/networking/net-modules.txt.
-
 Racal-Interlan (Micom) NI cards
 CONFIG_NET_VENDOR_RACAL
   If you have a network (Ethernet) card belonging to this class, such
@@ -7570,9 +7901,9 @@ CONFIG_RTL8129
 RealTek RTL-8139 PCI Fast Ethernet Adapter support
 CONFIG_8139TOO
   This is a driver for the Fast Ethernet PCI network cards based on
-  the RTL8139 chip. If you have one of those, say Y and
-  read the Ethernet-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .
+  the RTL8139 chips. If you have one of those, say Y and read
+  Documentation/networking/8139too.txt as well as the Ethernet-HOWTO,
+  available from http://www.linuxdoc.org/docs.html#howto .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7584,13 +7915,13 @@ CONFIG_SIS900
   This is a driver for the Fast Ethernet PCI network cards based on
   the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
   SiS 630 and SiS 540 chipsets. If you have one of those, say Y and
-  read the Ethernet-HOWTO, available via FTP (user: anonymous) in   
-  ftp://metalab.unc.edu/pub/Linux/docs/HOWTO. Please read 
-  Documentation/networking/sis900.txt and comments at the beginning
-  of drivers/net/sis900.c for more information.
+  read the Ethernet-HOWTO, available at
+  http://www.linuxdoc.org/docs.html#howto . Please read
+  Documentation/networking/sis900.txt and comments at the beginning of
+  drivers/net/sis900.c for more information.
 
-  This driver also supports AMD 79C901 HomePNA such that you can use
-  your phone line as network cable.
+  This driver also supports AMD 79C901 HomePNA so that you can use
+  your phone line as a network cable.
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -7632,6 +7963,18 @@ CONFIG_NET_SB1000
 
   If you don't have this card, of course say N.
 
+Adaptec Starfire support (EXPERIMENTAL)
+CONFIG_ADAPTEC_STARFIRE
+  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
+  adapter. The DuraLAN chip is used on the 64 bit PCI boards from
+  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip
+  driver.
+  
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called starfile.o.
+  
 Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
 CONFIG_ACENIC
   Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
@@ -7682,6 +8025,11 @@ MyriCOM Gigabit Ethernet support
 CONFIG_MYRI_SBUS
   This driver supports MyriCOM Sbus gigabit ethernet cards.
 
+  If you want to compile this driver as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called myri_sbus.o.
+
 AMD LANCE and PCnet (AT1500 and NE2100) support
 CONFIG_LANCE
   If you have a network (Ethernet) card of this type, say Y and read
@@ -7694,6 +8042,12 @@ CONFIG_LANCE
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called lance.o.
 
+SGI IOC3 Ethernet
+CONFIG_SGI_IOC3_ETH
+  If you have a network (Ethernet) card of this type, say Y and read
+  the Ethernet-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto .
+
 3COM cards
 CONFIG_NET_VENDOR_3COM
   If you have a network (Ethernet) card belonging to this class, say Y
@@ -7797,6 +8151,18 @@ CONFIG_EL3
   Documentation/networking/net-modules.txt. The module will be called
   3c509.o. 
 
+3c515 ISA Fast EtherLink
+CONFIG_3C515
+  If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
+  network card, say Y and read the Ethernet-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto .
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt as well as
+  Documentation/networking/net-modules.txt. The module will be called
+  3c515.o.
+
 3c590 series (592/595/597) "Vortex" support
 CONFIG_VORTEX
   If you have a 3Com "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597)
@@ -7858,7 +8224,7 @@ CONFIG_ARCNET_ETH
   ARCnet documentation in Documentation/networking/arcnet.txt for more
   information about using arc0e and arc0s.
 
-Enable arc0s (ARCnet RFC1051 packet format)
+Enable old ARCNet packet format (RFC 1051)
 CONFIG_ARCNET_1051
   This allows you to use RFC1051 with your ARCnet card via the virtual
   arc0s device. You only need arc0s if you want to talk to ARCnet
@@ -8178,7 +8544,7 @@ CONFIG_LNE390
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-Novell/Eagle/Microdyne NE3210 EISA support (EXPERIMENTAL)
+Novell/Eagle/Microdyne NE3210 EISA support
 CONFIG_NE3210
   If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available from
@@ -8263,10 +8629,10 @@ CONFIG_EEPRO100
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-EtherExpress PRO/100 support
-CONFIG_EEPRO100_PM (EXPERIMENTAL)
+Enable Power Management (EXPERIMENTAL)
+CONFIG_EEPRO100_PM
   If you want to play around with power management code
-  that has reported to lock up some machines, say Y here.
+  that has been reported to lock up some machines, say Y here.
 
 ICL EtherTeam 16i/32 support (EXPERIMENTAL)
 CONFIG_ETH16I
@@ -8297,7 +8663,7 @@ CONFIG_TLAN
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-  Please email feedback to torben.mathiasen@compaq.com.
+  Please email feedback to  torben.mathiasen@compaq.com.
 
 VIA Rhine support
 CONFIG_VIA_RHINE
@@ -8310,6 +8676,19 @@ CONFIG_VIA_RHINE
   a module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
+PCI DM9102(A)/DM9132/DM9801 support 
+CONFIG_DM9102
+  This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
+  Davicom ( http://www.davicom.com.tw ). If you have such a network
+  (Ethernet) card, say Y. Some information is contained in the file 
+  Documentation/networking/dmfe.txt.
+ 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called dmfe.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt as well as
+  Documentation/networking/net-modules.txt.
+
 Racal-Interlan EISA ES3210 support (EXPERIMENTAL)
 CONFIG_ES3210
   If you have a network (Ethernet) card of this type, say Y and read
@@ -8347,18 +8726,6 @@ CONFIG_ZNET
   by this driver. Read the Ethernet-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto .
 
-Adaptec Starfire support
-CONFIG_ADAPTEC_STARFIRE
-  If you have an Ethernet network card like this, say Y and read the
-  Ethernet-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .
-
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called starfire.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt as well as
-  Documentation/networking/net-modules.txt.
-
 Pocket and portable adapters
 CONFIG_NET_POCKET
   Cute little network (Ethernet) devices which attach to the parallel
@@ -8386,9 +8753,14 @@ CONFIG_ATP
   port. Read drivers/net/atp.c as well as the Ethernet-HOWTO,
   available from http://www.linuxdoc.org/docs.html#howto , if you
   want to use this. If you intend to use this driver, you should have
-  said N to the Parallel Printer support, because the two drivers
+  said N to the "Parallel printer support", because the two drivers
   don't like each other.
 
+  If you want to compile this driver as a module however ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want), say M here and read Documentation/modules.txt.
+  The module will be called atp.o.
+
 D-Link DE600 pocket adapter support
 CONFIG_DE600
   This is a network (Ethernet) device which attaches to your parallel
@@ -8459,22 +8831,22 @@ CONFIG_IBMOL
   The module will will be called olympic.o. If you want to compile it
   as a module, say M here and read Documentation/modules.txt.
 
-  Also read the file Documentation/networking/olympic.txt or check the 
+  Also read the file Documentation/networking/olympic.txt or check the
   Linux Token Ring Project site for the latest information at
-  http://www.linuxtr.net
+  http://www.linuxtr.net .
 
 IBM Lanstreamer chipset PCI adapter support
 CONFIG_IBMLS
   This is support for IBM Lanstreamer PCI Token Ring Cards.
 
-  If you have such an adapter, say Y and read the Token-Ring mini-HOWTO
-  available via FTP (user:anonymous) from
+  If you have such an adapter, say Y and read the Token-Ring
+  mini-HOWTO available via FTP (user:anonymous) from
   ftp://metalab.unc/edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a modules ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The modules will be called lanstreamer.o. If you want to compile it as
-  a module, say M here and read Documentation/modules.txt.
+  The modules will be called lanstreamer.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 Generic TMS380 Token Ring ISA/PCI/MCA/EISA adapter support
 CONFIG_TMS380TR
@@ -8483,16 +8855,21 @@ CONFIG_TMS380TR
   includes the SysKonnect TR4/16(+) ISA (SK-4190), SysKonnect
   TR4/16(+) PCI (SK-4590), SysKonnect TR4/16 PCI (SK-4591),
   Compaq 4/16 PCI, Thomas-Conrad TC4048 4/16 PCI, and several
-  Madge adapters.  If selected, you will be asked to select
+  Madge adapters.  If you say Y here, you will be asked to select
   which cards to support below.  If you're using modules, each
   class of card will be supported by a separate module.
 
-  If you have such an adapter and would like to use it, say Y or M and
+  If you have such an adapter and would like to use it, say Y and
   read the Token-Ring mini-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto .
 
-  Also read the file linux/Documentation/networking/tms380tr.txt or check
-  http://www.auk.cx/tms380tr/
+  Also read the file Documentation/networking/tms380tr.txt or
+  check http://www.auk.cx/tms380tr/ .
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will will be called tms380tr.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 Generic TMS380 PCI support
 CONFIG_TMSPCI
@@ -8504,30 +8881,53 @@ CONFIG_TMSPCI
      - Thomas-Conrad TC4048 PCI 4/16
      - 3Com Token Link Velocity
 
+  This driver is available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will will be called tmspci.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
+
 Madge Smart 16/4 PCI Mk2 support
 CONFIG_ABYSS
-  This tms380 module supports the Madge Smart 16/4 PCI Mk2 cards (51-02).
+  This tms380 module supports the Madge Smart 16/4 PCI Mk2 
+  cards (51-02).
+
+  This driver is available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will will be called abyss.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 Madge Smart 16/4 Ringode MicroChannel 
 CONFIG_MADGEMC
   This tms380 module supports the Madge Smart 16/4 MC16 and MC32
-  MicroChannel adapters
+  MicroChannel adapters.
+
+  This driver is available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will will be called madgemc.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 SMC ISA TokenRing adapter support
 CONFIG_SMCTR
-  This is support for the ISA and MCA SMC Token Ring cards, specifically
-  SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A (8115T/A) adapters.
+  This is support for the ISA and MCA SMC Token Ring cards,
+  specifically SMC TokenCard Elite (8115T) and SMC TokenCard Elite/A
+  (8115T/A) adapters.
 
   If you have such an adapter and would like to use it, say Y or M and
   read the Token-Ring mini-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .
+  http://www.linuxdoc.org/docs.html#howto and the file
+  Documentation/networking/smctr.txt.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will will be called smctr.o. If you want to compile it
+  as a module, say M here and read Documentation/modules.txt.
 
 Sun Happy Meal 10/100baseT support
 CONFIG_HAPPYMEAL
-  This driver supports the "hme" interface present on most Ultra systems
-  and as an option on older Sbus systems. This driver supports both PCI
-  and Sbus devices. This driver also supports the "qfe" quad 100baseT
-  device available in both PCI and Sbus configurations.
+  This driver supports the "hme" interface present on most Ultra
+  systems and as an option on older Sbus systems. This driver supports
+  both PCI and Sbus devices. This driver also supports the "qfe" quad
+  100baseT device available in both PCI and Sbus configurations.
 
   This support is also available as a module called sunhme.o ( = code
   which can be inserted in and removed from the running kernel
@@ -8539,8 +8939,8 @@ CONFIG_SUNLANCE
   This driver supports the "le" interface present on all 32-bit Sparc
   systems, on some older Ultra systems and as an Sbus option.
 
-  This support is also available as a module called sunlance.o ( = code
-  which can be inserted in and removed from the running kernel
+  This support is also available as a module called sunlance.o ( =
+  code which can be inserted in and removed from the running kernel
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
@@ -8620,8 +9020,10 @@ CONFIG_SKFP
   - Netelligent 100 FDDI DAS UTP
   - Netelligent 100 FDDI SAS UTP
   - Netelligent 100 FDDI SAS Fibre MIC
+  
   Read Documentation/networking/skfp.txt for information about
   the driver.
+
   WARNING: this driver does currently not support 64 bit systems!
   Questions concerning this driver can be addressed to:
     linux@syskonnect.de
@@ -8631,14 +9033,6 @@ CONFIG_SKFP
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called skfp.o.
 
-Linux telephony support
-CONFIG_PHONE
-  This option enable the kernel to manage telephony cards.
-
-  There are very few supported cards at this moment.
-
-  If unsure, say N.
-
 HIgh Performance Parallel Interface support (EXPERIMENTAL)
 CONFIG_HIPPI
   HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and
@@ -8712,7 +9106,7 @@ CONFIG_CD_NO_IDESCSI
   read Documentation/modules.txt. 
 
   If you want to use any of these CDROM drivers, you also have to
-  answer Y or M to "ISO 9660 CDROM file systems support" below (this
+  answer Y or M to "ISO 9660 CDROM file system support" below (this
   answer will get "defaulted" for you if you enable any of the Linux
   CDROM drivers).
 
@@ -8725,11 +9119,10 @@ CONFIG_CDU31A
   time as described in Documentation/cdrom/cdu31a or fill in your
   parameters into drivers/cdrom/cdu31a.c. Try "man bootparam" or
   see the documentation of your boot loader (lilo or loadlin) about
-  how to pass options to the kernel. The lilo procedure is also
-  explained in the SCSI-HOWTO. 
+  how to pass options to the kernel.
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
-  file systems support" below, because that's the file systems used on
+  file system support" below, because that's the file system used on
   CDROMs. 
 
   This driver is also available as a module ( = code which can be
@@ -8751,7 +9144,7 @@ CONFIG_MCD
   this. If you want that one, say N here.
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
-  file systems support" below, because that's the file systems used on
+  file system support" below, because that's the file system used on
   CDROMs. 
 
   This driver is also available as a module ( = code which can be
@@ -8784,7 +9177,7 @@ CONFIG_MCDX
   Documentation/cdrom/mcdx.
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
-  file systems support" below, because that's the file systems used on
+  file system support" below, because that's the file system used on
   CDROMs. 
 
   This driver is also available as a module ( = code which can be
@@ -8822,7 +9215,7 @@ CONFIG_SBPCD
   usable.
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
-  file systems support" below, because that's the file systems used on
+  file system support" below, because that's the file system used on
   CDROMs. 
 
   This driver is also available as a module ( = code which can be
@@ -8835,7 +9228,7 @@ CONFIG_SBPCD2
   Say Y here only if you have two CDROM controller cards of this type
   (usually only if you have more than four drives). You should enter
   the parameters for the second, third and fourth interface card into
-  linux/include/linux/sbpcd.h before compiling the new kernel. Read
+  include/linux/sbpcd.h before compiling the new kernel. Read
   the file Documentation/cdrom/sbpcd.
 
 Aztech/Orchid/Okano/Wearnes/TXC/CyDROM CDROM support
@@ -8847,7 +9240,7 @@ CONFIG_AZTCD
   CDA269-031SE. Please read the file Documentation/cdrom/aztcd. 
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
-  file systems support" below, because that's the file systems used on
+  file system support" below, because that's the file system used on
   CDROMs.
 
   This driver is also available as a module ( = code which can be
@@ -8872,8 +9265,8 @@ CONFIG_CDU535
 Goldstar R420 CDROM support
 CONFIG_GSCD
   If this is your CDROM drive, say Y here. As described in the file
-  linux/Documentation/cdrom/gscd, you might have to change a setting
-  in the file linux/drivers/cdrom/gscd.h before compiling the
+  Documentation/cdrom/gscd, you might have to change a setting
+  in the file drivers/cdrom/gscd.h before compiling the
   kernel. Please read the file Documentation/cdrom/gscd. 
 
   If you say Y here, you should also say Y or M to "ISO 9660 CDROM
@@ -8929,17 +9322,6 @@ CONFIG_SJCD
   The module will be called sjcd.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Soft configurable cdrom interface card support
-CONFIG_CDI_INIT
-  If you want to include boot-time initialization of any cdrom
-  interface card that is software configurable, say Y here. Currently
-  only the ISP16/MAD16/Mozart sound cards with built-in cdrom
-  interfaces are supported. 
-
-  Note that the answer to this question doesn't directly affect the
-  kernel: saying N will just cause this configure script to skip all
-  the questions about these CDROM drives.
-
 ISP16/MAD16/Mozart soft configurable cdrom interface support
 CONFIG_ISP16_CDI
   These are sound cards with built-in cdrom interfaces using the OPTi
@@ -8969,8 +9351,8 @@ CONFIG_USB
   traditional PC serial port. The bus supplies power to peripherals
   and allows for hot swapping. Up to 127 USB peripherals can be
   connected to a single USB port in a tree structure. The USB port is
-  the root of the tree, the peripherals are the leaves, and the inner
-  nodes are special USB devices called hubs. Many newer PCs have USB
+  the root of the tree, the peripherals are the leaves and the inner
+  nodes are special USB devices called hubs. Many newer PC's have USB
   ports and newer peripherals such as scanners, keyboards, mice,
   modems, and printers support the USB protocol and can be connected
   to the PC via those ports.
@@ -8986,6 +9368,12 @@ CONFIG_USB
   The module will be called usbcore.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+USB verbose debug messages
+CONFIG_USB_DEBUG
+  Say Y here if you want the USB core drivers to produce a bunch of
+  debug messages to the system log. Select this if you are having a
+  problem with USB support and want to see more of what is going on.
+
 UHCI (intel PIIX4, VIA, ...) support?
 CONFIG_USB_UHCI
   The Universal Host Controller Interface is a standard by Intel for
@@ -9061,17 +9449,37 @@ CONFIG_USB_KBD
   USB keyboard and prefer to use the keyboard in its limited Boot
   Protocol mode. This driver is much smaller than the HID one.
 
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usbkbd.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+  If unsure, say N.
+
 USB HIDBP Mouse support
 CONFIG_USB_MOUSE
   Say Y here if you don't want to use the generic HID driver for your
   USB mouse and prefer to use the mouse in its limited Boot Protocol
   mode. This driver is much smaller than the HID one.
 
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called usbmouse.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+  If unsure, say N.
+
 Wacom Intuos/Graphire tablet support
 CONFIG_USB_WACOM
-  Say Y here if you want to use the USB version of the Wacom
-  Intuos or Graphire tablet. Make sure you select Mouse and Event
-  support as well.
+  Say Y here if you want to use the USB version of the Wacom Intuos or
+  Graphire tablet. Make sure to say Y to "Mouse support"
+  (CONFIG_INPUT_MOUSEDEV) and "Event interface support"
+  (CONFIG_INPUT_EVDEV) as well.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called wacom.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 Logitech WingMan Force joystick support
 CONFIG_USB_WMFORCE
@@ -9079,42 +9487,65 @@ CONFIG_USB_WMFORCE
   on the USB port. No force-feedback support yet, but other than that,
   it should work like a normal joystick.
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called wmforce.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 Keyboard support
 CONFIG_INPUT_KEYBDEV
   Say Y here if you want your USB HID keyboard to be able to serve as
   a system keyboard.
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called keybdev.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 Mouse support
 CONFIG_INPUT_MOUSEDEV
   Say Y here if you want your USB HID mouse to be accessible as
-  misc devices 32+ under /dev/, as an emulated PS/2 mouse.
+  misc devices 32+ under /dev/, as an emulated PS/2 mouse. That way,
+  all user space programs will be able to use your mouse.
+  
+  If unsure, say Y.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called mousedev.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 Mix all mice into one device
 CONFIG_INPUT_MOUSEDEV_MIX
   Say Y here if you want input from all your USB HID mice to be mixed
   into one misc device. If you say N, you'll have a separate
-  device for each your USB mouse.
+  device for each USB mouse.
 
 Support for digitizers
 CONFIG_INPUT_MOUSEDEV_DIGITIZER
-  Use this if you have a digitizer that doesn't emulate a mouse
+  Say Y here if you have a digitizer that doesn't emulate a mouse
   itself, and want to use it as a mouse.
 
 Horizontal screen resolution
 CONFIG_INPUT_MOUSEDEV_SCREEN_X
-  For the mouse emulation to be correct, the mousedev driver needs
-  to know the screen resolution you are using (in X). 
+  For the mouse emulation to be correct, the mousedev driver needs to
+  know the screen resolution you are using (in the X window system).
 
 Vertical screen resolution
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y
-  For the mouse emulation to be correct, the mousedev driver needs
-  to know the screen resolution you are using (in X). 
+  For the mouse emulation to be correct, the mousedev driver needs to
+  know the screen resolution you are using (in the X window system).
 
 Joystick support
 CONFIG_INPUT_JOYDEV
   Say Y here if you want your USB HID joystick or gamepad to be
-  accessible as /dev/js device. You can't use a normal joystick
-  if you select this.
+  accessible as a /dev/js device. You can't use a normal (non-USB)
+  joystick if you say Y here.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joydev.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 Event interface support
 CONFIG_INPUT_EVDEV
@@ -9124,18 +9555,18 @@ CONFIG_INPUT_EVDEV
 
 USB Scanner support
 CONFIG_USB_SCANNER
-  Say Y here if you want to connect a USB scanner to your
-  computer's USB port. Please read Documentation/usb/scanner.txt
-  and Documentation/usb/scanner-hp-sane.txt for more information.
+  Say Y here if you want to connect a USB scanner to your computer's
+  USB port. Please read Documentation/usb/scanner.txt and
+  Documentation/usb/scanner-hp-sane.txt for more information.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called hp_scanner.o. If you want to compile it as
+  The module will be called scanner.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
 USB Audio support
 CONFIG_USB_AUDIO
-  Say Y here if you want to connect USB audio equipment such as
+  Say Y here if you want to connect UAB audio equipment such as
   speakers to your computer's USB port.
 
   This code is also available as a module ( = code which can be
@@ -9155,11 +9586,16 @@ CONFIG_USB_ACM
 
 USB Serial converter support
 CONFIG_USB_SERIAL
-  Say Y here if you want to connect a Connect Tech WhiteHEAT 
-  multi-port USB to serial converter; a FTDI or Keyspan single port 
-  USB to serial converter; or a Handspring Visor. Please read 
-  Documentation/usb/usb-serial.txt for more information.
-
+  Say Y here if you have a USB device that provides normal serial
+  ports, and you want to connect it to your USB bus. Supported devices
+  are the Tech WhiteHEAT multi-port USB to serial converter, and the
+  FTDI or Keyspan single port USB to serial converter Handspring
+  Visor. In addition to saying Y here, you need to say Y to the driver
+  for your specific hardware below. Some other devices may also be
+  used if you say Y to "USB Generic Serial Driver", below.
+
+  Please read Documentation/usb/usb-serial.txt for more information.
+  
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called usb-serial.o. If you want to compile it 
@@ -9167,10 +9603,11 @@ CONFIG_USB_SERIAL
 
 USB Generic Serial Driver
 CONFIG_USB_SERIAL_GENERIC
-  Say Y here if you want to use the generic USB serial driver.
-  Please read Documentation/usb/usb-serial.txt for more information
-  on using this driver. It is recommended that the USB Serial
-  Driver be compiled as a module for this driver to be used properly.
+  Say Y here if you want to use the generic USB serial driver. Please
+  read Documentation/usb/usb-serial.txt for more information on using
+  this driver. It is recommended that the "USB Serial converter
+  support" be compiled as a module for this driver to be used
+  properly.
 
 USB ConnectTech WhiteHEAT Serial Driver
 CONFIG_USB_SERIAL_WHITEHEAT
@@ -9186,7 +9623,10 @@ CONFIG_USB_SERIAL_VISOR
 USB FTDI Single Port Serial Driver
 CONFIG_USB_SERIAL_FTDI_SIO
   Say Y here if you want to use a FTDI SIO single port USB to serial
-  converter device.
+  converter device. The implementation I have is called the USC-1000
+
+  See http://reality.sgi.com/bryder_wellington/ftdi_sio for more information 
+   on this driver and the device
 
 USB FTDI Single Port Serial Driver
 CONFIG_USB_SERIAL_KEYSPAN_PDA
@@ -9203,26 +9643,11 @@ CONFIG_USB_PRINTER
   The module will be called printer.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-USB CPiA Camera support
-CONFIG_USB_CPIA
-  Say Y here if you want to connect this type of camera to your
-  computer's USB port.
-
-  This driver uses the Video For Linux API.  You must enable
-  (Y or M in config) Video For Linux (under Character Devices)
-  to use this driver.  Information on this API and pointers to
-  "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
-
-  This code is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called cpia.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
-
 USB IBM (Xirlink) C-It Camera support
 CONFIG_USB_IBMCAM
-  Say Y here if you want to connect this type of camera to your
-  computer's USB port.
+  Say Y here if you want to connect a IBM "C-It" camera, also known as
+  "Xirlink PC Camera" to your computer's USB port. For more
+  information, read Documentation/usb/ibmcam.txt.
 
   This driver uses the Video For Linux API.  You must enable
   (Y or M in config) Video For Linux (under Character Devices)
@@ -9243,11 +9668,10 @@ CONFIG_USB_OV511
   computer's USB port. See Documentation/usb/ov511.txt for more
   information and for a list of supported cameras.
   
-  This driver uses the Video For Linux API.  You must enable
-  (Y or M in config) Video For Linux (under Character Devices)
-  to use this driver.  Information on this API and pointers to
-  "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
+  This driver uses the Video For Linux API. You must say Y or M to
+  "Video For Linux" (under Character Devices) to use this driver.
+  Information on this API and pointers to "v4l" programs may be found
+  on the WWW at http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -9256,11 +9680,18 @@ CONFIG_USB_OV511
 
 USB ADMtek Pegasus-based ethernet device support
 CONFIG_USB_PEGASUS
-  Say Y if you want to use your USB ethernet device. Note that
-  the code is still experimental. If you have devices with vendor
-  IDs other than ADMtek's, you should change/add them in the
-  driver code and send a message to me (petkan@spct.net) for 
-  update.
+  Say Y if you want to use your USB ethernet device. Supported
+  cards until now are:
+    Accton 10/100
+    Billington USB-100
+    Corega FEter USB-TX
+    MELCO/BUFFALO LUA-TX
+    D-Link DSB-650TX, DSB-650TX-PNA
+    Linksys USB100TX
+    SNC 202
+  If you have devices with vendor IDs other than noted above
+  you should add them in the driver code and send a message
+  to me (petkan@spct.net) for update.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -9285,7 +9716,7 @@ CONFIG_USB_MDC800
   Say Y here if you want to connect this type of still camera to
   your computer's USB port. This driver can be used with gphoto 0.4.3
   and higher (look at www.gphoto.org).
-  To use it create a devicenode with mknod /dev/mustek c 10 171 and
+  To use it create a devicenode with mknod /dev/mustek c 180 32 and
   configure it in your software.
 
   This code is also available as a module ( = code which can be
@@ -9293,7 +9724,6 @@ CONFIG_USB_MDC800
   The module will be called mdc800.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-
 USB Mass Storage support
 CONFIG_USB_STORAGE
   Say Y here if you want to connect USB mass storage devices to your
@@ -9312,8 +9742,9 @@ CONFIG_USB_STORAGE_DEBUG
 USS720 parport driver
 CONFIG_USB_USS720
   This driver is for USB parallel port adapters that use the Lucent
-  Technologies USS-720 chip. These adapters provide USB compatibility
-  to peripherals designed with parallel port interfaces.
+  Technologies USS-720 chip. These cables are plugged into your USB
+  port and provide USB compatibility to peripherals designed with
+  parallel port interfaces.
   
   The chip has two modes: automatic mode and manual mode. In automatic
   mode, it looks to the computer like a standard USB printer. Only
@@ -9338,38 +9769,53 @@ CONFIG_USB_USS720
   
 USB device file system
 CONFIG_USB_DEVICEFS
-  This file system implements a "devices" file, that lists
-  the currently connected to your USB busses, a "drivers" file
-  that lists the USB kernel client drivers currently loaded,
-  and for every connected device a file named "xxx/yyy", where
-  xxx is the bus number and yyy the device number, that can be used
-  by userspace drivers to talk to the device.
+  If you say Y here (and to "/proc file system support" below), you
+  will get a file /proc/usb/devices which lists the devices currently
+  connected to your USB busses, a file /proc/usb/drivers file which
+  lists the USB kernel client drivers currently loaded, and for every
+  connected device a file named "/proc/usb/xxx/yyy", where xxx is the
+  bus number and yyy the device number; the latter files can be used
+  by userspace drivers to talk to the device. These files are
+  "virtual", meaning they are generated on the fly and not stored on
+  the hard drive.
+  
+  For the format of the /proc/usb/ files, please read
+  Documentation/usb/proc_usb_info.txt. 
+
+  Please note that this code is completely unrelated to devfs, the
+  "/dev file system support".
 
   Most users want to say Y here.
 
 DABUSB driver
 CONFIG_USB_DABUSB
-  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux brought
-  to you by the DAB-Team (http://dab.in.tum.de). 
-  This driver can be taken as an example for URB-based bulk, control, and
-  isochronous transactions.
+  A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
+  brought to you by the DAB-Team (http://dab.in.tum.de). This driver
+  can be taken as an example for URB-based bulk, control, and
+  isochronous transactions. URB's are explained in
+  Documentation/usb/URB.txt.
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module will be called dabusb.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
- 
+
 PLUSB driver
 CONFIG_USB_PLUSB
-  A driver for the Prolific PL-2302 USB-to-USB network device. This 'USB
-  cable' connects two hosts via a point-to-point network with bandwidth of
-  5 Mbit/s.  Configure this driver after connecting the USB cable via
-  ifconfig plusb0 10.0.0.1 pointopoint 10.0.0.2 
-  (and vice versa on the other host).
+  A driver for the Prolific PL-2302 USB-to-USB network device. This
+  'USB cable' connects two hosts via a point-to-point network with
+  bandwidth of 5 Mbit/s. Configure this driver after connecting the
+  USB cable via ifconfig plusb0 10.0.0.1 pointopoint 10.0.0.2 (and
+  vice versa on the other host).
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called plusb.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
 
 USB Diamond Rio500 support
 CONFIG_USB_RIO500
-  Say Y here if you want to connect a USB rio500 to your
+  Say Y here if you want to connect a USB Rio500 mp3 player to your
   computer's USB port. Please read Documentation/usb/rio.txt
   for more information.
 
@@ -9378,7 +9824,7 @@ CONFIG_USB_RIO500
   The module will be called rio500.o. If you want to compile it as
   a module, say M here and read Documentation/modules.txt.
 
-D-Link DSB-R100 FM radio upport
+D-Link DSB-R100 FM radio support
 CONFIG_USB_DSBR
   Say Y here if you want to connect this type of radio to your
   computer's USB port. Note that the audio is not digital, and
@@ -9396,28 +9842,22 @@ CONFIG_USB_DSBR
   The module will be called dsbr100.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-ACPI support
-CONFIG_ACPI
-  Advanced Configuration and Power Interface (ACPI) is an interface
-  specification to support power management of peripherals. If your
-  system supports it, say Y here.
-
 Minix fs support
 CONFIG_MINIX_FS
   Minix is a simple operating system used in many classes about OS's.
   The minix file system (method to organize files on a hard disk
   partition or a floppy disk) was the original file system for Linux,
   but has been superseded by the second extended file system ext2fs.
-  You don't want to use the minix file system on your hard disk because
-  of certain built-in restrictions, but it is sometimes found on older
-  Linux floppy disks. This option will enlarge your kernel by about 
-  28 kB. If unsure, say N.
+  You don't want to use the minix file system on your hard disk
+  because of certain built-in restrictions, but it is sometimes found
+  on older Linux floppy disks. This option will enlarge your kernel by
+  about 28 KB. If unsure, say N.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
-  called minix.o. Note that the file system of your root partition (the
-  one containing the directory /) cannot be compiled as a module.
+  called minix.o. Note that the file system of your root partition
+  (the one containing the directory /) cannot be compiled as a module.
 
 Second extended fs support
 CONFIG_EXT2_FS
@@ -9425,11 +9865,11 @@ CONFIG_EXT2_FS
   files on a storage device) for hard disks. 
 
   You want to say Y here, unless you intend to use Linux exclusively
-  from inside a DOS partition using the umsdos file system. The
+  from inside a DOS partition using the UMSDOS file system. The
   advantage of the latter is that you can get away without
   repartitioning your hard drive (which often implies backing
   everything up and restoring afterwards); the disadvantage is that
-  Linux becomes susceptible to DOS viruses and that umsdos is somewhat
+  Linux becomes susceptible to DOS viruses and that UMSDOS is somewhat
   slower than ext2fs. Even if you want to run Linux in this fashion,
   it might be a good idea to have ext2fs around: it enables you to
   read more floppy disks and facilitates the transition to a *real*
@@ -9437,7 +9877,7 @@ CONFIG_EXT2_FS
   ext2fs is a diskless Linux box which mounts all files over the
   network using NFS (in this case it's sufficient to say Y to "NFS
   file system support" below). Saying Y here will enlarge your kernel
-  by about 44 kB.
+  by about 44 KB.
 
   The Ext2fs-Undeletion mini-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto , gives information about
@@ -9451,9 +9891,10 @@ CONFIG_EXT2_FS
   command line tool package (available via FTP (user: anonymous) from
   ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2 ) and from
   within Windows NT using the ext2nt command line tool package from
-  ftp://metalab.unc.edu/pub/Linux/utils/dos . Explore2fs is a graphical
-  explorer for ext2fs partitions which runs on Windows 95 and Windows
-  NT and includes experimental write support; it is available from
+  ftp://metalab.unc.edu/pub/Linux/utils/dos . Explore2fs is a
+  graphical explorer for ext2fs partitions which runs on Windows 95
+  and Windows NT and includes experimental write support; it is
+  available from
   http://jnewbigin-pc.it.swin.edu.au/Linux/Explore2fs.htm .
 
   If you want to compile this file system as a module ( = code which
@@ -9467,31 +9908,50 @@ CONFIG_EXT2_FS
 BFS file system support (EXPERIMENTAL)
 CONFIG_BFS_FS
   Boot File System (BFS) is a file system used under SCO UnixWare to
-  allow bootloader access the kernel image and other important files
-  during the boot process. It is usually mounted under /stand and
-  corresponds to the slice marked as "STAND" in the UnixWare
-  partition. This is useful if you want to access files on your /stand
-  slice from Linux. More information on this file system can be found in
-  Documentation/filesystems/bfs.txt file. If you do not know what it is, 
-  say N.
+  allow the bootloader access to the kernel image and other important
+  files during the boot process. It is usually mounted under /stand
+  and corresponds to the slice marked as "STAND" in the UnixWare
+  partition. You should say Y if you want to read or write
+  the files on your /stand slice from within Linux. You then also 
+  need to say Y to "UnixWare slices support", below. More information
+  about the BFS file system is contained in the file 
+  Documentation/filesystems/bfs.txt. 
+
+  If you don't know what this is about, say N.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
   called bfs.o. Note that the file system of your root partition (the
   one containing the directory /) cannot be compiled as a module.
- 
+
+Compressed ROM file system support
+CONFIG_CRAMFS
+  Saying Y here includes support for CramFs (Compressed ROM File
+  System). Cramfs is designed to be a simple, small, and compressed
+  file system for ROM based embedded systems. CramFs is read-only,
+  limited to 256MB file systems (with 16MB files), and doesn't support
+  16/32 bits uid/gid, hard links and timestamps.
+  
+  See Documentation/filesystems/cramfs.txt and fs/cramfs/README
+  for further information.
+
+  If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called cramfs.o.
+   
 ISO 9660 CDROM file system support
 CONFIG_ISO9660_FS
   This is the standard file system used on CDROMs. It was previously
-  known as "High Sierra File System" and is called "hsfs" on other Unix
-  systems. The so-called Rock-Ridge extensions which allow for long
-  Unix filenames and symbolic links are also supported by this driver.
-  If you have a CDROM drive and want to do more with it than just
-  listen to audio CDs and watch its LEDs, say Y (and read
+  known as "High Sierra File System" and is called "hsfs" on other
+  Unix systems. The so-called Rock-Ridge extensions which allow for
+  long Unix filenames and symbolic links are also supported by this
+  driver. If you have a CDROM drive and want to do more with it than
+  just listen to audio CDs and watch its LEDs, say Y (and read
   Documentation/filesystems/isofs.txt and the CDROM-HOWTO, available
-  from http://www.linuxdoc.org/docs.html#howto ), thereby
-  enlarging your kernel by about 27 KB; otherwise say N.
+  from http://www.linuxdoc.org/docs.html#howto ), thereby enlarging
+  your kernel by about 27 KB; otherwise say N.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -9507,17 +9967,21 @@ CONFIG_JOLIET
   http://www.unicode.org for more information). Say Y here if you want
   to be able to read Joliet CDROMs under Linux.
 
-UDF file system support (read only)
+UDF File System support (read only)
 CONFIG_UDF_FS
-  This is the new file system used by some CDROMS and DVD drivers. Say
-  Y if you intend to mount DVD discs or CDRW's written in packet mode,
-  or if written to by other UDF utilities, such as DirectCD. Please
-  read Documentation/filesystems/udf.txt.
-
-  This file system support is also available as a module ( = code which
-  can be inserted in and removed from the running kernel whenever you
-  want). The module is called udf.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. 
+  This is the new file system used on some CDROMs and DVDs. Say Y if
+  you intend to mount DVD discs or CDRW's written in packet mode, or
+  if written to by other UDF utilities, such as DirectCD. This UDF
+  file system support is read-only. If you want to write to UDF
+  file systems on some media, you need to say Y to "UDF read-write
+  support" below in addition. Please read
+  Documentation/filesystems/udf.txt.
+
+  This file system support is also available as a module ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). The module is called udf.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
 
   If unsure, say N.
 
@@ -9525,7 +9989,7 @@ UDF write support (DANGEROUS)
 CONFIG_UDF_RW
   Say Y if you want to test write support for UDF file systems.
   Due to lack of support for writing to CDR/CDRW's, this option
-  is only supported for Hard Discs, DVD-RAM, and loopback files.
+  is only supported for hard discs, DVD-RAM, and loopback files.
 
 DOS FAT fs support
 CONFIG_FAT_FS
@@ -9537,18 +10001,24 @@ CONFIG_FAT_FS
   files on them, i.e. MSDOS files will look and behave just like all
   other Unix files.
 
-  This FAT support is not a file system in itself, it only provides the
-  foundation for the other file systems. You will have to say Y or M to
-  at least one of "msdos fs support" or "vfat fs support" in order to
-  make use of it.
+  This FAT support is not a file system in itself, it only provides
+  the foundation for the other file systems. You will have to say Y or
+  M to at least one of "MSDOS fs support" or "VFAT fs support" in
+  order to make use of it.
 
   Another way to read and write MSDOS floppies and hard drive
   partitions from within Linux (but not transparently) is with the
-  mtools ("man mtools") program suite. This doesn't require the FAT
-  file system support.
+  mtools ("man mtools") program suite. You don't need to say Y here in
+  order to do that.
 
+  If you need to move large files on floppies between a DOS and a
+  Linux box, say Y here, mount the floppy under Linux with an MSDOS
+  file system and use GNU tar's M option. GNU tar is a program
+  available for Unix and DOS ("man tar" or "info tar").
+  
   It is now also becoming possible to read and write compressed FAT
-  file systems; read Documentation/filesystems/fat_cvf.txt for details.
+  file systems; read Documentation/filesystems/fat_cvf.txt for
+  details.
   
   The FAT support will enlarge your kernel by about 37 KB. If unsure,
   say Y.
@@ -9557,11 +10027,11 @@ CONFIG_FAT_FS
   be inserted in and removed from the running kernel whenever you
   want), say M here and read Documentation/modules.txt. The module
   will be called fat.o. Note that if you compile the FAT support as a
-  module, you cannot compile any of the FAT-based file systems into the
-  kernel -- they will have to be modules as well. The file system of
-  your root partition (the one containing the directory /) cannot be a
-  module, so don't say M here if you intend to use UMSDOS as your root
-  file system.
+  module, you cannot compile any of the FAT-based file systems into
+  the kernel -- they will have to be modules as well. The file system
+  of your root partition (the one containing the directory /) cannot
+  be a module, so don't say M here if you intend to use UMSDOS as your
+  root file system.
 
 MSDOS fs support
 CONFIG_MSDOS_FS
@@ -9576,36 +10046,37 @@ CONFIG_MSDOS_FS
   transparent, i.e. the MSDOS files look and behave just like all
   other Unix files.
 
-  If you want to use umsdos, the Unix-like file system on top of DOS,
-  which allows you to run Linux from within a DOS partition without
-  repartitioning, you'll have to say Y or M here. 
+  If you want to use UMSDOS, the Unix-like file system on top of a
+  DOS file system, which allows you to run Linux from within a DOS
+  partition without repartitioning, you'll have to say Y or M here.
 
   If you have Windows 95 or Windows NT installed on your MSDOS
-  partitions, you should use the VFAT file system (say Y to "vfat fs
+  partitions, you should use the VFAT file system (say Y to "VFAT fs
   support" below), or you will not be able to see the long filenames
   generated by Windows 95 / Windows NT.
 
   This option will enlarge your kernel by about 7 KB. If unsure,
-  answer Y. This will only work if you said Y to "fat fs support" as
-  well. If you want to compile this as a module however ( = code which
-  can be inserted in and removed from the running kernel whenever you
-  want), say M here and read Documentation/modules.txt. The module
-  will be called msdos.o.
+  answer Y. This will only work if you said Y to "DOS FAT fs support"
+  as well. If you want to compile this as a module however ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want), say M here and read Documentation/modules.txt.
+  The module will be called msdos.o.
 
 VFAT (Windows-95) fs support
 CONFIG_VFAT_FS
   This option provides support for normal Windows file systems with
   long filenames. That includes non-compressed FAT-based file systems
-  used by Windows 95, Windows 98, Windows NT 4.0, and mtools. 
+  used by Windows 95, Windows 98, Windows NT 4.0, and the Unix
+  programs from the mtools package.
 
   You cannot use the VFAT file system for your Linux root partition
   (the one containing the directory /); use UMSDOS instead if you
   want to run Linux from within a DOS partition (i.e. say Y to
-  "umsdos: Unix like fs on top of std MSDOS fs", below).
+  "UMSDOS: Unix like fs on top of std MSDOS fs", below).
 
   The VFAT support enlarges your kernel by about 10 KB and it only
-  works if you said Y to the "fat fs support" above. Please read the
-  file Documentation/filesystems/vfat.txt for details. If unsure, 
+  works if you said Y to the "DOS FAT fs support" above. Please read
+  the file Documentation/filesystems/vfat.txt for details. If unsure,
   say Y.
 
   If you want to compile this as a module ( = code which can be
@@ -9613,23 +10084,6 @@ CONFIG_VFAT_FS
   say M here and read Documentation/modules.txt. The module will be
   called vfat.o.
 
-Compressed ROM file system support
-CONFIG_CRAMFS
-  This option provides support for CramFs (Compressed ROM File System).
-  Cramfs is designed to be a simple, small, and compressed file system for ROM
-  based embedded systems.
-  CramFs is read-only, limited to 256MB file systems (with 16MB files), don't
-  support neither 16/32 bits uid/gid nor hard links. Neither are timestamps.
-  It isn't endian aware.
-  
-  See Documentation/filesystems/cramfs.txt and fs/cramfs/README
-  for further information.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called cramfs.o.
-
 UMSDOS: Unix-like file system on top of standard MSDOS fs
 CONFIG_UMSDOS_FS
   Say Y here if you want to run Linux from within an existing DOS
@@ -9642,20 +10096,20 @@ CONFIG_UMSDOS_FS
   is to write files with long unix filenames to MSDOS floppies; it
   also allows Unix-style soft-links and owner/permissions of files on
   MSDOS floppies. You will need a program called umssync in order to
-  make use of umsdos; read Documentation/filesystems/umsdos.txt. 
+  make use of UMSDOS; read Documentation/filesystems/umsdos.txt. 
 
   To get utilities for initializing/checking UMSDOS file system, or
-  latest patches and/or information, visit UMSDOS homepage at
+  latest patches and/or information, visit the UMSDOS home page at
   http://www.voyager.hr/~mnalis/umsdos/ .
 
   This option enlarges your kernel by about 28 KB and it only works if
-  you said Y to both "fat fs support" and "msdos fs support" above. If
-  you want to compile this as a module ( = code which can be inserted
-  in and removed from the running kernel whenever you want), say M
-  here and read Documentation/modules.txt. The module will be called
-  umsdos.o. Note that the file system of your root partition (the one
-  containing the directory /) cannot be a module, so saying M could be
-  dangerous. If unsure, say N.
+  you said Y to both "DOS FAT fs support" and "MSDOS fs support"
+  above. If you want to compile this as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want),
+  say M here and read Documentation/modules.txt. The module will be
+  called umsdos.o. Note that the file system of your root partition
+  (the one containing the directory /) cannot be a module, so saying M
+  could be dangerous. If unsure, say N.
 
 /proc file system support
 CONFIG_PROC_FS
@@ -9674,30 +10128,35 @@ CONFIG_PROC_FS
 
   The /proc file system is explained in the file
   Documentation/filesystems/proc.txt and on the proc(5) manpage ("man
-  5 proc").
+  5 proc"). You can also use the program procinfo to display some
+  information about your system gathered from the /proc file system.
 
   This option will enlarge your kernel by about 67 KB. Several
   programs depend on this, so everyone should say Y here.
 
 /dev file system support (EXPERIMENTAL)
 CONFIG_DEVFS_FS
-  This is another virtual file system (like /proc) which provides the
-  file system interface to device drivers, normally found in /dev.
-  Devfs does not depend on major and minor number allocations. Device
-  drivers register entries in /dev which appear automagically. Without
-  devfs you need to populate /dev with hundreds, even thousands of
-  inodes.
+  This is support for devfs, a virtual file system (like /proc) which
+  provides the file system interface to device drivers, normally found
+  in /dev. Devfs does not depend on major and minor number
+  allocations. Device drivers register entries in /dev which then
+  appear automatically, which means that the system administrator does
+  not have to create character and block special device files in the
+  /dev directory using the mknod command anymore.
+
   This is work in progress. If you want to use this you *must* read
-  Documentation/filesystems/devfs/README
-  In particular, make sure you install devfsd. If you don't, expect to
-  spend time patching broken code and updating configuration files.
+  the material in Documentation/filesystems/devfs/, especially the
+  file README there.
+
+  If unsure, say N.
 
 Debug devfs
 CONFIG_DEVFS_DEBUG
-  This option appears if you have CONFIG_DEVFS_FS enabled. Setting
-  this to 'Y' enables devfs debugging output. See the file
+  If you say Y here, then the /dev file system code will generate
+  debugging messages. See the file
   Documentation/filesystems/devfs/boot-options for more details.
-  The default is 'N'.
+  
+  If unsure, say N.
 
 NFS file system support
 CONFIG_NFS_FS
@@ -9710,7 +10169,7 @@ CONFIG_NFS_FS
   programs nfsd and mountd (but does not need to have NFS file system
   support enabled in its kernel). NFS is explained in the Network
   Administrator's Guide, available from
-  http://metalab.unc.edu/mdw/linux.html#guide , on its man page: "man
+  http://www.linuxdoc.org/docs.html#guide , on its man page: "man
   nfs", and in the NFS-HOWTO.
   
   A superior but less widely used alternative to NFS is provided by
@@ -9761,35 +10220,34 @@ CONFIG_NFSD
   section.
 
   Please read the NFS-HOWTO, available from
-  http://www.linuxdoc.org/HOWTO/NFS-HOWTO.html .
-
+  http://www.linuxdoc.org/docs.html#howto .
 
   The NFS server is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module is called nfsd.o. If you want to compile it as a module,
   say M here and read Documentation/modules.txt. If unsure, say N.
 
-Provide NFSv3 server support (EXPERIMENTAL)
+Provide NFSv3 server support
 CONFIG_NFSD_V3
-  If you would like to include the NFSv3 server was well as the NFSv2
-  server, say Y here.  File locking, via the NLMv4 protocol, is also
-  supported. If unsure, say N.
+  If you would like to include the NFSv3 server as well as the NFSv2
+  server, say Y here.  In unsure, say Y.
 
 OS/2 HPFS file system support
 CONFIG_HPFS_FS
   OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
   is the file system used for organizing files on OS/2 hard disk
-  partitions. Say Y if you want to be able to read files from an OS/2
-  HPFS partition of your hard drive. OS/2 floppies however are in
-  regular MSDOS format, so you don't need this option in order to be
-  able to read them. Read Documentation/filesystems/hpfs.txt. 
+  partitions. Say Y if you want to be able to read files from and
+  write files to an OS/2 HPFS partition on your hard drive. OS/2
+  floppies however are in regular MSDOS format, so you don't need this
+  option in order to be able to read them. Read
+  Documentation/filesystems/hpfs.txt.
 
   This file system is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
   The module is called hpfs.o. If you want to compile it as a module,
   say M here and read Documentation/modules.txt. If unsure, say N.
 
-NTFS file system support (read only)
+NTFS support (read only)
 CONFIG_NTFS_FS
   NTFS is the file system of Microsoft Windows NT. Say Y if you want
   to get read access to files on NTFS partitions of your hard drive.
@@ -9804,11 +10262,13 @@ CONFIG_NTFS_FS
 
 NTFS write support (DANGEROUS)
 CONFIG_NTFS_RW
-  If you say Y here, you will (hopefully) be able to write to NTFS
-  file systems as well as read from them. The read-write support
-  in NTFS is far from being complete and is not well tested. If you
+  If you say Y here, you will (maybe) be able to write to NTFS file
+  systems as well as read from them. The read-write support in
+  NTFS is far from being complete and is not well tested. If you
   enable this, back up your NTFS volume first since it may get
-  damaged.
+  damaged. Also, make sure to run chkdsk from within Microsoft
+  Windows NT after having performed any writes to a NTFS partition
+  from Linux to detect any problems as early as possible.
 
   If unsure, say N.
 
@@ -9816,7 +10276,8 @@ System V and Coherent file system support (read only)
 CONFIG_SYSV_FS
   SCO, Xenix and Coherent are commercial Unix systems for Intel
   machines. Saying Y here would allow you to read from their floppies
-  and hard disk partitions.
+  and hard disk partitions. If you also want to write to these media,
+  say Y to "SYSV file system write support" below.
 
   If you have floppies or hard disk partitions like that, it is likely
   that they contain binaries from those other Unix systems; in order
@@ -9837,7 +10298,7 @@ CONFIG_SYSV_FS
   tar" or preferably "info tar"). Note also that this option has
   nothing whatsoever to do with the option "System V IPC". Read about
   the System V file system in Documentation/filesystems/sysv-fs.txt.
-  Saying Y here will enlarge your kernel by about 27 kB.
+  Saying Y here will enlarge your kernel by about 27 KB.
 
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
@@ -9848,12 +10309,12 @@ CONFIG_SYSV_FS
 
 SYSV file system write support (DANGEROUS)
 CONFIG_SYSV_FS_WRITE
-  If you say Y here, you will (hopefully) be able to write to System V
-  and Coherent file systems as well as read from them. The read-write
-  support in SYSV is not well tested yet. If you enable this, back up
-  your SYSV/Coherent volumes first since they may get damaged.
+  If you say Y here, you will be able to write to hard drive
+  partitions and floppy disks which carry a SYSV file system used the
+  commercial Unixes SCO, Xenix and Coherent. 
 
-  If unsure, say N.
+  This support is experimental and you may destroy your data. If
+  unsure, say N.
 
 Amiga FFS file system support
 CONFIG_AFFS_FS
@@ -9883,10 +10344,11 @@ CONFIG_HFS_FS
   Please read fs/hfs/HFS.txt to learn about the available mount
   options. 
 
-  This file system support is also available as a module ( = code which
-  can be inserted in and removed from the running kernel whenever you
-  want). The module is called hfs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  This file system support is also available as a module ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). The module is called hfs.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
 
 ROM file system support
 CONFIG_ROMFS_FS
@@ -9895,10 +10357,11 @@ CONFIG_ROMFS_FS
   other read-only media as well. Read
   Documentation/filesystems/romfs.txt for details. 
 
-  This file system support is also available as a module ( = code which
-  can be inserted in and removed from the running kernel whenever you
-  want). The module is called romfs.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. 
+  This file system support is also available as a module ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). The module is called romfs.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
 
   If you don't know whether you need it, then you don't need it:
   answer N.
@@ -9907,13 +10370,14 @@ QNX4 file system support (read only) (EXPERIMENTAL)
 CONFIG_QNX4FS_FS
   This is the file system used by the operating system QNX 4. Say Y if
   you intend to mount QNX hard disks or floppies. Unless you say Y to
-  "QNX4FS write support" below, you will only be able to read
+  "QNX4FS read-write support" below, you will only be able to read
   these file systems.
 
-  This file system support is also available as a module ( = code which
-  can be inserted in and removed from the running kernel whenever you
-  want). The module is called qnx4.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. 
+  This file system support is also available as a module ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). The module is called qnx4.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
 
   If you don't know whether you need it, then you don't need it:
   answer N.
@@ -9933,6 +10397,10 @@ CONFIG_AUTOFS_FS
   ftp://ftp.kernel.org/pub/linux/daemons/autofs ; you also want to
   answer Y to "NFS file system support", below.
 
+  If you want to use the newer version of the automounter with more
+  features, say N here and say Y to "Kernel automounter v4 support",
+  below.
+
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
@@ -9941,10 +10409,7 @@ CONFIG_AUTOFS_FS
   If you are not a part of a fairly large, distributed network, you
   probably do not need an automounter, and can say N here.
 
-  If you want to use the newer version of autofs with more features,
-  say N here and select automounter v4.
-
-Kernel automounter version 4 support (also supports v3)
+Kernel automounter v4 support
 CONFIG_AUTOFS4_FS
   The automounter is a tool to automatically mount remote file systems
   on demand. This implementation is partially kernel-based to reduce
@@ -9961,15 +10426,16 @@ CONFIG_AUTOFS4_FS
   called autofs4.o.  You will need to add "alias autofs autofs4" to
   your modules configuration file.
 
-  If you are not a part of a fairly large, distributed network or don't
-  have a laptop which needs to dynamically reconfigure to the local
-  network, you probably do not need an automounter, and can say N here.
+  If you are not a part of a fairly large, distributed network or
+  don't have a laptop which needs to dynamically reconfigure to the
+  local network, you probably do not need an automounter, and can say
+  N here.
 
-EFS file system support (read only) (EXPERIMENTAL)
+EFS file system support (read-only) (EXPERIMENTAL)
 CONFIG_EFS_FS
-  EFS is an older file system used for non-ISO9660 CDROMs and hard disk
-  partitions by SGI's IRIX operating system (IRIX 6.0 and newer uses
-  the XFS file system for hard disk partitions however).
+  EFS is an older file system used for non-ISO9660 CDROMs and hard
+  disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer
+  uses the XFS file system for hard disk partitions however).
 
   This implementation only offers read-only access. If you don't know
   what all this is about, it's safe to say N. For more information
@@ -9980,12 +10446,7 @@ CONFIG_EFS_FS
   whenever you want), say M here and read Documentation/modules.txt.
   The module will be called efs.o. 
 
-SGI disklabel support
-CONFIG_SGI_DISKLABEL
-  Say Y to this only if you plan on mounting disks with SGI
-  disklabels. This is not required to mount EFS-format CDROMs.
-
-UFS file system support (read only)
+UFS file system support (read-only)
 CONFIG_UFS_FS
   BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
   OpenBSD and NeXTstep) use a file system called UFS. Some System V
@@ -10028,7 +10489,7 @@ CONFIG_PARTITION_ADVANCED
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
-  the questions about foreign partitioning schemes.
+  the questions about foreign partitioning schemes. 
 
   If unsure, say N.
 
@@ -10084,13 +10545,14 @@ CONFIG_SGI_PARTITION
   Say Y here if you would like to be able to read the hard disk
   partition table format used by SGI machines.
 
-ADFS file system support (read only) (EXPERIMENTAL)
+ADFS file system support (EXPERIMENTAL)
 CONFIG_ADFS_FS
   The Acorn Disc Filing System is the standard file system of the
   RiscOS operating system which runs on Acorn's ARM-based Risc PC
   systems and the Acorn Archimedes range of machines. If you say Y
   here, Linux will be able to read from ADFS partitions on hard drives
-  and from ADFS-formatted floppy discs.
+  and from ADFS-formatted floppy discs. If you also want to be able to
+  write to those devices, say Y to "ADFS write support" below.
 
   The ADFS partition should be the first partition (i.e.,
   /dev/[hs]d?1) on each of your drives. Please read the file
@@ -10103,6 +10565,12 @@ CONFIG_ADFS_FS
 
   If unsure, say N.
 
+ADFS write support (DANGEROUS)
+CONFIG_ADFS_FS_RW
+  If you say Y here, you will be able to write to ADFS partitions on
+  hard drives and ADFS-formatted floppy disks. This is experimental
+  codes, so if you're unsure, say N.
+
 /dev/pts file system for Unix98 PTYs
 CONFIG_DEVPTS_FS
   You should say Y here if you said Y to "Unix98 PTY support" above.
@@ -10119,7 +10587,8 @@ CONFIG_DEVPTS_FS
   mode of operation; you also need client programs that use the Unix98
   API.
 
-  Note that CONFIG_DEVFS_FS is a more general facility.
+  Note that the experimental "/dev file system support"
+  (CONFIG_DEVFS_FS)  is a more general facility.
 
 UnixWare slices support (EXPERIMENTAL)
 CONFIG_UNIXWARE_DISKLABEL
@@ -10127,9 +10596,8 @@ CONFIG_UNIXWARE_DISKLABEL
   partition (VTOC - Virtual Table of Contents). Its format is
   incompatible with all other OSes. Saying Y here allows you to read
   VTOC and further mount UnixWare partitions read-only from within
-  Linux if you have also said Y to "UFS file system support", "System
-  V and Coherent file system support" or "BFS file system support",
-  above.
+  Linux if you have also said Y to "UFS file system support" or
+  "System V and Coherent file system support", above.
 
   This is mainly used to carry data from a UnixWare box to your
   Linux box via a removable medium like magneto-optical, ZIP or
@@ -10178,9 +10646,9 @@ CONFIG_CODA_FS
 
   If you say Y here, your Linux box will be able to act as a Coda
   *client*. You will need user level code as well, both for the client
-  and server. Servers are currently user level, i.e. need no kernel
-  support. Please read Documentation/filesystems/coda.txt and check
-  out the Coda home page http://www.coda.cs.cmu.edu .
+  and server. Servers are currently user level, i.e. they need no
+  kernel support. Please read Documentation/filesystems/coda.txt and
+  check out the Coda home page http://www.coda.cs.cmu.edu .
 
   If you want to compile the coda client support as a module ( = code
   which can be inserted in and removed from the running kernel
@@ -10266,7 +10734,7 @@ CONFIG_NCPFS_MOUNT_SUBDIR
 
   To utilize this feature you must use ncpfs-2.0.12 or newer.
 
-NDS interserver authentication domains
+NDS authentication support
 CONFIG_NCPFS_NDS_DOMAINS
   This allows storing NDS private keys in kernel space where they
   can be used to authenticate another server as interserver NDS
@@ -10295,7 +10763,7 @@ CONFIG_NCPFS_EXTRAS
 
 nls codepage 437
 CONFIG_NLS_CODEPAGE_437
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored
   in so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10306,7 +10774,7 @@ CONFIG_NLS_CODEPAGE_437
 
 nls codepage 737
 CONFIG_NLS_CODEPAGE_737
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored
   in so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10317,7 +10785,7 @@ CONFIG_NLS_CODEPAGE_737
 
 nls codepage 775
 CONFIG_NLS_CODEPAGE_775
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored
   in so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10328,7 +10796,7 @@ CONFIG_NLS_CODEPAGE_775
 
 nls codepage 850
 CONFIG_NLS_CODEPAGE_850
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10343,7 +10811,7 @@ CONFIG_NLS_CODEPAGE_850
 
 nls codepage 852
 CONFIG_NLS_CODEPAGE_852
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10357,7 +10825,7 @@ CONFIG_NLS_CODEPAGE_852
 
 nls codepage 855
 CONFIG_NLS_CODEPAGE_855
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10367,7 +10835,7 @@ CONFIG_NLS_CODEPAGE_855
 
 nls codepage 857
 CONFIG_NLS_CODEPAGE_857
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10377,7 +10845,7 @@ CONFIG_NLS_CODEPAGE_857
 
 nls codepage 860
 CONFIG_NLS_CODEPAGE_860
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10387,7 +10855,7 @@ CONFIG_NLS_CODEPAGE_860
 
 nls codepage 861
 CONFIG_NLS_CODEPAGE_861
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10397,7 +10865,7 @@ CONFIG_NLS_CODEPAGE_861
 
 nls codepage 862
 CONFIG_NLS_CODEPAGE_862
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10407,7 +10875,7 @@ CONFIG_NLS_CODEPAGE_862
 
 nls codepage 863
 CONFIG_NLS_CODEPAGE_863
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10418,7 +10886,7 @@ CONFIG_NLS_CODEPAGE_863
 
 nls codepage 864
 CONFIG_NLS_CODEPAGE_864
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10428,7 +10896,7 @@ CONFIG_NLS_CODEPAGE_864
 
 nls codepage 865
 CONFIG_NLS_CODEPAGE_865
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10439,7 +10907,7 @@ CONFIG_NLS_CODEPAGE_865
 
 nls codepage 866
 CONFIG_NLS_CODEPAGE_866
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10450,20 +10918,17 @@ CONFIG_NLS_CODEPAGE_866
 
 nls codepage 869
 CONFIG_NLS_CODEPAGE_869
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
   DOS/Windows partitions correctly. This does apply to the filenames
   only, not to the file contents. You can include several codepages;
   say Y here if you want to include the DOS codepage for Greek.
-###
-### Why do we have two codepages for Greek and Cyrillic?
-###
 
 nls codepage 874
 CONFIG_NLS_CODEPAGE_874
-  The Microsoft fat file system family can deal with filenames in
+  The Microsoft FAT file system family can deal with filenames in
   native language character sets. These character sets are stored in
   so-called DOS codepages. You need to include the appropriate
   codepage if you want to be able to read/write these filenames on
@@ -10474,7 +10939,7 @@ CONFIG_NLS_CODEPAGE_874
 nls iso8859-1
 CONFIG_NLS_ISO8859_1
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 1 character
   set, which covers most West European languages such as Albanian,
@@ -10485,7 +10950,7 @@ CONFIG_NLS_ISO8859_1
 nls iso8859-2
 CONFIG_NLS_ISO8859_2
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 2 character
   set, which works for most Latin-written Slavic and Central European
@@ -10495,7 +10960,7 @@ CONFIG_NLS_ISO8859_2
 nls iso8859-3
 CONFIG_NLS_ISO8859_3
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 3 character
   set, which is popular with authors of Esperanto, Galician, Maltese,
@@ -10504,7 +10969,7 @@ CONFIG_NLS_ISO8859_3
 nls iso8859-4
 CONFIG_NLS_ISO8859_4
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 4 character
   set which introduces letters for Estonian, Latvian, and
@@ -10513,7 +10978,7 @@ CONFIG_NLS_ISO8859_4
 nls iso8859-5
 CONFIG_NLS_ISO8859_5
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for ISO8859-5, a Cyrillic
   character set with which you can type Bulgarian, Byelorussian,
@@ -10523,7 +10988,7 @@ CONFIG_NLS_ISO8859_5
 nls iso8859-6
 CONFIG_NLS_ISO8859_6
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for ISO8859-6, the Arabic
   character set.
@@ -10531,7 +10996,7 @@ CONFIG_NLS_ISO8859_6
 nls iso8859-7
 CONFIG_NLS_ISO8859_7
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for ISO8859-7, the Modern
   Greek character set.
@@ -10539,7 +11004,7 @@ CONFIG_NLS_ISO8859_7
 nls iso8859-8
 CONFIG_NLS_ISO8859_8
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for ISO8859-8, the Hebrew
   character set.
@@ -10547,7 +11012,7 @@ CONFIG_NLS_ISO8859_8
 nls iso8859-9
 CONFIG_NLS_ISO8859_9
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 5 character
   set, and it replaces the rarely needed Icelandic letters in Latin 1
@@ -10556,7 +11021,7 @@ CONFIG_NLS_ISO8859_9
 nls iso8859-10
 CONFIG_NLS_ISO8859_10
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 6 character
   set, which adds the last Inuit (Greenlandic) and Sami (Lappish)
@@ -10566,7 +11031,7 @@ CONFIG_NLS_ISO8859_10
 NLS ISO 8859-14 (Latin 8; Celtic)
 CONFIG_NLS_ISO8859_14
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 8 character
   set, which adds the last accented vowels for Welsh (aka Cymraeg)
@@ -10576,7 +11041,7 @@ CONFIG_NLS_ISO8859_14
 nls iso8859-15
 CONFIG_NLS_ISO8859_15
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the Latin 9 character
   set, which covers most West European languages such as Albanian,
@@ -10591,7 +11056,7 @@ CONFIG_NLS_ISO8859_15
 nls koi8-r
 CONFIG_NLS_KOI8_R
   If you want to display filenames with native language characters
-  from the Microsoft fat file system family or from JOLIET CDROMs
+  from the Microsoft FAT file system family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
   input/output character sets. Say Y here for the preferred Russian
   character set.
@@ -10608,7 +11073,12 @@ CONFIG_VT
   is done with certain key combinations, usually Alt-<function key>.
 
   The setterm command ("man setterm") can be used to change the
-  properties (such as colors) of a virtual terminal.
+  properties (such as colors or beeping) of a virtual terminal. The
+  man page console_codes(4) ("man console_codes") contains the special
+  character sequences that can be used to change those properties
+  directly. The fonts used on virtual terminals can be changed with
+  the setfont ("man setfont") command and the key bindings are defined
+  with the loadkeys ("man loadkeys") command.
 
   You need at least one virtual terminal device in order to make use
   of your keyboard and monitor. Therefore, only people configuring an
@@ -10634,20 +11104,10 @@ CONFIG_VT_CONSOLE
   that with a kernel command line option such as "console=tty3" which
   would use the third virtual terminal as system console. (Try "man
   bootparam" or see the documentation of your boot loader (lilo or
-  loadlin) about how to pass options to the kernel at boot time. The
-  lilo procedure is also explained in the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .)
+  loadlin) about how to pass options to the kernel at boot time.)
 
   If unsure, say Y.
 
-Software generated cursor
-CONFIG_SOFTCURSOR
-  If you say Y here, you'll be able to do lots of nice things with the
-  cursors of your virtual consoles -- for example turn them into
-  non-blinking block cursors which are more visible on laptop screens,
-  or change their colors depending on the virtual console they're on.
-  See Documentation/VGA-softcursor.txt for more information.
-
 Support for PowerMac keyboard
 CONFIG_MAC_KEYBOARD
   This option allows you to use an ADB keyboard attached to your
@@ -10698,9 +11158,7 @@ CONFIG_SERIAL_CONSOLE
   you can alter that using a kernel command line option such as
   "console=ttyS1". (Try "man bootparam" or see the documentation of
   your boot loader (lilo or loadlin) about how to pass options to the
-  kernel at boot time. The lilo procedure is also explained in the
-  SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .)
+  kernel at boot time.)
 
   If you don't have a VGA card installed and you say Y here, the
   kernel will automatically use the first serial line, /dev/ttyS0, as
@@ -10766,11 +11224,11 @@ CONFIG_RISCOM8
 Computone IntelliPort Plus serial support
 CONFIG_COMPUTONE
   This driver supports the entire family of Intelliport II/Plus
-  controllers with the exception of the MicroChannel controllers. It
-  does not support products previous to the Intelliport II. These are
-  multiport cards, which give you many serial ports. You would need
-  something like this to connect more than two modems to your Linux
-  box, for instance in order to become a dial-in server. If you have a
+  controllers with the exception of the MicroChannel controllers and 
+  products previous to the Intelliport II. These are multiport cards,
+  which give you many serial ports. You would need something like 
+  this to connect more than two modems to your Linux box, for 
+  instance in order to become a dial-in server. If you have a
   card like that, say Y here and read Documentation/computone.txt.
 
   If you want to compile this as a module ( = code which can be
@@ -10818,13 +11276,13 @@ CONFIG_CYCLADES
 
 Cyclades-Z interrupt mode operation (EXPERIMENTAL)
 CONFIG_CYZ_INTR
-  The Cyclades-Z family of multiport cards allows 2 (two) driver
-  op modes: polling and interrupt. In polling mode, the driver will
-  check the status of the Cyclades-Z ports every certain amount of
-  time (which is called polling cycle and is configurable). In
-  interrupt mode, it will use an interrupt line (IRQ) in order to check
-  the status of the Cyclades-Z ports. The default op mode is polling.
-  If unsure, say N.
+  The Cyclades-Z family of multiport cards allows 2 (two) driver op
+  modes: polling and interrupt. In polling mode, the driver will check
+  the status of the Cyclades-Z ports every certain amount of time
+  (which is called polling cycle and is configurable). In interrupt
+  mode, it will use an interrupt line (IRQ) in order to check the
+  status of the Cyclades-Z ports. The default op mode is polling. If
+  unsure, say N.
 
 Stallion multiport serial support 
 CONFIG_STALDRV
@@ -10899,6 +11357,24 @@ CONFIG_ESPSERIAL
   and read Documentation/modules.txt. The module will be called esp.o.
   If unsure, say N.
 
+Moxa Intellio support
+CONFIG_MOXA_INTELLIO
+  Say Y here if you have a Moxa Intellio multiport serial card.
+
+  This driver can also be built as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called moxa.o. If you want to do that, say M
+  here.
+
+Moxa SmartIO support
+CONFIG_MOXA_SMARTIO
+  Say Y here if you have a Moxa SmartIO multiport serial card.
+
+  This driver can also be built as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called mxser.o. If you want to do that, say M
+  here.
+
 Multi-Tech multiport card support (EXPERIMENTAL)
 CONFIG_ISI
   This is a driver for the Multi-Tech cards which provide several
@@ -10964,10 +11440,8 @@ CONFIG_PRINTER
   If you have several parallel ports, you can specify which ports to
   use with the "lp" kernel command line option. (Try "man bootparam"
   or see the documentation of your boot loader (lilo or loadlin) about
-  how to pass options to the kernel at boot time. The lilo procedure
-  is also explained in the SCSI-HOWTO, available from
-  http://www.linuxdoc.org/docs.html#howto .) The syntax of the "lp"
-  command line option can be found in drivers/char/lp.c.
+  how to pass options to the kernel at boot time.) The syntax of the
+  "lp" command line option can be found in drivers/char/lp.c.
 
   If you have more than 3 printers, you need to increase the LP_NO
   variable in lp.c.
@@ -10980,11 +11454,118 @@ CONFIG_LP_CONSOLE
   option "console=lp" to the kernel at boot time.
 
   Note that kernel messages can get lost if the printer is out of
-  paper (or off, or unplugged, or too busy..), but this behavior
+  paper (or off, or unplugged, or too busy..), but this behaviour
   can be changed. See drivers/char/lp.c (do this at your own risk).
 
   If unsure, say N.
 
+Support for user-space parallel port device drivers
+CONFIG_PPDEV
+  Saying Y to this adds support for /dev/parport device nodes.  This
+  is needed for programs that want portable access to the parallel
+  port, for instance deviceid (which displays Plug-and-Play device
+  IDs).
+
+  This is the parallel port equivalent of SCSI generic support (sg).
+  It is safe to say N to this -- it is not needed for normal printing
+  or parallel port CD-ROM/disk support.
+
+  This support is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called ppdev.o.
+
+  If unsure, say N.
+
+I2C support
+CONFIG_I2C
+  I2C (pronounce: I-square-C) is a slow serial bus protocol used in
+  many micro controller applications and developed by Philips. SMBus,
+  or System Management Bus is a subset of the I2C protocol. More
+  information is contained in the directory Documentation/i2c/,
+  especially in the file called "summary" there.
+
+  Both I2C and SMBus are supported here. You will need this for
+  hardware sensors support, and also for Video for Linux support.
+  Specifically, if you want to use a BT848 based frame grabber/overlay
+  boards under Linux, say Y here and also to "I2C bit-banging
+  interfaces", below.
+
+  If you want I2C support, you should say Y here and also to the
+  specific driver for your bus adapter(s) below. If you say Y to
+  "/proc file system" below, you will then get a /proc interface which
+  is documented in Documentation/i2c/proc-interface.
+
+  This I2C support is also available as a module. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt. The module will be called i2c-core.o.
+
+I2C bit-banging interfaces
+CONFIG_I2C_ALGOBIT
+  This allows you to use a range of I2C adapters called bit-banging
+  adapters. Say Y if you own an I2C adapter belonging to this class
+  and then say Y to the specific driver for you adapter below.
+
+  This support is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-algo-bit.o.
+
+Philips style parallel port adapter
+CONFIG_I2C_PHILIPSPAR
+  This supports parallel-port I2C adapters made by Philips. Say Y if
+  you own such an adapter.
+
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-philips-par.o.
+
+ELV adapter
+CONFIG_I2C_ELV
+  This supports parallel-port I2C adapters called ELV. Say Y if you
+  own such an adapter.
+
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-elv.o.
+
+Velleman K9000 adapter
+CONFIG_I2C_VELLEMAN
+  This supports the Velleman K9000 parallel-port I2C adapter. Say Y if
+  you own such an adapter.
+
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-velleman.o.
+
+I2C PCF 8584 interfaces
+CONFIG_I2C_ALGOPCF
+  This allows you to use a range of I2C adapters called PCF adapters.
+  Say Y if you own an I2C adapter belonging to this class and then say
+  Y to the specific driver for you adapter below.
+
+  This support is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-algo-pcf.o.
+
+Elektor ISA card
+CONFIG_I2C_ELEKTOR
+  This supports the PCF8584 ISA bus I2C adapter. Say Y if you own such
+  an adapter.
+
+  This driver is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-elektor.o.
+
+I2C device interface
+CONFIG_I2C_CHARDEV
+  Say Y here to use i2c-* device files, usually found in the /dev
+  directory on your system. They make it possible to have user-space
+  programs use the I2C bus. Information on how to do this is contained
+  in the file Documentation/i2c/dev-interface.
+
+  This code is also available as a module. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt. The
+  module will be called i2c-dev.o.
+
 Bus Mouse Support
 CONFIG_BUSMOUSE
   Say Y here if your machine has a bus mouse as opposed to a serial
@@ -11069,7 +11650,7 @@ CONFIG_82C710_MOUSE
 
 PC110 digitizer pad support
 CONFIG_PC110_PAD
-  This drives the digitizer pad on the IBM PC110 palmtop. It can turn 
+  This drives the digitizer pad on the IBM PC110 palmtop. It can turn
   the digitizer pad into a PS/2 mouse emulation with tap gestures or
   into an absolute pad.
 
@@ -11258,11 +11839,10 @@ CONFIG_FT_PROC_FS
   kernel driver. Saying Y will enlarge the size of the ftape driver
   by approximately 2 KB.
 
-  WARNING: When compiling ftape as a module (i.e. saying M to
-  "Floppy tape drive") it is dangerous to use ftape's /proc file
-  system interface. Accessing `/proc/ftape' while the module is
-  unloaded will result in a kernel Oops. This cannot be fixed from
-  inside ftape.
+  WARNING: When compiling ftape as a module (i.e. saying M to "Floppy
+  tape drive") it is dangerous to use ftape's /proc file system
+  interface. Accessing `/proc/ftape' while the module is unloaded will
+  result in a kernel Oops. This cannot be fixed from inside ftape.
 
 Controlling the amount of debugging output of ftape
 CONFIG_FT_NORMAL_DEBUG
@@ -11434,50 +12014,52 @@ CONFIG_FT_FDC_MAX_RATE
 Direct Rendering Manager (XFree86 DRI support)
 CONFIG_DRM
   Kernel-level support for the Direct Rendering Infrastructure (DRI)
-  introduced in XFree86 4.x. These modules provide support for
-  synchronization, security, and DMA transfers. Select the module that
-  provides support for your graphics card.
+  introduced in XFree86 4.x. If you say Y here, you need to select 
+  the module that's right for your graphics card from the list below.
+  These modules provide support for synchronization, security, and 
+  DMA transfers. Please read drivers/char/drm/README.drm for more 
+  details. 
 
-tdfx Direct Rendering Manager (XFree86 DRI support)
+3dfx Banshee/Voodoo3
 CONFIG_DRM_TDFX
   Choose M here if you have a 3dfx Banshee/Voodoo3 graphics card.
+  The module will be called tdfx.o.
 
 3dlabs GMX 2000 Direct Rendering Driver (XFree86 DRI support)
 CONFIG_DRM_GAMMA
   Choose M here if you have a 3dlabs GMX 2000 graphics card.
+  The module will be called gamma.o.
 
 MTRR control and configuration
 CONFIG_MTRR
   On Intel P6 family processors (Pentium Pro, Pentium II and later)
   the Memory Type Range Registers (MTRRs) may be used to control
-  processor access to memory ranges. This is most useful when you have
+  processor access to memory ranges. This is most useful if you have
   a video (VGA) card on a PCI or AGP bus. Enabling write-combining
   allows bus write transfers to be combined into a larger transfer
   before bursting over the PCI/AGP bus. This can increase performance
-  of image write operations 2.5 times or more. This option creates a
-  /proc/mtrr file which may be used to manipulate your
-  MTRRs. Typically the X server should use this. This should have a
-  reasonably generic interface so that similar control registers on
-  other processors can be easily supported.
+  of image write operations 2.5 times or more. Saying Y here creates a
+  /proc/mtrr file which may be used to manipulate your processor's
+  MTRRs. Typically the X server should use this. 
+
+  This code has a reasonably generic interface so that similar 
+  control registers on other processors can be easily supported 
+  as well:
 
   The Cyrix 6x86, 6x86MX and M II processors have Address Range
   Registers (ARRs) which provide a similar functionality to MTRRs. For
-  these, the ARRs are used to emulate the MTRRs, which means that it
-  makes sense to say Y here for these processors as well.
-
+  these, the ARRs are used to emulate the MTRRs.
   The AMD K6-2 (stepping 8 and above) and K6-3 processors have two
   MTRRs. The Centaur C6 (WinChip) has 8 MCRs, allowing
-  write-combining. All of these processors are supported by this code.
-
-  The Centaur C6 (WinChip) has 8 MCRs, allowing write-combining. These
-  are supported.
+  write-combining. All of these processors are supported by this code
+  and it makes sense to say Y here if you have one of them.
 
   Saying Y here also fixes a problem with buggy SMP BIOSes which only
-  set the MTRRs for the boot CPU and not the secondary CPUs. This can
-  lead to all sorts of problems.
+  set the MTRRs for the boot CPU and not for the secondary CPUs. This
+  can lead to all sorts of problems, so it's good to say Y here.
 
   You can safely say Y even if your machine doesn't have MTRRs, you'll
-  just add about 9K to your kernel.
+  just add about 9 KB to your kernel.
 
   See Documentation/mtrr.txt for more information.
 
@@ -11487,11 +12069,6 @@ CONFIG_FT_ALPHA_CLOCK
   determined automatically, so you need to specify it here ONLY if
   running a DEC Alpha, otherwise this setting has no effect.
 
-Zilog serial support
-CONFIG_SUN_ZS
-  This driver does not exist at this point, so you might as well 
-  say N.
-
 Double Talk PC internal speech card support
 CONFIG_DTLK
   This driver is for the DoubleTalk PC, a speech synthesizer
@@ -11531,26 +12108,54 @@ CONFIG_APPLICOM
 
 Power Management support
 CONFIG_PM
-  This enable the kernel to lower the requested computer power by making some
-  devices enter in lower power levels (standy, sleep, ... modes).
-  Basically, this let you save power.
+  "Power Management" means that parts of your computer are shut
+  off or put into a power conserving "sleep" mode if they are not
+  being used. There are two competing standards for doing this: APM
+  and ACPI. If you want to use either one, say Y here and then also to
+  the requisite support below. 
+
+  Power Management is most important for battery powered laptop
+  computers; if you have a laptop, check out the Linux Laptop home
+  page on the WWW at
+  http://www.cs.utexas.edu/users/kharker/linux-laptop/ and the Battery
+  Powered Linux mini-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto .
 
-  Two majors interfaces exist between the hardware and the OS, the older
-  Advanced Power Management (APM) and the newer Advanced Configuration and
-  Power Interface (ACPI).
+  Note that, even if you say N here, Linux on the x86 architecture
+  will issue the hlt instruction if nothing is to be done, thereby
+  sending the processor to sleep and saving power.
 
-  Both are supported by the Linux Kernel.
+ACPI support
+CONFIG_ACPI
+  The Advanced Configuration and Power Interface is a standard
+  designed to allow the operating system more control over power
+  management issues, such as suspending a computer in a low power
+  consumption state after a certain time of inaction. It aims to be
+  an improved version of APM (see below). ACPI has to be
+  supported by the motherboard. You can read more about the standard
+  at http://www.teleport.com/~acpi/ . 
+
+  If your computer supports ACPI and you want to use it, say Y here.
+  You will then need supporting software; for location and more
+  information, please read Documentation/pm.txt and the Battery
+  Powered Linux mini-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto .
 
-  Note that on some architectures (such as ia32), the idle task perform hlt
-  instructions which makes the CPU enter a low power mode. This can be seen as
-  the first kernel PM level.
+  If you say Y here and also to "Advanced Power Management" (APM)
+  below, then ACPI has precedence in the sense that, if your hardware
+  supports ACPI, it will be used and APM won't.
+
+  To compile this driver as a module ( = code which can be inserted in
+  and removed from the running kernel whenever you want), say M here
+  and read Documentation/modules.txt. The module will be called 
+  acpi.o.
 
 Enter S1 for sleep (EXPERIMENTAL)
 CONFIG_ACPI_S1_SLEEP
-  This enable ACPI compliant devices to enter level 1 of ACPI saving
-  power levels. Basically, this will let them entering in sleep mode.
+  If you say Y here, ACPI compliant devices can enter level 1 of ACPI
+  saving power levels. Basically, this will let them enter sleep mode.
 
-Advanced Power Management
+Advanced Power Management BIOS support
 CONFIG_APM
   APM is a BIOS specification for saving power using several different
   techniques. This is mostly useful for battery powered laptops with
@@ -11565,8 +12170,9 @@ CONFIG_APM
   Note that the APM support is almost completely disabled for
   machines with more than one CPU.
 
-  Supporting software is available; for more information, read the
-  Battery Powered Linux mini-HOWTO, available from
+  In order to use APM, you will need supporting software. For location
+  and more information, read Documentation/pm.txt and the Battery
+  Powered Linux mini-HOWTO, available from
   http://www.linuxdoc.org/docs.html#howto .
 
   This driver does not spin down disk drives (see the hdparm(8)
@@ -11578,10 +12184,6 @@ CONFIG_APM
   desktop machines also don't have compliant BIOSes, and this driver
   may cause those machines to panic during the boot phase.
 
-  If you are running Linux on a laptop, you may also want to read the
-  Linux Laptop home page on the WWW at
-  http://www.cs.utexas.edu/users/kharker/linux-laptop/ .
-
   Generally, if you don't have a battery in your machine, there isn't
   much point in using this driver and you should say N. If you get
   random kernel OOPSes or reboots that don't seem to be related to
@@ -11689,7 +12291,7 @@ CONFIG_APM_ALLOW_INTS
   Normally we disable external interrupts while we are making calls to
   the APM BIOS as a measure to lessen the effects of a badly behaving
   BIOS implementation.  The BIOS should reenable interrupts if it
-  needs to.  Unfortunately, some BIOSes do not - especially those in
+  needs to.  Unfortunately, some BIOSes do not -- especially those in
   many of the newer IBM Thinkpads.  If you experience hangs when you
   suspend, try setting this to Y.  Otherwise, say N.
 
@@ -11724,7 +12326,7 @@ CONFIG_WATCHDOG
 
 Disable watchdog shutdown on close
 CONFIG_WATCHDOG_NOWAYOUT
-  The default watchdog behavior (which you get if you say N here) is
+  The default watchdog behaviour (which you get if you say N here) is
   to stop the timer if the process managing it closes the file
   /dev/watchdog. It's always remotely possible that this process might
   get killed. If you say Y here, the watchdog cannot be stopped once
@@ -11797,34 +12399,47 @@ CONFIG_ACQUIRE_WDT
   module, say M here and read Documentation/modules.txt. Most people
   will say N.
 
-Intel P6 CPU Microcode Update Support
+Mixcom Watchdog
+CONFIG_MIXCOMWD 
+  This is a driver for the Mixcom hardware watchdog cards. This
+  watchdog simply watches your kernel to make sure it doesn't freeze,
+  and if it does, it reboots your computer after a certain amount of
+  time.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module is called mixcomwd.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt. Most people
+  will say N.
+
+/dev/cpu/microcode - Intel P6 CPU microcode support
 CONFIG_MICROCODE
-  If you say Y here you will be able to update microcode on 
-  Intel processors in P6 family, e.g.  Pentium Pro, Pentium II, 
+  If you say Y here and also to "/dev file system support" in the
+  'File systems' section, you will be able to update the microcode on
+  Intel processors in the P6 family, e.g. Pentium Pro, Pentium II,
   Pentium III, Xeon etc. You will obviously need the actual microcode
-  binary data itself which is not shipped with the Linux kernel. 
-  You also need to say Y to "/dev file system support" in 'File systems'
-  section of the kernel configuration menu.
+  binary data itself which is not shipped with the Linux kernel.
 
-  You need to be superuser to do that. For latest news and information
-  on obtaining all the required ingredients for this driver, check:
-
-     http://www.ocston.org/~tigran/patches/microcode
+  For latest news and information on obtaining all the required
+  ingredients for this driver, check:
+  http://www.ocston.org/~tigran/patches/microcode .
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called microcode.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  The module will be called microcode.o. If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
 
 Enhanced Real Time Clock Support
 CONFIG_RTC
   If you say Y here and create a character special file /dev/rtc with
   major number 10 and minor number 135 using mknod ("man mknod"), you
-  will get access to the real time clock built into your computer.
+  will get access to the real time clock (or hardware clock) built 
+  into your computer.
+
   Every PC has such a clock built in. It can be used to generate
   signals from as low as 1Hz up to 8192Hz, and can also be used
   as a 24 hour alarm. It reports status information via the file
-  /proc/driver/rtc and its behavior is set by various ioctls on
+  /proc/driver/rtc and its behaviour is set by various ioctls on
   /dev/rtc.
 
   If you run Linux on a multiprocessor machine and said Y to
@@ -11835,6 +12450,15 @@ CONFIG_RTC
   sampling), then say Y here, and read Documentation/rtc.txt for
   details.
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module is called rtc.o. If you want to compile it as a module,
+  say M here and read Documentation/modules.txt. 
+
+### Add
+#EFI Real Time Clock Services
+#CONFIG_EFI_RTC
+
 Tadpole ANA H8 Support
 CONFIG_H8
   The Hitachi H8/337 is a microcontroller used to deal with the power
@@ -11878,6 +12502,11 @@ CONFIG_JOYSTICK
   the file Documentation/joystick.txt which contains more information
   and the location of the joystick package that you'll need.
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joystick.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
 Classic PC analog
 CONFIG_JOY_ANALOG
   Say Y here if you have a controller that connects to the PC
@@ -11887,30 +12516,55 @@ CONFIG_JOY_ANALOG
   ThrustMaster FCS or 6 and 8 button gamepads. For more information on
   how to use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-analog.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 FPGaming and MadCatz A3D
 CONFIG_JOY_ASSASSIN
   Say Y here if you have an FPGaming or MadCatz controller using the
   A3D protocol over the PC gameport. For more information on how to
   use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-assasin.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Gravis GrIP
 CONFIG_JOY_GRAVIS
   Say Y here if you have a Gravis controller using the GrIP protocol
   over the PC gameport. For more information on how to use the driver
   please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-gravis.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Logitech ADI
 CONFIG_JOY_LOGITECH
   Say Y here if you have a Logitech controller using the ADI
   protocol over the PC gameport. For more information on how to use
   the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-logitech.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Microsoft SideWinder
 CONFIG_JOY_SIDEWINDER
   Say Y here if you have a Microsoft controller using the Digital
   Overdrive protocol over PC gameport. For more information on how to
   use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-sidewinder.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 ThrustMaster DirectConnect
 CONFIG_JOY_THRUSTMASTER
   Say Y here if you have a ThrustMaster controller using the
@@ -11918,18 +12572,44 @@ CONFIG_JOY_THRUSTMASTER
   information on how to use the driver please read
   Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-thrustmaster.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Creative Labs Blaster
 CONFIG_JOY_CREATIVE
   Say Y here if you have a Creative Labs controller using the
   Blaster protocol over the PC gameport. For more information on how
   to use the driver please read Documentation/joystick.txt
 
-PDPI Lightning 4 card
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-creative.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+PDPI Lightning 4 cards
 CONFIG_JOY_LIGHTNING
   Say Y here if you have a PDPI Lightning 4 gamecard and an analog
   joystick or gamepad connected to it. For more information on how to
   use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-lightning.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+Logitech WingMan Warrior
+CONFIG_JOY_WARRIOR
+  Say Y here if you have a Logitech WingMan Warrior controller
+  connected to your computer's serial port.  For more information on
+  how to use the driver please read Documentation/joystick.txt
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-warrior.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Trident 4DWave and Aureal Vortex gameport
 CONFIG_JOY_PCI
   Say Y here if you have a Trident 4DWave DX/NX or Aureal Vortex 1/2
@@ -11937,12 +12617,22 @@ CONFIG_JOY_PCI
   with and ordinary analog joystick. For more information on how to
   use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-pci.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Magellan and Space Mouse
 CONFIG_JOY_MAGELLAN
   Say Y here if you have a Magellan or Space Mouse 6DOF controller
   connected to your computer's serial port.  For more information on
   how to use the driver please read Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-magellan.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 SpaceTec SpaceOrb 360 and SpaceBall Avenger
 CONFIG_JOY_SPACEORB
   Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF
@@ -11950,6 +12640,11 @@ CONFIG_JOY_SPACEORB
   information on how to use the driver please read
   Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-spaceorb.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+ 
 SpaceTec SpaceBall 4000 FLX
 CONFIG_JOY_SPACEBALL
   Say Y here if you have a SpaceTec SpaceBall 4000 FLX
@@ -11957,12 +12652,11 @@ CONFIG_JOY_SPACEBALL
   information on how to use the driver please read
   Documentation/joystick.txt
 
-Logitech WingMan Warrior
-CONFIG_JOY_WARRIOR
-  Say Y here if you have a Logitech WingMan Warrior controller
-  connected to your computer's serial port.  For more information on
-  how to use the driver please read Documentation/joystick.txt
-
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-spaceball.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+ 
 NES, SNES, N64, PSX, Multi
 CONFIG_JOY_CONSOLE
   Say Y here if you have a Nintendo Entertainment System gamepad,
@@ -11972,15 +12666,25 @@ CONFIG_JOY_CONSOLE
   For more information on how to use the driver please read
   Documentation/joystick.txt and Documentation/joystick-parport.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-console.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Sega, Multi
 CONFIG_JOY_DB9
   Say Y here if you have a Sega Master System gamepad, Sega Genesis
   gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,
-  Commodore, Amstrad CPC joystick connected to your parallel port. For
-  more information on how to use the driver please read
-  Documentation/joystick.txt and Documentation/joystick-parport.txt
+  Commodore, Amstrad CPC joystick connected to your parallel port. 
+  For more information on how to use the driver please read 
+  Documentation/joystick.txt and Documentation/joystick-parport.txt.
 
-TurboGraFX interface
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-db9.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+TurboGraFX Multisystem interface
 CONFIG_JOY_TURBOGRAFX
   Say Y here if you have the TurboGraFX interface by Steffen Schwenke,
   and want to use it with Multiststem -- Atari, Amiga, Commodore,
@@ -11988,12 +12692,22 @@ CONFIG_JOY_TURBOGRAFX
   please read Documentation/joystick.txt and
   Documentation/joystick-parport.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-turbografx.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Amiga joysticks
 CONFIG_JOY_AMIGA
   Say Y here if you have an Amiga with a digital joystick connected
   to it. For more information on how to use the driver please read
   Documentation/joystick.txt
 
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called joy-amiga.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
 Atomwide Serial Support
 CONFIG_ATOMWIDE_SERIAL
   If you have an Atomwide Serial card for an Acorn system, say Y to
@@ -12017,7 +12731,7 @@ CONFIG_NWBUTTON
   row.
 
   Do not hold the button down for too long, as the driver does not
-  alter the behavior of the hardware reset circuitry attached to the
+  alter the behaviour of the hardware reset circuitry attached to the
   button; it will still execute a hard reset if the button is held
   down for longer than approximately five seconds.
 
@@ -12066,7 +12780,7 @@ CONFIG_SOUND
   I'm told that even without a sound card, you can make your computer
   say more than an occasional beep, by programming the PC speaker.
   Kernel patches and supporting utilities to do that are in the pcsp
-  package, available at ftp://ftp.infradead.org/pub/pcsp/.
+  package, available at ftp://ftp.infradead.org/pub/pcsp/ .
 
 OSS sound modules
 CONFIG_SOUND_OSS
@@ -12096,24 +12810,25 @@ CONFIG_SOUND_SGALAXY
   This module initializes the older non Plug and Play sound galaxy
   cards from Aztech. It supports the Waverider Pro 32 - 3D and the
   Galaxy Washington 16.
+
   If you compile the driver into the kernel, you have to add
-  "sgalaxy=<io>,<irq>,<dma>,<dma2>,<sgbase>" to the kernel command line.
+  "sgalaxy=<io>,<irq>,<dma>,<dma2>,<sgbase>" to the kernel command
+  line.
 
 Support for AD1816(A) based cards (EXPERIMENTAL)
 CONFIG_SOUND_AD1816
   Say M here if you have a sound card based on the Analog Devices 
   AD1816(A) chip.
+
   If you compile the driver into the kernel, you have to add
   "ad1816=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
 
-  NOTE: This driver is still EXPERIMENTAL. 
-        See Documentation/sound/AD1816 for further information.
-
 Yamaha OPL3-SA1 audio controller
 CONFIG_SOUND_OPL3SA1
   Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
   usually built into motherboards. Read Documentation/sound/OPL3-SA
   for details.
+
   If you compile the driver into the kernel, you have to add
   "opl3sa=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
   command line.
@@ -12124,6 +12839,7 @@ CONFIG_SOUND_PAS
   16 or Logitech SoundMan 16 sound card. Don't answer Y if you have
   some other card made by Media Vision or Logitech since they are not
   PAS16 compatible.
+
   If you compile the driver into the kernel, you have to add
   "pas2=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<sbdma2>
   to the kernel command line.
@@ -12138,14 +12854,16 @@ CONFIG_SOUND_SB
   Please read the file Documentation/sound/Soundblaster.
 
   You should also say Y here for cards based on the Avance Logic
-  ALS-007 chip (read Documentation/sound/ALS007) and for cards based
+  ALS-007 chip (read Documentation/sound/ALS) and for cards based
   on ESS chips (read Documentation/sound/ESS1868 and
   Documentation/sound/ESS). If you have an SB AWE 32 or SB AWE 64, say
   Y here and also to "Additional lowlevel drivers" and to "SB32/AWE
   support" below and read Documentation/sound/INSTALL.awe. If you have
   an IBM Mwave card, say Y here and read Documentation/sound/mwave.
-  If you compile the driver into the kernel and don't want to use isapnp,
-  you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
+
+  If you compile the driver into the kernel and don't want to use
+  isapnp, you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel
+  command line.
   
   You can say M here to compile this driver as a module; the module is
   called sb.o.
@@ -12161,6 +12879,7 @@ CONFIG_SOUND_GUS
   Say Y here for any type of Gravis Ultrasound card, including
   the GUS or GUS MAX. See also Documentation/sound/ultrasound for
   more information on configuring this card with modules.
+
   If you compile the driver into the kernel, you have to add
   "gus=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
 
@@ -12174,6 +12893,7 @@ CONFIG_SOUND_MPU401
   was in the list of supported cards, look at the card specific
   instructions in the drivers/sound/Readme.cards file. It's safe to
   answer Y if you have a true MPU401 MIDI interface card.
+
   If you compile the driver into the kernel, you have to add
   "mpu401=<io>,<irq>" to the kernel command line.
 
@@ -12182,14 +12902,10 @@ CONFIG_SOUND_UART6850
   This option enables support for MIDI interfaces based on the 6850
   UART chip. This interface is rarely found on sound cards. It's safe
   to answer N to this question.
+
   If you compile the driver into the kernel, you have to add
   "uart6850=<io>,<irq>" to the kernel command line.
 
-VIDC Sound
-CONFIG_VIDC_SOUND
-  Say Y here for ARM systems with the VIDC video controller and 16-bit
-  Linear sound DACs. If unsure, say N.
-
 PSS (AD1848, ADSP-2115, ESC614) support
 CONFIG_SOUND_PSS
   Answer Y or M if you have an Orchid SW32, Cardinal DSP16, Beethoven
@@ -12197,6 +12913,7 @@ CONFIG_SOUND_PSS
   ADSP-2115 DSP chip + Echo ESC614 ASIC CHIP). For more information on
   how to compile it into the kernel or as a module see the file
   Documentation/sound/PSS.
+
   If you compile the driver into the kernel, you have to add
   "pss=<io>,<mssio>,<mssirq>,<mssdma>,<mpuio>,<mpuirq>" to the kernel
   command line.
@@ -12223,16 +12940,6 @@ CONFIG_PSS_BOOT_FILE
   Enter the full pathname of your DSPxxx.LD file or SYNTH.LD file,
   starting from /.
 
-16 bit sampling option of GUS (_NOT_ GUS MAX)
-CONFIG_SOUND_GUS16
-  Answer Y if you have installed the 16 bit sampling daughtercard on
-  your GUS. Answer N if you have a GUS MAX, since saying Y here
-  disables GUS MAX support.
-
-GUS MAX support
-CONFIG_SOUND_GUSMAX
-  Answer Y only if you have a Gravis Ultrasound MAX.
-
 Microsoft Sound System support
 CONFIG_SOUND_MSS
   Again think carefully before answering Y to this question. It's safe
@@ -12258,8 +12965,10 @@ CONFIG_SOUND_MSS
   specific instructions in drivers/sound/Readme.cards. Some drivers
   have their own MSS support and saying Y to this option will cause a
   conflict.
+
   If you compile the driver into the kernel, you have to add
-  "ad1848=<io>,<irq>,<dma>,<dma2>[,<type>]" to the kernel command line.
+  "ad1848=<io>,<irq>,<dma>,<dma2>[,<type>]" to the kernel command
+  line.
 
 SGI Visual Workstation on-board audio
 CONFIG_SOUND_VWSND
@@ -12272,16 +12981,15 @@ CONFIG_SOUND_SSCAPE
   Answer Y if you have a sound card based on the Ensoniq SoundScape
   chipset. Such cards are being manufactured at least by Ensoniq, Spea
   and Reveal (Reveal makes also other cards).
+
   If you compile the driver into the kernel, you have to add
-  "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command line.
+  "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command
+  line.
 
 MediaTriX AudioTriX Pro support
 CONFIG_SOUND_TRIX
   Answer Y if you have the AudioTriX Pro sound card manufactured
   by MediaTrix.
-  If you compile the driver into the kernel, you have to add
-  "trix=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<mpuio>,<mpuirq>"
-  to the kernel command line.
 
 Have TRXPRO.HEX firmware file
 CONFIG_TRIX_HAVE_BOOT
@@ -12306,6 +13014,7 @@ CONFIG_SOUND_MAD16
   and Diamond (latest ones). Note however that the Tropez sound cards
   have their own driver; if you have one of those, say N here and Y or
   M to "Full support for Turtle Beach WaveFront", below. 
+
   If you compile the driver into the kernel, you have to add
   "mad16=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the
   kernel command line.
@@ -12329,6 +13038,7 @@ Support for Crystal CS4232 based (PnP) cards
 CONFIG_SOUND_CS4232
   Say Y here if you have a card based on the Crystal CS4232 chip set,
   which uses its own Plug and Play protocol.
+
   If you compile the driver into the kernel, you have to add
   "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
   command line.
@@ -12341,6 +13051,7 @@ CONFIG_SOUND_OPL3SA2
   Say Y or M if you have a card based on one of these Yamaha
   sound chipsets. Read Documentation/sound/OPL3-SA2 for more
   information on configuring these cards.
+
   If you compile the driver into the kernel, you have to add
   "opl3sa2=<io>,<irq>,<dma>,<dma2>,<mssio>,<mpuio>" to the kernel
   command line.
@@ -12349,6 +13060,7 @@ Support for Turtle Beach Wave Front (Maui, Tropez) synthesizers
 CONFIG_SOUND_MAUI
   Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez
   sound card.
+
   If you compile the driver into the kernel, you have to add
   "maui=<io>,<irq>" to the kernel command line.
 
@@ -12447,15 +13159,11 @@ CONFIG_SOUND_YM3812
   cards, however).
   Please read the file Documentation/sound/OPL3 if your card has an
   OPL3 chip.
+
   If you compile the driver into the kernel, you have to add
   "opl3=<io>" to the kernel command line.
 
   If unsure, say Y.
- 
-Sun Audio support
-CONFIG_SUN_AUDIO
-  This is support for the sound cards on Sun workstations. The code
-  does not exist yet, so you might as well say N here.
 
 ACI mixer (miroPCM12/PCM20)
 CONFIG_SOUND_ACI_MIXER
@@ -12502,6 +13210,7 @@ CONFIG_AEDSP16_SBPRO
   You should then say Y to "100% Sound Blaster compatibles
   (SB16/32/64, ESS, Jazz16) support" and N to "Audio Excel DSP 16 (MSS
   emulation)".
+
   If you compile the driver into the kernel, you have to add
   "aedsp16=<io>,<irq>,<dma>,<mssio>,<mpuio>,<mouirq>" to the kernel
   command line.
@@ -12590,7 +13299,7 @@ CONFIG_SOUND_TRIDENT
   for Trident 4Dwave. PCI ID 1039:7018 stands for SiS7018.
 
   This driver differs slightly from OSS/Free, so PLEASE READ the
-  comments at of driver/sound/trident.c
+  comments at the top of driver/sound/trident.c
 
 Rockwell WaveArtist
 CONFIG_SOUND_WAVEARTIST
@@ -12599,18 +13308,18 @@ CONFIG_SOUND_WAVEARTIST
 
 VIA 82Cxxx Audio Codec
 CONFIG_SOUND_VIA82CXXX
-  Say Y here to include support for the audio codec found on
-  VIA 82Cxxx-based chips.  Typically these are built into a motherboard.
-  DO NOT select SoundBlaster or Adlib with this driver, unless you have
-  a SoundBlaster or Adlib card in addition to your VIA audio chip.
+  Say Y here to include support for the audio codec found on VIA
+  82Cxxx-based chips. Typically these are built into a motherboard. DO
+  NOT select Sound Blaster or Adlib with this driver, unless you have
+  a Sound Blaster or Adlib card in addition to your VIA audio chip.
 
 NeoMagic 256AV/256ZX sound chipsets
 CONFIG_SOUND_NM256
   Say M here to include audio support for the NeoMagic 256AV/256ZX
-  chipsets.  These are the audio chipsets found in the Sony Z505S/SX/DX,
-  some Sony F-series, and the Dell Latitude CPi and CPt laptops. It includes 
-  support for an AC97-compatible mixer and an apparently proprietary sound 
-  engine.
+  chipsets. These are the audio chipsets found in the Sony
+  Z505S/SX/DX, some Sony F-series, and the Dell Latitude CPi and CPt
+  laptops. It includes support for an AC97-compatible mixer and an
+  apparently proprietary sound engine.
 
   See Documentation/sound/NM256 for further information.
 
@@ -12627,9 +13336,9 @@ CONFIG_CROSSCOMPILE
 
 Kernel support for Linux/MIPS 32-bit binary compatibility
 CONFIG_MIPS32_COMPAT
-  Select this option this option if you want Linux/MIPS 32-bit binary
-  compatibility.  Since all software available available for Linux/MIPS
-  is currently 32-bit you should say Y here.
+  Select this option if you want Linux/MIPS 32-bit binary
+  compatibility. Since all software available for Linux/MIPS is
+  currently 32-bit you should say Y here.
 
 Build fp exception handler module
 CONFIG_MIPS_FPE_MODULE
@@ -12717,7 +13426,7 @@ CONFIG_ISDN_AUDIO
 
 X.25 PLP on top of ISDN
 CONFIG_ISDN_X25
-  This feature provides the X.25 protocol over ISDN connections.
+  This feature provides the X.25 protocol over ISDN connections. 
   See Documentation/isdn/README.x25 for more information
   if you are thinking about using this.
 
@@ -12782,11 +13491,21 @@ CONFIG_ISDN_DRV_HISAX
 
 HiSax Support for EURO/DSS1
 CONFIG_HISAX_EURO
-  Enable this if you have a EURO ISDN line.
+  Say Y or N according to the D-channel protocol which your local
+  telephone service company provides.
 
-Support for german chargeinfo
+  NOTE: If you say Y here and you have only one ISDN card installed,
+  you cannot say Y to "HiSax Support for German 1TR6", below. And vice
+  versa.
+
+Support for german charge info
 CONFIG_DE_AOC
-  If you have german AOC, you can enable this to get the charginfo.
+  If you want that the HiSax hardware driver sends messages to the
+  upper level of the isdn code on each AOCD (Advice Of Charge, During
+  the call -- transmission of the fee information during a call) and
+  on each AOCE (Advice Of Charge, at the End of the call --
+  transmission of fee information at the end of the call), say Y here.
+  This works only in Germany.
 
 Disable sending complete
 CONFIG_HISAX_NO_SENDCOMPLETE
@@ -12800,12 +13519,17 @@ CONFIG_HISAX_NO_LLC
 
 Disable keypad protocol option
 CONFIG_HISAX_NO_KEYPAD
-  If you like to send special dialstrings including * or # without
+  If you like to send special dial strings including * or # without
   using the keypad protocol, select this option.
 
-HiSax Support for german 1TR6
+HiSax Support for German 1TR6
 CONFIG_HISAX_1TR6
-  Enable this if you have a old german 1TR6 line.
+  Say Y or N according to the D-channel protocol which your local
+  telephone service company provides.
+
+  NOTE: If you say Y here and you have only one ISDN card installed,
+  you cannot say Y to "HiSax Support for EURO/DSS1", above. And vice
+  versa.
 
 Teles 16.0/8.0
 CONFIG_HISAX_16_0
@@ -12829,7 +13553,7 @@ Teles PCI
 CONFIG_HISAX_TELESPCI
   This enables HiSax support for the Teles PCI.
   See Documentation/isdn/README.HiSax on how to configure it.
-
+ 
 Teles S0Box
 CONFIG_HISAX_S0BOX
   This enables HiSax support for the Teles/Creatix parallel port
@@ -12992,8 +13716,8 @@ CONFIG_HISAX_W6692
 
 HFC-S+, HFC-SP, HFC-PCMCIA cards (EXPERIMENTAL)
 CONFIG_HISAX_HFC_SX
-  This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA cards.
-  This code is not finished yet.
+  This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA
+  cards. This code is not finished yet.
 
 Am7930 (EXPERIMENTAL)
 CONFIG_HISAX_AMD7930
@@ -13049,10 +13773,16 @@ CONFIG_ISDN_TTY_FAX
 
 CAPI2.0 support
 CONFIG_ISDN_CAPI
-  This provides the CAPI (Common ISDN Application Programming Interface, a
-  standard making it easy for programs to access ISDN hardware, see
-  http://www.capi.org/. This is needed for AVM's set of active ISDN
-  controllers like B1, T1, M1.
+  This provides the CAPI (Common ISDN Application Programming
+  Interface, a standard making it easy for programs to access ISDN
+  hardware, see http://www.capi.org/ . This is needed for AVM's set of
+  active ISDN controllers like B1, T1, M1.
+
+  This code is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The modules will be called capi.o and kernelcapi.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
 
 AVM B1 ISA support
 CONFIG_ISDN_DRV_AVMB1_B1ISA
@@ -13091,7 +13821,6 @@ CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON
   disconnecting. This will increase the size of the kernel by 7 KB. If
   unsure, say Y.
 
-
 IBM Active 2000 support (EXPERIMENTAL)
 CONFIG_ISDN_DRV_ACT2000
   Say Y here if you have an IBM Active 2000 ISDN card. In order to use
@@ -13100,12 +13829,12 @@ CONFIG_ISDN_DRV_ACT2000
   isdn4k-utils package. Please read the file
   Documentation/isdn/README.act2000 for more information.
 
-Support for AP1000 multicomputer
-CONFIG_AP1000
-  This enables support for a SPARC based parallel multi-computer
-  called AP1000+. For details on our efforts to port Linux to this
-  machine see http://cap.anu.edu.au/cap/projects/linux or mail to
-  hackers@cafe.anu.edu.au
+Hypercope HYSDN cards (Champ, Ergo, Metro) support (module)
+CONFIG_HYSDN
+  Say Y here if you have one of Hypercope's active PCI ISDN cards
+  Champ, Ergo and Metro. You will then get a module called hysdn.o.
+  Please read the file Documentation/isdn/README.hysdn for more
+  information.
 
 Support for Sun4 architecture
 CONFIG_SUN4
@@ -13127,11 +13856,11 @@ PTI Qlogic, ISP Driver
 CONFIG_SCSI_QLOGICPTI
   This driver supports SBUS SCSI controllers from PTI or QLogic. These
   controllers are known under Solaris as qpti and in the openprom as
-  PTI,ptisp or QLGC,isp. Note that PCI QLogic SCSI controllers are driven
-  by a different driver.
+  PTI,ptisp or QLGC,isp. Note that PCI QLogic SCSI controllers are
+  driven by a different driver.
 
-  This support is also available as a module called qlogicpti.o ( = code
-  which can be inserted in and removed from the running kernel
+  This support is also available as a module called qlogicpti.o ( =
+  code which can be inserted in and removed from the running kernel
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
@@ -13147,14 +13876,14 @@ CONFIG_SUN_OPENPROMIO
 
 Openprom tree appears in /proc/openprom
 CONFIG_SUN_OPENPROMFS
-  If you say Y, the OpenPROM device tree will be available as a virtual
-  file system, which you can mount to /proc/openprom by
-  "mount -t openpromfs none /proc/openprom".
+  If you say Y, the OpenPROM device tree will be available as a
+  virtual file system, which you can mount to /proc/openprom by "mount
+  -t openpromfs none /proc/openprom".
 
-  If you want to compile the /proc/openprom support as a module ( = code
-  which can be inserted in and removed from the running kernel whenever
-  you want), say M here and read Documentation/modules.txt. The module
-  will be called openpromfs.o. If unsure, say M.
+  If you want to compile the /proc/openprom support as a module ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want), say M here and read Documentation/modules.txt.
+  The module will be called openpromfs.o. If unsure, say M.
 
 Kernel support for Linux/Sparc 32bit binary compatibility
 CONFIG_SPARC32_COMPAT
@@ -13195,8 +13924,8 @@ CONFIG_OBP_FLASH
 
 JavaStation OS Flash SIMM (EXPERIMENTAL)
 CONFIG_SUN_JSFLASH
-  This option enables a driver for JavaStation OS Flash driver.
-  Say N unless you want to boot from your Flash SIMM.
+  If you say Y here, you will be able to boot from your JavaStation's
+  Flash memory.
 
 Siemens SAB82532 serial support
 CONFIG_SAB82532
@@ -13212,8 +13941,9 @@ Audio support (EXPERIMENTAL)
 CONFIG_SPARCAUDIO
   This driver provides support for the build-in sound devices on most
   Sun machines. If you want to be able to use this, select this option
-  and one or more of the lowlevel drivers below. See 
-  http://www.dementia.org/~shadow/sparcaudio.html for more information.
+  and one or more of the lowlevel drivers below. See
+  http://www.dementia.org/~shadow/sparcaudio.html for more
+  information.
 
 AMD7930 Lowlevel Driver
 CONFIG_SPARCAUDIO_AMD7930
@@ -13227,108 +13957,20 @@ CONFIG_SPARCAUDIO_CS4231
 
 DBRI Lowlevel Driver
 CONFIG_SPARCAUDIO_DBRI
-  This driver supports the DBRI audio interface found on the SS10, SS20,
-  Sparcbook 3, and Voyager systems.
+  This driver supports the DBRI audio interface found on the SS10,
+  SS20, Sparcbook 3, and Voyager systems.
 
 Dummy lowlevel Driver
 CONFIG_SPARCAUDIO_DUMMY
-  This is a pseudo-driver used for debugging and testing the sparcaudio
-  subsystem. Say N unless you want to work on this subsystem.
+  This is a pseudo-driver used for debugging and testing the
+  sparcaudio subsystem. Say N unless you want to work on this
+  subsystem.
 
 Sparc hardware (EXPERIMENTAL)
 CONFIG_PARPORT_SUNBPP
-  This driver provides support for the bidirectional parallel port found
-  on many Sun machines. Note that many of the newer Ultras actually have
-  pc style hardware instead.
-
-IEEE 1394 (aka FireWire) support
-CONFIG_IEEE1394
-  IEEE 1394 describes a high performance serial bus, which is also
-  known as FireWire(tm) or i.Link(tm) and is used for connecting all
-  sorts of devices (most notably digital video cameras).
-
-  If you have FireWire hardware and want to use it, say Y here.  This
-  is the core support only, you will also need to select a driver for
-  your IEEE 1394 adapter.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called ieee1394.o.
-
-  FireWire is a trademark by Apple Inc. and i.Link is a trademark by 
-  Sony.
-
-TI PCILynx IEEE 1394 support
-CONFIG_IEEE1394_PCILYNX
-  Say Y here if you have a IEEE-1394 controller with the Texas
-  Instruments PCILynx chip.  Note: this driver is written for revision
-  2 of this chip and may not work with revision 0.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called pcilynx.o.
-
-Use local RAM on PCILynx board
-CONFIG_IEEE1394_PCILYNX_LOCALRAM
-  This option makes the PCILynx driver use local RAM available on some
-  PCILynx setups for Packet Control Lists.  Local RAM may speed up
-  command processing because no PCI transfers are necessary during 
-  use of the Packet Control Lists.
-  
-  Note that there are no known PCILynx systems providing local RAM
-  except for the evaluation boards by Texas Instruments and that the
-  PCILynx does not reliably report missing RAM.
-  
-  Unless you are absolutely sure that you have 64kB of local RAM and
-  that you want to use it or if you don't know what this is all about,
-  say N here.
-
-Adaptec AIC-5800 IEEE 1394 support
-CONFIG_IEEE1394_AIC5800
-  Say Y here if you have a IEEE 1394 controller using the Adaptec
-  AIC-5800 chip. All Adaptec host adapters (89xx series) use this
-  chip, as well as miro's DV boards.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called aic5800.o.
-
-OHCI (Open Host Controller Interface) support
-CONFIG_IEEE1394_OHCI1394
-  Say Y here if you have a IEEE 1394 controller based on OHCI.
-  The current driver was only tested with OHCI chipsets made
-  by Texas Instruments. However, most third-party vendors use
-  TI chips.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called ohci1394.o.
-
-Raw IEEE 1394 I/O support
-CONFIG_IEEE1394_RAWIO
-  Say Y here if you want support for the raw device. This is generally
-  a good idea, so you should say Y here. The raw device enables
-  direct communication of user programs to the IEEE 1394 bus.
-
-  If you want to compile this as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want),
-  say M here and read Documentation/modules.txt. The module will be
-  called raw1394.o.
-
-Excessive debugging output
-CONFIG_IEEE1394_VERBOSEDEBUG
-  If you say Y here, you will get very verbose debugging logs from the
-  subsystem which includes a dump of the header of every sent and
-  received packet.  This can amount to a high amount of data collected
-  in a very short time which is usually also saved to disk by the
-  system logging daemons.
-
-  Say Y if you really want or need the debugging output, everyone else
-  says N.
+  This driver provides support for the bidirectional parallel port
+  found on many Sun machines. Note that many of the newer Ultras
+  actually have pc style hardware instead.
 
 #
 # m68k-specific kernel options
@@ -13370,23 +14012,12 @@ CONFIG_HP300
 
 Sun 3X support
 CONFIG_SUN3X
-  This option enables support for the Sun 3x series of workstations. Be
-  warned that this support is very experimental. You will also want to
-  say Y to 68020 support and N to the other processors below.
+  This option enables support for the Sun 3x series of workstations.
+  Be warned that this support is very experimental. You will also want
+  to say Y to 68020 support and N to the other processors below.
 
   If you don't want to compile a kernel for a Sun 3x, say N.
 
-Sun 3 support
-CONFIG_SUN3
-  This option enables support for the Sun 3 series of workstations. Be
-  warned that this support is very experimental. You will also want to
-  say Y to 68020 support and N to the other processors below.
-  Currently, it is not possible to build a kernel with support for the
-  Sun 3 and something else, so make sure you have said N to all the
-  other machines. This option does not support the sun3x series of
-  machines (the Sun 3/80 and 3/460). If you don't want to compile a
-  kernel for a Sun 3, say N.
-
 68020 support
 CONFIG_M68020
   If you anticipate running this kernel on a computer with a MC68020
@@ -13444,7 +14075,13 @@ CONFIG_ADVANCED
   This gives you access to some advanced options for the CPU. The
   defaults should be fine for most users, but these options may make
   it possible for you to improve performance somewhat if you know what
-  you are doing. Most users should say N to this question.
+  you are doing. 
+
+  Note that the answer to this question won't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about these options.
+
+  Most users should say N to this question.
 
 Use read-modify-write instructions
 CONFIG_RMW_INSNS
@@ -13465,8 +14102,9 @@ CONFIG_ZORRO
   cards that obey the AutoConfig(tm) specification.
   Say Y if you want your expansion cards to be identified on bootup;
   it will enlarge your kernel by about 10 KB. The identification
-  information is also available through /proc/zorro (say Y to
-  "/proc file system support"!).
+  information is then also available through /proc/zorro (say Y to
+  "/proc file system support"!). Read Documentation/zorro.txt for more
+  information. 
 
   Note that even if you say N here, you can still use your expansion
   cards. If in doubt, say Y.
@@ -13476,23 +14114,6 @@ CONFIG_AMIGA_PCMCIA
   Include support in the kernel for pcmcia on Amiga 1200 and Amiga
   600. If you intend to use pcmcia cards say Y; otherwise say N.
 
-Amiga GSP (TMS340x0) support
-CONFIG_AMIGA_GSP
-  Include support for Amiga graphics cards that use the Texas
-  Instruments TMS340x0 GSP (Graphics Signal Processor) chips. Say Y
-  if you want to use a DMI Resolver or Commodore A2410 (Lowell)
-  graphics card on an Amiga; otherwise, say N.
-
-DMI Resolver support
-CONFIG_GSP_RESOLVER
-  Include support in the kernel for the DMI Resolver graphics card. If
-  you have one, say Y; otherwise, say N.
-
-A2410 support
-CONFIG_GSP_A2410
-  Include support in the kernel for the Commodore/University of Lowell
-  A2410 graphics card. If you have one, say Y; otherwise, say N.
-
 Amiga Zorro II ramdisk support
 CONFIG_AMIGA_Z2RAM
   This enables support for using Chip RAM and Zorro II RAM as a
@@ -13591,7 +14212,7 @@ CONFIG_CYBERSTORMII_SCSI
   and the optional Cyberstorm SCSI controller, say Y. Otherwise,
   answer N.
 
-Blizzard 2060 SCSI support
+Blizzard 2060 SCSI support (EXPERIMENTAL)
 CONFIG_BLZ2060_SCSI
   If you have an Amiga with a Phase5 Blizzard 2060 accelerator board
   and want to use the onboard SCSI controller, say Y. Otherwise,
@@ -13603,7 +14224,7 @@ CONFIG_BLZ1230_SCSI
   1260 accelerator, and the optional SCSI module, say Y. Otherwise,
   say N.
 
-Blizzard PowerUP 603e+ SCSI support (EXPERIMENTAL)
+Blizzard PowerUP 603e+ SCSI support
 CONFIG_BLZ603EPLUS_SCSI
   If you have an Amiga 1200 with a Phase5 Blizzard PowerUP 603e+
   accelerator, say Y. Otherwise, say N.
@@ -13706,16 +14327,6 @@ CONFIG_ATARI_PAMSNET
   ACSI port ("ACSI node"). The driver works (has to work...) with a
   polled I/O scheme, so it's rather slow :-(
 
-Multiface Card III parallel support
-CONFIG_MULTIFACE_III_LP
-  If you have a Multiface III card for your Amiga, and want to use its
-  parallel port in Linux, say Y. Otherwise, say N.
-
-  This driver is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module is called lp_m68k.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
-
 Amiga mouse support
 CONFIG_AMIGAMOUSE
   If you want to be able to use an Amiga mouse in Linux, say Y. 
@@ -13725,13 +14336,6 @@ CONFIG_AMIGAMOUSE
   The module is called amigamouse.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Amiga Copper Console
-CONFIG_COPCON
-  This configures the console to use the Amiga's graphics coprocessor
-  for scrolling, instead of using the CPU. This option markedly
-  improves response times in the high color modes (5 bitplanes and
-  up). If you would like to use this, say Y; otherwise, say N.
-
 Atari mouse support
 CONFIG_ATARIMOUSE
   If you want to be able to use an Atari mouse in Linux, say Y. 
@@ -13821,12 +14425,44 @@ CONFIG_MULTIFACE_III_TTY
   If you want to compile it as a module, say M here and read
   Documentation/modules.txt.
 
-Amiga or Atari DMA sound support
-CONFIG_DMASOUND
-  If you want to use the internal audio of your Atari or Amiga in
-  Linux, answer Y to this question. This will provide a Sun-like
-  /dev/audio, compatible with the Linux/i386 sound system. Otherwise,
-  say N.
+Atari DMA sound support
+CONFIG_DMASOUND_ATARI
+  If you want to use the internal audio of your Atari in Linux, answer
+  Y to this question. This will provide a Sun-like /dev/audio,
+  compatible with the Linux/i386 sound system. Otherwise, say N.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you
+  want). If you want to compile it as a module, say M here and read
+  Documentation/modules.txt.
+
+PowerMac DMA sound support
+CONFIG_DMASOUND_AWACS
+  If you want to use the internal audio of your PowerMac in Linux,
+  answer Y to this question. This will provide a Sun-like /dev/audio,
+  compatible with the Linux/i386 sound system. Otherwise, say N.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you
+  want). If you want to compile it as a module, say M here and read
+  Documentation/modules.txt.
+
+Amiga DMA sound support
+CONFIG_DMASOUND_PAULA
+  If you want to use the internal audio of your Amiga in Linux, answer
+  Y to this question. This will provide a Sun-like /dev/audio,
+  compatible with the Linux/i386 sound system. Otherwise, say N.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you
+  want). If you want to compile it as a module, say M here and read
+  Documentation/modules.txt.
+
+Q40 sound support
+CONFIG_DMASOUND_Q40
+  If you want to use the internal audio of your Q40 in Linux, answer
+  Y to this question. This will provide a Sun-like /dev/audio,
+  compatible with the Linux/i386 sound system. Otherwise, say N.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you
@@ -13843,11 +14479,6 @@ CONFIG_HPLANCE
   If you want to use the builtin "LANCE" Ethernet controller on an
   HP300 machine, say Y here.
 
-Sun 3 onboard LANCE support
-CONFIG_SUN3LANCE
-  If you want to use the onboard AMD "LANCE" (le) Ethernet hardware
-  on a Sun 3, you will need to say Y here.
-
 DIO bus support
 CONFIG_DIO
   Say Y here to enable support for the "DIO" expansion bus used in
@@ -13857,10 +14488,10 @@ CONFIG_DIO
 Processor Type
 CONFIG_6xx
   There are three types of PowerPC chips supported. The more common
-  types (601, 603, 604, 740, 750), the Motorola embedded versions (821,
-  823, 850, 855, 860), and the IBM embedded versions (403 and 405).
-  Unless you are building a kernel for one of the embedded processor
-  systems, choose 6xx.
+  types (601, 603, 604, 740, 750), the Motorola embedded versions
+  (821, 823, 850, 855, 860), and the IBM embedded versions (403 and
+  405). Unless you are building a kernel for one of the embedded
+  processor systems, choose 6xx.
 
 Machine Type
 CONFIG_PMAC
@@ -13932,6 +14563,35 @@ CONFIG_BMAC
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
+GMAC (G4/iBook ethernet) support
+CONFIG_GMAC
+  Say Y for support of GMAC Ethernet interfaces. These are used on G4
+  and iBook computers. 
+
+  This driver is also available as a module called gmac.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Symbios 53c885 (Synergy ethernet) support
+CONFIG_NCR885E
+  This is and Ethernet driver for the dual-function NCR 53C885
+  SCSI/Ethernet controller.
+
+  This driver is also available as a module called ncr885e.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+National DP83902AV (Oak ethernet) support
+CONFIG_OAKNET
+  Say Y if your machine has this type of Ethernet network card.
+
+  This driver is also available as a module called oaknet.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
 Video For Linux
 CONFIG_VIDEO_DEV
   Support for audio/video capture and overlay devices and FM radio
@@ -14037,10 +14697,6 @@ CONFIG_RADIO_CADET
   say M here and read Documentation/modules.txt. The module will be
   called radio-cadet.o.
 
-ADS Cadet AM/FM Radio Tuner Card I/O Port
-CONFIG_RADIO_CADET_PORT
-  Enter the I/O address of the card here (most commonly 330). 
-
 SF16FMI Radio
 CONFIG_RADIO_SF16FMI
   Choose Y here if you have one of these FM radio cards, and then fill
@@ -14160,7 +14816,9 @@ CONFIG_RADIO_GEMTEK
 GemTek i/o port
 CONFIG_RADIO_GEMTEK_PORT
   Enter either 0x20c, 0x30c, 0x24c or 0x34c here. The card default is
-  0x34c, if you haven't changed the jumper setting on the card.
+  0x34c, if you haven't changed the jumper setting on the card. On
+  Sound Vision 16 Gold PnP with FM Radio (ESS1869+FM Gemtek), the i/o
+  port is 0x28c.
 
 PlanB Video-In for PowerMacs
 CONFIG_VIDEO_PLANB
@@ -14179,34 +14837,56 @@ CONFIG_RADIO_TERRATEC
   Note: This driver is in its early stages. Right now volume and
   frequency control and muting works at least for me, but
   unfortunately i have not found anybody who wants to use this card
-  with linux. So if it is this what YOU are trying to do right now,
+  with Linux. So if it is this what YOU are trying to do right now,
   PLEASE DROP ME A NOTE!! Rolf Offermanns (rolf@offermanns.de)
   
   In order to control your radio card, you will need to use programs
   that are compatible with the Video for Linux API. Information on
   this API and pointers to "v4l" programs may be found on the WWW at
-  http://roadrunner.swansea.uk.linux.org/v4l.shtml; to browse the WWW,
-  you need to have access to a machine on the Internet that has a
-  program like lynx or netscape.
+  http://roadrunner.swansea.uk.linux.org/v4l.shtml .
 
   If you want to compile this driver as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt. The module will be
   called radio-terratec.o.
 
+Terratec i/o port (normally 0x590)
+CONFIG_RADIO_TERRATEC_PORT
+  Fill in the i/o port of your TerraTec FM radio card. If unsure, go
+  with the default.
+
+### Add these
 # Zoran ZR36057/36060 support
 # CONFIG_VIDEO_ZORAN
 
 # Include support for Iomega Buz
 # CONFIG_VIDEO_BUZ
 
+Trust FM radio card
+CONFIG_RADIO_TRUST
+  This is a driver for the Trust FM radio cards. Say Y if you have
+  such a card and want to use it under Linux.
+
+  This driver is also available as a module called radio-trust.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Trust i/o port (usually 0x350 or 0x358)
+CONFIG_RADIO_TRUST_PORT
+  Enter the i/o port of your Trust FM radio card. If unsure, try the
+  values "0x350" or "0x358".
+
 BT848 Video For Linux
 CONFIG_VIDEO_BT848
   Support for BT848 based frame grabber/overlay boards. This includes
   the Miro, Hauppauge and STB boards. Please read the material in
   Documentation/video4linux/bttv for more information.
 
-  This driver is also available as a module called bttv.o ( = code
+  If you say Y or M here, you need to say Y or M to "I2C support" and
+  "I2C bit-banging interfaces" in the character device section.
+  
+  This driver is available as a module called bttv.o ( = code
   which can be inserted in and removed from the running kernel
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
@@ -14245,11 +14925,12 @@ CONFIG_VIDEO_BWQCAM
 
 Colour QuickCam Video For Linux
 CONFIG_VIDEO_CQCAM
-  This is the video4linux driver for the color version of the
+  This is the video4linux driver for the colour version of the
   Connectix Quickcam. If you have one of these cameras, say Y here,
   otherwise say N. This driver does not work with the original
   monochrome Quickcam, Quickcam VC or QuickClip. It is also available
-  as a module (c-qcam.o).
+  as a module (c-qcam.o). Read Documentation/video4linux/CQcam.txt for
+  more information.
 
 Mediavision Pro Movie Studio Video For Linux
 CONFIG_VIDEO_PMS
@@ -14266,114 +14947,9 @@ CONFIG_BLK_CPQ_DA
    boards supported by this driver, and for further information 
    on the use of this driver. 
 
-QuickNet Internet LineJack/PhoneJack support
-CONFIG_PHONE_IXJ
-  Say M if you have a telephony card manufactured by Quicknet
-  Technologies, Inc.  These include the Internet PhoneJACK and
-  Internet LineJACK Telephony Cards.
-
-  For the ISA versions of these products, you can configure the
-  cards using the isapnp tools (pnpdump/isapnp) or you can use the
-  isapnp support.  Please read:
-
-  /usr/src/linux/Documentation/telephony/ixj.txt.
-
-  For more information on these cards, see Quicknet's website at:
-  http://www.quicknet.net/
-
-  If you do not have any Quicknet telephony cards, you can safely
-  ignore this option.
-
-/dev/agpgart (AGP Support) (EXPERIMENTAL)
-CONFIG_AGP
-  The agpgart kernel module is necessary to use the AGP features
-  of your 3D rendering video card.  It acts as a sort of "AGP
-  driver" for the motherboard's chipset.
-  Loading this module into the kernel will allow the glx module to
-  program the GART (graphics aperture relocation table) registers
-  with appropriate values to transfer commands to the card. 
-
-  If you need more texture memory than you can get with the AGP GART
-  (theoretically up to 256 megs, but in practice usually 64 or 128
-  megs due to kernel allocation issues), you could use PCI accesses
-  and have up to a couple gigs of texture space.
-
-  Note that this is the only mean to have get XFree4/GLX use
-  write-combining with MTRR support on AGP bus. Without, OpenGL
-  direct rendering will be a lot slower but still faster than PIO.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
-  or need to use the 810 Xserver in XFree 3.3.6
-
-Intel 440LX/BX/GX support
-CONFIG_AGP_INTEL
-  This option give you AGP support for the GLX component of the
-  "soon to be released" XFree86-4 on Intel 440LX/BX/GX chipsets.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
-Intel I810/I810 DC100/I810e support
-CONFIG_AGP_I810
-  This option give you AGP support for the Xserver for the intel
-  810 chipset boards. This is required to do any useful video
-  modes.
-
-VIA VP3/MVP3/Apollo Pro support
-CONFIG_AGP_VIA
-  This option give you AGP support for the GLX component of the
-  "soon to be released" XFree86-4 on VIA MPV3/Apollo Pro chipsets.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
-AMD Irongate support
-CONFIG_AGP_AMD
-  This option give you AGP support for the GLX component of the
-  "soon to be released" XFree86-4 on Intel AMD Irongate chipset.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
-Generic SiS support
-CONFIG_AGP_SIS
-  This option give you AGP support for the GLX component of the
-  "soon to be released" XFree86-4 on Silicon Integrated Systems [SiS]
-  chipsets.
-
-  Note than 5591/5592 AGP chipsets are NOT supported.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
-ALI M1541 support
-CONFIG_AGP_ALI
-  This option give you AGP support for the GLX component of the
-  "soon to be released" XFree86-4 on ALI M1541 chipset.
-
-  For the moment, most people should say no, unless you want to
-  test the GLX component which can be downloaded from
-       http://glx.on.openprojects.net/
-
 #
 # ARM options
 #
-CPU Optimization
-CONFIG_CPU_ARM2
-  This selects the processor type of your CPU. This is only used to
-  determine C compiler optimization options, and can affect the
-  compatibility of the kernel on other processors. If you specify
-  ARM6, the kernel should work on all 32-bit processors. If you
-  specify ARM2, ARM250 or ARM3, it should work on all 26-bit
-  processors. If you're not sure, set it to "None".
-
 ARM System type
 CONFIG_ARCH_ARC
   This selects what ARM system you wish to build the kernel for. It
@@ -14381,14 +14957,6 @@ CONFIG_ARCH_ARC
   to set this option to, please consult any information supplied with
   your system.
 
-Include support for Chalice CATS boards
-CONFIG_CATS
-  Say Y here if you intend to run this kernel on a CATS system.
-
-Include support for Intel EBSA285
-CONFIG_ARCH_EBSA285
-  board.
-
 Include support for the NetWinder
 CONFIG_ARCH_NETWINDER
   Say Y here if you intend to run this kernel on the NetWinder.
@@ -14412,7 +14980,7 @@ CONFIG_NWFPE
   Say Y to include the NWFPE floating point emulator in the kernel.
   This is necessary to run most binaries. Linux does not currently
   support floating point hardware so you need to say Y here even if
-  your machine has an FPA or floating point co-processor module.
+  your machine has an FPA or floating point co-processor podule.
 
   It is also possible to say M to build the emulator as a module
   (nwfpe.o) or indeed to leave it out altogether. However, unless you
@@ -14441,12 +15009,6 @@ CONFIG_DEBUG_ERRORS
   you are concerned with the code size or don't want to see these
   messages.
 
-Build Tools Selection
-CONFIG_BINUTILS_NEW
-  Say Y here if and only if you're using GCC 2.8.1/EGCS with a
-  binutils version >= 2.8.1 to compile the kernel (check with "gcc
-  --version" and "ld -v").
-
 Compile kernel with frame pointer
 CONFIG_FRAME_POINTER
   If you say Y here, the resulting kernel will be slightly larger and
@@ -14469,12 +15031,12 @@ CONFIG_DEBUG_INFO
   time and disk space needed for compilation of the kernel. If in
   doubt say N.
 
-Split initialization functions into discardable section
+Split initialisation functions into discardable section
 CONFIG_TEXT_SECTIONS
   If you say Y here, kernel code that is only used during
-  initialization is collected into a special area of the kernel so
+  initialisation is collected into a special area of the kernel so
   that it can be discarded and the memory reclaimed when
-  initialization is complete. In addition, if the kernel you wish to
+  initialisation is complete. In addition, if the kernel you wish to
   build is able to run on multiple architectures, it allows the unused
   code to be discarded. Some versions of binutils, however, have a bug
   that causes the kernel to crash during startup when this option is
@@ -14535,7 +15097,7 @@ CONFIG_HOST_FOOTBRIDGE
 MFM hard disk support
 CONFIG_BLK_DEV_MFM
   Support the MFM hard drives on the Acorn Archimedes both
-  on-board the A4x0 motherboards and via the Acorn MFM modules.
+  on-board the A4x0 motherboards and via the Acorn MFM podules.
   Drives up to 64MB are supported. If you haven't got one of these
   machines or drives just say N.
 
@@ -14553,7 +15115,7 @@ CONFIG_BLK_DEV_MFM_AUTODETECT
   sometimes doesn't work and it also does some dodgy stuff which
   potentially might damage your drive.
 
-IrDA Protocols
+IrDA subsystem support
 CONFIG_IRDA
   Say Y here if you want to build support for the IrDA (TM) protocols.
   The Infrared Data Associations (tm) specifies standards for wireless
@@ -14565,8 +15127,9 @@ CONFIG_IRDA
   Documentation/networking/irda.txt. You also want to read the
   IR-HOWTO, available at http://www.linuxdoc.org/docs.html#howto .
 
-  This support is also available as a module. If you want to compile
-  it as a module, say M here and read Documentation/modules.txt.
+  This support is also available as a module called irda.o. If you
+  want to compile it as a module, say M here and read
+  Documentation/modules.txt.
 
 IrDA Cache last LSAP
 CONFIG_IRDA_CACHE_LAST_LSAP
@@ -14623,7 +15186,7 @@ CONFIG_IRDA_DEFLATE
 IrLAN Protocol 
 CONFIG_IRLAN
   Say Y here if you want to build support for the IrLAN protocol. If
-  you want to compile it as a module, say M here and read
+  you want to compile it as a module (irlan.o), say M here and read
   Documentation/modules.txt. IrLAN emulates an Ethernet and makes it
   possible to put up a wireless LAN using infrared beams.
 
@@ -14635,19 +15198,20 @@ CONFIG_IRLAN
 IrCOMM Protocol
 CONFIG_IRCOMM
   Say Y here if you want to build support for the IrCOMM protocol. If
-  you want to compile it as a module, say M here and read
-  Documentation/modules.txt. IrCOMM implements serial port emulation,
-  and makes it possible to use all existing applications that
-  understands TTY's with an infrared link. Thus you should be able to
-  use application like PPP, minicom and others. Enabling this option
-  will create two modules called ircomm and ircomm-tty.
+  you want to compile it as a module (you will get ircomm.o and
+  ircomm-tty.o), say M here and read Documentation/modules.txt. IrCOMM
+  implements serial port emulation, and makes it possible to use all
+  existing applications that understands TTY's with an infrared link.
+  Thus you should be able to use application like PPP, minicom and
+  others. Enabling this option will create two modules called ircomm
+  and ircomm_tty.
 
 IrTTY IrDA Device Driver
 CONFIG_IRTTY_SIR
   Say Y here if you want to build support for the IrTTY line
-  discipline. If you want to compile it as a module, say M here and
-  read Documentation/modules.txt. IrTTY makes it possible to use
-  Linux's own serial driver for all IrDA ports that are 16550
+  discipline. If you want to compile it as a module (irtty.o), say M
+  here and read Documentation/modules.txt. IrTTY makes it possible to
+  use Linux's own serial driver for all IrDA ports that are 16550
   compatible. Most IrDA chips are 16550 compatible so you should
   probably say Y to this option. Using IrTTY will however limit the
   speed of the connection to 115200 bps (IrDA SIR mode)
@@ -14657,50 +15221,62 @@ CONFIG_IRTTY_SIR
 IrPORT IrDA Device Driver
 CONFIG_IRPORT_SIR
   Say Y here if you want to build support for the IrPORT IrDA device
-  driver. If you want to compile it as a module, say M here and
-  read Documentation/modules.txt. IrPORT can be used instead of
-  IrTTY and sometimes this can be better. One example is if your
-  IrDA port does not have echo-canceling, which will work OK with
-  IrPORT since this driver is working in half-duplex mode only. You
-  don't need to use irattach with IrPORT, but you just insert it 
-  the same way as FIR drivers (insmod irport io=0x3e8 irq=11).
-  Notice that IrPORT is a SIR device driver which means that speed
-  is limited to 115200 bps.
+  driver. If you want to compile it as a module (irport.o), say M here
+  and read Documentation/modules.txt. IrPORT can be used instead of
+  IrTTY and sometimes this can be better. One example is if your IrDA
+  port does not have echo-canceling, which will work OK with IrPORT
+  since this driver is working in half-duplex mode only. You don't
+  need to use irattach with IrPORT, but you just insert it the same
+  way as FIR drivers (insmod irport io=0x3e8 irq=11). Notice that
+  IrPORT is a SIR device driver which means that speed is limited to
+  115200 bps.
 
   If unsure, say Y.
 
-SiS5513 chipset support
-CONFIG_BLK_DEV_SIS5513
-  This driver ensures (U)DMA support for SIS5513 chipset based
-  mainboards. SiS620/530 UDMA mode 4, SiS5600/5597 UDMA mode 2, all
-  other DMA mode 2 limited chipsets are unsupported to date.
-
-  If you say Y here, you need to say Y to "Use DMA by default when
-  available" as well.
-
-  Please read the comments at the top of drivers/block/sis5513.c
- 
 Winbond W83977AF IrDA Device Driver
 CONFIG_WINBOND_FIR
   Say Y here if you want to build IrDA support for the Winbond
-  W83977AF super-io chipset. If you want to compile it as a module,
-  say M here and read Documentation/modules.txt. This driver should be
-  used for the IrDA chipset in the Corel NetWinder. The driver
-  supports SIR, MIR and FIR (4Mbps) speeds.
+  W83977AF super-io chipset. This driver should be used for the IrDA
+  chipset in the Corel NetWinder. The driver supports SIR, MIR and FIR
+  (4Mbps) speeds.
+
+  If you want to compile it as a module, say M here and read
+  Documentation/modules.txt. The module will be called w83977af_ir.o.
 
 NSC PC87108 IrDA Device Driver
 CONFIG_NSC_FIR
   Say Y here if you want to build support for the NSC PC87108 and
-  PC87338 IrDA chipsets. If you want to compile it as a module, say M 
-  here and read Documentation/modules.txt. This driver supports SIR, 
-  MIR and FIR (4Mbps) speeds.
+  PC87338 IrDA chipsets. This driver supports SIR, 
+  MIR and FIR (4Mbps) speeds. 
+
+  If you want to compile it as a module, say M here and read
+  Documentation/modules.txt. The module will be called nsc-ircc.o.
 
 Toshiba Type-O IR Port Device Driver
 CONFIG_TOSHIBA_FIR
   Say Y here if you want to build support for the Toshiba Type-O IR
-  chipset. If you want to compile it as a module, say M here and
-  read Documentation/modules.txt. This chipset is used by the Toshiba
-  Libretto 100CT, and many more laptops.
+  chipset. This chipset is used by the Toshiba Libretto 100CT, and
+  many more laptops. If you want to compile it as a module, say M here
+  and read Documentation/modules.txt. The module will be called
+  toshoboe.o.
+
+SMC IrCC (Experimental)
+CONFIG_SMC_IRCC_FIR
+  Say Y here if you want to build support for the SMC Infrared
+  Communications Controller. It is used in the Fujitsu Lifebook 635t
+  and Sony PCG-505TX. If you want to compile it as a module, say M
+  here and read Documentation/modules.txt. The module will be called
+  smc-ircc.o.
+
+Serial dongle support
+CONFIG_DONGLE
+  Say Y here if you have an infrared device that connects to your
+  computer's serial port. These devices are called dongles. Then say Y
+  or M to the driver for your particular dongle below.
+
+  Note that the answer to this question won't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about serial dongles.
 
 ESI JetEye PC Dongle
 CONFIG_ESI_DONGLE
@@ -14748,6 +15324,14 @@ CONFIG_LITELINK_DONGLE
   by IrTTY. To activate support for Parallax dongles you will have to
   start irattach like this "irattach -d litelink".
 
+Old Belkin dongle
+CONFIG_OLD_BELKIN_DONGLE
+  Say Y here if you want to build support for the Adaptec Airport 1000
+  and 2000 dongles. If you want to compile it as a module, say M here
+  and read Documentation/modules.txt. The module will be called
+  old_belkin.o. Some information is contained in the comments at the
+  top of drivers/net/irda/old_belkin.c.
+
 VME (Motorola and BVM) support
 CONFIG_VME
   Say Y here if you want to build a kernel for a 680x0 based VME
@@ -14795,13 +15379,6 @@ CONFIG_BVME6000_SCSI
   SCSI controller chip.  Almost everyone using one of these boards
   will want to say Y to this question.
 
-Simple 53c710 SCSI support (Compaq, NCR machines)
-CONFIG_SCSI_SIM710
-  This is a driver for the NCR53C710 chip commonly found in Compaq and
-  NCR machines.  If you are looking for 53C710 support for an Amiga or
-  some 680x0 based VME card then you probably want the other NCR53C710
-  driver.
-
 MVME16x Ethernet support
 CONFIG_MVME16x_NET
   This is the driver for the Ethernet interface on the Motorola
@@ -14916,6 +15493,31 @@ CONFIG_I2C_CHARDEV
   files, usually found in the /dev directory on your system. They
   make it possible to have user-space programs use the I2C bus.
 
+CPiA Video For Linux
+CONFIG_VIDEO_CPIA
+  This is the video4linux driver for cameras based on Vision's CPiA
+  (Colour Processor Interface ASIC), such as the Creative Labs Video
+  Blaster Webcam II. If you have one of these cameras, say Y here
+  and select parallel port and/or USB lowlevel support below,
+  otherwise say N. This will not work with the Creative Webcam III.
+  It is also available as a module (cpia.o).
+
+CPiA Parallel Port Lowlevel Support
+CONFIG_VIDEO_CPIA_PP
+  This is the lowlevel parallel port support for cameras based on
+  Vision's CPiA (Colour Processor Interface ASIC), such as the
+  Creative Webcam II. If you have the parallel port version of one
+  of these cameras, say Y here, otherwise say N. It is also available
+  as a module (cpia_pp.o).
+
+CPiA USB Lowlevel Support
+CONFIG_VIDEO_CPIA_USB
+  This is the lowlevel USB support for cameras based on Vision's CPiA
+  (Colour Processor Interface ASIC), such as the Creative Webcam II.
+  If you have the USB version of one of these cameras, say Y here,
+  otherwise say N. This will not work with the Creative Webcam III.
+  It is also available as a module (cpia_usb.o).
+
 #
 # A couple of things I keep forgetting:
 #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet, 
@@ -14930,7 +15532,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  CONFIG coprocessor DX Pentium SX lilo loadlin HOWTO ftp metalab
 # LocalWords:  unc edu docs emu README kB BLK DEV FD Thinkpad fd MFM RLL IDE gz
 # LocalWords:  cdrom diskless netboot nfs xzvf ATAPI MB ide pavia rubini pl pd
-# LocalWords:  HD CDROMs IDECD NEC MITSUMI XT XD PCI BIOS cezar ATEN
+# LocalWords:  HD CDROMs IDECD NEC MITSUMI filesystem XT XD PCI BIOS cezar ATEN
 # LocalWords:  ISA EISA Microchannel VESA BIOSes IPC SYSVIPC ipc Ctrl dmesg hlt
 # LocalWords:  BINFMT Linkable http ac uk jo html GCC SPARC AVANTI CABRIOLET EB
 # LocalWords:  netscape gcc LD CC toplevel MODVERSIONS insmod rmmod modprobe IP
@@ -14960,11 +15562,11 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  readprofile diskdrives org com masq EtherTalk tcp netrom sunacm
 # LocalWords:  misc AIC aic pio scc Portmaster eql GIS PhotoCDs MCDX Perell PG
 # LocalWords:  mcdx gscd optcd sjcd ISP hdparm Workgroups Lan samba PARIDE PCD
-# LocalWords:  smbfs ATA ppp PCTech RZ www powerquest txt CMD ESDI
+# LocalWords:  filesystems smbfs ATA ppp PCTech RZ www powerquest txt CMD ESDI
 # LocalWords:  chipset FB multicast MROUTE appletalk ifconfig IBMTR multiport
 # LocalWords:  Multisession STALDRV EasyIO EC EasyConnection ISTALLION ONboard
 # LocalWords:  Brumby pci TNC cis ohio faq usenet NETLINK dev hydra ca Tyne mem
-# LocalWords:  carleton Deskstation DECstation SUNFD JENSEN Noname XXXM SLiRP
+# LocalWords:  carleton DECstation SUNFD JENSEN Noname XXXM SLiRP LILO's amifb
 # LocalWords:  pppd Zilog ZS SRM bootloader ez mainmenu rarp ipfwadm paride pcd
 # LocalWords:  RTNETLINK mknod xos MTU lwared Macs mac netatalk macs cs Wolff
 # LocalWords:  dartmouth flowerpt MultiMaster FlashPoint tudelft etherexpress
@@ -14977,12 +15579,13 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  PMAX MILO Alphas Multia Tseng linuxelf endian mipsel mips drv HT
 # LocalWords:  kerneld callouts AdvanSys advansys Admin WDT DataStor EP verden
 # LocalWords:  wdt hdb hdc bugfix SiS vlb Acculogic CSA DTC dtc Holtek ht QDI
-# LocalWords:  QD qd UMC umc ALI ali oss sgi com azstarnet cdr fb MDA ps esdi
+# LocalWords:  QD qd UMC umc ALI ali lena fnet fr azstarnet cdr fb MDA ps esdi
 # LocalWords:  Avanti XL AlphaStations Jensen DECpc AXPpci UDB Cabriolet MCA RC
 # LocalWords:  AlphaPC mca AOUT OUTput PPro sipx gwdg lo nwe FourPort Boca unm
 # LocalWords:  Keepalive linefill RELCOM keepalive analogue CDR conf CDI INIT
 # LocalWords:  OPTi isp irq noisp VFAT vfat NTFS losetup dmsdosfs dosfs ISDN MP
-# LocalWords:  NOWAYOUT behavior dialin isdn callback BTX Teles ICN EDSS Cisco
+# LocalWords:  NOWAYOUT behaviour dialin isdn callback BTX Teles  XXXX LVM lvm
+ICN EDSS Cisco
 # LocalWords:  ipppd syncppp RFC MPP VJ downloaded icn NICCY Creatix shmem ufr
 # LocalWords:  ibp md ARCnet ether encap NDIS arcether ODI Amigas AmiTCP NetBSD
 # LocalWords:  initrd tue util DES funet des OnNet BIOSP smc Travan Iomega CMS
@@ -15052,12 +15655,12 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  caldera Preload Preloading slowdowns schoebel uni NBD nbd prog
 # LocalWords:  stuttgart rdist TRANS hostnames mango jukeboxes ESS userland PD
 # LocalWords:  hardlinked NAMETRANS env mtab fstab umount nologin runlevel gid
-# LocalWords:  transname filespace adm Nodename hostname uname Kernelname bootp
+# LocalWords:  filespace adm Nodename hostname uname Kernelname bootp nmi DI OV
 # LocalWords:  KERNNAME kname ktype kernelname Kerneltype KERNTYPE Alt RX mdafb
 # LocalWords:  dataless kerneltype SYSNAME Comtrol Rocketport palmtop fbset EGS
 # LocalWords:  nvram SYSRQ SysRq PrintScreen sysrq NVRAMs NvRAM Shortwave RTTY
-# LocalWords:  Sitor Amtor Pactor GTOR hayes TX TMOUT JFdocs HIGHMEM DAC IRQ's
-# LocalWords:  IDEPCI IDEDMA idedma PDC pdc TRM trm raidtools luthien nuclecu
+# LocalWords:  Sitor Amtor Pactor GTOR hayes TX TMOUT JFdocs BIGMEM DAC IRQ's
+# LocalWords:  IDEPCI IDEDMA PDC pdc TRM trm raidtools luthien nuclecu BAGET VR
 # LocalWords:  unam mx miguel koobera uic EMUL solaris pp ieee lpsg co DMAs TOS
 # LocalWords:  BLDCONFIG preloading jumperless BOOTINIT modutils multipath GRE
 # LocalWords:  misconfigured autoconfiguration IPGRE ICMP tracert ipautofw PIM
@@ -15073,7 +15676,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  Braam braam Schmidt's freiburg nls codepages codepage Romanian
 # LocalWords:  Slovak Slovenian Sorbian Nordic iso Catalan Faeroese Galician SZ
 # LocalWords:  Valencian Slovene Esperanto Estonian Latvian Byelorussian KOI mt
-# LocalWords:  charset Inuit Greenlandic Sami Lappish koi SOFTCURSOR softcursor
+# LocalWords:  charset Inuit Greenlandic Sami Lappish koi Alexey Kuznetsov's sa
 # LocalWords:  Specialix specialix DTR RTS RTSCTS cycladesZ Exabyte ftape's inr
 # LocalWords:  Iomega's LBFM claus ZFTAPE VFS zftape zft William's lzrw DFLT kb
 # LocalWords:  MTSETBLK MTIOCTOP qft setblk zftape's tar's afio's setdrvbuffer
@@ -15087,7 +15690,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  struct APIC realtime OSs LynxOS CNC tmp cvf HFS hfs ADFS Risc os
 # LocalWords:  adfs ncpmount namespace SUBDIR reexport NDS kcore FT SPX spx DAT
 # LocalWords:  interserver BLKSZ NUMBUFFERS apmd Tadpole ANA roestock QuickCam
-# LocalWords:  isapnptools Colour CQCAM color Connectix QuickClip prive mentre
+# LocalWords:  isapnptools Colour CQCAM colour Connectix QuickClip prive mentre
 # LocalWords:  KMOD kmod conformant utexas kharker UnixWare Mwave cgi cl ts ibm
 # LocalWords:  eXchange threepio oakland simtel pre ULTRAMCA EtherLink isa luik
 # LocalWords:  EtherLink OpenBSD pts DEVPTS devpts ptmx ttyp glibc readback SA
@@ -15103,8 +15706,8 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  Yellowfin gsfc nasa gov yellowfin pcnet Mylex LNE lne EtherH hs
 # LocalWords:  EBSA chattr RiscOS Winmodem AGP Atomwide DUALSP pcsp robinson CT
 # LocalWords:  SGALAXY Waverider DSPxxx TRXPRO AudioTrix OSWF MOT CFB DSY kbps
-# LocalWords:  tuwien kkudielk LVD mega lun MAXTAGS Gbps arcnet Olicom SKTR SNA
-# LocalWords:  SysKonnect tms380tr sna etherboot ufs NetBEUI MultiSound MSNDCLAS GX
+# LocalWords:  tuwien kkudielk LVD mega lun MAXTAGS Gbps arcnet Olicom SNA PAE
+# LocalWords:  SysKonnect tms sna etherboot ufs NetBEUI MultiSound MSNDCLAS GX
 # LocalWords:  MSNDINIT MSNDPERM MSNDPIN PNDSPINI PNDSPERM Ensoniq's RetinaZ SS
 # LocalWords:  AudioPCI lspci SonicVibes sonicvibes SPARCs roadrunner CLgen UPA
 # LocalWords:  swansea shtml Zoltrix zoltrix BINUTILS EGCS binutils VIDC DACs
@@ -15141,7 +15744,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  ACTiSYS Dongle dongle dongles esi actisys IrMate tekram BVM MVME
 # LocalWords:  BVME BVME WRITETHROUGH copyback writethrough fwmark syncookie tu
 # LocalWords:  alphalinux GOBIOS csn chemnitz nat ACARD AMI MegaRAID megaraid
-# LocalWords:  QNX4FS ISI isicom xterms Apollos VPN RCPCI rcpci sgi visws pcmcia
+# LocalWords:  QNXFS ISI isicom xterms Apollos VPN RCPCI rcpci sgi visws pcmcia
 # LocalWords:  IrLPT UIRCC Tecra Strebel jstrebel suse Eichwalder ke INI INIA
 # LocalWords:  FCP qlogicfc sym isapnp DTLK DoubleTalk rcsys dtlk DMAP SGIVW ar
 # LocalWords:  dmabuf EcoRadio MUTEFREQ GIrBIL girbil tepkom vol mha diplom PQS
@@ -15151,7 +15754,7 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  VROOTHUB KBD ARRs MCRs NWBUTTON nwbutton NUM WaveArtist APNE cpu
 # LocalWords:  apne blackhawke PlanB lu mlan planb NWFPE FPA nwfpe unbootable
 # LocalWords:  FPEmulator ds vmlinux initialisation discardable pgtable PGT mdw
-# LocalWords:  quicklist pagetable arthur StrongARM module modules Autodetect
+# LocalWords:  quicklist pagetable arthur StrongARM podule podules Autodetect
 # LocalWords:  dodgy IrPORT irport Litelink litelink SuSE rtfm internet hda CY
 # LocalWords:  multmode DriveReady SeekComplete DriveStatusError miscompile AEC
 # LocalWords:  mainboard's Digital's alim FastTrak aec PIIXn piix Gayle Eyetech
@@ -15173,9 +15776,56 @@ CONFIG_I2C_CHARDEV
 # LocalWords:  ServeRAID IPS ips ipslinux gzip BSDCOMP LZW RAYCS Interphase app
 # LocalWords:  Tachyon IPHASE Surfboard NextLevel SURFboard jacksonville Tigon
 # LocalWords:  fventuri adelphia siglercm linuxpower AceNICs Starfire starfire
-# LocalWords:  ISOC CPiA cpia uss ACPI UDF DirectCD udf CDRW's OSF Manx acpi
+# LocalWords:  ISOC CPiA cpia uss ACPI UDF DirectCD udf CDRW's OSF Manx acpi DM
 # LocalWords:  Unixware cymru Computone IntelliPort Intelliport computone SI sx
 # LocalWords:  adbmouse DRI DRM dlabs GMX PLCs Applicom fieldbus applicom int
 # LocalWords:  VWSND eg ESSSOLO CFU CFNR scribed eiconctrl eicon hylafax KFPU
-# LocalWords:  EXTRAPREC fpu mainboards KHTTPD kHTTPd khttpd Xcelerator
-# LocalWords:  LOGIBUSMOUSE OV511 ov511 Integraphics
+# LocalWords:  EXTRAPREC fpu mainboards KHTTPD kHTTPd khttpd Xcelerator SBNI tw
+# LocalWords:  LOGIBUSMOUSE Granch granch sbni Raylink NOHIGHMEM Athlon SIM sim
+# LocalWords:  hpl Tourrilhes DuraLAN starfile Davicom davicom dmfe auk tms tr
+# LocalWords:  TokenExpress Belkin Peracom eTek DVDs infradead Cxxx Adlib AV ZX
+# LocalWords:  NeoMagic CPi CPt Celeron decapsulation Undeletion BFS bfs nVidia
+# LocalWords:  OnStream Irongate Riva phonedev QuickNet LineJack PhoneJack IXJ
+# LocalWords:  Quicknet PhoneJACK LineJACK ixj pnpdump Quicknet's Joandi SSID
+# LocalWords:  aironet quickconfig adhoc btw bap NONCS cardservices Xircom lin
+# LocalWords:  Netwave AirSurfer netwave HomePNA failover MVP iMacs ALi aktual
+# LocalWords:  Aladin HIDBP usbkbd KEYBDEV MOUSEDEV JOYDEV EVDEV UAB WhiteHEAT
+# LocalWords:  Handspring ov DABUSB URB URB's dabusb CRAMFS NFSv ELV IOAPIC WIP
+# LocalWords:  NLMv SMBus ALGOBIT algo PHILIPSPAR philips elv Velleman velleman
+# LocalWords:  ALGOPCF Elektor elektor CHARDEV dfx TDFX tdfx Extensa dof gravis
+# LocalWords:  assasin logitech Overdrive thrustmaster DWave Aureal magellan db
+# LocalWords:  SpaceTec SpaceOrb SpaceBall spaceorb FLX spaceball turbografx zr
+# LocalWords:  amiga ESS's WaveWatcher Maxi belkin RW's ata glx GART MPV Baget
+# LocalWords:  OpenGL Xserver agpgart HOTPLUG CyberPro Integraphics Netwinder
+# LocalWords:  aty FONTWIDTH eni zatm nicstar ForeRunner OC DECstations DEC's
+# LocalWords:  PHYsical SUNI reinsertion ChipSAR KVC PHY ClassID iphase iadbg
+# LocalWords:  DEVS FireWire PCILynx pcilynx LOCALRAM miro's DV RAWIO GRED Mk
+# LocalWords:  Diffserv DSMARK Ingress Qdisc TCINDEX TMSPCI tmspci Ringode JE
+# LocalWords:  MADGEMC madgemc TokenRing SMCTR TokenCard smctr Wacom Graphire
+# LocalWords:  WMFORCE mousedev ConnectTech HandSpring Xirlink IBMCAM ibmcam SN
+# LocalWords:  DEVICEFS yyy userspace Cymraeg Dwave SIMM JSFLASH JavaStation's
+# LocalWords:  nsc ircc DDB Vrc CMN TB PROMs Vino rivafb DDC Matroxes MGA TVO
+# LocalWords:  MAVEN fbdev crtc maven matroxset NTSC PCA SBA AAL SKFP DAS SAS
+# LocalWords:  skfp Intuos ADMtek's pegasus PLUSB plusb pointopoint mp rio Xeon
+# LocalWords:  DEVFS devfs dd bs EDSS german TELESPCI FRITZPCI HFC HFCS BDS HST
+# LocalWords:  ISURF ISAR Saphir HSTSAPHIR Telekom BKM Scitel Quadro SCT Gazel
+# LocalWords:  SP PRI Hypercope HYSDN Hypercope's hysdn IbssJoinNetTimeout FTDI
+# LocalWords:  ARCNet Keyspan PDA ADMtek sgalaxy sgbase opl mpuio mpuirq sbio
+# LocalWords:  sbirq sbdma gus uart mssio mssirq mssdma sscape maui mouirq iph
+# LocalWords:  CHDLC UPS's usbmouse wacom wmforce keybdev joydev fibre Trunking
+# LocalWords:  Etherchannel IOC Moxa Intellio moxa SmartIO mxser Mixcom EFI ir
+# LocalWords:  MIXCOMWD mixcomwd SENDCOMPLETE GMAC iBook gmac OAKNET oaknet PCG
+# LocalWords:  diffserv irlan irtty toshoboe IrCC Lifebook idex AUTODMA FIP Cxx
+# LocalWords:  Yenta Databook TCIC FMVJ fmvj NMCLAN LiveWire nmclan XIRC xirc
+# LocalWords:  loadkeys setfont shm SuperIO soc SOCAL socal FCAL fc fcal COMX
+# LocalWords:  MultiGate ITConsult comx CMX HiCOMX downloadable hw LoCOMX PROTO
+# LocalWords:  locomx MixCOM mixcom proto MyriCOM MYRI Sbus myri sbus IBMLS hme
+# LocalWords:  lanstreamer baseT HAPPYMEAL qfe sunhme SUNLANCE sunlance BigMAC
+# LocalWords:  SUNBMAC sunbmac QuadEthernet SUNQE qe FastEthernet sunqe DSB PTI
+# LocalWords:  DSBR dsbr procinfo QLOGICPTI qpti ptisp QLGC qlogicpti se LBA NF
+# LocalWords:  OPENPROMFS OpenPROM openpromfs OBP OpenBoot flashable Multiboard
+# LocalWords:  SPARCAUDIO SparcClassic Ultras DBRI Sparcbook sparcaudio SUNBPP
+# LocalWords:  UltraDMA WDC CRC CONNTRACK IPTABLES iptables nfmark interface's
+# LocalWords:  tdfxfb TNTx HGA hgafb VERBOSEDEBUG SunTrunking SunSoft XIRTULIP
+# LocalWords:  ethercards PNIC Macronix MXIC ASIX xircom Mustek MDC gphoto mdc
+# LocalWords:  CramFs Cramfs uid cramfs AVM's kernelcapi PCIV
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 368f037f7..1b1ce265b 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -1,7 +1,14 @@
-BOOKS	:= wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml kernel-api.sgml
-	
+BOOKS	:= wanbook.sgml z8530book.sgml mcabook.sgml videobook.sgml kernel-api.sgml parportbook.sgml
+
+PS	:=	$(patsubst %.sgml, %.ps, $(BOOKS))
+PDF	:=	$(patsubst %.sgml, %.pdf, $(BOOKS))
+
 books:	docproc $(BOOKS)
 
+ps:	$(PS)
+
+pdf:	$(PDF)
+
 docproc:
 	$(MAKE) -C $(TOPDIR)/scripts docproc
 
@@ -36,11 +43,32 @@ kernel-api.sgml: kernel-api.tmpl
 		$(TOPDIR)/drivers/net/wan/syncppp.c \
 		$(TOPDIR)/drivers/net/wan/z85230.c \
 		$(TOPDIR)/kernel/pm.c \
+		$(TOPDIR)/kernel/ksyms.c \
+		$(TOPDIR)/net/netsyms.c \
 		<kernel-api.tmpl >kernel-api.sgml
 
+parportbook.sgml: parportbook.tmpl
+	$(TOPDIR)/scripts/docgen $(TOPDIR)/drivers/parport/init.c \
+		<parportbook.tmpl >parportbook.sgml
+
+DVI	:=	$(patsubst %.sgml, %.dvi, $(BOOKS))
+AUX	:=	$(patsubst %.sgml, %.aux, $(BOOKS))
+TEX	:=	$(patsubst %.sgml, %.tex, $(BOOKS))
+LOG	:=	$(patsubst %.sgml, %.log, $(BOOKS))
+
 clean:
-	rm -f core *~
-	rm -f $(BOOKS)
+	$(RM) core *~
+	$(RM) $(BOOKS)
+	$(RM) $(DVI) $(AUX) $(TEX) $(LOG)
+
+mrproper: clean
+	$(RM) $(PS) $(PDF)
+
+%.ps : %.sgml
+	db2ps $<
+
+%.pdf : %.sgml
+	db2pdf $<
 
 include $(TOPDIR)/Rules.make
 
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index f0013b011..3f886e702 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -34,13 +34,71 @@
  </bookinfo>
 
 <toc></toc>
-  <chapter id="intfuncs">
-     <title>Interrupt Handling</title>
-!Iarch/i386/kernel/irq.c
+  <chapter id="vfs">
+     <title>The Linux VFS</title>
+     <sect1><title>The Directory Cache</title>
+!Efs/dcache.c
+!Iinclude/linux/dcache.h
+     </sect1>
+     <sect1><title>Inode Handling</title>
+!Efs/inode.c
+!Efs/bad_inode.c
+     </sect1>
+     <sect1><title>Registration and Superblocks</title>
+!Efs/super.c
+     </sect1>
+  </chapter>
+
+  <chapter id="netcore">
+     <title>Linux Networking</title>
+     <sect1><title>Socket Buffer Functions</title>
+!Iinclude/linux/skbuff.h
+!Enet/core/skbuff.c
+     </sect1>
+     <sect1><title>Socket Filter</title>
+!Enet/core/filter.c
+     </sect1>
+  </chapter>
+
+  <chapter id="netdev">
+     <title>Network device support</title>
+     <sect1><title>Driver Support</title>
+!Edrivers/net/net_init.c
+!Enet/core/dev.c
+     </sect1>
+     <sect1><title>8390 Based Network Cards</title>
+!Edrivers/net/8390.c
+     </sect1>
+     <sect1><title>Synchronous PPP</title>
+!Edrivers/net/wan/syncppp.c
+     </sect1>
+  </chapter>
+
+  <chapter id="modload">
+     <title>Module Loading</title>
+!Ekernel/kmod.c
   </chapter>
-  <chapter id="mtrrfuncs">
-     <title>MTRR Handling</title>
+
+  <chapter id="hardware">
+     <title>Hardware Interfaces</title>
+     <sect1><title>Interrupt Handling</title>
+!Iarch/i386/kernel/irq.c
+     </sect1>
+
+     <sect1><title>MTRR Handling</title>
 !Earch/i386/kernel/mtrr.c
+     </sect1>
+     <sect1><title>PCI Support Library</title>
+!Edrivers/pci/pci.c
+     </sect1>
+     <sect1><title>MCA Architecture</title>
+	<sect2><title>MCA Device Functions</title>
+!Earch/i386/kernel/mca.c
+	</sect2>
+	<sect2><title>MCA Bus DMA</title>
+!Iinclude/asm-i386/mca_dma.h
+	</sect2>
+     </sect1>
   </chapter>
 
   <chapter id="pmfuncs">
@@ -58,34 +116,14 @@
 !Edrivers/char/videodev.c
   </chapter>
 
-  <chapter id="netdev">
-     <title>Network devices</title>
-!Idrivers/net/net_init.c
-!Edrivers/net/8390.c
-  </chapter>
-
   <chapter id="snddev">
      <title>Sound Devices</title>
 !Edrivers/sound/sound_core.c
 !Idrivers/sound/sound_firmware.c
   </chapter>
 
-  <chapter id="mcabus">
-     <title>MCA Architecture</title>
-	<sect1><title>MCA Device Functions</title>
-!Earch/i386/kernel/mca.c
-	</sect1>
-	<sect1><title>MCA Bus DMA</title>
-!Iinclude/asm-i386/mca_dma.h
-	</sect1>
-  </chapter>
-
-  <chapter id="syncppp">
-     <title>Synchronous PPP</title>
-!Edrivers/net/wan/syncppp.c
-  </chapter>
 
-  <chapter id="16x50">
+  <chapter id="uart16x50">
      <title>16x50 UART Driver</title>
 !Edrivers/char/serial.c
   </chapter>
@@ -95,9 +133,5 @@
 !Edrivers/net/wan/z85230.c
   </chapter>
 
-  <chapter id="pcilib">
-     <title>PCI Support Library</title>
-!Edrivers/pci/pci.c
-  </chapter>
 
 </book>
diff --git a/Documentation/DocBook/parportbook.sgml b/Documentation/DocBook/parportbook.tmpl
index 1644748ad..1644748ad 100644
--- a/Documentation/DocBook/parportbook.sgml
+++ b/Documentation/DocBook/parportbook.tmpl
diff --git a/Documentation/arm/SA1100/Brutus b/Documentation/arm/SA1100/Brutus
index 798f18999..39a8905c7 100644
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
@@ -23,7 +23,7 @@ Currently supported:
 	- RS232 serial ports
 	- audio output
 	- LCD screen
-	- keyboard (needs to be cleaned up badly... any volunteer?)
+	- keyboard
 	
 The actual Brutus support may not be complete without extra patches. 
 If such patches exist, they should be found from 
diff --git a/Documentation/arm/SA1100/ThinClient b/Documentation/arm/SA1100/ThinClient
new file mode 100644
index 000000000..c254b74b2
--- /dev/null
+++ b/Documentation/arm/SA1100/ThinClient
@@ -0,0 +1,33 @@
+Thin Client / Single Board Computer
+
+The Thin Client, a low cost high power single board computer, has been
+designed to provide intuitive graphical displays in embedded systems.
+
+For more details, contact Applied Data Systems or see
+http://www.flatpanels.com/products.html
+
+Current Linux support for this product has been provided by Nicolas Pitre
+<nico@cam.org>.
+
+It's currently possible to mount a root filesystem via NFS providing a
+complete Linux environment.  Otherwyse a ramdisk image may be used.  Use
+'make thinclient_config' before any 'make config'.  This will set up
+defaults for ThinClient support.
+
+Supported peripherals:
+- SA1100 LCD frame buffer (only 8bpp yet)
+- on-board SMC 92C94 ethernet NIC
+- SA1100 serial port
+- possibly UCB1200 audio (not tested yet)
+
+To do:
+- touchscreen driver
+- flash memory access
+- 16bpp frame buffer support
+- extra (external) serial port driver
+- pcmcia
+- some console keyboard support (maybe IR?)
+- everything else!  :-)
+
+Any contribution can be sent to nico@cam.org and will be greatly welcome!
+
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt
index d9789eadb..8e7505bd4 100644
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
@@ -4,10 +4,13 @@ NTFS Overview
 To mount an NTFS volume, use the filesystem type 'ntfs'. The driver
 currently works only in read-only mode, with no fault-tolerance
 supported.  If you enable the experimental write support, make sure
-you can recover from a complete loss of data. For ftdisk support,
-limited success was reported with volume sets on top of the md driver,
-although mirror and stripe sets should work as well - if the md
-driver can be talked into using the same layout as Windows NT.
+you can recover from a complete loss of data and also always run
+chkdsk from within Microsoft Windows NT after performing a write to
+a NTFS partition from Linux to detect any problems as early as 
+possible. For ftdisk support, limited success was reported with 
+volume sets on top of the md driver, although mirror and stripe 
+sets should work as well - if the md driver can be talked into 
+using the same layout as Windows NT.
 
 The ntfs driver supports the following mount options:
 iocharset=name      Character set to use when returning file names.
diff --git a/Documentation/sound/CMI8330 b/Documentation/sound/CMI8330
index 0ca5af70f..8885d3307 100644
--- a/Documentation/sound/CMI8330
+++ b/Documentation/sound/CMI8330
@@ -2,6 +2,9 @@ Documentation for CMI 8330 (SoundPRO)
 -------------------------------------
 Alessandro Zummo <azummo@ita.flashnet.it>
 
+( Be sure to read Documentation/sound/SoundPro too )
+
+
 This adapter is now directly supported by the sb driver.
 
  The only thing you have to do is to compile the kernel sound
@@ -24,17 +27,6 @@ CONFIG_SOUND_MPU401=m
  for MPU401 support.
 
 
-CONFIG_SOUND_YM3812=m
-
- for OPL3 support. Please note that there are better ways to play midi files, like
- timidity or the softoss2 module.
-
-
-CONFIG_JOYSTICK=y
-
- to activate the joystick port.
-
-
 (I suggest you to use "make menuconfig" or "make xconfig" 
  for a more comfortable configuration editing)
 
@@ -51,29 +43,12 @@ You should get something similar in syslog:
 sb: CMI8330 detected.
 sb: CMI8330 sb base located at 0x220
 sb: CMI8330 mpu base located at 0x330
-sb: CMI8330 gameport base located at 0x200
-sb: CMI8330 opl3 base located at 0x388
 sb: CMI8330 mail reports to Alessandro Zummo <azummo@ita.flashnet.it>
 sb: ISAPnP reports CMI 8330 SoundPRO at i/o 0x220, irq 7, dma 1,5
 
 
 
 
-To activate the OPL3 support, you need these lines in /etc/modules.conf
-or in a file in /etc/modutils
-
-alias synth0 opl3
-options opl3 io=0x388
-
-and then you can do:
-
- modprobe opl3
-
-
-
-
-
-
 The old documentation file follows for reference
 purposes.
 
diff --git a/Documentation/sound/PAS16 b/Documentation/sound/PAS16
new file mode 100644
index 000000000..5a519df67
--- /dev/null
+++ b/Documentation/sound/PAS16
@@ -0,0 +1,185 @@
+Pro Audio Spectrum 16 for 2.3.99 and later
+=========================================
+by Thomas Molina (tmolina@home.com)
+last modified 26 Mar 2000
+Acknowledgement to Axel Boldt (boldt@math.ucsb.edu) for stuff taken
+from Configure.help, Riccardo Facchetti for stuff from README.OSS,
+and others whose names I could not find.
+
+This documentation is relevant for the PAS16 driver (pas2_card.c and
+friends) under kernel version 2.3.99 and later.  If you are
+unfamiliar with configuring sound under Linux, please read the
+Sound-HOWTO, linux/Documentation/sound/Introduction and other 
+relevant docs first.
+
+The following information is relevant information from README.OSS
+and legacy docs for the Pro Audio Spectrum 16 (PAS16):
+==================================================================
+
+The pas2_card.c driver supports the following cards --
+Pro Audio Spectrum 16 (PAS16) and compatibles:
+        Pro Audio Spectrum 16
+        Pro Audio Studio 16
+        Logitech Sound Man 16
+        NOTE! The original Pro Audio Spectrum as well as the PAS+ are not
+              and will not be supported by the driver.
+
+The sound driver configuration dialog
+-------------------------------------
+
+Sound configuration starts by making some yes/no questions. Be careful
+when answering to these questions since answering y to a question may
+prevent some later ones from being asked. For example don't answer y to
+the question about (PAS16) if you don't really have a PAS16.  Sound
+configuration may also be made modular by answering m to configuration
+options presented. 
+
+Note also that all questions may not be asked. The configuration program
+may disable some questions depending on the earlier choices. It may also
+select some options automatically as well.
+
+  "ProAudioSpectrum 16 support",
+        - Answer 'y'_ONLY_ if you have a Pro Audio Spectrum _16_,
+          Pro Audio Studio 16 or Logitech SoundMan 16 (be sure that
+          you read the above list correctly). Don't answer 'y' if you
+          have some other card made by Media Vision or Logitech since they
+          are not PAS16 compatible.
+          NOTE! Since 3.5-beta10 you need to enable SB support (next question)
+          if you want to use the SB emulation of PAS16. It's also possible to
+          the emulation if you want to use a true SB card together with PAS16
+          (there is another question about this that is asked later).
+  "Sound Blaster support",
+        - Answer 'y' if you have an original SB card made by Creative Labs
+          or a full 100% hardware compatible clone (like Thunderboard or
+          SM Games). If your card was in the list of supported cards (above),
+          please look at the card specific instructions later in this file
+          before answering this question. For an unknown card you may answer
+          'y' if the card claims to be SB compatible.
+         Enable this option also with PAS16.
+
+  "Generic OPL2/OPL3 FM synthesizer support",
+        - Answer 'y' if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
+	  The PAS16 has an OPL3-compatible FM chip.
+
+With PAS16 you can use two audio device files at the same time. /dev/dsp (and
+/dev/audio) is connected to the 8/16 bit native codec and the /dev/dsp1 (and
+/dev/audio1) is connected to the SB emulation (8 bit mono only).
+
+
+The new stuff for 2.3.99 and later
+============================================================================
+The following configuration options from linux/Documentation/Configure.help
+are relevant to configuring the PAS16:
+
+Sound card support
+CONFIG_SOUND
+  If you have a sound card in your computer, i.e. if it can say more
+  than an occasional beep, say Y. Be sure to have all the information
+  about your sound card and its configuration down (I/O port,
+  interrupt and DMA channel), because you will be asked for it.
+
+  You want to read the Sound-HOWTO, available from
+  http://www.linuxdoc.org/docs.html#howto . General information
+  about the modular sound system is contained in the files
+  Documentation/sound/Introduction. The file
+  Documentation/sound/README.OSS contains some slightly outdated but
+  still useful information as well.
+
+OSS sound modules
+CONFIG_SOUND_OSS
+  OSS is the Open Sound System suite of sound card drivers. They make
+  sound programming easier since they provide a common API. Say Y or M
+  here (the module will be called sound.o) if you haven't found a
+  driver for your sound card above, then pick your driver from the
+  list below.
+
+Persistent DMA buffers
+CONFIG_SOUND_DMAP
+  Linux can often have problems allocating DMA buffers for ISA sound
+  cards on machines with more than 16MB of RAM. This is because ISA
+  DMA buffers must exist below the 16MB boundary and it is quite
+  possible that a large enough free block in this region cannot be
+  found after the machine has been running for a while. If you say Y
+  here the DMA buffers (64Kb) will be allocated at boot time and kept
+  until the shutdown. This option is only useful if you said Y to
+  "OSS sound modules", above. If you said M to "OSS sound modules"
+  then you can get the persistent DMA buffer functionality by passing
+  the command-line argument "dmabuf=1" to the sound.o module.
+
+  Say y here for PAS16.
+
+ProAudioSpectrum 16 support
+CONFIG_SOUND_PAS
+  Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
+  16 or Logitech SoundMan 16 sound card. Don't answer Y if you have
+  some other card made by Media Vision or Logitech since they are not
+  PAS16 compatible.
+  If you compile the driver into the kernel, you have to add
+  "pas2=<io>,<irq>,<dma>,<dma2>,<sbio>,<sbirq>,<sbdma>,<sbdma2>
+  to the kernel command line.
+
+100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support
+CONFIG_SOUND_SB
+  Answer Y if you have an original Sound Blaster card made by Creative
+  Labs or a 100% hardware compatible clone (like the Thunderboard or
+  SM Games). For an unknown card you may answer Y if the card claims
+  to be Sound Blaster-compatible.  The PAS16 has 8-bit Soundblaster
+  support, so you can answer Y here for it.
+
+  Please read the file Documentation/sound/Soundblaster.
+
+  If you compile the driver into the kernel and don't want to use isapnp,
+  you have to add "sb=<io>,<irq>,<dma>,<dma2>" to the kernel command line.
+
+  You can say M here to compile this driver as a module; the module is
+  called sb.o.
+
+FM Synthesizer (YM3812/OPL-3) support
+CONFIG_SOUND_YM3812
+  Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
+  Answering Y is usually a safe and recommended choice, however some
+  cards may have software (TSR) FM emulation. Enabling FM support with
+  these cards may cause trouble (I don't currently know of any such
+  cards, however).
+  Please read the file Documentation/sound/OPL3 if your card has an
+  OPL3 chip.
+  If you compile the driver into the kernel, you have to add
+  "opl3=<io>" to the kernel command line.
+
+  If you compile your drivers into the kernel, you MUST configure 
+  OPL3 support as a module for PAS16 support to work properly.
+  You can then get OPL3 functionality by issuing the command:
+  insmod opl3
+  In addition, you must either add the following line to 
+  /etc/modules.conf:
+  options opl3 io=0x388
+  or else add the following line to /etc/lilo.conf:
+  opl3=0x388
+
+
+EXAMPLES
+===================================================================
+To use the PAS16 in my computer I have enabled the following sound
+configuration options:
+
+CONFIG_SOUND=y
+CONFIG_SOUND_OSS=y
+CONFIG_SOUND_TRACEINIT=y
+CONFIG_SOUND_DMAP=y
+CONFIG_SOUND_PAS=y
+CONFIG_SOUND_SB=y
+CONFIG_SOUND_YM3812=m
+
+I have also included the following append line in /etc/lilo.conf:
+append="pas2=0x388,10,3,-1,0x220,5,1,-1 sb=0x220,5,1,-1 opl3=0x388"
+
+The io address of 0x388 is default configuration on the PAS16.  The
+irq of 10 and dma of 3 may not match your installation.  The above 
+configuration enables PAS16, 8-bit Soundblaster and OPL3
+functionality.  If Soundblaster functionality is not desired, the
+following line would be appropriate:
+append="pas2=0x388,10,3,-1,0,-1,-1,-1 opl3=0x388"
+
+If sound is built totally modular, the above options may be 
+specified in /etc/modules.conf for pas2.o, sb.o and opl3.o 
+respectively. 
diff --git a/Documentation/sound/SoundPro b/Documentation/sound/SoundPro
index 6e8c69ed2..61b9a9197 100644
--- a/Documentation/sound/SoundPro
+++ b/Documentation/sound/SoundPro
@@ -1,6 +1,8 @@
 Documentation for the SoundPro CMI8330 extensions in the WSS driver (ad1848.o)
 ------------------------------------------------------------------------------
 
+( Be sure to read Documentation/sound/CMI8330 too )
+
 Ion Badulescu, ionut@cs.columbia.edu
 February 24, 1999
 
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 49faf2dab..b68e71cf9 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -1,7 +1,7 @@
 
-                      MAGIC SYSRQ KEY DOCUMENTATION v1.31
+                      MAGIC SYSRQ KEY DOCUMENTATION v1.32
                      ------------------------------------
-                        [Mon Mar 13 21:45:48 EST 2000]
+                        [Sat Apr  8 22:15:03 CEST 2000]
 
 *  What is the magic SysRQ key?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -113,13 +113,13 @@ virtual console (ALT+Fn) and then back again should also help.
 
 *  I hit SysRQ, but nothing seems to happen, what's wrong?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-There are some keyboards which do not support 'SysRQ', you can try running
-'showkey -s' and pressing SysRQ or alt-SysRQ to see if it generates any
-0x54 codes. If it doesn't, you may define the magic sysrq sequence to a
-different key. Find the keycode with showkey, and change the define of
-'#define SYSRQ_KEY 0x54' in [/usr/src/linux/]include/asm/keyboard.h to
-the keycode of the key you wish to use, then recompile. Oh, and by the way,
-you exit 'showkey' by not typing anything for ten seconds.
+There are some keyboards that send different scancodes for SysRQ than the
+pre-defined 0x54. So if SysRQ doesn't work out of the box for a certain 
+keyboard, run 'showkey -s' to find out the proper scancode sequence. Then 
+use 'setkeycodes <sequence> 84' to define this sequence to the usual SysRQ 
+code (84 is decimal for 0x54). It's probably best to put this command in a
+boot script. Oh, and by the way, you exit 'showkey' by not typing anything 
+for ten seconds.
 
 *  I have more questions, who can I ask?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/usb/CREDITS b/Documentation/usb/CREDITS
index b1230f70a..38bdbaee0 100644
--- a/Documentation/usb/CREDITS
+++ b/Documentation/usb/CREDITS
@@ -16,6 +16,7 @@ difficult to maintain, add yourself with a patch if desired.
   Paul Mackerras <paulus@cs.anu.edu.au>
   David E. Nelson <dnelson@jump.net>
   Vojtech Pavlik <vojtech@suse.cz>
+  Bill Ryder <bryder@sgi.com>
   Thomas Sailer <sailer@ife.ee.ethz.ch>
   Gregory P. Smith <greg@electricrain.com>
   Linus Torvalds <torvalds@transmeta.com>
diff --git a/Documentation/usb/acm.txt b/Documentation/usb/acm.txt
index c978974f1..e4fced658 100644
--- a/Documentation/usb/acm.txt
+++ b/Documentation/usb/acm.txt
@@ -1,94 +1,138 @@
-The ACM driver works with modems and ISDN TAs that use the USB Abstract
-Control Model standard. 
-
-****************************
-Test it:
-Watch out, the driver is not stable and tested. Sync often, make backups,
-most importand: don't blame me...
-
-Create device files:
-mknod /dev/ttyACM0 c 166 0
-mknod /dev/ttyACM1 c 166 1
-mknod /dev/ttyACM2 c 166 2
-mknod /dev/ttyACM3 c 166 3
-Compile a kernel with support for your host controller (uhci only for now!)
-and support for ACM. Boot this kernel. If you connect your device to the
-USB bus you should see messages like the following:
-
-Jul 19 20:14:29 office kernel: USB new device connect, assigned device number 1
-Jul 19 20:14:29 office kernel: Found 02:09
-Jul 19 20:14:29 office kernel: Found 04:09
-Jul 19 20:14:29 office kernel: Found 05:07
-Jul 19 20:14:29 office last message repeated 2 times
-Jul 19 20:14:29 office kernel: parsed = 39 len = 67
-Jul 19 20:14:29 office kernel: Expected descriptor 04/09, got 02/09 - skipping
-Jul 19 20:14:29 office kernel:    0 09
-Jul 19 20:14:29 office kernel:    1 02
-Jul 19 20:14:29 office kernel:    2 43
-Jul 19 20:14:29 office kernel:    3 00
-Jul 19 20:14:29 office kernel:    4 02
-Jul 19 20:14:29 office kernel:    5 02
-Jul 19 20:14:29 office kernel:    6 04
-Jul 19 20:14:29 office kernel:    7 60
-Jul 19 20:14:29 office kernel:    8 00
-Jul 19 20:14:29 office kernel: Found 04:09
-Jul 19 20:14:29 office kernel: Found 02:09
-Jul 19 20:14:29 office kernel: Found 04:09
-Jul 19 20:14:29 office kernel: Found 05:07
-Jul 19 20:14:29 office kernel: Found 04:09
-Jul 19 20:14:29 office kernel: Found 05:07
-Jul 19 20:14:29 office kernel: Found 05:07
-Jul 19 20:14:29 office kernel: parsed = 67 len = 0
-Jul 19 20:14:29 office kernel: getstringtable
-Jul 19 20:14:29 office kernel: acm_probe
-Jul 19 20:14:29 office kernel: USB ACM found
-
-Watch out for the line:
-Jul 19 20:14:29 office kernel: USB new device connect, assigned device number 1
-and the line:
-Jul 19 20:14:29 office kernel: USB ACM found
-These two lines show that the device was seen by the usb host controller and
-then recognized by the acm driver as a valid device.
-
-If you use a terminal emulation software like minicom with /dev/ttyACM0 you
-should be able to send AT commands to your device and get responses. I've 
-been able to do zmodem downloads to another pc. However downloads from one
-ISDN TA to another ISDN TA connected to the same PC didn't work. Don't
-know why. Flow control is not finised after all and i'd guess there might
-be problems on heavily loades PCs. I also did some tests with ppp but i'm
-not finised with this. There might be a chance to get it working. However
-i'd like to know if your device is recognized as an ACM device. I'm also
-interested if the thing is stable or if it crashes.
-(should i say how it crases?)
-
-You should be able to add and remove devices from the bus. The driver will
-always try to fill up unused ttys. This means if you hotplug devices their
-order may have changed after reboot. This is not the behaviour Linus liked
-to see but it's ok for now. (I hope ;-)
-
-Please report your experiences to me:
-fuerst@in.tum.de
-
-***************************
-I've tested it with:
-3Com ISDN Pro TA.
-
-It should work with (That means i know these devices conform to ACM):
-3Com Office Connect Modem
-3Com Sportster USB (I think that's what it's called)
-
-***************************
-Many thanks to 3Com which did not only support me with hardware but also
-with technical support in USB questions. They also allowed me to do tests in
-their lab. Great!
-
-***************************
-Known bugs:
-Flow control not tested (likely not to work)
-Some tty function calls not implemented (putchar, etc...)
-Huge amounts of debug output (compile in [*] Magic SysRq key and press ALT+PRTSCR+0 )
-Not all mem is freed at close (need terminate irq in hcd)
-
-***************************
-Have fun,
-	Armin Fuerst
+			  Linux ACM driver v0.16
+		 (c) 1999 Vojtech Pavlik <vojtech@suse.cz>
+			     Sponsored by SuSE
+----------------------------------------------------------------------------
+
+0. Disclaimer
+~~~~~~~~~~~~~
+  This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+  This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+  You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc., 59
+Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+  Should you need to contact me, the author, you can do so either by e-mail
+- mail your message to <vojtech@suse.cz>, or by paper mail: Vojtech Pavlik,
+Ucitelska 1576, Prague 8, 182 00 Czech Republic
+
+  For your convenience, the GNU General Public License version 2 is included
+in the package: See the file COPYING.
+
+1. Usage
+~~~~~~~~
+  The drivers/usb/acm.c drivers works with USB modems and USB ISDN terminal
+adapters that conform to the Universal Serial Bus Communication Device Class
+Abstract Control Model (USB CDC ACM) specification.
+
+  Many modems do, here is a list of those I know of:
+
+	3Com OfficeConnect 56k
+	3Com Voice FaxModem Pro
+	3Com Sportster
+	MultiTech MultiModem 56k
+	Zoom 2986L FaxModem
+	Compaq 56k FaxModem
+	ELSA Microlink 56k
+
+  I know of one ISDN TA that does work with the acm driver:
+
+	3Com USR ISDN Pro TA
+
+  Unfortunately many modems and most ISDN TAs use proprietary interfaces and
+thus won't work with this drivers. Check for ACM compliance before buying.
+
+  The driver (with devfs) creates these devices in /dev/usb/acm:
+
+	crw-r--r--   1 root     root     166,   0 Apr  1 10:49 0
+	crw-r--r--   1 root     root     166,   1 Apr  1 10:49 1
+	crw-r--r--   1 root     root     166,   2 Apr  1 10:49 2
+
+  And so on, up to 31, with the limit being possible to change in acm.c to up
+to 256, so you can use up to 256 USB modems with one computer (you'll need
+three USB cards for that, though).
+
+  If you don't use devfs, then you can create device nodes with the same
+minor/major numbers anywhere you want, but either the above location or
+/dev/usb/ttyACM0 is preferred.
+
+  To use the modems you need these modules loaded:
+
+	usbcore.o
+	usb-[uo]hci.o or uhci.o
+	acm.o
+
+  After that, the modem[s] should be accessible. You should be able to use
+minicom, ppp and mgetty with them.
+
+2. Verifying that it works
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+  The first step would be to check /proc/bus/usb/devices, it should look
+like this:
+
+T:  Bus=01 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#=  1 Spd=12  MxCh= 2
+B:  Alloc=  0/900 us ( 0%), #Int=  0, #Iso=  0
+D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
+P:  Vendor=0000 ProdID=0000 Rev= 0.00
+S:  Product=USB UHCI Root Hub
+S:  SerialNumber=6800
+C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=  0mA
+I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub
+E:  Ad=81(I) Atr=03(Int.) MxPS=   8 Ivl=255ms
+T:  Bus=01 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#=  2 Spd=12  MxCh= 0
+D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2
+P:  Vendor=04c1 ProdID=008f Rev= 2.07
+S:  Manufacturer=3Com Inc.
+S:  Product=3Com U.S. Robotics Pro ISDN TA
+S:  SerialNumber=UFT53A49BVT7
+C:  #Ifs= 1 Cfg#= 1 Atr=60 MxPwr=  0mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=acm
+E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
+E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms
+C:* #Ifs= 2 Cfg#= 2 Atr=60 MxPwr=  0mA
+I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm
+E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=128ms
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm
+E:  Ad=85(I) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
+E:  Ad=04(O) Atr=02(Bulk) MxPS=  64 Ivl=  0ms
+
+The presence of these three lines (and the Cls= 'comm' and 'data' classes)
+is important, it means it's an ACM device. The Driver=acm means the acm
+driver is used for the device. If you see only Cls=ff(vend.) then you're out
+of luck, you have a device with vendor specific-interface.
+
+D:  Ver= 1.00 Cls=02(comm.) Sub=00 Prot=00 MxPS= 8 #Cfgs=  2
+I:  If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=02 Prot=01 Driver=acm
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=acm
+
+In the system log you should see:
+
+usb.c: USB new device connect, assigned device number 2
+usb.c: kmalloc IF c7691fa0, numif 1
+usb.c: kmalloc IF c7b5f3e0, numif 2
+usb.c: skipped 4 class/vendor specific interface descriptors
+usb.c: new device strings: Mfr=1, Product=2, SerialNumber=3
+usb.c: USB device number 2 default language ID 0x409
+Manufacturer: 3Com Inc.
+Product: 3Com U.S. Robotics Pro ISDN TA
+SerialNumber: UFT53A49BVT7
+acm.c: probing config 1
+acm.c: probing config 2
+ttyACM0: USB ACM device
+acm.c: acm_control_msg: rq: 0x22 val: 0x0 len: 0x0 result: 0
+acm.c: acm_control_msg: rq: 0x20 val: 0x0 len: 0x7 result: 7
+usb.c: acm driver claimed interface c7b5f3e0
+usb.c: acm driver claimed interface c7b5f3f8
+usb.c: acm driver claimed interface c7691fa0
+
+If all this seems to be OK, fire up minicom and set it to talk to the ttyACM
+device and try typing 'at'. If it responds with 'OK', then everything is
+working.
diff --git a/Documentation/usb/hid.txt b/Documentation/usb/hid.txt
deleted file mode 100644
index 3cd3373ff..000000000
--- a/Documentation/usb/hid.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-			   Linux HID driver v0.8
-		 (c) 1999 Vojtech Pavlik <vojtech@suse.cz>
-		    (c) 1999 Andreas Gal <agal@uwsp.edu>
-			     Sponsored by SuSE
-----------------------------------------------------------------------------
-
-0. Disclaimer
-~~~~~~~~~~~~~
-  This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-  This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-  You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc., 59
-Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-  Should you need to contact me, the author, you can do so either by e-mail
-- mail your message to <vojtech@suse.cz>, or by paper mail: Vojtech Pavlik,
-Ucitelska 1576, Prague 8, 182 00 Czech Republic
-
-  For your convenience, the GNU General Public License version 2 is included
-in the package: See the file COPYING.
-
-1. Introduction
-~~~~~~~~~~~~~~~
-  This is a driver for USB devices conforming to the USB HID (Human Input
-Device) standard. These devices include namely keyboards, mice and
-joysticks.
-
-  However many other devices (monitors, speakers, UPSs ...) also communicate
-through the same protocol, which makes its specification somewhat bloated.
-This isn't a problem, though, because the driver doesn't need to know about
-all the possible devices it can control, and can just parse the protocol and
-leave the rest of the job (for example understanding what the UPS wants to
-say) to the userland.
-
-  Because of this, the USB HID driver has two interfaces. One is via the
-proc filesystem, allowing userland applications send and read arbitrary
-reports to and from a connected USB device. The other is via a very simple
-yet generic input device driver, which dispatches input events (keystrokes,
-mouse or joystick movements) to specific, backward compatible userland
-interfaces. This way a PS/2 mouse, an AT keyboard or a Linux joystick driver
-interface are emulated, and allow applications to immediately work with USB
-mice, USB keyboards and USB joysticks without any changes.
-
-  The input driver is aimed for a little more than USB device handling in
-the future, though. It's generic enough so that it can be used for any
-mouse, keyboard or joystick (and more, of course). A PS/2 mouse driver, a
-serial mouse, Sun mouse, and most of the busmouse drivers were rewritten to
-use this as well as the AT keyboard and Sun keyboard drivers. This will
-hopefully allow conversion of all Linux keyboard and mouse and joystick
-drivers to this scheme.
-
-  This effort has it's home page at:
-
-	http://www.suse.cz/development/input/
-
-You'll find both the latest HID driver and the complete Input driver there.
-There is also a mailing list for this:
-
-	listproc@atrey.karlin.mff.cuni.cz
-
-Send "subscribe linux-joystick Your Name" to subscribe to it.
-
-2. Usage
-~~~~~~~~
-  Since the driver comes with recent 2.3 kernels, all that's needed to use
-it is to enable it either as a module or compiled-in into the kernel. 
-
-  After that, after reboot (and possibly also inserting the USB and HID
-modules) the following will happen:
-
-* If you selected keyboard support, all USB keystrokes will be also routed
-  to the Linux keyboard driver as if being input through the ordinary system
-  keyboard.
-
-* If you selected mouse support, there will be (one or more) simulated PS/2
-  mouse devices on major 10, minor 32, 33 and more. These simulated mice can
-  in addition to a standard 3-button PS/2 mouse behave like MS Intellimice,
-  with a wheel. If you want to use the wheel, just specify '-t imps2' to gpm
-  and 'Protocol "ImPS/2"' to X, and it will work. A single emulated mouse
-  device can be open by any number of processes (unlike the /dev/psaux), and
-  for each of them the emulation is separate, each can use a different mode.
-  The mousedev driver, which emulates the mice, can also emulate a Genius
-  NewScroll 5 buttons-and-a-wheel mouse, if you set it to a Genius PS/2
-  mode ('-t netmouse' 'Protocol "NetMousePS/2"'). However, not gpm, nor X
-  can decode the 5 buttons yet, so this isn't very useful right now.
-
-* If you selected joystick support, the driver will take over major 15, the
-  joystick major number, and will emulate joysticks on it. This means the
-  normal joystick driver can't be used together with it (now, after the
-  normal joystick drivers are converted to the input scheme, all will work
-  nicely together). Also, you'll probably need to calibrate your joystick
-  manually ('man jscal') to be able to use it, because the USB
-  autocalibration is far from perfect yet.
-
-* If you selected event device support, there will be devices on major 10,
-  minors 64, 65 and more for each input device connected through this
-  driver. These devices output raw events the input driver dispatches. Each
-  has a timestamp. This hopefully will be THE way X will talk to keyboard
-  and mice, because it's hardware independent, and not limited by existing
-  de-facto standards.
-
-3. Verifying if it works
-~~~~~~~~~~~~~~~~~~~~~~~~
-  Typing a couple keys on the keyboard should be enough to check that a USB
-keyboard works and is correctly connected to the kernel keyboard driver.
-
-  Doing a cat /dev/hidmouse (c, 10, 32) will verify that a mouse is also
-emulated, characters should appear if you move it.
-
-  You can test the joystick emulation with the 'jstest' utility, available
-in the joystick package (see Documentation/joystick.txt).
-
-  You can test the event devics with the 'evtest' utitily available on the
-input driver homepage (see the URL above).
-
-4. FAQ
-~~~~~~
-Q: Why aren't any questions here yet?
-A: Because none were frequent enough yet.
-
-5. Event interface
-~~~~~~~~~~~~~~~~~~
-  Should you want to add event device support into any application (X, gpm,
-svgalib ...) I (vojtech@suse.cz) will be happy to provide you any help I
-can. Here goes a description of the current state of things, which is going
-to be extended, but not changed incompatibly as time goes:
-
-  You can use blocking and nonblocking reads, also select() on the
-/dev/inputX devices, and you'll always get a whole number of input events on
-a read. Their layout is:
-
-struct input_event {
-	struct timeval time;
-	unsigned short type;
-	unsigned short code;
-	unsigned int value;
-};
-
-  'time' is the timestamp, it returns the time at which the event happened.
-Type is for example EV_REL for relative momement, REL_KEY for a keypress or
-release. More types are defined in include/linux/input.h.
-
-  'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete
-list is in include/linux/input.h.
-
-  'value' is the value the event carries. Either a relative change for
-EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for
-release, 1 for keypress and 2 for autorepeat.
-
-6. Proc interface
-~~~~~~~~~~~~~~~~~
-  For HID-specific devices there is also the /proc interface. It isn't
-present in this release yet, though, so it's description will appear here
-together with the code in the driver.
diff --git a/Documentation/usb/ibmcam.txt b/Documentation/usb/ibmcam.txt
index 5943227a6..21d07c0ba 100644
--- a/Documentation/usb/ibmcam.txt
+++ b/Documentation/usb/ibmcam.txt
@@ -7,8 +7,7 @@ the IBM camera. However most of needed features work well.
 
 This driver was developed using logs of observed USB traffic
 which was produced by standard Windows driver (c-it98.sys).
-I did not have any input from Xirlink. Some people asked about
-data sheets, but nothing came out of that. I didn't try.
+I did not have data sheets from Xirlink.
 
 Video formats:
       128x96  [model 1]
@@ -29,14 +28,16 @@ SUPPORTED CAMERAS:
 IBM "C-It" camera, also known as "Xirlink PC Camera"
 The device uses proprietary ASIC (and compression method);
 it is manufactured by Xirlink. See http://www.xirlink.com/
-or http://www.c-itnow.com/ for details and pictures.
+http://www.ibmpccamera.com or http://www.c-itnow.com/ for
+details and pictures.
 
 The Linux driver was developed with camera with following
 model number (or FCC ID): KSX-XVP510. This camera has three
 interfaces, each with one endpoint (control, iso, iso). This
-type of cameras is referred to as "model 1".
+type of cameras is referred to as "model 1". These cameras are
+no longer manufactured.
 
-It appears that Xirlink made some changes in their cameras recently.
+Xirlink now manufactures new cameras which are somewhat different.
 In particular, following models [FCC ID] belong to that category:
 
 XVP300 [KSX-X9903]
@@ -46,29 +47,20 @@ XVP610 [KSX-X9902]
 (see http://www.xirlink.com/ibmpccamera/ for updates, they refer
 to these new cameras by Windows driver dated 12-27-99, v3005 BETA)
 These cameras have two interfaces, one endpoint in each (iso, bulk).
-Such type of cameras is referred to as "model 2". They are supported.
+Such type of cameras is referred to as "model 2". They are supported
+(with exception of 352x288 native mode).
 
 Quirks of Model 2 cameras:
 -------------------------
 
-These cameras apparently produce only 176x144 native video stream;
-the 352x288 formats are produced from 176x144 RGB stream. In fact,
-Xirlink broke perfectly good Model 1 (which used I420 on all sizes)
-and instead switched to color-separated RGB which is a terrible waste
-of bandwidth and resolution. However it probably allowed to simplify
-the camera and use less RAM. Model 2 camera works visibly worse than
-model 1 even using Xirlink's own driver on Windows. The image quality
-is better on Linux than on Windows, partly thanks to _absence_ of
-annoying automatic color corrections which Windows driver feeds into
-the camera several times per second.
-
 Model 2 does not have hardware contrast control. Corresponding V4L
 control is not used at the moment. It may be possible to implement
 contrast control in software, at cost of extra processor cycles.
 
-The bandwidth demand imposed by RGB quasi-352x288 mode (800 Kbits per
-frame) essentially limits this mode to 10 frames per second or less, in
-ideal conditions on the bus (USB is shared, after all). The frame rate
+This driver provides 352x288 mode by switching the camera into
+quasi-352x288 RGB mode (800 Kbits per frame) essentially limiting
+this mode to 10 frames per second or less, in ideal conditions on
+the bus (USB is shared, after all). The frame rate
 has to be programmed very conservatively. Additional concern is that
 frame rate depends on brightness setting; therefore the picture can
 be good at one brightness and broken at another! I did not want to fix
@@ -81,24 +73,21 @@ try to adjust brightness - brighter image is slower, so USB will be able
 to send all data. However if you regularly use Model 2 cameras you may
 prefer videosize=1 which makes perfectly good I420, with no scaling and
 lesser demands on USB (300 Kbits per second, or 26 frames per second).
-Remember that model 2 cameras never produce images with resolution
-better than "true" 176x144 - or so it seems.
 
 The camera that I had also has a hardware quirk: if disconnected,
 it needs few minutes to "relax" before it can be plugged in again
 (poorly designed USB processor reset circuit?)
 
-Finally, to say something good about Model 2: it is much simpler to program
-than Model 1. Commands are few, and they all are straightforward. This camera
-can be programmed for very high sensitivity (starlight may be enough), this
-makes it convenient for tinkering with. The driver code has enough comments
-to help a programmer to tweak the camera as s/he feels necessary.
+Model 2 camera can be programmed for very high sensitivity (even starlight
+may be enough), this makes it convenient for tinkering with. The driver
+code has enough comments to help a programmer to tweak the camera
+as s/he feels necessary.
 
 WHAT YOU NEED:
 
 - A supported IBM PC (C-it) camera (model 1 or 2)
 
-- A Linux box with USB support (2.3/2.4 or 2.2 w/backport)
+- A Linux box with USB support (2.3/2.4; 2.2 w/backport may work)
 
 - A Video4Linux compatible frame grabber program such as xawtv.
   
@@ -179,6 +168,19 @@ flags           This is a bit mask, and you can combine any number of
                 FLAGS_OVERLAY_STATS     8  Shows tiny numbers on screen,
                                            useful only for debugging.
                 FLAGS_FORCE_TESTPATTERN 16 Shows blue screen with numbers.
+                FLAGS_SEPARATE_FRAMES   32 Shows each frame separately, as
+                                           it was received from the camera.
+                                           Default (not set) is to mix the
+                                           preceding frame in to compensate
+                                           for occasional loss of Isoc data
+                                           on high frame rates.
+                FLAGS_CLEAN_FRAMES      64 Forces "cleanup" of each frame
+                                           prior to use; relevant only if
+                                           FLAGS_SEPARATE_FRAMES is set.
+                                           Default is not to clean frames,
+                                           this is a little faster but may
+                                           produce flicker if frame rate is
+                                           too high and Isoc data gets lost.
 
 framerate       This setting controls frame rate of the camera. This is
                 an approximate setting (in terms of "worst" ... "best")
diff --git a/Documentation/usb/input.txt b/Documentation/usb/input.txt
new file mode 100644
index 000000000..ebf9058de
--- /dev/null
+++ b/Documentation/usb/input.txt
@@ -0,0 +1,294 @@
+			  Linux Input drivers v0.9
+		 (c) 1999 Vojtech Pavlik <vojtech@suse.cz>
+			     Sponsored by SuSE
+----------------------------------------------------------------------------
+
+0. Disclaimer
+~~~~~~~~~~~~~
+  This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+  This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+  You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc., 59
+Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+  Should you need to contact me, the author, you can do so either by e-mail
+- mail your message to <vojtech@suse.cz>, or by paper mail: Vojtech Pavlik,
+Ucitelska 1576, Prague 8, 182 00 Czech Republic
+
+  For your convenience, the GNU General Public License version 2 is included
+in the package: See the file COPYING.
+
+1. Introduction
+~~~~~~~~~~~~~~~
+  This is a collection of drivers that is designed to support all input
+devices under Linux. However, in the current kernels, although it's
+possibilities are much bigger, it's limited to USB devices only. This is
+also why it resides in the drivers/usb subdirectory.
+
+  The center of the input drivers is the input.o module, which must be
+loaded before any other of the input modules - it serves as a way of
+communication between two groups of modules:
+
+1.1 Device drivers
+~~~~~~~~~~~~~~~~~~
+  These modules talk to the hardware (for example via USB), and provide
+events (keystrokes, mouse movements) to the input.o module.
+
+1.2 Event handlers
+~~~~~~~~~~~~~~~~~~
+  These modules get events from input.o and pass them where needed via
+various interfaces - keystrokes to the kernel, mouse movements via a
+simulated PS/2 interface to GPM and X and so on.
+
+2. Simple Usage
+~~~~~~~~~~~~~~~
+  For the most usual configuration, with one USB mouse and one USB keyboard,
+you'll have to load the following modules (or have them built in to the
+kernel):
+
+	input.o
+	mousedev.o
+	keybdev.o
+	usbcore.o
+	usb-[uo]hci.o
+	hid.o
+
+  After this, the USB keyboard will work straight away, and the USB mouse
+will be available as a character device on major 13, minor 32:
+
+	crw-r--r--   1 root     root      13,  32 Mar 28 22:45 mouse0
+
+  This device, has to be created, unless you use devfs, in which case it's
+created automatically. The commands to do that are:
+
+	cd /dev
+	mkdir input
+	mknod input/mouse0 c 13 32
+
+  After that you have to point GPM (the textmode mouse cut&paste tool) and
+XFree to this device to use it - GPM should be called like:
+
+	gpm -t ps2 -m /dev/input/mouse0
+
+  And in X:
+
+	Section "Pointer"
+	    Protocol    "ImPS/2"
+	    Device      "/dev/input/mouse0"
+	    ZAxisMapping 4 5
+	EndSection
+
+  When you do all of the above, you can use your USB mouse and keyboard.
+
+3. Detailed Description
+~~~~~~~~~~~~~~~~~~~~~~~
+3.1 Device drivers
+~~~~~~~~~~~~~~~~~~
+  Device drivers are the modules that generate events. The events are
+however not useful without being handled, so you also will need to use some
+of the modules from section 3.2.
+
+3.1.1 hid.c
+~~~~~~~~~~~
+  Hid.c is the largest and most complex driver of the whole suite. It
+handles all HID devices, and because there is a very wide variety of them,
+and because the USB HID specification isn't simple, it needs to be this big.
+
+  Currently, it handles USB mice, joysticks, gamepads, steering wheels
+keyboards, trackballs and digitizers.
+
+ However, USB uses HID also for monitor controls, speaker controls, UPSs,
+LCDs and many other purposes.
+
+ The monitor and speaker controls should be easy to add to the hid/input
+interface, but for the UPSs and LCDs it doesn't make much sense. The driver
+doesn't support these yet, and a new, non-event interface should be designed
+for them. If you have any of these devices (I don't), feel free to design
+something and if it's good, it'll get into the driver.
+
+  The usage of the hid.o module is very simple, it takes no parameters,
+detects everything automatically and when a HID device is inserted, it
+detects it appropriately.
+
+  However, because the devices vary wildly, you might happen to have a
+device that doesn't work well. In that case #define DEBUG at the beginning
+of hid.c and send me the syslog traces.
+
+3.1.2 usbmouse.c
+~~~~~~~~~~~~~~~~
+  For embedded systems, for mice with broken HID descriptors and just any
+other use when the big hid.c wouldn't be a good choice, there is the
+usbmouse.c driver. It handles USB mice only. It uses a simpler HIDBP
+protocol. This also means the mice must support this simpler protocol. Not
+all do. If you don't have any strong reason to use this module, use hid.c
+instead.
+
+3.1.3 usbkbd.c
+~~~~~~~~~~~~~~
+  Much like usbmouse.c, this module talks to keyboards with a simpplified
+HIDBP protocol. It's smaller, but doesn't support any extra special keys.
+Use hid.c instead if there isn't any special reason to use this.
+
+3.1.4 wacom.c
+~~~~~~~~~~~~~
+  This is a driver for Wacom Graphire and Intuos tablets. Not for Wacom
+PenPartner, that one is handled by the HID driver. Although the Intuos and
+Graphire tablets claim that they are HID tablets as well, they are not and
+thus need this specific driver.
+
+3.1.5 wmforce.c
+~~~~~~~~~~~~~~~
+  A driver for the Logitech WingMan Force joysticks, when connected via the
+USB port. It works quite well, but there is no force feedback support yet,
+because the interface to do that is a trade secret of Immersion Corp, and
+even Logitech can't disclose it.
+
+  Support for Logitech WingMan Force Wheel isn't present in this driver, but
+if someone has the device, and is willing to cooperate, it should be a
+matter of a couple days to add it.
+
+3.2 Event handlers
+~~~~~~~~~~~~~~~~~~
+  Event handlers distrubite the events from the devices to userland and
+kernel, as needed.
+
+3.2.1 keybdev.c
+~~~~~~~~~~~~~~~
+  Keybdev is currently a rather ugly hack that translates the input events
+into architecture-specific keyboard raw mode (Xlated AT Set2 on x86), and
+passes them into the handle_scancode function of the keyboard.c module. This
+works well enough on all architectures that keybdev can generate rawmode on,
+other architectures can be added to it.
+
+  The right way would be to pass the events to keyboard.c directly, best if
+keyboard.c would itself be an event handler. This is done in the input
+patch, available on the webpage mentioned below.
+
+3.2.2 mousedev.c
+~~~~~~~~~~~~~~~~
+  Mousedev is also a hack to make programs that use mouse input work. It
+takes events from either mice or digitizers/tablets and makes a PS/2-style
+(a la /dev/psaux) mouse device available to the userland. Ideally, the
+programs could use a more reasonable interface, for example evdev.c
+
+  Mousedev devices in /dev/input (as shown above) are:
+
+	crw-r--r--   1 root     root      13,  32 Mar 28 22:45 mouse0
+	crw-r--r--   1 root     root      13,  33 Mar 29 00:41 mouse1
+	crw-r--r--   1 root     root      13,  34 Mar 29 00:41 mouse2
+	crw-r--r--   1 root     root      13,  35 Apr  1 10:50 mouse3
+
+and so on, up to mouse31. Each is assigned to a single mouse or digitizer,
+unless CONFIG_INPUT_MOUSEDEV_MIX is set. In that case all mice and
+digitizers share a single character device, mouse0, and even when none are
+connected, mouse0 is present. This is useful for hotplugging USB mice, so
+that programs can open the device even when no mice are present.
+
+  CONFIG_INPUT_MOUSEDEV_SCREEN_[XY] in the kernel configuration are the size
+of your screen (in pixels) in XFree86. This is needed if you want to use
+your digitizer in X, because it's movement is sent to X via a virtual PS/2
+mouse.
+
+  Mousedev.c will generate either PS/2, ImPS/2 (microsoft intellimouse) or
+GenPS/2 (genius netmouse/netscroll) protocols, depending on what the program
+wishes. You can set GPM and X to any of these. You'll need ImPS/2 if you
+want to make use of a wheel on a USB mouse and GenPS/2 if you want to use
+extra (up to 5) buttons. I'm not sure how much is GenPS/2 supported in X,
+though.
+
+3.2.3 joydev.c
+~~~~~~~~~~~~~~
+  Joydev implements v0.x and v1.x Linux joystick api, much like
+drivers/char/joystick/joystick.c. See joystick-api.txt in the Documentation
+subdirectory for details. Joydev does it on top of the input subsystem,
+though. As soon as any USB joystick is connected, it can be accessed in
+/dev/input on:
+
+	crw-r--r--   1 root     root      13,   0 Apr  1 10:50 js0
+	crw-r--r--   1 root     root      13,   1 Apr  1 10:50 js1
+	crw-r--r--   1 root     root      13,   2 Apr  1 10:50 js2
+	crw-r--r--   1 root     root      13,   3 Apr  1 10:50 js3
+
+And so on up to js31.
+
+3.2.4 evdev.c
+~~~~~~~~~~~~~
+  Evdev is the generic input event interface. It passes the events generated
+in the kernel straight to the program, with timestamps. The API is still
+evolving, but should be useable now. It's described in section 5.
+
+  This should be the way for GPM and X to get keyboard and mouse mouse
+events. It allows for multihead in X without any specific multihead kernel
+support. The event codes are the same on all architectures and are hardware
+independent.
+
+  The devices are in /dev/input:
+
+	crw-r--r--   1 root     root      13,  64 Apr  1 10:49 event0
+	crw-r--r--   1 root     root      13,  65 Apr  1 10:50 event1
+	crw-r--r--   1 root     root      13,  66 Apr  1 10:50 event2
+	crw-r--r--   1 root     root      13,  67 Apr  1 10:50 event3
+
+3. Contacts
+~~~~~~~~~~~
+  This effort has it's home page at:
+
+	http://www.suse.cz/development/input/
+
+You'll find both the latest HID driver and the complete Input driver there.
+There is also a mailing list for this:
+
+	majordomo@atrey.karlin.mff.cuni.cz
+
+Send "subscribe linux-input" to subscribe to it.
+
+4. Verifying if it works
+~~~~~~~~~~~~~~~~~~~~~~~~
+  Typing a couple keys on the keyboard should be enough to check that a USB
+keyboard works and is correctly connected to the kernel keyboard driver.
+
+  Doing a cat /dev/input/mouse0 (c, 13, 32) will verify that a mouse is also
+emulated, characters should appear if you move it.
+
+  You can test the joystick emulation with the 'jstest' utility, available
+in the joystick package (see Documentation/joystick.txt).
+
+  You can test the event devics with the 'evtest' utitily available on the
+input driver homepage (see the URL above).
+
+5. Event interface
+~~~~~~~~~~~~~~~~~~
+  Should you want to add event device support into any application (X, gpm,
+svgalib ...) I <vojtech@suse.cz> will be happy to provide you any help I
+can. Here goes a description of the current state of things, which is going
+to be extended, but not changed incompatibly as time goes:
+
+  You can use blocking and nonblocking reads, also select() on the
+/dev/inputX devices, and you'll always get a whole number of input events on
+a read. Their layout is:
+
+struct input_event {
+	struct timeval time;
+	unsigned short type;
+	unsigned short code;
+	unsigned int value;
+};
+
+  'time' is the timestamp, it returns the time at which the event happened.
+Type is for example EV_REL for relative momement, REL_KEY for a keypress or
+release. More types are defined in include/linux/input.h.
+
+  'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete
+list is in include/linux/input.h.
+
+  'value' is the value the event carries. Either a relative change for
+EV_REL, absolute new value for EV_ABS (joysticks ...), or 0 for EV_KEY for
+release, 1 for keypress and 2 for autorepeat.
diff --git a/Documentation/usb/ov511.txt b/Documentation/usb/ov511.txt
index 757f7458f..b4c536ec1 100644
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
@@ -5,42 +5,17 @@ Readme for Linux device driver for the OmniVision OV511 USB to camera bridge IC
 Author: Mark McClelland
 Homepage: http://alpha.dyndns.org/ov511
 
+NEW IN THIS VERSION:
+ o Support for OV511+
+ o Support for OV7620
+
 INTRODUCTION:
 
 This is a preliminary version of my OV511 Linux device driver. Currently, it can
 grab a frame in color (YUV420) at 640x480 or 320x240 using either vidcat or
 xawtv. Other utilities may work but have not yet been tested.
 
-NEW IN THIS VERSION:
- o Preliminary snapshot support
- o Experimental red-blue misalignment fixes
- o Better YUV420 color conversion
- o Module options
- o Finer-grained debug message control
- o Support for new cameras (4, 36)
- o Uses initcalls
-
-SUPPORTED CAMERAS:
-_________________________________________________________
-Manufacturer     | Model           | Custom ID | Status
------------------+-----------------+-----------+---------
-MediaForte       | MV300           | 0         | Working
-Aiptek           | HyperVCam ?     | 0         | Working
-NetView          | NV300M          | 0         | Working
-D-Link           | DSB-C300        | 3         | Working
-Hawking Tech.    | ???             | 3         | Working
-???              | Generic         | 4         | Untested
-Puretek          | PT-6007         | 5         | Working
-Creative Labs    | WebCam 3        | 21        | Working
-???              | Koala-Cam       | 36        | Untested
-Lifeview         | RoboCam         | 100       | Untested
-AverMedia        | InterCam Elite  | 102       | Working
-MediaForte       | MV300           | 112       | Working
-Omnivision       | OV7110 EV board | 112       | Working*
----------------------------------------------------------
-(*) uses OV7110 (monochrome)
-
-Any camera using the OV511 and the OV7610 CCD should work with this driver. The
+Any camera using the OV511/OV511+ and the OV7610/20/20AE CCD should work. The
 driver only detects known cameras though, based on their custom id number. If
 you have a currently unsupported camera, the ID number should be reported to you
 in the kernel logs. Please send me the model, manufacturer and ID number and I 
@@ -140,7 +115,7 @@ MODULE PARAMETERS:
   DESC: The camera normally adjusts exposure, gain, and hue automatically. This
         can be set to 0 to disable this automatic adjustment. Note that there is
         currently no way to set these parameters manually once autoadjust is
-        disabled. (This feature is not working yet)
+        disabled.
 
   NAME: debug
   TYPE: integer (0-6)
@@ -174,7 +149,8 @@ WORKING FEATURES:
  o Color streaming/capture at 640x480 and 320x240
  o YUV420 color
  o Monochrome
- o Setting/getting of saturation, contrast and brightness (no color yet)
+ o Setting/getting of saturation, contrast and brightness (no hue yet; only
+   works with OV7610, not the OV7620 or OV7620AE)
 
 EXPERIMENTAL FEATURES:
  o fix_rgb_offset: Sometimes works, but other times causes errors with xawtv and
@@ -197,13 +173,13 @@ TODO:
  o Get hue (red/blue channel balance) adjustment working (in ov511_get_picture()
    and ov511_set_picture())
  o Get autoadjust disable working
- o Devise some clean way to support different types of CCDs (based on Custom ID)
- o OV511A support
  o V4L2 support (Probably not until it goes into the kernel)
  o Fix I2C initialization. Some people are reporting problems with reading the
    7610 registers. This could be due to timing differences, an excessive I2C
    clock rate, or a problem with ov511_i2c_read().
  o Get rid of the memory management functions (put them in videodev.c??)
+ o Setting of contrast and brightness not working with 7620
+ o Driver/camera state save/restore for when USB supports suspend/resume
 
 HOW TO CONTACT ME:
 
diff --git a/Documentation/usb/proc_usb_info.txt b/Documentation/usb/proc_usb_info.txt
index 8d1066a9f..84510b950 100644
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
@@ -1,16 +1,17 @@
 /proc/bus/usb filesystem output
 ===============================
-(version 19991218)
+(version 2000.03.24)
 
 
 The /proc filesystem for USB devices generates
 /proc/bus/usb/drivers and /proc/bus/usb/devices.
 
-/proc/bus/usb/drivers just lists the registered drivers,
-one per line.  Not very interesting or pretty.
+/proc/bus/usb/drivers lists the registered drivers,
+one per line, with each driver's USB minor dev node
+number range if applicable.
 
 In /proc/bus/usb/devices, each device's output has multiple
-lines (except for a root hub) of ASCII output.
+lines of ASCII output.
 I made it ASCII instead of binary on purpose, so that someone
 can obtain some useful data from it without the use of an
 auxiliary program.  However, with an auxiliary program, the numbers
@@ -22,11 +23,12 @@ different topo/connections and it looked possible.)
 Each line is tagged with a one-character ID for that line:
 
 T = Topology (etc.)
-B = Bandwidth
+B = Bandwidth (applies only to USB host controllers, which are
+    virtualized as root hubs)
 D = Device descriptor info.
 P = Product ID info. (from Device descriptor, but they won't fit
     together on one line)
-S = String info
+S = String descriptors.
 C = Configuration descriptor info. (* = active configuration)
 I = Interface descriptor info.
 E = Endpoint descriptor info.
@@ -93,7 +95,17 @@ S:  Manufacturer=ssss
 |__String info tag
 
 S:  Product=ssss
-|   |__Product description of this device as read from the device.
+|   |__Product description of this device as read from the device,
+|      except that it is a generated string for USB host controllers
+|      (virtual root hubs), in the form "USB *HCI Root Hub".
+|__String info tag
+
+S:  SerialNumber=ssss
+|   |__Serial Number of this device as read from the device,
+|      except that it is a generated string for USB host controllers
+|      (virtual root hubs), and represent's the host controller's
+|      unique identification in the system (currently I/O or
+|      memory-mapped base address).
 |__String info tag
 
 
@@ -142,7 +154,7 @@ where the valid characters are TDPCIE.  With a slightly more able
 script, it can display any selected lines (for example, only T, D,
 and P lines) and change their output format.  (The "procusb"
 Perl script is the beginning of this idea.  It will list only
-selected lines [selected from TDPCIE] or "All" lines from
+selected lines [selected from TBDPSCIE] or "All" lines from
 /proc/bus/usb/devices.)
 
 The Topology lines can be used to generate a graphic/pictorial
@@ -163,6 +175,13 @@ a serial converter connected to the external hub.
 
 T:  Bus=00 Lev=00 Prnt=00 Port=00 Cnt=00 Dev#=  1 Spd=12  MxCh= 2
 B:  Alloc= 28/900 us ( 3%), #Int=  2, #Iso=  0
+D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
+P:  Vendor=0000 ProdID=0000 Rev= 0.00
+S:  Product=USB UHCI Root Hub
+S:  SerialNumber=dce0
+C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr=  0mA
+I:  If#= 0 Alt= 0 #EPs= 1 Cls=09(hub  ) Sub=00 Prot=00 Driver=hub
+E:  Ad=81(I) Atr=03(Int.) MxPS=   8 Ivl=255ms
 T:  Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 4
 D:  Ver= 1.00 Cls=09(hub  ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
 P:  Vendor=0451 ProdID=1446 Rev= 1.00
diff --git a/Documentation/usb/scanner-hp-sane.txt b/Documentation/usb/scanner-hp-sane.txt
index a1cbcd1b4..c47491765 100644
--- a/Documentation/usb/scanner-hp-sane.txt
+++ b/Documentation/usb/scanner-hp-sane.txt
@@ -1,10 +1,11 @@
 Copyright (C) 1999, 2000 David E. Nelson
 
-Jan. 22, 2000
+Mar. 23, 2000
 
 CHANGES
 
 - Amended for Linux-2.3.40
+- Updated for multiple scanner support
 
 
 INTRODUCTION
@@ -30,13 +31,13 @@ http://www.mostang.com/sane/.  Testing has been performed using
 version SANE-1.0.1.  For instructions on building and installing SANE,
 refer to the various README files within the SANE distribution.
 
-The latest SANE HP backend available from http://www.kirchgessner.net.
+The latest SANE HP backend is available from http://www.kirchgessner.net.
 At the time of this writing, version 0.83 was available.
 
 
 OK, I'VE INSTALLED SANE. SO WHAT DO I DO NOW?
 
-NOTE: $INSTALL_DIR is the location where SANE was installed.  It may
+NOTE: $INSTALL_DIR is the location where SANE is installed.  It may
 be /usr/local, /usr, /opt or somewhere else.  If you don't know, ask
 your system administrator.
 
@@ -54,6 +55,9 @@ files: dll.conf, hp.conf.
     /dev/usbscanner
     option connect-device
 
+NOTE: If you are using multiple scanners, make sure to have the correct
+devince, ie /dev/usbscanner0.  See scanner.txt for more info.
+
 3) You should now be able to use SANE (xscanimage or scanimage).
 
 Don't forget to read any relevant man pages regarding the usage of
diff --git a/Documentation/usb/scanner.txt b/Documentation/usb/scanner.txt
index 193035085..a750e191d 100644
--- a/Documentation/usb/scanner.txt
+++ b/Documentation/usb/scanner.txt
@@ -1,12 +1,15 @@
 Copyright (C) 1999, 2000 David E. Nelson
 
-Jan. 22, 2000
+Mar. 23, 2000
 
 CHANGES
 
 - Amended for linux-2.3.40
 - Appended hp_scan.c to end of this README
 - Removed most references to HP
+- Updated uhci/ohci host controller info
+- Updated support for multiple scanner support
+- Updated supported scanners list
 
 
 OVERVIEW
@@ -28,10 +31,8 @@ http://www.linux-usb.org/
 REQUIREMENTS
 
 A host with a USB port.  Ideally, either a UHCI (Intel) or OHCI
-(Compaq and others) hardware port should work.  However, I've only
-been able to really use an OHCI controller.  At the time of this
-writing, both uhci and ohci work with scanner.c *except* for the HP
-4100C which only works with ohci.  This problem is being investigated.
+(Compaq and others) hardware port should work.  At the time of this
+writing, there are two UHCI drivers and one OHCI.
 
 A Linux development kernel (2.3.x) with USB support enabled or a
 backported version to linux-2.2.x.  See http://www.linux-usb.org for
@@ -69,12 +70,26 @@ hardware (determined from the steps above), 'USB Scanner support', and
 (you may need to execute `depmod -a` to update the module
 dependencies).  Testing was performed only as modules, YMMV.
 
-Add a device for the USB scanner:
-  `mknod /dev/usbscanner c 180 48`
+Beginning with version 0.4 of the driver, up to 16 scanners can be
+connected/used simultaneously.  If you intend to use more than
+one scanner at a time:
 
-Set appropriate permissions for /dev/usbscanner (don't forget about
-group and world permissions).  Both read and write permissions are
-required for proper operation.
+   Add a device for the USB scanner:
+	`mknod /dev/usbscanner0 c 180 48`
+	`mknod /dev/usbscanner1 c 180 49`
+                      . 
+                      .
+	`mknod /dev/usb/scanner15 180 63`
+
+
+If you forsee using only one scanner:
+	`mknod /dev/usbscanner0 c 180 48`
+	`ln -s /dev/usbscanner0 /dev/usbscanner`
+
+
+Set appropriate permissions for /dev/usbscanner[0-15] (don't forget
+about group and world permissions).  Both read and write permissions
+are required for proper operation.
 
 Load the appropriate modules (if compiled as modules):
 
@@ -110,25 +125,49 @@ support the listed USB products.
 At the time of this writing, the following scanners were supported by
 scanner.c:
 
+  Acer
+
+    Prisa AcerScan 620U
+
+  Agfa
+
+    SnapScan 1212U, SnapScan Touch
+
+  Genius
+
+    ColorPage Vivid Pro
+
   Hewlett Packard
 
     3300, 4100, 4200, 5200, 6200, 6300, PhotoSmart S20
 
-  AGFA
+  Microtek
 
-    SnapScan 1212U
+    ScanMaker X6-X6U, Phantom 336CX - C3, Phantom C6, ScanMaker V6USL,
+    ScanMaker V6UL - SpicyU
 
-  Umax
+  Mustek
+
+    1200 CU
 
-    Astra 2000U
+  Primax/Colorado
+
+    G2-300, G2-600, G2E-300, G2E-600, ReadyScan 636i, Colorado USB
+    19200, Colorado 600u, Colorado 1200u
 
   Seiko/Epson
 
-    Perfection 636, Perfection 1200U
+    Perfection Perfection 610, Perfection 636U/636Photo, Perfection
+    1200U/1200Photo
 
-  Mustek
+  Umax
+
+    Astra 1220U, 1236U, 2000U
+
+  Visioneer
+
+    OneTouch 5300, OneTouch 7600, 6100,
 
-    1200 CU
 
   User Specified.  See MODULE PARAMETERS for details.
 
@@ -142,11 +181,11 @@ options to the driver.  Simply add 'options scanner vendor=0x####
 product=0x****' to the conf.modules/modules.conf file replacing the
 #'s and the *'s with the correct ID's.  The ID's can be retrieved from
 the messages file or using `cat /proc/bus/usb/devices` if USB /proc
-support was selected during kernel configuration.  In later kernels
-(2.3.38+), a new filesystem was introduced, usbdevfs.  To mount the
-filesystem, issue the command `mount -t usbdevfs /proc/bus/usb
-/proc/bus/usb`.  You can then issue ` cat /proc/bus/usb/devices` to
-extract USB device information.
+support was selected during kernel configuration.  **NOTE**:In later
+kernels (2.3.38+), a new filesystem was introduced, usbdevfs.  To
+mount the filesystem, issue the command `mount -t usbdevfs
+/proc/bus/usb /proc/bus/usb`.  You can then issue ` cat
+/proc/bus/usb/devices` to extract USB device information.
 
 
 BUGS
diff --git a/Documentation/usb/usb-help.txt b/Documentation/usb/usb-help.txt
new file mode 100644
index 000000000..9abd4a08b
--- /dev/null
+++ b/Documentation/usb/usb-help.txt
@@ -0,0 +1,16 @@
+usb-help.txt
+2000-March-24
+
+For USB help other than the readme files that are located in
+linux/Documentation/usb/*, see the following:
+
+Linux-USB project:  http://www.linux-usb.org
+  mirrors at        http://www.suse.cz/development/linux-usb/
+         and        http://usb.in.tum.de/linux-usb/
+Linux USB Guide:    http://linuxusbguide.sourceforge.net
+Linux-USB device overview (working devices and drivers):
+                    http://www.qbik.ch/usb/devices/
+    
+The Linux-USB mailing list is linux-usb@suse.com .
+
+###
diff --git a/Documentation/video4linux/README.cpia b/Documentation/video4linux/README.cpia
new file mode 100644
index 000000000..2674d1fd4
--- /dev/null
+++ b/Documentation/video4linux/README.cpia
@@ -0,0 +1,191 @@
+This is a driver for the CPiA PPC2 driven parallel connected
+Camera. For example the Creative WebcamII is CPiA driven.
+
+   ) [1]Peter Pregler, Linz 2000, published under the [2]GNU GPL
+
+---------------------------------------------------------------------------
+
+USAGE:
+
+General:
+========
+
+1) Make sure you have created the video devices (/dev/video*):
+
+- if you have a recent MAKEDEV do a 'cd /dev;./MAKEDEV video'
+- otherwise do a:
+
+cd /dev
+mknod video0 c 81 0
+ln -s video0 video
+
+2) Compile the kernel (see below for the list of options to use),
+   configure your parport and reboot.
+
+3) If all worked well you should get messages similar
+   to the following (your versions may be different) on the console:
+
+V4L-Driver for Vision CPiA based cameras v0.7.4
+parport0: read2 timeout.
+parport0: Multimedia device, VLSI Vision Ltd PPC2
+Parallel port driver for Vision CPiA based camera
+  CPIA Version: 1.20 (2.0)
+  CPIA PnP-ID: 0553:0002:0100
+  VP-Version: 1.0 0100
+  1 camera(s) found
+
+
+As modules:
+===========
+
+Make sure you have selected the following kernel options (you can
+select all stuff as modules):
+
+The cpia-stuff is in the section 'Character devices -> Video For Linux'.
+
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_1284=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+
+For autoloading of all those modules you need to tell kerneld some
+stuff. Add the following line to your kerneld config-file
+(e.g. /etc/modules.conf or wherever your distribution does store that
+stuff):
+
+options parport_pc dma=3 irq=7
+alias char-major-81 cpia_pp
+
+The first line tells the dma/irq channels to use. Those _must_ match
+the settings of your BIOS. Do NOT simply use the values above.  See
+Documentation/parport.txt for more information about this. The second
+line associates the video-device file with the driver. Of cause you
+can also load the modules once upon boot (usually done in /etc/modules).
+
+Linked into the kernel:
+=======================
+
+Make sure you have selected the following kernel options. Note that
+you cannot compile the parport-stuff as modules and the cpia-driver
+statically (the other way round is okay though).
+
+The cpia-stuff is in the section 'Character devices -> Video For Linux'.
+
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_1284=y
+CONFIG_VIDEO_DEV=y
+CONFIG_VIDEO_CPIA=y
+CONFIG_VIDEO_CPIA_PP=y
+
+To use DMA/irq you will need to tell the kernel upon boot time the
+hardware configuration of the parport. You can give the boot-parameter
+at the LILO-prompt or specify it in lilo.conf. I use the following
+append-line in lilo.conf:
+
+        append="parport=0x378,7,3"
+
+See Documentation/parport.txt for more information about the
+configuration of the parport and the values given above. Do not simply
+use the values given above.
+
+---------------------------------------------------------------------------
+FEATURES:
+
+- mmap/read v4l-interface (but no overlay)
+- image formats: CIF/QCIF, SIF/QSIF, various others used by isabel;
+  note: all sizes except CIF/QCIF are implemented by clipping, i.e.
+  pixels are not uploaded from the camera
+- palettes: VIDEO_PALETTE_GRAY, VIDEO_PALETTE_RGB565, VIDEO_PALETTE_RGB555,
+  VIDEO_PALETTE_RGB24, VIDEO_PALETTE_RGB32, VIDEO_PALETTE_YUYV,
+  VIDEO_PALETTE_UYVY, VIDEO_PALETTE_YUV422
+- state information (color balance, exposure, ...) is preserved between
+  device opens
+- complete control over camera via proc-interface (_all_ camera settings are
+  supported), there is also a python-gtk application available for this [3]
+- works under SMP (but the driver is completly serialized and synchronous)
+  so you get no benefit from SMP, but at least it does not crash your box
+- might work for non-Intel architecture, let us know about this
+
+---------------------------------------------------------------------------
+TESTED APPLICATIONS:
+
+- a simple test application based on Xt is available at [3]
+- another test-application based on gqcam-0.4 (uses GTK)
+- gqcam-0.6 should work
+- xawtv-3.x (also the webcam software)
+- xawtv-2.46
+- w3cam (cgi-interface and vidcat, e.g. you may try out 'vidcat  |xv
+  -maxpect -root -quit +noresetroot -rmode 5 -')
+- vic, the MBONE video conferencing tool (version 2.8ucl4-1)
+- isabel 3R4beta (barely working, but AFAICT all the problems are on
+  their side)
+- camserv-0.40
+
+See [3] for pointers to v4l-applications.
+
+---------------------------------------------------------------------------
+KNOWN PROBLEMS:
+
+- some applications do not handle the image format correctly, you will
+  see strange horizontal stripes instead of a nice picture -> make sure
+  your application does use a supported image size or queries the driver
+  for the actually used size (reason behind this: the camera cannot
+  provide any image format, so if size NxM is requested the driver will
+  use a format to the closest fitting N1xM1, the application should now
+  query for this granted size, most applications do not).
+- all the todo ;)
+- if there is not enough light and the picture is too dark try to
+  adjust the SetSensorFPS setting, automatic frame rate adjustment
+  has its price
+- do not try out isabel 3R4beta (built 135), you will be disappointed
+
+---------------------------------------------------------------------------
+TODO:
+
+- multiple camera support (struct camera or something) - This should work,
+  but hasn't been tested yet.
+- architecture independence?
+- SMP-safe asynchronous mmap interface
+- nibble mode for old parport interfaces
+- streaming capture, this should give a performance gain
+
+---------------------------------------------------------------------------
+IMPLEMENTATION NOTES:
+
+The camera can act in two modes, streaming or grabbing. Right now a
+polling grab-scheme is used. Maybe interrupt driven streaming will be
+used for a ansychronous mmap interface in the next major release of the
+driver. This might give a better frame rate.
+
+---------------------------------------------------------------------------
+THANKS (in no particular order):
+
+- Scott J. Bertin <sbertin@mindspring.com> for cleanups, the proc-filesystem
+  and much more
+- Henry Bruce <whb@vvl.co.uk> for providing developers information about
+  the CPiA chip, I wish all companies would treat Linux as seriously
+- Karoly Erdei <Karoly.Erdei@risc.uni-linz.ac.at> and RISC-Linz for being
+  my boss ;) resp. my employer and for providing me the hardware and
+  allow me to devote some working time to this project
+- Manuel J. Petit de Gabriel <mpetit@dit.upm.es> for providing help
+  with Isabel (http://isabel.dit.upm.es/)
+- Bas Huisman <bhuism@cs.utwente.nl> for writing the initial parport code
+- Jarl Totland <Jarl.Totland@bdc.no> for setting up the mailing list 
+  and maintaining the web-server[3]
+- Chris Whiteford <Chris@informinteractive.com> for fixes related to the
+  1.02 firmware
+- special kudos to all the tester whose machines crashed and/or
+  will crash. :)
+
+---------------------------------------------------------------------------
+REFERENCES
+
+   1. http://www.risc.uni-linz.ac.at/people/ppregler
+      mailto:Peter_Pregler@email.com
+   2. see the file COPYING in the top directory of the kernel tree
+   3. http://webcam.sourceforge.net/
diff --git a/Documentation/video4linux/bttv/CARDLIST b/Documentation/video4linux/bttv/CARDLIST
index 495eb7e3d..e41e60edf 100644
--- a/Documentation/video4linux/bttv/CARDLIST
+++ b/Documentation/video4linux/bttv/CARDLIST
@@ -37,6 +37,7 @@ bttv.o
   card=35 - Chronos Video Shuttle II
   card=36 - Typhoon TView TV/FM Tuner
   card=37 - PixelView PlayTV pro
+  card=38 - TView99 CPH063
 
 tuner.o
   type=0 - Temic PAL
@@ -53,3 +54,4 @@ tuner.o
   type=11 - Alps TSBB5
   type=12 - Alps TSBE5
   type=13 - Alps TSBC5
+  type=14 - Temic 4006FH5