o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

1 files changed, 1757 insertions, 974 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index 5766188db..7f6d6fd18 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -5,15 +5,19 @@
 # development kernels and need not be completely stable.
 #
 # Translations of this file available on the WWW:
+#
 #   - http://jf.gee.kyoto-u.ac.jp/JF/JF-ftp/euc/Configure.help.euc
 # is a Japanese translation, maintained by Tetsuyasu YAMADA
-# (tetsu@cauchy.nslab.ntt.jp). 
+# (tetsu@cauchy.nslab.ntt.co.jp).
 #   - http://nevod.perm.su/service/linux/doc/kernel/Configure.help 
 # is a Russian translation, maintained by kaf@linux.nevod.perm.su.
 #   - http://www.linux-kheops.com/traduc/kernels/
 # has a French translation of the whole kernel, including
 # Configure.help. This is maintained by David Bourgin
 # (dbourgin@wsc.com). 
+#   - http://visar.csustan.edu/~carlos/ contains Spanish translations 
+# of the 2.0 kernel documentation files, produced by Carlos Perelló 
+# Marín (fperllo@ehome.encis.es). 
 #   - ftp://ftp-pavia1.linux.it/pub/linux/Configure.help
 # is a work-in-progress effort of the Italian translation team,
 # currently only for the 2.0 version of this file, maintained 
@@ -24,14 +28,14 @@
 #
 # Information about what a kernel is, what it does, how to patch and
 # compile it and much more is contained in the Kernel-HOWTO, available
-# via ftp (user: anonymous) from sunsite.unc.edu in the directory
+# via FTP (user: anonymous) from sunsite.unc.edu in the directory
 # /pub/Linux/docs/HOWTO. Before you start compiling, make sure that
 # you have the necessary versions of all programs and libraries
 # required to compile and run this kernel; they are listed in the file
 # Documentation/Changes. Make sure to read the toplevel kernel README 
 # file as well.
 #
-# Format of this file: description<nl>variable<nl>helptext<nl><nl>. If
+# Format of this file: description<nl>variable<nl>help text<nl><nl>. If
 # the question being documented is of type "choice", we list only the
 # first occurring config variable. The help texts may contain empty
 # lines, but every non-empty line must be indented two positions.
@@ -99,7 +103,7 @@ CONFIG_MATH_EMULATION
   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 via ftp (user: anonymous) in
+  available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.) 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 Linux
@@ -152,28 +156,58 @@ CONFIG_BLK_DEV_INITRD
 
 Loop device support
 CONFIG_BLK_DEV_LOOP
-  Saying Y here will allow you to mount a file as a file system. This
-  is useful if you want to check an ISO9660 file system before burning
-  the CD, or want to use floppy images without first writing them to
-  floppy. This option also allows you to mount a filesystem with
-  encryption. To use these features, you need a recent version of
-  mount (available via ftp (user: anonymous) from
-  ftp://ftp.win.tue.nl/pub/linux/util/). Note that this loop device
-  has nothing to do with the loopback device used for network
-  connections from the machine to itself. Most users will answer N
-  here.
+  Saying Y here will allow you to use a regular file as a block
+  device; you can then create a file system on that block device and
+  mount it just as you would mount other block devices such as hard drive
+  partitions, CDROM drives or floppy drives.
+
+  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.
+
+  The loop device driver can also be used to "hide" a filesystem in a
+  disk partition, floppy, or regular file, either using encryption
+  (scrambling the data) or steganography (hiding the data in the low
+  bits of, say, a sound file). This is also safe if the file resides
+  on a remote file server. If you want to do this, you will first have
+  to acquire and install a kernel patch from
+  ftp://ftp.replay.com/pub/crypto/linux/all, and then you need to say
+  Y to this option.
+
+  Note that alternative ways use encrypted filesystems are provided by
+  the cfs package, which can be gotten via FTP (user: anonymous) from
+  ftp://ftp.replay.com/pub/crypto/disk/, and the newer tcfs package,
+  available at http://tcfs.dia.unisa.it/. These do not require any
+  kernel support and you can say N here if you want to use one of
+  them.
+
+  To use the loop device, you need the losetup utility and a recent
+  version of the mount program, both contained in the util-linux
+  package (available via FTP (user: anonymous) from
+  ftp://ftp.win.tue.nl/pub/linux/util/).
+
+  Note that this loop device has nothing to do with the loopback
+  device used for network connections from the machine to itself.
+
+  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 loop.o.
+
+  Most users will answer N here.
 
 Network Block Device support
 CONFIG_BLK_DEV_NBD
-  Saying Y here will allow your computer to serve as a client for
-  network block devices - it will be able to use block devices
-  exported by servers (mount filesystems on them etc.). Communication
-  between client and server works over TCP/IP networking, but to the
-  client program this is hidden: it looks like a regular local file
-  access to a special file such as /dev/nd0. It also allows you to run
-  a block-device in userland (making server and client physically the
-  same computer, communicating using the loopback network device). 
-  Read Documentation/nbd.txt for details.
+  Saying Y here will allow your computer to be a client for network
+  block devices - it will be able to use block devices exported by
+  servers (mount filesystems on them etc.). Communication between
+  client and server works over TCP/IP networking, but to the client
+  program this is hidden: it looks like a regular local file access to
+  a special file such as /dev/nd0. It also allows you to run a
+  block-device in userland (making server and client physically the
+  same computer, communicating using the loopback network device).
+  Read Documentation/nbd.txt for more information, especially about
+  where to find the server code.
 
   Note that this has nothing to do with the network file system NFS;
   you can say N here even if you intend to use NFS.
@@ -195,7 +229,7 @@ CONFIG_BLK_DEV_IDE
   Useful information about large (>540MB) IDE disks, sound card IDE
   ports, module support, and other topics, is contained in
   Documentation/ide.txt. For detailed information about hard drives,
-  consult the Disk-HOWTO, available via ftp (user: anonymous) from
+  consult the Disk-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. To fine-tune IDE
   drive/interface parameters for improved performance, look for the
   hdparm package at
@@ -218,7 +252,7 @@ CONFIG_BLK_DEV_HD_ONLY
   for systems with only older MFM/RLL/ESDI drives. Choosing the old
   driver can save 13kB or so of kernel memory. If you are unsure, then
   just choose the Enhanced IDE/MFM/RLL driver instead of this one. For
-  more detailed information, read the Disk-HOWTO, available via ftp
+  more detailed information, read the Disk-HOWTO, available via FTP
   (user: anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
 Use old disk-only driver on primary interface
@@ -260,9 +294,9 @@ CONFIG_BLK_DEV_IDECD
   along with other IDE devices, as "hdb" or "hdc", or something
   similar (check the boot messages with dmesg). If this is your only
   CDROM drive, you can say N to all other CDROM options, but be sure
-  to say Y to "ISO9660 cdrom filesystem support".
+  to say Y or M to "ISO 9660 CDROM filesystem support".
 
-  Read the CDROM-HOWTO, available via ftp (user: anonymous) in
+  Read the CDROM-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO and the file
   Documentation/cdrom/ide-cd. Note that older versions of lilo (the
   Linux boot loader) cannot properly deal with IDE/ATAPI CDROMs, so
@@ -314,12 +348,21 @@ SCSI emulation support
 CONFIG_BLK_DEV_IDESCSI
   This will provide SCSI host adapter emulation for IDE ATAPI devices,
   and will allow you to use a SCSI device driver instead of a native
-  ATAPI driver. 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. If both this SCSI emulation and
-  native ATAPI support are compiled into the kernel, the native
-  support will be used.  Normally, say N.
+  ATAPI driver.
+
+  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.
+
+  Note that this option does NOT allow you to attach SCSI devices to a
+  box that doesn't have a SCSI host adapter installed.
+
+  If both this SCSI emulation and native ATAPI support are compiled
+  into the kernel, the native support will be used.
+
+  If unsure, say N.
 
 CMD640 chipset bugfix/support
 CONFIG_BLK_DEV_CMD640
@@ -338,7 +381,7 @@ CONFIG_BLK_DEV_CMD640
   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 via ftp (user: anonymous) in
+  the SCSI-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.)
 
   The CMD640 chip is also used on add-in cards by Acculogic, and on
@@ -374,10 +417,8 @@ Generic PCI bus-master DMA support
 CONFIG_BLK_DEV_IDEDMA
   If your PCI system uses IDE drive(s) (as opposed to SCSI, say) and
   is capable of bus-master DMA operation (most Pentium PCI systems),
-  you will want to say Y here to reduce CPU overhead.  With this
-  option, Linux will automatically enable DMA transfers in most cases,
-  noting this with "DMA" appended to the drive identification info.
-  You can also use the "hdparm" utility to enable DMA for drives which
+  you will want to say Y here to reduce CPU overhead.
+  You can use the "hdparm" utility to enable DMA for drives which
   were not enabled automatically.  You can get the latest version of
   the hdparm utility via anonymous FTP from
   ftp://sunsite.unc.edu/pub/Linux/system/hardware/. 
@@ -387,6 +428,18 @@ CONFIG_BLK_DEV_IDEDMA
 
   It is safe to say Y to this question.
 
+Use DMA by default when available
+CONFIG_IDEDMA_AUTO
+  Prior to kernel version 2.1.112, Linux used to automatically use
+  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 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!
+
+  It is nearly always safe to say Y to this question.
+
 Other IDE chipset support
 CONFIG_IDE_CHIPSETS
   Say Y here if you want to include enhanced support for various IDE
@@ -451,46 +504,51 @@ NS87415 support (EXPERIMENTAL)
 CONFIG_BLK_DEV_NS87415
   This driver adds detection and support for the NS87415 chip
   (used in SPARC64, among others).
+
   Please read the comments at the top of drivers/block/ns87415.c.
 
 QDI QD6580 support
 CONFIG_BLK_DEV_QD6580
   This driver is enabled at runtime using the "ide0=qd6580" kernel
   boot parameter.  It permits faster I/O speeds to be set.  See the
-  Documentation/ide.txt and qd6580.c files for more info.
+  files Documentation/ide.txt and qd6580.c for more info.
 
 UMC 8672 support
 CONFIG_BLK_DEV_UMC8672
   This driver is enabled at runtime using the "ide0=umc8672" kernel
   boot parameter.  It enables support for the secondary IDE interface
   of the UMC-8672, and permits faster I/O speeds to be set as well.
-  See the Documentation/ide.txt and umc8672.c files for more info.
+  See the files Documentation/ide.txt and umc8672.c for more info.
 
 ALI M14xx support
 CONFIG_BLK_DEV_ALI14XX
   This driver is enabled at runtime using the "ide0=ali14xx" kernel
   boot parameter.  It enables support for the secondary IDE interface
   of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster
-  I/O speeds to be set as well.  See the Documentation/ide.txt and
-  ali14xx.c files for more info.
+  I/O speeds to be set as well. See the files Documentation/ide.txt
+  and ali14xx.c for more info.
 
 Apple Macintosh builtin IDE interface support (EXPERIMENTAL)
 CONFIG_BLK_DEV_MAC_IDE
   This is the IDE driver for the builtin IDE interface on some Apple
   Macintosh models.  It supports both the Quadra/Performa/LC 630 and
   the PowerBook 190 IDE interface.
+
   Say Y if you have such a Macintosh model and want to use IDE devices
   (hard disks, CD-ROM drives, etc.) that are connected to the builtin
   IDE interface.
 
 XT hard disk support
 CONFIG_BLK_DEV_XD
-  Very old 8 bit hard disk controllers used in the IBM XT computer. To
-  include a driver for these, say Y. 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 called xd.o. It's
-  pretty unlikely that you have one of these: say N.
+  Very old 8 bit hard disk controllers used in the IBM XT computer
+  will be supported if you say Y here. 
+
+  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
+  called xd.o. 
+
+  It's pretty unlikely that you have one of these: say N.
 
 Parallel port IDE device support
 CONFIG_PARIDE
@@ -539,8 +597,8 @@ CONFIG_PARIDE_PCD
   must also have at least one parallel port protocol driver in your
   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 to "ISO9660
-  cdrom filesystem support" below, because that's the filesystem used
+  you have such a CD-ROM drive, you should also say Y or M to "ISO 9660
+  CDROM filesystem support" below, because that's the filesystem used
   on CDROMs.
 
 Parallel port ATAPI disks
@@ -566,6 +624,21 @@ CONFIG_PARIDE_PT
   your system.  Among the devices supported by this driver is the
   parallel port version of the HP 5GB drive.
 
+Parallel port generic ATAPI devices
+CONFIG_PARIDE_PG
+  This option enables a special high-level driver for generic ATAPI
+  devices connected through a parallel port. The driver allows user
+  programs, such as cdrecord, to send ATAPI commands directly to a
+  device. If you chose to build PARIDE support into your kernel, you 
+  may answer Y here to build in the parallel port generic ATAPI driver, 
+  otherwise you should answer M to build it as a loadable module.
+  The module will be called pg.o.  You must also have at least one 
+  parallel port protocol driver in your system.  This driver 
+  implements an API loosely related to the generic SCSI driver.  
+  See /usr/include/linux/pg.h for details, or visit 
+  http://www.torque.net/parport/cdr.html for more information and
+  the required patches to cdrecord.
+
 ATEN EH-100 protocol
 CONFIG_PARIDE_ATEN 
   This option enables support for the ATEN EH-100 parallel port IDE
@@ -626,6 +699,28 @@ CONFIG_PARIDE_EPIA
   The module will be called epia.o.  You must also have a high-level 
   driver for the type of device that you want to support.
 
+FIT TD-2000 protocol
+CONFIG_PARIDE_FIT2
+  This option enables support for the TD-2000 parallel port IDE protocol
+  from Fidelity International Technology.  This is a simple (low speed) 
+  adapter that is used in some portable hard drives.  If you chose to 
+  build PARIDE support into your kernel, you may answer Y here to 
+  build in the protocol driver, otherwise you should answer M to 
+  build it as a loadable module.  The module will be called ktti.o.  
+  You must also have a high-level driver for the type of device 
+  that you want to support.
+
+FIT TD-3000 protocol
+CONFIG_PARIDE_FIT3
+  This option enables support for the TD-3000 parallel port IDE
+  protocol from Fidelity International Technology. This protocol is
+  used in newer models of their portable disk, CD-ROM and PD/CD
+  devices. If you chose to build PARIDE support into your kernel, you
+  may answer Y here to build in the protocol driver, otherwise you
+  should answer M to build it as a loadable module. The module will be
+  called fit3.o. You must also have a high-level driver for the type
+  of device that you want to support.
+
 FreeCom power protocol
 CONFIG_PARIDE_FRPW 
   This option enables support for the Freecom power parallel port IDE 
@@ -646,6 +741,17 @@ CONFIG_PARIDE_KBIC
   kbic.o.  You must also have a high-level driver for the type of device 
   that you want to support.
 
+KT PHd protocol
+CONFIG_PARIDE_KTTI
+  This option enables support for the "PHd" parallel port IDE protocol
+  from KT Technology.  This is a simple (low speed) adapter that is
+  used in some 2.5" portable hard drives.  If you chose to build PARIDE 
+  support into your kernel, you may answer Y here to build in the 
+  protocol driver, otherwise you should answer M to build it as a 
+  loadable module.  The module will be called ktti.o.  You must also 
+  have a high-level driver for the type of device that you want to
+  support.
+
 OnSpec 90c20 protocol
 CONFIG_PARIDE_ON20 
   This option enables support for the (obsolete) 90c20 parallel port 
@@ -672,10 +778,10 @@ CONFIG_BLK_DEV_MD
   logical block device. This can be used to combine several redundant
   hard disks to a RAID1/4/5 device so as to provide protection against
   hard disk failures. More information and the necessary tools are
-  available over ftp (user: anonymous) from
+  available over FTP (user: anonymous) from
   ftp://sweet-smoke.ufr-info-p7.ibp.fr/pub/Linux in the md package and
   the md-FAQ. Please read drivers/block/README.md and the relevant
-  section of the Disk-HOWTO, available via ftp (user: anonymous) from
+  section of the Disk-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If unsure, say N.
 
 Linear (append) mode
@@ -741,6 +847,24 @@ CONFIG_MD_MIRRORING
   want to compile it as a module, say M here and read
   Documentation/modules.txt. If unsure, say Y.
 
+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.
+
+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.
+
+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 here.
+
 Boot support (linear, striped)
 CONFIG_MD_BOOT
   To boot with an initial linear or striped md device you have to say
@@ -825,7 +949,7 @@ CONFIG_NET_ALIAS
   typically used for services that act differently based on the
   address they listen on (e.g. "multihosting" or "virtual domains" or
   "virtual hosting services" on the web server apache and the ftp
-  server wuftpd -- read the Virtual-Services-HOWTO, available via ftp
+  server wuftpd -- read the Virtual-Services-HOWTO, available via FTP
   (user: anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO)
   or for connecting to different logical networks through the same
   physical interface (most commonly an Ethernet networking card). See
@@ -873,11 +997,10 @@ CONFIG_FIREWALL
   is talking to the firewall box -- makes the local network completely
   invisible to the outside world and avoids the need to allocate
   globally valid IP host addresses for the machines on the local net)
-  and IP packet accounting (keeping track of what is using up all your
-  network bandwidth) and IP transparent proxying (makes the computers
-  on the local network think they're talking to a remote computer,
-  while in reality the traffic is redirected by your Linux firewall to
-  a local proxy server).
+  and IP transparent proxying (makes the computers on the local
+  network think they're talking to a remote computer, while in reality
+  the traffic is redirected by your Linux firewall to a local proxy
+  server).
   
   Make sure to say N to "Fast switching" below if you intend to say Y
   here.
@@ -901,6 +1024,11 @@ CONFIG_SYN_COOKIES
   about SYN cookies, check out
   ftp://koobera.math.uic.edu/pub/docs/syncookies-archive.
 
+  If you are SYN flooded, the source address reported by the kernel is
+  likely to have been forged by the attacker; it is only reported as
+  an aid in tracing the packets to their actual source and should not
+  be taken as absolute truth.
+
   If you say Y here, note that SYN cookies aren't enabled by default;
   you can enable them by saying Y to "/proc filesystem support" and
   "Sysctl support" below and executing the command
@@ -913,16 +1041,16 @@ CONFIG_SYN_COOKIES
 
 Sun floppy controller support
 CONFIG_BLK_DEV_SUNFD
-  This is support for floppy drives on Sun Sparc workstations. Say Y
+  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_AVANTI
   Find out what type of Alpha motherboard you have. You will probably
-  want to read the Linux/Alpha homepage on the WWW at
+  want to read the Linux/Alpha home page on the WWW at
   http://www.azstarnet.com/~axplinux/ (to browse the WWW, you need to
   have access to a machine on the Internet that has a program like
-  lynx or netscape) and also the Alpha-HOWTO, available via ftp (user:
+  lynx or netscape) and also the Alpha-HOWTO, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. For this
   question, it suffices to give a unique prefix of the option you want
   to choose. The choices:
@@ -1000,7 +1128,7 @@ CONFIG_SERIAL_MANY_PORTS
   Say Y here if you have dumb serial boards other than the four
   standard COM 1/2/3/4 ports. This may happen if you have an AST
   FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
-  via ftp (user: anonymous) from
+  via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini), or other custom
   serial port hardware which acts similar to standard serial port
   hardware. If you only use the standard COM 1/2/3/4 ports, you can
@@ -1013,18 +1141,15 @@ CONFIG_SERIAL_SHARE_IRQ
   serial ports on the same board to share a single IRQ.  To enable
   support for this in the serial driver, say Y here.
 
-Autodetect IRQ on standard ports (unsafe)
+Auto detect IRQ on standard ports (unsafe)
 CONFIG_SERIAL_DETECT_IRQ
-  Enable this option if you want the kernel to try to guess which IRQ
-  is configured during the boot sequence and you're too lazy to edit
-  the boot scripts to use the setserial command.  This option can be
-  unsafe and should not be enabled on most machines.  It is far
-  better to dynamically request autoconfiguration during the boot-time
-  scripts using the setserial command.  You can change the IRQ and/or 
-  request automatic IRQ configuration at any time by using the 
-  "setserial" program.  I wouldn't include this config option at all except
-  people keep bellyaching about it.  I guess they are really are too lazy 
-  to edit their boot scripts.  :-)   If unsure, say No.
+  Say Y here if you want the kernel to try to guess which IRQ
+  to use for your serial port. 
+
+  This is considered unsafe; it is far better to configure the IRQ in
+  a boot script using the setserial command.
+
+  If unsure, say N.
 
 Support special multiport boards
 CONFIG_SERIAL_MULTIPORT
@@ -1056,6 +1181,26 @@ CONFIG_HUB6
   Say Y here to enable support in the dumb serial driver to support
   the HUB6 card.
 
+Unix98 PTY support
+CONFIG_UNIX98_PTYS
+  Linux traditionally uses BSD-like /dev/ptyxx and /dev/ttyxx names
+  for pseudo-ttys (PTYs).  This scheme has a number or problems.  The
+  GNU C library 2.1 and later, however, supports the Unix98 naming
+  standard, using a cloning device /dev/ptmx and numbered devices in a
+  subdirectory /dev/pts/xxx.  The device nodes in /dev/pts can be
+  automatically generated by the devpts virtual filesystem.
+
+  Say Y here if you are uncertain, unless you are very short on memory.
+
+Maximum number of Unix98 PTYs in use (0-2048)
+CONFIG_UNIX98_PTY_COUNT
+  The maximum number of Unix98 PTYs that can be used at any one time.
+  The default is 256, and should be enough for desktop systems,
+  however, server machines which support incoming telnet/rlogin/ssh
+  connections may want to increase this.  When not in use, each
+  additional set of 256 PTYs occupy approximately 8K of kernel memory
+  on 32-bit architectures.
+
 TGA Console Support
 CONFIG_TGA_CONSOLE
   Many Alpha systems (e.g the Multia) are shipped with a graphics card
@@ -1070,9 +1215,10 @@ CONFIG_PCI
   bus system, i.e. the way the CPU talks to the other stuff inside
   your box. Other bus systems are ISA, EISA, Microchannel (MCA) or
   VESA. If you have PCI, say Y, otherwise N. The PCI-HOWTO, available
-  via ftp (user: anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO,
-  contains valuable information about which PCI hardware does work
-  under Linux and which doesn't.
+  via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO, contains valuable
+  information about which PCI hardware does work under Linux and which
+  doesn't.
 
   If some of your PCI devices don't work and you get a warning during
   boot time ("man dmesg"), please follow the instructions at the top
@@ -1102,8 +1248,9 @@ CONFIG_PCI_DIRECT
 PCI quirks
 CONFIG_PCI_QUIRKS
   If you have a broken BIOS, it may fail to set up the PCI bus in a
-  correct or optimal fashion. If your BIOS is fine you can say N here
-  for a very slightly smaller kernel. If unsure, say Y.
+  correct or optimal fashion. Saying Y here will correct that problem.
+  If your BIOS is fine you can say N here for a very slightly smaller
+  kernel. If unsure, say Y.
 
 PCI bridge optimization (experimental)
 CONFIG_PCI_OPTIMIZE
@@ -1142,12 +1289,12 @@ CONFIG_SYSVIPC
   and exchange information. It is generally considered to be a good
   thing, and some programs won't run unless you say Y here. In
   particular, if you want to run the DOS emulator dosemu under Linux
-  (read the DOSEMU-HOWTO, available via ftp (user: anonymous) in
+  (read the DOSEMU-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO), you'll need to say Y
   here.
   
   You can find documentation about IPC with "info ipc" and also in
-  section 6.4 of the Linux Programmer's Guide, available via ftp
+  section 6.4 of the Linux Programmer's Guide, available via FTP
   (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/LDP/programmers-guide.
 
@@ -1236,7 +1383,7 @@ CONFIG_BINFMT_JAVA
   becoming a universal executable format.
 
   If you want to execute JAVA binaries, read the Java on Linux HOWTO,
-  available via ftp (user: anonymous) at
+  available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You will then need to
   install the run time system contained in the Java Developers Kit
   (JDK) as described in the HOWTO. This is completely independent of
@@ -1302,7 +1449,7 @@ CONFIG_BINFMT_MISC
 Solaris binary emulation
 CONFIG_SOLARIS_EMUL
   This is experimental code which will enable you to run (many)
-  Solaris binaries on your Sparc Linux machine.  
+  Solaris binaries on your SPARC Linux machine.  
 
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -1340,6 +1487,12 @@ CONFIG_M386
 
   If you don't know what to do, choose "386".
 
+VGA text console
+CONFIG_VGA_CONSOLE
+  Saying Y here will allow you to use Linux in text mode through a
+  display that complies with the generic VGA standard. Virtually
+  everyone wants that. Say Y.
+
 Video mode selection support
 CONFIG_VIDEO_SELECT
   This enables support for text mode selection on kernel startup. If
@@ -1350,11 +1503,307 @@ CONFIG_VIDEO_SELECT
   "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 via ftp (user: anonymous) in
+  explained in the SCSI-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Read
   Documentation/svga.txt for more information about the Video mode
   selection support. If unsure, say N.
 
+Support for frame buffer devices (EXPERIMENTAL)
+CONFIG_FB
+  The frame buffer device provides an abstraction for the graphics
+  hardware. It represents the frame buffer of some video hardware and
+  allows application software to access the graphics hardware through
+  a well-defined interface, so the software doesn't need to know
+  anything about the low-level (hardware register) stuff. This works
+  across the different architectures supported by Linux and makes the
+  implementation of application programs easier and more portable; at
+  this point, an X server exists which uses the frame buffer device
+  exclusively.
+
+  The device is accessed through special device nodes, usually located
+  in the /dev directory, i.e. /dev/fb*.
+
+  Please read the file Documentation/fb/framebuffer.txt for more
+  information.
+
+  If you want to play with it, say Y here and to the driver for your
+  graphics board, below. If unsure, say N.
+
+Acorn VIDC support
+CONFIG_FB_ACORN
+  This is the frame buffer device driver for the Acorn VIDC graphics
+  chipset.
+
+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
+  chipset found in Amigas.
+
+Amiga OCS chipset support
+CONFIG_FB_AMIGA_OCS
+  This enables support for the original Agnus and Denise video chips,
+  found in the Amiga 1000 and most A500's and A2000's.  If you intend
+  to run Linux on any of these systems, say Y; otherwise say N.
+
+Amiga ECS chipset support
+CONFIG_FB_AMIGA_ECS
+  This enables support for the Enhanced Chip Set, found in later
+  A500's, later A2000's, the A600, the A3000, the A3000T and CDTV.  If
+  you intend to run Linux on any of these systems, say Y; otherwise
+  say N.
+
+Amiga AGA chipset support
+CONFIG_FB_AMIGA_AGA
+  This enables support for the Advanced Graphics Architecture (also
+  known as the AGA or AA) Chip Set, found in the A1200, A4000, A4000T
+  and CD32.  If you intend to run Linux on any of these systems, say Y;
+  otherwise say N.
+
+Amiga CyberVision support
+CONFIG_FB_CYBER
+  This enables support for the Cybervision 64 graphics card from Phase5.
+  Please note that its use is not all that intuitive (i.e. if you have
+  any questions, be sure to ask!).  Say N unless you have a Cybervision
+  64 or plan to get one before you next recompile the kernel.         
+  Please note that this driver DOES NOT support the Cybervision 64 3D
+  card, as they use incompatible video chips.           
+
+Amiga CyberVision3D support (EXPERIMENTAL)
+CONFIG_FB_VIRGE
+  This enables support for the Cybervision 64/3D graphics card from Phase5.
+  Please note that its use is not all that intuitive (i.e. if you have
+  any questions, be sure to ask!).  Say N unless you have a Cybervision
+  64/3D or plan to get one before you next recompile the kernel.         
+  Please note that this driver DOES NOT support the older Cybervision 64
+  card, as they use incompatible video chips.           
+
+Amiga RetinaZ3 support (EXPERIMENTAL)
+CONFIG_FB_RETINAZ3
+  This enables support for the Retina Z3 graphics card. Say N unless you
+  have a Retina Z3 or plan to get one before you next recompile the kernel.
+
+Amiga CLgen driver (EXPERIMENTAL)
+CONFIG_FB_CLGEN
+  This enables support for Cirrus Logic GD542x/543x based boards on Amiga:
+  SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.  Say N
+  unless you have such a graphics board or plan to get one before you next
+  recompile the kernel.
+
+Atari native chipset support
+CONFIG_FB_ATARI
+  This is the frame buffer device driver for the builtin graphics
+  chipset found in Ataris.
+
+Open Firmware frame buffer device support 
+CONFIG_FB_OF
+  Say Y if you want support with Open Firmware for your graphics board.
+
+S3 Trio frame buffer device support 
+CONFIG_FB_S3TRIO
+  If you have a S3 Trio say Y. Say N for S3 Virge. 
+
+ATI Mach64 display support
+CONFIG_FB_ATY
+  This driver supports graphics boards with the ATI Mach64 chips.
+
+PowerMac "control" frame buffer device support
+CONFIG_FB_CONTROL
+  This driver supports a frame buffer for the graphics adapter in the
+  Power Macintosh 7300 and others.
+
+PowerMac "platinum" frame buffer device support
+CONFIG_FB_PLATINUM
+  This driver supports a frame buffer for the "platinum" graphics adapter
+  in some Power Macintoshes.
+
+Chips 65550 display support
+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.
+
+VGA chipset support (text only)
+CONFIG_FB_VGA
+  This is the frame buffer device driver for generic VGA chips. This
+  driver works only in text mode; if you want graphics mode, say Y to
+  "VESA VGA graphics console" as well.
+
+TGA frame buffer support' 
+CONFIG_FB_TGA
+  This is the frame buffer device driver for generic TGA graphic cards.
+  Say Y if you have one of those.
+
+VESA VGA graphics console
+CONFIG_FB_VESA
+  This is the frame buffer device driver for generic VESA graphic cards.
+  Please read Documentation/fb/vesafb.txt.
+
+MDA dual-headed support
+CONFIG_FB_MDA
+  Say Y here if you have an old MDA or monochrome Hercules graphics
+  adapter in your system acting as a second head ( = video card).  Do 
+  not enable this driver if your MDA card is the primary card in your
+  system; the normal VGA driver will handle it.
+  
+  This 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 mdafb.o.  If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+  
+  If unsure, say N.
+
+SBUS and UPA framebuffers
+CONFIG_FB_SBUS
+  Say Y if you want support for SBUS or UPA based frame buffer device.
+
+Creator/Creator3D support
+CONFIG_FB_CREATOR
+  This is the frame buffer device driver for the Creator and Creator3D
+  graphics boards.
+
+CGsix (GX,TurboGX) support
+CONFIG_FB_CGSIX
+  This is the frame buffer device driver for the CGsix (GX, TurboGX)
+  frame buffer.
+
+BWtwo support
+CONFIG_FB_BWTWO
+  This is the frame buffer device driver for the BWtwo frame buffer.
+
+CGthree support
+CONFIG_FB_CGTHREE
+  This is the frame buffer device driver for the CGthree frame buffer.
+
+TCX (SS4/SS5 only) support
+CONFIG_FB_TCX
+  This is the frame buffer device driver for the TCX 24/8bit frame buffer.
+
+Virtual Frame Buffer support (ONLY FOR TESTING!)
+CONFIG_FB_VIRTUAL
+  This is a `virtual' frame buffer device.  It operates on a chunk of
+  unswapable kernel memory instead of on the memory of a graphics board.
+  This means you cannot see any output sent to this frame buffer device,
+  while it does consume precious memory.  The main use of this frame
+  buffer device is testing and debugging the frame buffer subsystem. Do
+  NOT enable it for normal systems! To protect the innocent, it has to
+  be enabled explicitly on boot time using the kernel option `video=vfb:'.
+
+  This 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 vfb.o.  If you want to compile it as
+  a module, say M here and read Documentation/modules.txt.
+ 
+  If unsure, say N.
+
+Advanced low level driver options
+CONFIG_FBCON_ADVANCED
+  The frame buffer console uses character drawing routines that are
+  tailored to the specific organization of pixels in the memory of your
+  graphics hardware.  These are called the low level frame buffer console
+  drivers. Note that they are used for text console output only; they are
+  NOT needed for graphical applications.
+
+  If you do not enable this option, the needed low level drivers are
+  automatically enabled, depending on what frame buffer devices you
+  selected. This is recommended for most users.
+
+  If you enable this option, you have more fine-grained control over which
+  low level drivers are enabled. You can e.g. leave out low level drivers
+  for color depths you do not intend to use for text consoles.
+
+  Low level frame buffer console drivers can be modules ( = code which
+  can be inserted and removed from the running kernel whenever you want).
+  The modules will be called fbcon-*.o.  If you want to compile (some of)
+  them as modules, read Documentation/modules.txt.
+  
+  If unsure, say N.
+
+Monochrome support
+CONFIG_FBCON_MFB
+  This is the low level frame buffer console driver for monochrome
+  (2 colors) packed pixels.
+
+2 bpp packed pixels support
+CONFIG_FBCON_CFB2
+  This is the low level frame buffer console driver for 2 bits per pixel
+  (4 colors) packed pixels.
+
+4 bpp packed pixels support
+CONFIG_FBCON_CFB4
+  This is the low level frame buffer console driver for 4 bits per pixel
+  (16 colors) packed pixels.
+
+8 bpp packed pixels support
+CONFIG_FBCON_CFB8
+  This is the low level frame buffer console driver for 8 bits per pixel
+  (256 colors) packed pixels.
+
+16 bpp packed pixels support
+CONFIG_FBCON_CFB16
+  This is the low level frame buffer console driver for 15 or 16 bits
+  per pixel (32K or 64K colors, also known as `hicolor') packed pixels.
+
+24 bpp packed pixels support
+CONFIG_FBCON_CFB24
+  This is the low level frame buffer console driver for 24 bits per
+  pixel (16M colors, also known as `truecolor') packed pixels. It is
+  NOT for `sparse' 32 bits per pixel mode.
+
+32 bpp packed pixels support
+CONFIG_FBCON_CFB32
+  This is the low level frame buffer console driver for 32 bits per pixel
+  (16M colors, also known as `truecolor') sparse packed pixels.
+
+Amiga bitplanes support
+CONFIG_FBCON_AFB
+  This is the low level frame buffer console driver for 1 to 8 bitplanes
+  (2 to 256 colors) on Amiga.
+
+Amiga interleaved bitplanes support
+CONFIG_FBCON_ILBM
+  This is the low level frame buffer console driver for 1 to 8
+  interleaved bitplanes (2 to 256 colors) on Amiga.
+
+Atari interleaved bitplanes (2 planes) support
+CONFIG_FBCON_IPLAN2P2
+  This is the low level frame buffer console driver for 2 interleaved
+  bitplanes (4 colors) on Atari.
+
+Atari interleaved bitplanes (4 planes) support
+CONFIG_FBCON_IPLAN2P4
+  This is the low level frame buffer console driver for 4 interleaved
+  bitplanes (16 colors) on Atari.
+
+Atari interleaved bitplanes (8 planes) support
+CONFIG_FBCON_IPLAN2P8
+  This is the low level frame buffer console driver for 8 interleaved
+  bitplanes (256 colors) on Atari.
+
+Mac variable bpp packed pixels support
+CONFIG_FBCON_MAC
+  This is the low level frame buffer console driver for 1/2/4/8/16/32
+  bits per pixel packed pixels on Mac. It supports variable fontwidths
+  for low resolution screens.
+  
+VGA characters/attributes support
+CONFIG_FBCON_VGA
+  This is the low level frame buffer console driver for VGA text mode, as
+  used by vgafb.
+
 Parallel-port support
 CONFIG_PARPORT
   If you want to use devices connected to your machine's parallel port
@@ -1565,10 +2014,10 @@ IP: use TOS value as routing key
 CONFIG_IP_ROUTE_TOS
   The header of every IP packet carries a TOS (Type of Service) value
   with which the packet requests a certain treatment, e.g. low latency
-  (for interactive traffic), high throughput, or high
-  reliability. Normally, these values are ignored, but if you say Y
-  here, you will be able to specify different routes for packets with
-  different TOS values.
+  (for interactive traffic), high throughput, or high reliability.
+  Normally, these values are ignored, but if you say Y here, you will
+  be able to specify different routes for packets with different TOS
+  values.
 
 IP: verbose route monitoring
 CONFIG_IP_ROUTE_VERBOSE
@@ -1611,17 +2060,20 @@ CONFIG_IP_ROUTER
 IP: firewalling
 CONFIG_IP_FIREWALL
   If you want to configure your Linux box as a packet filter firewall
-  for a local TCP/IP based network, say Y here. This will enlarge your
-  kernel by about 2kB. You may need to read the FIREWALL-HOWTO,
-  available via ftp (user: anonymous) in
+  for a local TCP/IP based network, say Y here. You may want to read
+  the FIREWALL-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
-  Also, you will need the ipfwadm tool (available via ftp (user:
-  anonymous) from ftp://ftp.xos.nl/pub/linux/ipfwadm/) to allow selective
-  blocking of Internet traffic based on type, origin and destination;
-  this type of firewall is called a "packet filter". The other type of
-  firewall, "proxy-based" ones, is more secure but more intrusive and
-  more bothersome to set up; it inspects the network traffic much more
+  Also, you will need the ipchains tool (available on the WWW at
+  http://www.adelaide.net.au/~rustcorp/) to allow selective blocking
+  of Internet traffic based on type, origin and destination. 
+  Note that the Linux firewall code has changed and the old program
+  called ipfwadm won't work anymore.
+
+  The type of firewall provided by ipchains and this kernel support is
+  called a "packet filter". The other type of firewall, a
+  "proxy-based" one, is more secure but more intrusive and more
+  bothersome to set up; it inspects the network traffic much more
   closely, modifies it and has knowledge about the higher level
   protocols, which a packet filter lacks. Moreover, proxy-based
   firewalls often require changes to the programs running on the local
@@ -1643,11 +2095,13 @@ CONFIG_IP_FIREWALL
   talking to the firewall box -- makes the local network completely
   invisible to the outside world and avoids the need to allocate
   globally valid IP host addresses for the machines on the local net)
-  and IP packet accounting (keeping track of what is using all your
-  network bandwidth) and IP transparent proxying (makes the computers
-  on the local network think they're talking to a remote computer,
-  while in reality the traffic is redirected by your Linux firewall to
-  a local proxy server).
+  and IP packet logging and accounting (keeping track of what is using
+  all your network bandwidth) and IP transparent proxying (makes the
+  computers on the local network think they're talking to a remote
+  computer, while in reality the traffic is redirected by your Linux
+  firewall to a local proxy server).
+
+  If in doubt, say N here.
 
 IP: firewall packet netlink device
 CONFIG_IP_FIREWALL_NETLINK
@@ -1655,21 +2109,15 @@ CONFIG_IP_FIREWALL_NETLINK
   blocked, the first 128 bytes of each such packet are passed on to
   optional user space monitoring software that can then look for
   attacks and take actions such as paging the administrator of the
-  site. To use this, you need to create a character special file under
-  /dev with major number 36 and minor number 3 using mknod ("man
-  mknod"), and you need (to write) a program that reads from that
-  device and takes appropriate action.
-
-IP: accounting
-CONFIG_IP_ACCT
-  This keeps track of your IP network traffic and produces some
-  statistics. Usually, you only want to say Y here if your box will be
-  a router or a firewall for some local network. For the latter, you
-  need to say Y to "IP firewalling". The data is accessible with "cat
-  /proc/net/ip_acct", so you want to say Y to the /proc filesystem
-  below, if you say Y here. To specify what exactly should be
-  recorded, you need the tool ipfwadm (available via ftp (user:
-  anonymous) from ftp://ftp.xos.nl/pub/linux/ipfwadm/).
+  site. 
+
+  To use this, you need to create a character special file under /dev
+  with major number 36 and minor number 3 using mknod ("man mknod"),
+  and you need (to write) a program that reads from that device and
+  takes appropriate action.
+
+  With the ipchains tool you can specify which packets you want to go
+  to this device, as well as how many bytes from each packet.
 
 IP: kernel level autoconfiguration
 CONFIG_IP_PNP
@@ -1741,12 +2189,6 @@ CONFIG_NET_IPGRE_BROADCAST
   Network), but can be distributed all over the Internet. If you want
   to do that, say Y here and to "IP: multicast routing" below.
 
-IP: firewall packet logging
-CONFIG_IP_FIREWALL_VERBOSE
-  This gives you information about what your firewall did with
-  packets it received. The information is handled by the klogd daemon
-  which is responsible for kernel messages ("man klogd").
-
 IP: transparent proxying
 CONFIG_IP_TRANSPARENT_PROXY
   This enables your Linux firewall to transparently redirect any
@@ -1774,7 +2216,7 @@ CONFIG_IP_MASQUERADE
   addresses. (This last problem can also be solved by connecting the
   Linux box to the Internet using SLiRP [SLiRP is a SLIP/PPP emulator
   that works if you have a regular dial up shell account on some UNIX
-  computer; get it via ftp (user: anonymous) from
+  computer; get it via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/system/network/serial/ ].) 
 
   The IP masquerading code will only work if IP forwarding is enabled
@@ -1787,13 +2229,15 @@ CONFIG_IP_MASQUERADE
   from a boot time script after the /proc filesystem has been mounted. 
 
   Details on how to set things up are contained in the IP Masquerade
-  mini-HOWTO, available via ftp (user: anonymous) from
-  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini.
+  mini-HOWTO, available via FTP (user: anonymous) from
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini; there's also some
+  information on the WWW at
+  http://www.tor.shaw.wave.ca/~ambrose/kernel21.html. 
 
   If you say Y here, you should also say Y to "IP: always defragment",
   below. If you say Y here, then the modules ip_masq_ftp.o (for ftp
   transfers through the firewall), ip_masq_irc.o (for irc chats
-  through the firewall), and ip_masq_raudio.o (for realaudio downloads
+  through the firewall), and ip_masq_raudio.o (for RealAudio downloads
   through the firewall) will automatically be compiled. Modules are
   pieces of code which can be inserted in and removed from the running
   kernel whenever you want; read Documentation/modules.txt for
@@ -1814,7 +2258,7 @@ CONFIG_IP_MASQUERADE_IPAUTOFW
   ipautofw is a program by Richard Lynch allowing additional support
   for masquerading protocols which do not (as yet) have their own
   protocol helpers. Information and source for ipautofw is available
-  via ftp (user: anonymous) from
+  via FTP (user: anonymous) from
   ftp://ftp.netis.com/pub/members/rlynch/
 
   The ipautofw code is still under development and so is currently
@@ -1827,13 +2271,23 @@ CONFIG_IP_MASQUERADE_IPAUTOFW
 
 IP: ipportfw masquerade support
 CONFIG_IP_MASQUERADE_IPPORTFW
-  ipportfw is an addition to IP Masquerading written by Steven Clarke
-  to allow some forwarding of packets from outside to inside a
-  firewall on given ports. Information and source for ipportfw is
-  available from
+  Port Forwarding is an addition to IP Masquerading written by Steven
+  Clarke to allow some forwarding of packets from outside to inside a
+  firewall on given ports. This could be useful if, for example, you
+  want to run a web server behind the firewall or masquerading host
+  and this web server should be visible to the outside world. An
+  external client connects to port 80 of the firewall, the firewall
+  forwards requests to this port to the web server, the web server
+  handles the request and the results are sent through the firewall to
+  the original client. The client thinks that the firewall machine
+  itself is running the web server.
+
+  Information about it is available from
   http://www.monmouth.demon.co.uk/ipsubs/portforwarding.html (to
   browse the WWW, you need to have access to a machine on the Internet
-  that has a program like lynx or netscape).
+  that has a program like lynx or netscape). You will need the user
+  space program ipportfw which can be downloaded from
+  ftp://ftp.compsoc.net/users/steve/ipportfw/linux21/
 
   The portfw code is still under development and so is currently
   marked EXPERIMENTAL. If you want to try it, say Y.
@@ -1858,10 +2312,10 @@ CONFIG_IP_ALWAYS_DEFRAG
   you might also want to say Y here, to have a more reliable firewall
   (otherwise second and further fragments will always be accepted by
   the firewall). When using "IP: transparent proxying", this option is
-  implicit, although it is safe to say Y here. Do not say Y to this
-  option except when running either a firewall that is the sole link
-  to your network or a transparent proxy. Never ever say Y to this for
-  a normal router or host.
+  implicit, although it is safe to say Y here. Only say Y here if
+  running either a firewall that is the sole link to your network or a
+  transparent proxy; never ever say Y here for a normal router or
+  host.
 
 IP: aliasing support
 CONFIG_IP_ALIAS
@@ -1874,7 +2328,7 @@ CONFIG_IP_ALIAS
   the WWW at http://www.thesphere.com/~dlp/TwoServers/ (to browse the
   WWW, you need to have access to a machine on the Internet that has a
   program like lynx or netscape) and also in the
-  Virtual-Hosting-HOWTO, available via ftp (user: anonymous) from
+  Virtual-Hosting-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   Another scenario would be
@@ -1918,7 +2372,7 @@ CONFIG_IP_PIMSM_V2
 
 PC/TCP compatibility mode
 CONFIG_INET_PCTCP
-  If you have been having difficulties telneting to your Linux machine
+  If you have been having difficulties telnetting to your Linux machine
   from a DOS system that uses (broken) PC/TCP networking software (all
   versions up to OnNet 2.0) over your local Ethernet try saying Y
   here.  Everyone else says N. People having problems with NCSA telnet
@@ -1937,8 +2391,8 @@ CONFIG_INET_RARP
   Y here; you'll then have to run the program rarp ("man rarp") on
   your box.
 
-  If you actually want to use a diskless Sun 3 machine as an Xterminal
-  to Linux, say Y here and fetch Linux-Xkernel from
+  If you actually want to use a diskless Sun 3 machine as an X
+  terminal to Linux, say Y here and fetch Linux-Xkernel from
   ftp://sunsite.unc.edu/pub/Linux/system/network/boot.net/.
 
   Superior solutions to the problem of booting and configuring
@@ -2018,17 +2472,20 @@ CONFIG_SKB_LARGE
 Unix domain sockets
 CONFIG_UNIX
   This includes Unix domain sockets, the standard Unix mechanism for
-  establishing and accessing network connections. Unless you are
-  working on an embedded system or something, you definitely want to
-  say Y here.
+  establishing and accessing network connections. Many commonly used
+  programs such as the X Window system and syslog use these sockets
+  even if your machine is not connected to any network. Unless you are
+  working on an embedded system or something similar, you therefore
+  definitely want to say Y here.
 
   The socket support 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 unix.o. If you want to compile it
   as a module, say M here and read Documentation/modules.txt. If you
   try building this as a module and you are running kerneld, be sure
-  to add 'alias net-pf-1 unix' to your /etc/conf.module file. If
-  unsure, say Y.
+  to add 'alias net-pf-1 unix' to your /etc/conf.module file. 
+
+  If unsure, say Y.
 
 The IPv6 protocol
 CONFIG_IPV6
@@ -2075,12 +2532,12 @@ CONFIG_IPV6_NETLINK
   say Y to "Kernel/User network link driver" and to "Routing
   messages" instead.
   
-The IPX protocol
+IPX networking
 CONFIG_IPX
   This is support for the Novell networking protocol, IPX, commonly
   used for local networks of Windows machines. You need it if you want
   to access Novell NetWare file or print servers using the Linux
-  Novell client ncpfs (available via ftp (user: anonymous) from
+  Novell client ncpfs (available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/system/filesystems/) or from within
   the Linux DOS emulator dosemu (read the DOSEMU-HOWTO, available in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO). In order to do the
@@ -2096,6 +2553,7 @@ CONFIG_IPX
   ftp://sunsite.unc.edu/pub/Linux/system/network/daemons/ or mars_nwe from
   ftp://ftp.gwdg.de/pub/linux/misc/ncpfs. For more information, read the
   IPX-HOWTO in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
+
   General information about how to connect Linux, Windows machines and
   Macs is on the WWW at http://www.eats.com/linux_mac_win.html (to
   browse the WWW, you need to have access to a machine on the Internet
@@ -2112,12 +2570,12 @@ IPX: Full internal IPX network
 CONFIG_IPX_INTERN
   Every IPX network has an address that identifies it. Sometimes it is
   useful to give an IPX "network" address to your Linux box as well
-  (for example if your box is acting as a fileserver for different IPX
+  (for example if your box is acting as a file server for different IPX
   networks: it will then be accessible from everywhere using the same
   address).  The way this is done is to create a virtual internal
   "network" inside your box and to assign an IPX address to this
   network. Say Y here if you want to do this; read the IPX-HOWTO at
-  sunsite.unc.edu:/pub/Linux/docs/howto for details.  
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO for details.  
 
   The full internal IPX network enables you to allocate sockets on
   different virtual nodes of the internal network. This is done by
@@ -2146,27 +2604,27 @@ CONFIG_SPX
   space programs lwared or mars_nwe for the server side).
 
   Say Y here if you have use for SPX; read the IPX-HOWTO at
-  sunsite.unc.edu:/pub/Linux/docs/howto for details.
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO 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 will be called af_spx.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Appletalk DDP
+AppleTalk DDP
 CONFIG_ATALK
-  Appletalk is the way Apple computers speak to each other on a
+  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. You will need to use the
   netatalk package so that your Linux box can act as a print and file
-  server for macs as well as access appletalk printers. Check out
+  server for Macs as well as access AppleTalk printers. Check out
   http://threepio.hitchcock.org/cgi-bin/faq/netatalk/faq.pl on the WWW
   for details (to browse the WWW, you need to have access to a machine
   on the Internet that has a program like lynx or netscape). EtherTalk
-  is the name used for appletalk over Ethernet and the cheaper and
-  slower LocalTalk is appletalk over a proprietary apple network using
-  serial links. Ethertalk and Localtalk are fully supported by Linux.
-  The NET-2-HOWTO, available via ftp (user: anonymous) in
+  is the name used for AppleTalk over Ethernet and the cheaper and
+  slower LocalTalk is AppleTalk over a proprietary apple network using
+  serial links. EtherTalk and LocalTalk are fully supported by Linux.
+  The NET-2-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO contains valuable
   information as well.
 
@@ -2180,14 +2638,14 @@ CONFIG_ATALK
   the GNU boycott of Apple is over, so even politically correct people
   are allowed to say Y here.
 
-Appletalk-IP driver support
+AppleTalk-IP driver support
 CONFIG_IPDDP
-  This allows IP networking for users who only have Appletalk
-  networking available. This feature is experimental. With this
-  driver, you can either encapsulate IP inside Appletalk (e.g. if your
-  Linux box is stuck on an Appletalk only network) or decapsulate
+  This allows IP networking for users who only have AppleTalk
+  networking available.  This feature is experimental. With this
+  driver, you can either encapsulate IP inside AppleTalk (e.g. if your
+  Linux box is stuck on an AppleTalk only network) or decapsulate
   (e.g. if you want your Linux box to act as an Internet gateway for a
-  zoo of appletalk connected Macs). You decide which one of the two
+  zoo of AppleTalk connected Macs). You decide which one of the two
   you want in the following two questions; you can say Y to only one
   of them. Please see Documentation/networking/ipddp.txt for more
   information.
@@ -2197,23 +2655,23 @@ CONFIG_IPDDP
   The module is called ipddp.o. If you want to compile it as a module,
   say M here and read Documentation/modules.txt.
 
-IP to Appletalk-IP Encapsulation support
+IP to AppleTalk-IP Encapsulation support
 CONFIG_IPDDP_ENCAP
   If you say Y here, the kernel will be able to encapsulate IP packets
-  inside Appletalk frames; this is useful if your Linux box is stuck
-  on an appletalk network (which hopefully contains a decapsulator
+  inside AppleTalk frames; this is useful if your Linux box is stuck
+  on an AppleTalk network (which hopefully contains a decapsulator
   somewhere). Please see Documentation/networking/ipddp.txt for more
-  information. If you say Y here, you cannot say Y to "Appletalk-IP to
+  information. If you say Y here, you cannot say Y to "AppleTalk-IP to
   IP Decapsulation support", below.
 
-Appletalk-IP to IP Decapsulation support
+AppleTalk-IP to IP Decapsulation support
 CONFIG_IPDDP_DECAP
   If you say Y here, the kernel will be able to decapsulate
-  Appletalk-IP frames to IP packets; this is useful if you want your
-  Linux box to act as an Internet gateway for an appletalk
+  AppleTalk-IP frames to IP packets; this is useful if you want your
+  Linux box to act as an Internet gateway for an AppleTalk
   network. Please see Documentation/networking/ipddp.txt for more
   information. If you say Y here, you cannot say Y to "IP to
-  Appletalk-IP Encapsulation support", above.
+  AppleTalk-IP Encapsulation support", above.
 
 Apple/Farallon LocalTalk PC card support
 CONFIG_LTPC
@@ -2229,7 +2687,7 @@ CONFIG_COPS
   This allows you to use COPS AppleTalk cards to connect to LocalTalk
   networks. You also need version 1.3.3 or later of the netatalk
   package.  This driver is experimental, which means that it may not
-  work.  This driver will only work if you choose "Appletalk DDP"
+  work.  This driver will only work if you choose "AppleTalk DDP"
   networking support, above.
   Please read the file Documentation/networking/cops.txt. 
 
@@ -2250,7 +2708,7 @@ CONFIG_HAMRADIO
   Y here. You want to read http://www.tapr.org/tapr/html/pkthome.html
   (to browse the WWW, you need to have access to a machine on the
   Internet that has a program like lynx or netscape) and the HAM-HOWTO
-  and the AX25-HOWTO, both available via ftp (user: anonymous) from
+  and the AX25-HOWTO, both available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 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 amateur
@@ -2265,15 +2723,15 @@ CONFIG_AX25
   use a low speed TNC (a Terminal Node Controller acts as a kind of
   modem connecting your computer's serial port to your radio's
   microphone input and speaker output) supporting the KISS protocol or
-  one of the various SCC cards that are supported by the Ottawa PI,
-  the Gracilis Packetwin or the generic Z8530 driver. Another option
-  are the Baycom modem serial and parallel port hacks or the sound card
-  modem (supported by their own drivers). If you say Y here, you also
-  have to say Y to one of those drivers. 
+  one of the various SCC cards that are supported by the generic Z8530
+  or the DMA SCC driver. Another option are the Baycom modem serial
+  and parallel port hacks or the sound card modem (supported by their
+  own drivers). If you say Y here, you also have to say Y to one of
+  those drivers.
 
   Information about where to get supporting software for Linux amateur
   radio as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via ftp (user: anonymous) in
+  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You might also want to
   check out the file Documentation/networking/ax25.txt in the kernel
   source. More information about digital amateur radio in general is
@@ -2311,7 +2769,7 @@ CONFIG_NETROM
 
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via ftp (user: anonymous) in
+  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You also might want to
   check out the file Documentation/networking/ax25.txt. More
   information about digital amateur radio in general is on the WWW at
@@ -2332,7 +2790,7 @@ CONFIG_ROSE
 
   A comprehensive listing of all the software for Linux amateur radio
   users as well as information about how to configure an AX.25 port is
-  contained in the AX25-HOWTO, available via ftp (user: anonymous) in
+  contained in the AX25-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You also might want to check
   out the file Documentation/networking/ax25.txt. More information
   about digital amateur radio in general is on the WWW at
@@ -2387,41 +2845,43 @@ CONFIG_BPQETHER
 
 High-speed (DMA) SCC driver for AX.25
 CONFIG_DMASCC
-  This is a driver for high-speed SCC boards (used to connect your
-  computer to your amateur radio and send Internet traffic over the
-  radio), i.e. those supporting DMA on one port. Currently, only
-  Ottawa PI/PI2 boards (see http://hydra.carleton.ca/info/pi2.html)
-  and Gracilis PackeTwin boards (see http://www.paccomm.com/; to
-  browse the WWW, you need to have access to a machine on the Internet
-  that has a program like lynx or netscape) are supported and detected
-  automatically.
-
-  If you have one of these cards, you can say Y here and should read
-  the HAM-HOWTO, available via ftp (user: anonymous) in
-  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
-
-  This driver operates multiple boards simultaneously. If you compile
-  this driver as a module, it will be called dmascc.o. If you don't
-  give any parameter to the driver, all possible I/O addresses are
-  probed. This could irritate other devices that are currently not in
-  use. You may specify the list of addresses to be probed by
-  "dmascc=addr1,addr2,..." (when compiled into the kernel image) or
-  "io=addr1,addr2,..." (when loaded as a module). The network
+  This is a driver for high-speed SCC boards, i.e. those supporting
+  DMA on one port. You usually use those boards to connect your
+  computer to an amateur radio modem (such as the WA4DSY 56kbps
+  modem), in order to send and receive AX.25 packet radio network
+  traffic.
+
+  Currently, this driver supports Ottawa PI/PI2
+  (http://hydra.carleton.ca/info/pi2.html) and Gracilis PackeTwin
+  (http://www.paccomm.com/) boards. They are detected automatically.
+  If you have one of these cards, say Y here and read the HAM-HOWTO,
+  available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/.
+
+  This driver can operate multiple boards simultaneously. If you compile
+  it as a module (by saying M instead of Y), it will be called dmascc.o.
+  If you don't pass any parameter to the driver, all possible I/O
+  addresses are probed. This could irritate other devices that are
+  currently not in use. You may specify the list of addresses to be
+  probed by "dmascc=addr1,addr2,..." (when compiled into the kernel
+  image) or "io=addr1,addr2,..." (when loaded as a module). The network
   interfaces will be called dmascc0 and dmascc1 for the board detected
-  first, dmascc2 and dmascc3 for the second one, and so on. Before you
-  configure each interface with ifconfig, you MUST set certain
-  parameters, such as channel access timing, clock mode, and DMA
-  channel. This is accomplished with a small utility program called
-  dmascc_cfg, which is part of the ax25-utils package. Alternatively,
-  you may download the utility from
-  http://www.oevsv.at/~oe1kib/Linux.html.
+  first, dmascc2 and dmascc3 for the second one, and so on. 
+
+  Before you configure each interface with ifconfig, you MUST set
+  certain parameters, such as channel access timing, clock mode, and
+  DMA channel. This is accomplished with a small utility program,
+  dmascc_cfg, available at
+  http://www.nt.tuwien.ac.at/~kkudielk/Linux/. (To browse the WWW, you
+  need to have access to a machine on the Internet that has a program
+  like lynx or netscape).
 
 Z8530 SCC driver for AX.25
 CONFIG_SCC
   These cards are used to connect your Linux box to an amateur radio
   in order to communicate with other computers.  If you want to use
   this, read Documentation/networking/z8530drv.txt and the
-  AX.25-HOWTO, available via ftp (user: anonymous) at
+  AX.25-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  Also make sure to say Y to
   "Amateur Radio AX.25 Level 2" support. 
 
@@ -2457,6 +2917,21 @@ CONFIG_BAYCOM_PAR
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called baycom_par.o.
 
+BAYCOM EPP driver for AX.25
+CONFIG_BAYCOM_EPP
+  This is a driver for Baycom style simple amateur radio modems that
+  connect to a parallel interface. The driver supports the EPP
+  designs. To configure the driver, use the sethdlc utility available
+  in the standard ax25 utilities package. For information on the
+  modems, see http://www.baycom.de (to browse the WWW, you need to
+  have access to a machine on the Internet that has a program like
+  lynx or netscape) and Documentation/networking/baycom.txt.
+
+  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 baycom_par.o.
+
 BAYCOM ser12 full duplex driver for AX.25
 CONFIG_BAYCOM_SER_FDX
   This is one of two drivers for Baycom style simple amateur radio
@@ -2498,7 +2973,7 @@ CONFIG_BAYCOM_SER_HDX
 
 Sound card modem driver for AX.25
 CONFIG_SOUNDMODEM
-  This experimental driver allows a standard SoundBlaster or
+  This experimental driver allows a standard Sound Blaster or
   WindowsSoundSystem compatible sound card to be used as a packet radio
   modem (NOT as a telephone modem!), to send digital traffic over
   amateur radio. 
@@ -2516,11 +2991,11 @@ CONFIG_SOUNDMODEM
   say M here and read Documentation/modules.txt. This is recommended.
   The module will be called soundmodem.o.
 
-Sound card modem support for SoundBlaster and compatible cards
+Sound card modem support for Sound Blaster and compatible cards
 CONFIG_SOUNDMODEM_SBC
-  This option enables the soundmodem driver to use SoundBlaster and
+  This option enables the soundmodem driver to use Sound Blaster and
   compatible cards. If you have a dual mode card (i.e. a WSS cards
-  with a SoundBlaster emulation) you should say N here and Y to
+  with a Sound Blaster emulation) you should say N here and Y to
   "Sound card modem support for WSS and Crystal cards", below, because
   this usually results in better performance. This option also supports
   SB16/32/64 in full duplex mode.
@@ -2598,7 +3073,7 @@ CONFIG_X25
   entry point can carry several logical point-to-point connections
   (called "virtual circuits") to other computers connected to the X.25
   network. Governments, banks, and other organizations tend to use it
-  to connect to each other or to form Wide Area Networks (WAN's). Many
+  to connect to each other or to form Wide Area Networks (WANs). Many
   countries have public X.25 networks.  X.25 consists of two
   protocols: the higher level Packet Layer Protocol (PLP) (say Y here
   if you want that) and the lower level data link layer protocol LAPB
@@ -2659,12 +3134,12 @@ CONFIG_BRIDGE
   other third party bridge products. 
 
   In order to use this, you'll need the bridge configuration tools
-  available via ftp (user: anonymous) from
+  available via FTP (user: anonymous) from
   ftp://shadow.cabi.net/pub/Linux. 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 via ftp (user: anonymous)
+  details read the Ethernet-HOWTO, available via FTP (user: anonymous)
   in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. The Bridging code is
   still in test. If unsure, say N.
 
@@ -2713,11 +3188,14 @@ CONFIG_SCSI
   If you want to use a SCSI hard disk, SCSI tape drive, SCSI CDROM or
   any other SCSI device under Linux, say Y and make sure that you know
   the name of your SCSI host adapter (the card inside your computer
-  that "speaks" the SCSI protocol), because you will be asked for
-  it. You also need to say Y here if you want support for the parallel
-  port version of the 100MB IOMEGA ZIP drive. Please read the
-  SCSI-HOWTO, available via ftp (user: anonymous) in
-  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
+  that "speaks" the SCSI protocol, also called SCSI controller),
+  because you will be asked for it. 
+
+  You also need to say Y here if you want support for the parallel
+  port version of the 100MB IOMEGA ZIP drive.
+
+  Please read the SCSI-HOWTO, available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -2731,7 +3209,7 @@ SCSI disk support
 CONFIG_BLK_DEV_SD
   If you want to use a SCSI hard disk or the SCSI or parallel port
   version of the IOMEGA ZIP drive under Linux, say Y and read the
-  SCSI-HOWTO and the Disk-HOWTO, both available via ftp (user:
+  SCSI-HOWTO and the Disk-HOWTO, both available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. This is
   NOT for SCSI CDROMs.
 
@@ -2746,8 +3224,8 @@ CONFIG_BLK_DEV_SD
 
 SCSI tape support
 CONFIG_CHR_DEV_ST
-  If you want to use a SCSI tapedrive under Linux, say Y and read the
-  SCSI-HOWTO, available via ftp (user: anonymous) in
+  If you want to use a SCSI tape drive under Linux, say Y and read the
+  SCSI-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO and
   drivers/scsi/README.st in the kernel source. This is NOT for SCSI
   CDROMs.
@@ -2762,8 +3240,8 @@ SCSI CDROM support
 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 from
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Also make sure to say Y to
-  "ISO9660 cdrom filesystem support" later. 
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Also make sure to say Y or M 
+  to "ISO 9660 CDROM filesystem 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).
@@ -2774,7 +3252,7 @@ CONFIG_BLK_DEV_SR
 Enable vendor-specific extensions (for SCSI CDROM)
 CONFIG_BLK_DEV_SR_VENDOR
   This enables the usage of vendor specific SCSI commands. This is
-  required to support multisession CD's with old NEC/TOSHIBA cdrom
+  required to support multisession CDs with old NEC/TOSHIBA cdrom
   drives (and HP Writers). If you have such a drive and get the first
   session only, try saying Y here; everybody else says N.
 
@@ -2785,11 +3263,11 @@ CONFIG_CHR_DEV_SG
   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 via ftp (user: anonymous)
+  would need the program cdwrite, available via FTP (user: anonymous)
   from ftp://sunsite.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 via ftp (user: anonymous) in
+  SCSI-Programming-HOWTO, both available via FTP (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. 
 
   If you want to compile this as a module ( = code which can be
@@ -2846,7 +3324,7 @@ Adaptec AHA152X/2825 support
 CONFIG_SCSI_AHA152X
   This is support for the AHA-1510, AHA-1520, AHA-1522, and AHA-2825
   SCSI host adapters. It is explained in section 3.3 of the
-  SCSI-HOWTO, available via ftp (user: anonymous) at
+  SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You might also want to
   read the comments at the top of drivers/scsi/aha152x.c.
 
@@ -2858,7 +3336,7 @@ CONFIG_SCSI_AHA152X
 Adaptec AHA1542 support
 CONFIG_SCSI_AHA1542
   This is support for a SCSI host adapter. It is explained in section
-  3.4 of the SCSI-HOWTO, available via ftp (user: anonymous) at
+  3.4 of the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  Note that Trantor was
   recently purchased by Adaptec, and some former Trantor products are
   being sold under the Adaptec name. If it doesn't work out of the
@@ -2872,7 +3350,7 @@ CONFIG_SCSI_AHA1542
 Adaptec AHA1740 support
 CONFIG_SCSI_AHA1740
   This is support for a SCSI host adapter. It is explained in section
-  3.5 of the SCSI-HOWTO, available via ftp (user: anonymous) at
+  3.5 of the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/aha1740.h.
@@ -2891,7 +3369,7 @@ CONFIG_SCSI_AIC7XXX
   Information on the configuration options for this controller can be
   found by checking the help file for each of the available
   configuration options. You also want to read
-  drivers/scsi/README.aic7xxx and the SCSI-HOWTO, available via ftp
+  drivers/scsi/README.aic7xxx and the SCSI-HOWTO, available via FTP
   (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Note
   that the AHA2920 SCSI host adapter is *not* supported by this
   driver; choose "Future Domain 16xx SCSI support" instead if you have
@@ -2906,7 +3384,7 @@ Override driver defaults for commands per LUN
 CONFIG_OVERRIDE_CMDS
   Say Y here if you want to override the default maximum number of
   commands that a single device on the aic7xxx controller is allowed
-  to have active at one time. This option only effects tagged queueing
+  to have active at one time. This option only affects tagged queueing
   capable devices. The driver uses a "failsafe" value of 8 by default.
   This is much lower than many devices can handle, but left in place
   for safety's sake. If you say Y here, you can adjust the number of
@@ -2966,7 +3444,7 @@ CONFIG_AIC7XXX_RESET_DELAY
 BusLogic SCSI support
 CONFIG_SCSI_BUSLOGIC
   This is support for BusLogic MultiMaster and FlashPoint SCSI Host
-  Adapters.  Consult the SCSI-HOWTO, available via anonymous ftp from
+  Adapters.  Consult the SCSI-HOWTO, available via anonymous FTP from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO, and the files
   README.BusLogic and README.FlashPoint in drivers/scsi for more
   information.  If this driver does not work correctly without
@@ -2989,7 +3467,7 @@ CONFIG_SCSI_OMIT_FLASHPOINT
 DTC3180/3280 SCSI support
 CONFIG_SCSI_DTC3280
   This is support for DTC 3180/3280 SCSI Host Adapters.  Please read
-  the SCSI-HOWTO, available via ftp (user: anonymous) at
+  the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO and the file
   drivers/scsi/README.dtc3x80.  
 
@@ -3005,7 +3483,7 @@ CONFIG_SCSI_EATA_DMA
   and the DPT PM2011B and PM2012B controllers.  Note that there is
   also another driver for the same hardware: "EATA ISA/EISA/PCI
   support". You should only say Y to one of them. Please read the
-  SCSI-HOWTO, available via ftp (user: anonymous) at
+  SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   This driver is also available as a module (= code which can be
@@ -3020,7 +3498,7 @@ CONFIG_SCSI_EATA_PIO
   host adapters could also use this driver but are discouraged from
   doing so, since this driver only supports hard disks and lacks
   numerous features.  You might want to have a look at the SCSI-HOWTO,
-  available via ftp (user: anonymous) at
+  available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   If you want to compile this as a module ( = code which can be
@@ -3034,7 +3512,7 @@ CONFIG_SCSI_U14_34F
   The source at drivers/scsi/u14-34f.c contains some information about
   this hardware. If the driver doesn't work out of the box, you may
   have to change some settings in drivers/scsi/u14-34f.c.  Read the
-  SCSI-HOWTO, available via ftp (user: anonymous) at
+  SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Note that there is also
   another driver for the same hardware: "UltraStor SCSI support",
   below.  You should say Y to both only if you want 24F support as
@@ -3064,7 +3542,7 @@ CONFIG_SCSI_FUTURE_DOMAIN
   (TMC-1660/1680, TMC-1650/1670, TMC-3260, TMC-1610M/MER/MEX) and
   other adapters based on the Future Domain chipsets (Quantum
   ISA-200S, ISA-250MG; Adaptec AHA-2920; and at least one IBM board).
-  It is explained in section 3.7 of the SCSI-HOWTO, available via ftp
+  It is explained in section 3.7 of the SCSI-HOWTO, available via FTP
   (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   This driver is also available as a module ( = code which can be
@@ -3076,7 +3554,7 @@ Generic NCR5380/53c400 SCSI support
 CONFIG_SCSI_GENERIC_NCR5380
   This is the generic NCR family of SCSI controllers, not to be
   confused with the NCR 53c7 or 8xx controllers. It is explained in
-  section 3.8 of the SCSI-HOWTO, available via ftp (user: anonymous)
+  section 3.8 of the SCSI-HOWTO, available via FTP (user: anonymous)
   at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work
   out of the box, you may have to change some settings in
   drivers/scsi/g_NCR5380.h.
@@ -3105,7 +3583,7 @@ NCR53c7,8xx SCSI support
 CONFIG_SCSI_NCR53C7xx
   This is the 53c7 and 8xx NCR family of SCSI controllers, not to be
   confused with the NCR 5380 controllers. It is explained in section
-  3.8 of the SCSI-HOWTO, available via ftp (user: anonymous) at
+  3.8 of the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/53c7,8xx.h.
@@ -3141,49 +3619,57 @@ CONFIG_SCSI_NCR53C7xx_DISCONNECT
 
 NCR53C8XX SCSI support
 CONFIG_SCSI_NCR53C8XX
-  This is the BSD ncr driver adapted to Linux for the NCR53C8XX family
+  This is the BSD ncr driver adapted to linux for the NCR53C8XX family
   of PCI-SCSI controllers. This driver supports parity checking,
-  tagged command queuing, Fast-20 data transfer up to 20 MB/s with
-  narrow SCSI devices and 40 MB/s with wide SCSI devices.
+  tagged command queuing and fast synchronous data transfers up to 80
+  MB/s with wide FAST-40 LVD devices and controllers.
+
+  The NCR53C860 and NCR53C875 support FAST-20 transfers. The NCR53C895 
+  supports FAST-40 transfers with Ultra2 LVD devices.
+
   Please read drivers/scsi/README.ncr53c8xx for more information.
-  Linux/i386, Linux/Alpha and Linux/PPC are supported by this driver.
 
 synchronous data transfers frequency
 CONFIG_SCSI_NCR53C8XX_SYNC
-  SCSI-2 specifications allow SCSI devices to negotiate a synchronous 
-  transfer period of 25 nano-seconds or more.
-
-  The transfer period value is 4 times the agreed transfer period.
-  So, data can be transferred at a 10 MHz frequency, allowing 10
-  MB/second throughput with 8 bits SCSI-2 devices and 20 MB/second
-  with wide16 devices.  This frequency can be used safely with
-  differential devices but may cause problems with single-ended
-  devices.
-
-  Specify 0 if you want to only use asynchronous data transfers.
-  Otherwise, specify a value between 5 and 10.  Commercial O/Ses
-  generally use 5 Mhz frequency for synchronous transfers.  It is a
-  reasonable default value.
-
-  However, a flawless single-ended SCSI bus supports 10 MHz data
-  transfers.  Regardless of the value chosen in the Linux
-  configuration, the synchronous period can be changed after boot-up
-  through the /proc/scsi file system. The generic command is:
-
-      echo "setsync #target period" >/proc/scsi/ncr53c8xx/0
-
-  Use a 25 ns period for 10 Mhz synchronous data transfers.
-  If you don't know what to do now, go with the default.
+  The SCSI Parallel Interface-2 Standard defines 4 classes of transfer
+  rates: FAST-5, FAST-10, FAST-20 and FAST-40. The numbers are
+  respectively the maximum data transfer rates in mega-transfers per
+  second for each class. For example, a FAST-20 Wide 16 device is able
+  to transfer data at 40 million 16 bit packets per second for a total
+  rate of 40 MB/s.
+
+  You may specify 0 if you want to only use asynchronous data
+  transfers. This is the safest and slowest option. Otherwise, specify
+  a value between 5 and 40, depending on the capability of your SCSI
+  controller. The higher the number, the faster the data transfer.
+  Note that 40 should normally be ok since the driver decreases the
+  value automatically according to the controller's capabilities.
+
+  Your answer to this question is ignored for controllers with NVRAM,
+  since the driver will get this information from the user set-up. It
+  also can be overridden using a boot setup option, as follows
+  (example): 'ncr53c8xx=sync:12' will allow the driver to negotiate
+  for FAST-20 synchronous data transfer (20 mega-transfers per
+  second).
+
+  The normal answer therefore is not to go with the default but to
+  select the maximum value 40 allowing the driver to use the maximum
+  value supported by each controller. If this causes problems with
+  your SCSI devices, you should come back and decrease the value.
+
+  There is no safe option other than using good cabling, right
+  terminations and SCSI conformant devices.
 
 use normal IO
 CONFIG_SCSI_NCR53C8XX_IOMAPPED
-  This option allows you to force the driver to use normal IO.
-  Memory mapped IO has less latency than normal IO and works for most 
-  Intel-based hardware.  Under Linux/Alpha and Linux/PPC only normal 
-  IO is currently supported by the driver and so, this option has no
-  effect. On Linux/PPC MMIO and normal IO are done the same (all IO
-  is memory mapped) so you lose nothing by using normal IO. The normal
-  answer therefore is N. Try Y only if you have problems.
+  If you say Y here, the driver will use normal IO, as opposed to
+  memory mapped IO. Memory mapped IO has less latency than normal IO
+  and works for most Intel-based hardware. Under Linux/Alpha only
+  normal IO is currently supported by the driver and so, this option
+  has no effect on those systems. 
+
+  The normal answer therefore is N; try Y only if you encounter SCSI
+  related problems.
 
 not allow targets to disconnect
 CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT
@@ -3193,75 +3679,69 @@ CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT
   not allow targets to disconnect is not reasonable if there is more
   than 1 device on a SCSI bus.  The normal answer therefore is N.
 
-detect and read serial NVRAMs
-CONFIG_SCSI_NCR53C8XX_NVRAM_DETECT
-  Enable support for reading the serial NVRAM data on Symbios and some
-  Symbios compatible cards, and Tekram DC390W/U/F cards. Useful for
-  systems with more than one Symbios compatible controller where at
-  least one has a serial NVRAM, or for a system with a mixture of
-  Symbios and Tekram cards. Enables setting the boot order of host
-  adaptors to something other than the default order or "reverse
-  probe" order.  Also enables Symbios and Tekram cards to be
-  distinguished so that the option "assume boards are SYMBIOS
-  compatible" (CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT) below may be set
-  in a system with a mixture of Symbios and Tekram cards so that the
-  Symbios cards can make use of the full range of Symbios features,
-  differential, led pin, without causing problems for the Tekram
-  card(s).  Also enables setting host and targets SCSI features as
-  defined in the user setup for each host using a serial NVRAM. Read
-  drivers/scsi/README.ncr53c8xx for more information. The default
-  answer is N, the normal answer should be Y.
-
-enable tagged command queuing
-CONFIG_SCSI_NCR53C8XX_TAGGED_QUEUE
-  This option allows you to enable tagged command queuing support at
-  Linux start-up.  Some SCSI devices do not properly support this
-  feature.  The suggested method is to say N here and to use the
-  "settags" control command after boot-up to enable this feature:
-
-      echo "settags 2 4" >/proc/scsi/ncr53c8xx/0
+default tagged command queue depth
+CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS
+  "Tagged command queuing" is a feature of SCSI-2 which improves
+  performance: the host adapter can send several SCSI commands to a
+  device's queue even if previous commands haven't finished yet. Some
+  SCSI devices don't implement this properly; if you want to disable
+  this feature, enter 0 or 1 here (it doesn't matter which).
 
-  asks the driver to use up to 4 concurrent tagged commands for target
-  2 of controller 0.
+  The default value is 8 and should be supported by most hard disks.
+  This option has no effect for adapters with NVRAM, since the driver 
+  will get this information from the user set-up. It also can be 
+  overridden using a boot setup option, as follows (example):
+  'ncr53c8xx=tags:4/t2t3q16/t0u2q10' will set default queue depth to 4, 
+  set queue depth to 16 for target 2 and target 3 on controller 0 and 
+  set queue depth to 10 for target 0 / lun 2 on controller 1.
 
-  See the file drivers/scsi/README.ncr53c8xx for more information.
-  WARNING! If you say Y here, then you have to say N to "not allow
-  targets to disconnect", above.
+  The normal answer therefore is to go with the default 8 and to use 
+  a boot command line option for devices that need to use a different 
+  command queue depth.
 
-  The safe answer therefore is N.
-  The normal answer therefore is Y.
+  There is no safe option other than using good SCSI devices.
 
 maximum number of queued commands
 CONFIG_SCSI_NCR53C8XX_MAX_TAGS
   This option allows you to specify the maximum number of commands
-  that can be queued to a device, when tagged command queuing is
-  possible.  The default value is 4. Minimum is 2, maximum is 12.  The
-  normal answer therefore is the default one.
+  that can be queued to any device, when tagged command queuing is
+  possible.  The default value is 32. Minimum is 2, maximum is 64.
+  For value less than 32, this option only saves a little memory 
+  (8*7*(32-MAXTAGS) bytes), so using less than 32 isn't worth it.
+  For value greater than 32, latency on reselection will be increased 
+  by 1 or 2 micro-seconds. So, the normal answer here is to go with the 
+  default value 32 unless you are using very large hard disks with 
+  large cache (>= 1MB) that are able to take advantage of more than 
+  32 tagged commands.
+
+  There is no safe option and the default answer is recommended.
 
 assume boards are SYMBIOS compatible
 CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT
   This option allows you to enable some features depending on GPIO
-  wiring.  These General Purpose Input/Output pins can be used for
+  wiring. These General Purpose Input/Output pins can be used for
   vendor specific features or implementation of the standard SYMBIOS
-  features.  Genuine SYMBIOS boards use GPIO0 in output for controller
-  LED and GPIO3 bit as a flag indicating single-ended/differential
-  interface.
-
-  If all the boards of your system are genuine SYMBIOS boards or use
-  BIOS and drivers from SYMBIOS, you would want to enable this option.
-  The driver behaves correctly on my system with this option enabled.
-  (SDMS 4.0 + Promise SCSI ULTRA 875 rev 0x3 + ASUS SC200 810A rev
-  0x12).  This option must be set to N if your system has at least one
-  53C8XX based SCSI board with a vendor-specific BIOS (example: Tekram
-  DC-390/U/W/F). 
-
-  However, if all your non Symbios compatible boards have NVRAM,
-  setting option "detect and read serial NVRAMs"
-  (CONFIG_SCSI_NCR53C8XX_NVRAM_DETECT) above allows the driver to
-  distinguish Symbios compatible boards from other ones.  So, you can
-  answer Y if all non Symbios compatible boards have NVRAM.
+  features. Genuine SYMBIOS controllers use GPIO0 in output for
+  controller LED and GPIO3 bit as a flag indicating
+  singled-ended/differential interface. The Tekram DC-390U/F boards
+  uses a different GPIO wiring.
+  
+  Your answer to this question is ignored if all your controllers have
+  NVRAM, since the driver is able to detect the board type from the
+  NVRAM format.
 
-  If unsure, say N.
+  If all the controllers in your system are genuine SYMBIOS boards or
+  use BIOS and drivers from SYMBIOS, you would want to say Y here,
+  otherwise N. N is the safe answer.
+
+enable profiling statistics gathering
+CONFIG_SCSI_NCR53C8XX_PROFILE
+  This option allows you to enable profiling information gathering.
+  These statistics are not very accurate due to the low frequency 
+  of the kernel clock (100 Hz on i386) and have performance impact 
+  on systems that use very fast devices.
+
+  The normal answer therefore is N.
 
 IBMMCA SCSI support
 CONFIG_SCSI_IBMMCA
@@ -3278,7 +3758,7 @@ CONFIG_SCSI_IBMMCA
   '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 via ftp (user: anonymous) in
+  the SCSI-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this driver as a module ( = code which can be
@@ -3344,7 +3824,7 @@ CONFIG_SCSI_IN2000
 PAS16 SCSI support
 CONFIG_SCSI_PAS16
   This is support for a SCSI host adapter. It is explained in section
-  3.10 of the SCSI-HOWTO, available via ftp (user: anonymous) at
+  3.10 of the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/pas16.h.
@@ -3357,7 +3837,7 @@ CONFIG_SCSI_PAS16
 PCI2000 support
 CONFIG_SCSI_PCI2000
   This is support for the PCI2000I EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via ftp
+  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
   (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module called pci2000.o ( = code
@@ -3368,7 +3848,7 @@ CONFIG_SCSI_PCI2000
 PCI2220i support
 CONFIG_SCSI_PCI2220I
   This is support for the PCI2220i EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via ftp
+  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
   (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module called pci2220i.o ( = code
@@ -3379,7 +3859,7 @@ CONFIG_SCSI_PCI2220I
 PSI240i support
 CONFIG_SCSI_PSI240I
   This is support for the PSI240i EIDE interface card which acts as a
-  SCSI host adapter. Please read the SCSI-HOWTO, available via ftp
+  SCSI host adapter. Please read the SCSI-HOWTO, available via FTP
   (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module called psi240i.o ( = code
@@ -3395,7 +3875,7 @@ CONFIG_SCSI_QLOGIC_FAS
   does NOT support the PCI version. The PCI versions are supported by
   the Qlogic ISP driver though.  Information about this driver is
   contained in drivers/scsi/README.qlogicfas.  You should also read
-  the SCSI-HOWTO, available via ftp (user: anonymous) at
+  the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -3411,7 +3891,7 @@ CONFIG_SCSI_QLOGIC_ISP
   Y here, make sure to say Y to "PCI BIOS support" as well. More
   information is contained in the file
   drivers/scsi/README.qlogicisp. You should also read the SCSI-HOWTO,
-  available via ftp (user: anonymous) at
+  available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -3423,7 +3903,7 @@ Seagate ST-02 and Future Domain TMC-8xx SCSI support
 CONFIG_SCSI_SEAGATE
   These are 8-bit SCSI controllers; the ST-01 is also supported by
   this driver. It is explained in section 3.9 of the SCSI-HOWTO,
-  available via ftp (user: anonymous) at
+  available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/seagate.h.
@@ -3436,7 +3916,7 @@ CONFIG_SCSI_SEAGATE
 Trantor T128/T128F/T228 SCSI support
 CONFIG_SCSI_T128
   This is support for a SCSI host adapter. It is explained in section
-  3.11 of the SCSI-HOWTO, available via ftp (user: anonymous) at
+  3.11 of the SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/t128.h. Note that Trantor was purchased by Adaptec, and
@@ -3451,7 +3931,7 @@ UltraStor SCSI support
 CONFIG_SCSI_ULTRASTOR
   This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
   adapter family. This driver is explained in section 3.12 of the
-  SCSI-HOWTO, available via ftp (user: anonymous) at
+  SCSI-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If it doesn't work out
   of the box, you may have to change some settings in
   drivers/scsi/ultrastor.h.
@@ -3479,10 +3959,10 @@ CONFIG_SCSI_EATA
   This driver supports all the EATA/DMA-compliant SCSI host adapters
   and does not need any BIOS32 service.  DPT ISA and all EISA i/o
   addresses are probed looking for the "EATA" signature. If you said Y
-  to "PCI bios support", the addresses of all the PCI SCSI controllers
+  to "PCI BIOS support", the addresses of all the PCI SCSI controllers
   reported by BIOS32 are probed as well.  You want to read
   the start of drivers/scsi/eata.c and the SCSI-HOWTO, available via
-  ftp (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
+  FTP (user: anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   Note that there is also another driver for the same hardware
   available: "EATA-DMA support". You should say Y to only one of them.
@@ -3498,7 +3978,7 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE
   adapter can send several SCSI commands to a device's queue even if
   previous commands haven't finished yet. Some SCSI devices don't
   implement this properly, so the safe answer is N.
-
+        
 enable elevator sorting
 CONFIG_SCSI_EATA_LINKED_COMMANDS
   This is a feature of SCSI-2 which improves performance: the host
@@ -3517,7 +3997,7 @@ NCR53c406a SCSI support
 CONFIG_SCSI_NCR53C406A
   This is support for the NCR53c406a SCSI host adapter. For user
   configurable parameters, check out drivers/scsi/NCR53c406.c in the
-  kernel source. Also read the SCSI-HOWTO, available via ftp (user:
+  kernel source. Also read the SCSI-HOWTO, available via FTP (user:
   anonymous) at ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   If you want to compile this driver as a module ( = code which can be
@@ -3541,7 +4021,7 @@ AM53/79C974 PCI SCSI support
 CONFIG_SCSI_AM53C974
   This is support for the AM53/79C974 SCSI host adapters. Please read
   drivers/scsi/README.AM53C974 for details. Also, the SCSI-HOWTO,
-  available via ftp (user: anonymous) at
+  available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO, is for you. 
 
   If you want to compile this driver as a module ( = code which can be
@@ -3566,7 +4046,7 @@ CONFIG_SCSI_PPA
   (a 100Mb removable media device). For more information about this
   driver and how to use it you should read the file
   drivers/scsi/README.ppa. You should also read the SCSI-HOWTO, which
-  is available via ftp (user: anonymous) from
+  is available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If you use this driver,
   you will still be able to use the parallel port for other tasks,
   such as a printer; it is safe to compile both drivers into the
@@ -3607,13 +4087,86 @@ 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
+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. 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. Only the SBus
+  incarnation of the adapter is supported at the moment.
+
+SparcSTORAGE Array 100 and 200 series
+CONFIG_SCSI_PLUTO
+  If you never bought a disk array made by Sun, go with N.  
+
+AcornSCSI support
+CONFIG_SCSI_ACORNSCSI_3
+  This enables support for the Acorn SCSI card (aka30).  If you have an
+  Acorn system with one of these, say Y.  If unsure, say N.
+
+Acorn SCSI tagged queue support
+CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE
+  Say Y here to enable tagged queuing support on the Acorn SCSI card.
+
+  This is a feature of SCSI-2 which improves performance: the host
+  adapter can send several SCSI commands to a device's queue even if
+  previous commands haven't finished yet. Some SCSI devices don't
+  implement this properly, so the safe answer is N.
+
+Acorn SCSI Synchronous transfers support
+CONFIG_SCSI_ACORNSCSI_SYNC
+  Say Y here to enable synchronous transfer negotiation with all targets
+  on the Acorn SCSI card.
+
+  In general, this improves performance; however some SCSI devices
+  don't implement it properly, so the safe answer is N.
+
+Oak SCSI support
+CONFIG_SCSI_OAK1
+  This enables support for the Oak SCSI card.  If you have an Acorn system
+  with one of these, say Y.  If unsure, say N.
+
+Cumana SCSI I support
+CONFIG_SCSI_CUMANA_1
+  This enables support for the Cumana SCSI I card.  If you have an Acorn
+  system with one of these, say Y.  If unsure, say N.
+
+Cumana SCSI II support
+CONFIG_SCSI_CUMANA_2
+  This enables support for the Cumana SCSI II card.  If you have an Acorn
+  system with one of these, say Y.  If unsure, say N.
+
+EcoSCSI support
+CONFIG_SCSI_ECOSCSI
+  This enables support for the EcoSCSI card - a small card that sits in
+  the Econet socket.  If you have an Acorn system with one of these,
+  say Y.  If unsure, say N.
+
+EESOX SCSI support
+CONFIG_SCSI_EESOXSCSI
+  This enables support for the EESOX SCSI card.  If you have an Acorn
+  system with one of these, say Y, otherwise say N.
+
+Powertec SCSI support
+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.  
+
 Network device support?
 CONFIG_NETDEVICES
   You can say N here if you don't intend to connect to any other
   computer at all or if all your connections will be over a telephone
   line with a modem either via UUCP (UUCP is a protocol to forward
   mail and news between unix hosts over telephone lines; read the
-  UUCP-HOWTO, available via ftp (user: anonymous) in
+  UUCP-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO) or dialing up a shell
   account or a BBS, even using term (term is a program which gives you
   almost full Internet connectivity if you have a regular dial up
@@ -3628,7 +4181,7 @@ CONFIG_NETDEVICES
   plan to use more than one network card under Linux), available from
   sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini) or if you want to use
   SLIP (Serial Line Internet Protocol is the protocol used to send
-  Internet traffic over telephone lines or nullmodem cables) or CSLIP
+  Internet traffic over telephone lines or null modem cables) or CSLIP
   (compressed SLIP) or PPP (Point to Point Protocol, a better and
   newer replacement for SLIP) or PLIP (Parallel Line Internet Protocol
   is mainly used to create a mini network by connecting the parallel
@@ -3647,7 +4200,7 @@ CONFIG_DUMMY
   address. It is most commonly used in order to make your currently
   inactive SLIP address seem like a real address for local programs.
   If you use SLIP or PPP, you might want to say Y here. Read about it
-  in the Network Administrator's Guide, available via ftp (user:
+  in the Network Administrator's Guide, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/LDP. Since this
   thing often comes in handy, the default is Y. It won't enlarge your
   kernel either. What a deal.
@@ -3667,15 +4220,15 @@ CONFIG_SLIP
   Slip/CSlip server for other people to dial in.  SLIP (Serial Line
   Internet Protocol) is a protocol used to send Internet traffic
   over telephone lines or serial cables (also known as
-  nullmodems); nowadays, the protocol PPP is more common than SLIP. 
+  null modems); nowadays, the PPP is a more common protocol than SLIP. 
 
   Normally, your access provider has to support SLIP in order for you
   to be able to use it, but there is now a SLIP emulator called SLiRP
-  around (available via ftp (user: anonymous) from
+  around (available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/system/network/serial/ ) which
   allows you to use SLIP over a regular dial up shell connection. If
   you plan to use SLiRP, make sure to say Y to CSLIP, below. The
-  NET-2-HOWTO, available via ftp (user: anonymous) in
+  NET-2-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO, explains how to
   configure SLIP. Note that you don't need this option if you just
   want to run term (term is a program which gives you almost full
@@ -3698,11 +4251,11 @@ CONFIG_SLIP_COMPRESSED
   TCP/IP headers (not on the data itself), but it has to be supported
   on both ends. Ask your access provider if you are not sure and say
   Y, just in case. You will still be able to use plain SLIP. If you
-  plan to use SLiRP, the SLIP emulator (available via ftp (user:
+  plan to use SLiRP, the SLIP emulator (available via FTP (user:
   anonymous) from
   ftp://sunsite.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-2-HOWTO, available via ftp
+  definitely want to say Y here. The NET-2-HOWTO, available via FTP
   (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO,
   explains how to configure CSLIP. This won't enlarge your kernel.
 
@@ -3717,7 +4270,7 @@ CONFIG_SLIP_MODE_SLIP6
   Just occasionally you may need to run IP over hostile serial
   networks that don't pass all control characters or are only seven
   bit. Saying Y here adds an extra mode you can use with SLIP:
-  "slip6". In this mode, SLIP will only send normal ascii symbols over
+  "slip6". In this mode, SLIP will only send normal ASCII symbols over
   the serial device. Naturally, this has to be supported at the other
   end of the link as well. It's good enough, for example, to run IP
   over the async ports of a Camtec JNT Pad. If unsure, say N.
@@ -3729,7 +4282,7 @@ CONFIG_PPP
   serial) lines. Ask your access provider if they support it, because
   otherwise you can't use it (not quite true any more: the free
   program SLiRP can emulate a PPP line if you just have a regular dial
-  up shell account on some UNIX computer; get it via ftp (user:
+  up shell account on some UNIX computer; get it via FTP (user:
   anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/system/network/serial/). Note that
   you don't need "PPP support" if you just want to run term (term is a
@@ -3762,14 +4315,14 @@ CONFIG_PPP
 
 Wireless LAN (non-hamradio)
 CONFIG_NET_RADIO
-  Support for wireless LAN's and everything having to do with 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. 
 
   Some user-level drivers for scarab devices which don't require
-  special kernel support are available via ftp (user: anonymous) from
+  special kernel support are available via FTP (user: anonymous) from
   ftp://shadow.cabi.net/pub/Linux.
 
 STRIP (Metricom Starmode radio IP)
@@ -3799,18 +4352,23 @@ CONFIG_STRIP
 
 AT&T WaveLAN & DEC RoamAbout DS support
 CONFIG_WAVELAN
-  The Lucent Wavelan (formerly NCR and AT&T ; or DEC RoamAbout DS) is
+  The Lucent WaveLAN (formerly NCR and AT&T; or DEC RoamAbout DS) is
   a Radio LAN (wireless Ethernet-like Local Area Network) using the
   radio frequencies 900 MHz and 2.4 GHz.
   
-  This driver support the ISA version of the Wavelan card. A separate
-  driver for the pcmcia hardware is available in David Hinds's pcmcia
-  package. If you want to use an ISA Wavelan card under Linux, say Y
-  and read the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  This driver support the ISA version of the WaveLAN card. A separate
+  driver for the pcmcia hardware is available in David Hinds'
+  pcmcia-cs package (see the file Documentation/Changes for location).
+
+  If you want to use an ISA WaveLAN card under Linux, say Y and read
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Some more specific
-  information is contained in Documentation/networking/wavelan.txt.
+  information is contained in Documentation/networking/wavelan.txt and
+  in the source code drivers/net/wavelan.p.h.
+
   You will also need the wireless tools package available from
   ftp://ftp.inka.de/pub/comp/Linux/networking/NetTools/contrib/.
+  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).
@@ -3818,26 +4376,6 @@ CONFIG_WAVELAN
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-Radio support
-CONFIG_MISC_RADIO
-  If you have a radio card (which enables your computer to receive
-  regular radio broadcasts), then you will want to say Y here and
-  make a character device file (usually /dev/radio) with major number
-  10 and minor 152 using mknod ("man mknod").  And then, don't forget
-  to pick up some useful tools to use said device (you _might_ find
-  something at ftp://ftp.lmh.ox.ac.uk/users/weejock/linux/, but I haven't
-  written anything too useful yet...)
-
-AIMSlab RadioTrack card
-CONFIG_RADIO_RTRACK
-  Choose Y here if you have one of these, and then fill in the port
-  address below.
-
-RadioTrack i/o port
-CONFIG_RADIO_RTRACK_PORT
-  Enter either 0x30f or 0x20f here.  The card default is 0x30f, if you
-  haven't changed the jumper setting on the card.
-
 LAPB over Ethernet driver
 CONFIG_LAPBETHER
   This is a driver for a pseudo device (typically called /dev/lapb0)
@@ -3871,9 +4409,9 @@ CONFIG_HFMODEM
   Pactor 1 and GTOR using a standard PC sound card. If unsure,
   say N.
 
-Shortwave radio modem driver support for SoundBlaster and compatible cards
+Shortwave radio modem driver support for Sound Blaster and compatible cards
 CONFIG_HFMODEM_SBC
-  This option enables the hfmodem driver to use SoundBlaster and
+  This option enables the hfmodem driver to use Sound Blaster and
   compatible cards. It requires a 16bit capable card, i.e.
   SB16 or better, or ESS1688 or newer.
 
@@ -3908,7 +4446,7 @@ CONFIG_PLIP
   has a program like lynx or netscape) and winsock or NCSA's telnet.
 
   If you want to use PLIP, say Y and read the PLIP mini-HOWTO,
-  available via ftp (user: anonymous) in
+  available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini as well as the
   NET-2-HOWTO in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Note that
   the PLIP protocol was changed and this PLIP driver won't work
@@ -4005,6 +4543,35 @@ CONFIG_SDLA
   The module will be called sdla.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+Acorn Econet/AUN protocols (EXPERIMENTAL)
+CONFIG_ECONET
+  Econet is a fairly old and slow networking protocol mainly used by
+  Acorn computers to access file and print servers. It uses native
+  Econet network cards. AUN is an implementation of the higher level
+  parts of Econet that runs over ordinary Ethernet connections, on
+  top of the UDP packet protocol, which in turn runs on top of the
+  Internet protocol IP.
+
+  If you say Y here, you can choose with the next two options whether
+  to send Econet/AUN traffic over a UDP Ethernet connection or over
+  a native Econet network 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 econet.o. If you want to compile it as a
+  module, say M here and read Documentation/modules.txt.
+
+AUN over UDP
+CONFIG_ECONET_AUNUDP
+  Say Y here if you want to send Econet/AUN traffic over a a UDP
+  connection (UDP is a packet based protocol that runs on top of the
+  Internet protocol IP) using an ordinary Ethernet network card.
+
+Native Econet
+CONFIG_ECONET_NATIVE
+  Say Y here if you have a native Econet network card installed in
+  your computer.
+
 WAN Router
 CONFIG_WAN_ROUTER
   Wide Area Networks (WANs), such as X.25, frame relay and leased
@@ -4074,14 +4641,18 @@ CONFIG_NET_SCHED
   called packet schedulers. You can attach different schedulers to
   different network devices. If you want to stick to the default
   scheduling algorithm, say N here. If you want to experiment with a
-  couple of different algorithms, say Y. 
+  couple of different algorithms, say Y. Currently, this is only
+  recommended for experts.
 
   To administer these schedulers, you'll need the user-level utilities
   from the package iproute2+tc at ftp://ftp.inr.ac.ru/ip-routing/
 
-  The available schedulers are
-  listed in the following questions; you can say Y to as many as you
-  like.  If unsure, say N now.
+  If you say Y here and to "/proc filesystem" below, you will be able
+  to read status information about priority 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.
 
 CBQ packet scheduler
 CONFIG_NET_SCH_CBQ
@@ -4090,8 +4661,8 @@ CONFIG_NET_SCH_CBQ
   algorithm classifies the waiting packets into a tree-like hierarchy
   of classes; the leaves of this tree are in turn scheduled by
   separate algorithms (called "disciplines" in this context) which you
-  can choose below from among the "auxiliary disciplines".  See the top
-  of net/sched/sch_cbq.c for references about the CBQ algorithm.
+  can choose below from among the various queueing algorithms. See the
+  top of net/sched/sch_cbq.c for references about the CBQ algorithm.
 
   This code is also available as a module called sch_cbq.o ( = code
   which can be inserted in and removed from the running kernel
@@ -4113,7 +4684,18 @@ CONFIG_NET_SCH_CSZ
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
-RED queueing discipline
+The simplest PRIO pseudo scheduler
+CONFIG_NET_SCH_PRIO
+  Say Y here if you want to use an n-band priority queue packet
+  "scheduler" for some of your network devices or as a leaf discipline
+  for the CBQ scheduling algorithm. 
+
+  This code is also available as a module called sch_prio.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.
+
+RED queue
 CONFIG_NET_SCH_RED
   Say Y here if you want to use the Random Early Detection (RED)
   packet scheduling algorithm for some of your network devices (see
@@ -4125,7 +4707,7 @@ CONFIG_NET_SCH_RED
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
-SFQ queueing discipline
+SFQ queue
 CONFIG_NET_SCH_SFQ
   Say Y here if you want to use the Stochastic Fairness Queueing (SFQ)
   packet scheduling algorithm for some of your network devices or as a
@@ -4138,7 +4720,21 @@ CONFIG_NET_SCH_SFQ
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
-auxiliary TBF queue
+TEQL queue
+CONFIG_NET_SCH_TEQL
+  Say Y here if you want to use the True Link Equalizer (TLE) packet
+  scheduling algorithm for some of your network devices or as a leaf
+  discipline for the CBQ scheduling algorithm. This queueing
+  discipline allows the combination of several physical devices into
+  one virtual device. (see the top of net/sched/sch_teql.c for
+  details).
+
+  This code is also available as a module called sch_teql.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.
+
+TBF queue
 CONFIG_NET_SCH_TBF
   Say Y here if you want to use the Simple Token Bucket Filter (TBF)
   packet scheduling algorithm for some of your network devices or as a
@@ -4150,27 +4746,49 @@ CONFIG_NET_SCH_TBF
   whenever you want). If you want to compile it as a module, say M
   here and read Documentation/modules.txt.
 
-auxiliary FIFO queue
-CONFIG_NET_SCH_PFIFO
-  Say Y here if you want to use a simple FIFO (first in - first out)
-  packet "scheduler" for some of your network devices or as a leaf
-  discipline for the CBQ scheduling algorithm. 
+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 net devices.
 
-  This code is also available as a module called sch_fifo.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.
-
-auxiliary PRIO queue
-CONFIG_NET_SCH_PRIO
-  Say Y here if you want to use an n-band priority queue packet
-  "scheduler" for some of your network devices or as a leaf discipline
-  for the CBQ scheduling algorithm. 
-
-  This code is also available as a module called sch_prio.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.
+  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.
+
+Rate estimator
+CONFIG_NET_ESTIMATOR
+  In order for Quality of Service scheduling to work, the current
+  rate-of-flow for a network device has to be estimated; if you say Y
+  here, the kernel will do just that.
+
+Packet classifier API
+CONFIG_NET_CLS
+  The CBQ scheduling algorithm requires that network packets which are
+  scheduled to be sent out over a network device be classified in some
+  way. If you say Y here, you will get a choice of several different
+  packet classifiers with the following questions. 
+#
+# Routing tables based classifier
+# CONFIG_NET_CLS_ROUTE
+#
+# Firewall based classifier
+# CONFIG_NET_CLS_FW
+#
+# U32 classifier
+# CONFIG_NET_CLS_U32
+#
+# Special RSVP classifier
+# CONFIG_NET_CLS_RSVP
+#
+# Special RSVP classifier for IPv6
+# CONFIG_NET_CLS_RSVP6
+#
+# Ingres traffic policing
+# CONFIG_NET_CLS_POLICE
+###
+### Some expert please fill these in
+###
 
 Network code profiler
 CONFIG_NET_PROFILE
@@ -4245,16 +4863,23 @@ CONFIG_WANPIPE_PPP
 Ethernet (10 or 100Mbit)
 CONFIG_NET_ETHERNET
   Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
-  type of Local Area Networks (LANs) in universities or
-  companies. 10-base-2 or Thinnet (10 Mbps over coaxial cable, linking
-  computers in a chain), 10-base-T (10 Mbps over twisted pair
-  telephone cable, linking computers to a central hub) and
-  100-base-<whatever> (100 Mbps) are common types of Ethernet. 
+  type of Local Area Network (LAN) in universities and companies.
+
+  Common varieties of Ethernet are: 10BASE-2 or Thinnet (10 Mbps over
+  coaxial cable, linking computers in a chain), 10BASE-T or twisted
+  pair (10 Mbps over twisted pair cable, linking computers to central
+  hubs), 10BASE-F (10 Mbps over optical fiber links, using hubs),
+  100BASE-TX (100 Mbps over two twisted pair cables, using hubs),
+  100BASE-T4 (100 Mbps over 4 standard voice-grade twisted pair
+  cables, using hubs), 100BASE-FX (100 Mbps over optical fiber links)
+  [the 100BASE varieties are also known as Fast Ethernet], and Gigabit
+  Ethernet (1 Gbps over optical fiber or short copper links).
 
   If your Linux machine will be connected to an Ethernet and you have
-  an Ethernet network card installed in your computer, say Y here and
-  read the Ethernet-HOWTO, available via ftp (user: anonymous) from
-  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
+  an Ethernet network interface card (NIC) installed in your computer,
+  say Y here and read the Ethernet-HOWTO, available via FTP (user:
+  anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. You will
+  then also have to say Y to the driver for your particular NIC.
 
   Note that the answer to this question won't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -4263,7 +4888,7 @@ CONFIG_NET_ETHERNET
 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
+  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
@@ -4279,7 +4904,7 @@ CONFIG_SUN_INTEL
 Western Digital/SMC cards
 CONFIG_NET_VENDOR_SMC
   If you have a network (Ethernet) card belonging to this class, say Y
-  and read the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  and read the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   Note that the answer to this question doesn't directly affect the
@@ -4290,7 +4915,7 @@ CONFIG_NET_VENDOR_SMC
 WD80*3 support
 CONFIG_WD80x3
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -4303,7 +4928,7 @@ SMC Ultra MCA support
 CONFIG_ULTRAMCA
   If you have a network (Ethernet) card of this type and are running
   an MCA based system (PS/2), say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -4315,7 +4940,7 @@ CONFIG_ULTRAMCA
 SMC Ultra support
 CONFIG_ULTRA
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
   
   Important: There have been many reports that, with some motherboards
@@ -4334,7 +4959,7 @@ CONFIG_ULTRA
 SMC Ultra32 EISA support
 CONFIG_ULTRA32
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.  
 
   This driver is also available as a module ( = code which can be
@@ -4348,9 +4973,9 @@ CONFIG_SMC9194
   This is support for the SMC9xxx based Ethernet cards. Choose this
   option if you have a DELL laptop with the docking station, or
   another SMC9192/9194 based chipset. Say Y if you want it compiled
-  into the kernel, and read the the file
+  into the kernel, and read the file
   Documentation/networking/smc9.txt and the Ethernet-HOWTO, available
-  via ftp (user: anonymous) in
+  via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4359,11 +4984,24 @@ CONFIG_SMC9194
   it as a module, say M here and read Documentation/modules.txt as
   well as Documentation/networking/net-modules.txt.
 
+PCI NE2000 support
+CONFIG_NE2K_PCI
+  This driver is for NE2000 compatible PCI cards. It will not work
+  with ISA NE2000 cards. If you have a PCI NE2000 network (Ethernet)
+  card, say Y and read the Ethernet-HOWTO, available via FTP (user:
+  anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/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 ne2k-pci.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
   as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO,
-  available via ftp (user: anonymous) in
+  available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   Note that the answer to this question doesn't directly affect the
@@ -4374,7 +5012,7 @@ CONFIG_NET_VENDOR_RACAL
 NI5010 support
 CONFIG_NI5010
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Note that this is still
   experimental code. 
 
@@ -4387,7 +5025,7 @@ CONFIG_NI5010
 NI5210 support
 CONFIG_NI52
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -4399,7 +5037,7 @@ CONFIG_NI52
 NI6510 support
 CONFIG_NI65
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   This driver is also available as a module ( = code which can be
@@ -4408,17 +5046,43 @@ CONFIG_NI65
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
+RealTek 8129/8139 (not 8019/8029!) support
+CONFIG_RTL8139
+  This is a driver for the Fast Ethernet PCI network cards based on
+  the RTL8129 and RTL8139 chips. If you have one of those, say Y and
+  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/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),
+  say M here and read Documentation/modules.txt. This is recommended.
+  The module will be called rtl8139.o.
+
+Packet Engines Yellowfin Gigabit-NIC support
+CONFIG_YELLOWFIN
+  Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
+  adapter. This adapter is used by the Beowulf Linux cluster project.
+  See http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html for
+  more information about this driver in particular and Beowulf in
+  general (to browse the WWW, you need to have access to a machine on
+  the Internet that has a program like lynx or netscape).
+
+  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 yellowfin.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
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Some LinkSys cards are
   of this type.
 
 3COM cards
 CONFIG_NET_VENDOR_3COM
   If you have a network (Ethernet) card belonging to this class, say Y
-  and read the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  and read the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   Note that the answer to this question doesn't directly affect the
@@ -4429,7 +5093,7 @@ CONFIG_NET_VENDOR_3COM
 3c501 support
 CONFIG_EL1
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Also, consider buying a
   new card, since the 3c501 is slow, broken, and obsolete: you will
   have problems. Some people suggest to ping ("man ping") a nearby
@@ -4444,7 +5108,7 @@ CONFIG_EL1
 3c503 support
 CONFIG_EL2
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4457,7 +5121,7 @@ CONFIG_EL2
 CONFIG_ELPLUS
   Information about this network (Ethernet) card can be found in
   Documentation/networking/3c505.txt. If you have a card of this type,
-  say Y and read the Ethernet-HOWTO, available via ftp (user:
+  say Y and read the Ethernet-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -4469,7 +5133,7 @@ CONFIG_ELPLUS
 3c507 support
 CONFIG_EL16
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4481,7 +5145,7 @@ CONFIG_EL16
 3c523 support 
 CONFIG_ELMC
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4494,7 +5158,7 @@ CONFIG_ELMC
 CONFIG_EL3
   If you have a network (Ethernet) card belonging to the 3Com
   EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
-  via ftp (user: anonymous) in
+  via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If your card is not working you may need to use the DOS
@@ -4509,10 +5173,10 @@ CONFIG_EL3
 
 3c590 series (592/595/597) "Vortex" support
 CONFIG_VORTEX
-  If you have a 3Com "Vortex" or "Boomerang" series network (Ethernet)
-  card (Fast EtherLink 3c590/3c592/3c595/3c597 or the EtherLink XL
-  3c900 or 3c905), say Y and read the Ethernet-HOWTO, available via
-  ftp (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
+  If you have a 3Com "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597)
+  or "Boomerang" series (EtherLink XL 3c900 or 3c905) network
+  (Ethernet) card, say Y and read the Ethernet-HOWTO, available via FTP
+  (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
   More specific information is in Documentation/networking/vortex.txt
   and in the comments at the beginning of drivers/net/3c59x.c.
 
@@ -4524,11 +5188,11 @@ CONFIG_VORTEX
 Other ISA cards
 CONFIG_NET_ISA
   If your network (Ethernet) card hasn't been mentioned yet and its
-  bus system (that's the way the components of the card talk to each
-  other) is ISA (as opposed to EISA, VLB or PCI), say Y. Make sure you
-  know the name of your card. Read the Ethernet-HOWTO, available via
-  ftp (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
-  If unsure, say Y.
+  bus system (that's the way the cards talks to the other components
+  of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.
+  Make sure you know the name of your card. Read the Ethernet-HOWTO,
+  available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. If unsure, say Y.
 
   Note that the answer to this question doesn't directly affect the
   kernel: saying N will just cause this configure script to skip all
@@ -4546,7 +5210,7 @@ CONFIG_ARCNET
   below.
 
   You might also want to have a look at the Ethernet-HOWTO, available
-  via ftp (user: anonymous) in
+  via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO (even though ARCnet is
   not really Ethernet).
 
@@ -4584,7 +5248,7 @@ CONFIG_ARCNET_1051
 ARCnet COM90xx (normal) chipset driver
 CONFIG_ARCNET_COM90xx
   This is the chipset driver for the standard COM90xx cards. If you
-  have always used the old arcnet driver without knowing what type of
+  have always used the old ARCnet driver without knowing what type of
   card you had, this is probably the one for you. 
 
   This driver is also available as a module ( = code which can be
@@ -4634,7 +5298,7 @@ CONFIG_ARCNET_COM20020
 Cabletron E21xx support
 CONFIG_E2100
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4647,7 +5311,7 @@ CS89x0 support
 CONFIG_CS89x0
   Support for CS89x0 chipset based Ethernet cards. If you have a
   network (Ethernet) card of this type, say Y and read the
-  Ethernet-HOWTO, available via ftp (user: anonymous) in
+  Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO as well as
   Documentation/networking/cs89x0.txt.
 
@@ -4660,7 +5324,7 @@ CONFIG_CS89x0
 DEPCA support
 CONFIG_DEPCA
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO as well as
   drivers/net/depca.c.
 
@@ -4675,7 +5339,7 @@ CONFIG_EWRK3
   This driver supports the DE203, DE204 and DE205 network (Ethernet)
   cards. If this is for you, say Y and read
   Documentation/networking/ewrk3.txt in the kernel source as well as
-  the Ethernet-HOWTO, available via ftp (user: anonymous) from
+  the Ethernet-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -4687,13 +5351,13 @@ CONFIG_EWRK3
 SEEQ8005 support
 CONFIG_SEEQ8005
   This is a driver for the SEEQ 8005 network (Ethernet) card. If this
-  is for you, read the Ethernet-HOWTO, available via ftp (user:
+  is for you, read the Ethernet-HOWTO, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
 AT1700 support
 CONFIG_AT1700
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4706,7 +5370,7 @@ CONFIG_AT1700
 FMV-181/182/183/184 support
 CONFIG_FMV18X
   If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,
-  say Y and read the Ethernet-HOWTO, available via ftp (user:
+  say Y and read the Ethernet-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you use an FMV-183 or FMV-184 and it is not working, you may need
@@ -4718,11 +5382,11 @@ CONFIG_FMV18X
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt. 
 
-EtherExpressPro support
+EtherExpress PRO support
 CONFIG_EEXPRESS_PRO
   If you have a network (Ethernet) card of this type, say Y. Note
-  however that the EtherExpressPro 100 Ethernet card has its own
-  separate driver. Please read the Ethernet-HOWTO, available via ftp
+  however that the EtherExpress PRO/100 Ethernet card has its own
+  separate driver. Please read the Ethernet-HOWTO, available via FTP
   (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4734,7 +5398,7 @@ CONFIG_EEXPRESS_PRO
 EtherExpress support
 CONFIG_EEXPRESS
   If you have an EtherExpress16 network (Ethernet) card, say Y and
-  read the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Note that the Intel
   EtherExpress16 card used to be regarded as a very poor choice
   because the driver was very unreliable. We now have a new driver
@@ -4749,7 +5413,7 @@ CONFIG_EEXPRESS
 HP PCLAN+ (27247B and 27252A) support
 CONFIG_HPLAN_PLUS
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4761,7 +5425,7 @@ CONFIG_HPLAN_PLUS
 HP PCLAN (27245 and other 27xxx series) support
 CONFIG_HPLAN
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4773,7 +5437,7 @@ CONFIG_HPLAN
 HP 10/100VG PCLAN (ISA, EISA, PCI) support
 CONFIG_HP100
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -4785,7 +5449,7 @@ CONFIG_HP100
 NE2000/NE1000 support
 CONFIG_NE2000
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Many Ethernet cards
   without a specific driver are compatible with NE2000.
 
@@ -4798,14 +5462,14 @@ CONFIG_NE2000
 SK_G16 support
 CONFIG_SK_G16
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
 EISA, VLB, PCI and on board controllers
 CONFIG_NET_EISA
   This is another class of network cards which attach directly to the
   bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-  available via ftp (user: anonymous) from
+  available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   Note that the answer to this question doesn't directly affect the
@@ -4817,13 +5481,19 @@ CONFIG_NET_EISA
 AMD PCnet32 (VLB and PCI) support
 CONFIG_PCNET32
   If you have a PCnet32 or PCnetPCI based network (Ethernet) card, say
-  Y here and read the Ethernet-HOWTO, available via ftp (user:
+  Y here and read the Ethernet-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/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 pcnet32.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.
+
 Ansel Communications EISA 3200 support
 CONFIG_AC3200
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4835,7 +5505,7 @@ CONFIG_AC3200
 Racal-Interlan EISA ES3210 support
 CONFIG_ES3210
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4844,10 +5514,22 @@ CONFIG_ES3210
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
+Mylex EISA LNE390A/LNE390B support
+CONFIG_LNE390
+  If you have a network (Ethernet) card of this type, say Y and read
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/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 lne390.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.
+
 Apricot Xen-II on board Ethernet
 CONFIG_APRICOT
   If you have a network (Ethernet) controller of this type, say Y and
-  read the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  read the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -4861,7 +5543,7 @@ CONFIG_DE4X5
   This is support for the DIGITAL series of PCI/EISA Ethernet cards.
   These include the DE425, DE434, DE435, DE450 and DE500 models. If
   you have a network card of this type, say Y and read the
-  Ethernet-HOWTO, available via ftp (user: anonymous) in
+  Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. More specific
   information is contained in Documentation/networking/de4x5.txt.
 
@@ -4879,7 +5561,7 @@ CONFIG_DEC_ELCP
   of this type. (If your card is NOT SMC EtherPower 10/100 PCI
   (smc9332dst), you can also try the driver for "Generic DECchip"
   cards, above. However, most people with a network card of this type
-  will say Y here.) Do read the Ethernet-HOWTO, available via ftp
+  will say Y here.) Do read the Ethernet-HOWTO, available via FTP
   (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
   More specific information is contained in
   Documentation/networking/tulip.txt.
@@ -4895,7 +5577,7 @@ CONFIG_DGRS
   This is support for the Digi International RightSwitch series of
   PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
   models. If you have a network card of this type, say Y and read the
-  Ethernet-HOWTO, available via ftp (user: anonymous) in
+  Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. More specific
   information is contained in Documentation/networking/dgrs.txt.
 
@@ -4905,10 +5587,10 @@ CONFIG_DGRS
   module, say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-EtherExpressPro/100 support
+EtherExpress PRO/100 support
 CONFIG_EEXPRESS_PRO100
-  If you have an Intel EtherExpressPro 100 PCI network (Ethernet)
-  card, say Y and read the Ethernet-HOWTO, available via ftp (user:
+  If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
+  card, say Y and read the Ethernet-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4920,7 +5602,7 @@ CONFIG_EEXPRESS_PRO100
 ICL EtherTeam 16i/32 support
 CONFIG_ETH16I
   If you have a network (Ethernet) card of this type, say Y and read
-  the Ethernet-HOWTO, available via ftp (user: anonymous) in
+  the Ethernet-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4931,11 +5613,14 @@ CONFIG_ETH16I
 
 TI ThunderLAN support (EXPERIMENTAL)
 CONFIG_TLAN
-  If you have a TLAN based network card which is supported by this
-  driver, say Y and read the Ethernet-HOWTO, available via ftp (user:
-  anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Devices
-  currently supported are the Compaq Netelligent 10, Netelligent
-  10/100, and Internal NetFlex 3.
+  If you have a PCI Ethernet network card based on the ThunderLAN chip
+  which is supported by this driver, say Y and read the
+  Ethernet-HOWTO, available via FTP (user: anonymous) in
+  ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
+
+  Devices currently supported by this driver are Compaq Netelligent,
+  Compaq NetFlex and Olicom cards. Please read the file
+  Documentation/tlan.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).
@@ -4947,9 +5632,9 @@ CONFIG_TLAN
 
 SMC EtherPower II (EXPERIMENTAL)
 CONFIG_EPIC100
-  If you have an SMC EtherPower II 9432 PCI ethernet network card
+  If you have an SMC EtherPower II 9432 PCI Ethernet network card
   which is based on the SMC83c170, say Y and read the Ethernet-HOWTO,
-  available via ftp (user: anonymous) in
+  available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   This driver is also available as a module ( = code which can be
@@ -4963,23 +5648,23 @@ CONFIG_ZNET
   The Zenith Z-Note notebook computer has a built-in network
   (Ethernet) card, and this is the Linux driver for it. Note that the
   IBM Thinkpad 300 is compatible with the Z-Note and is also supported
-  by this driver. Read the Ethernet-HOWTO, available via ftp (user:
+  by this driver. Read the Ethernet-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
 Pocket and portable adapters
 CONFIG_NET_POCKET
   Cute little network (Ethernet) devices which attach to the parallel
   port ("pocket adapters"), commonly used with laptops. If you have
-  one of those, say Y and read the Ethernet-HOWTO, available via ftp
+  one of those, say Y and read the Ethernet-HOWTO, available via FTP
   (user: anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to plug a network card into the PCMCIA slot of your
   laptop instead (PCMCIA is the standard for credit card size
-  extension cards used by all modern laptops), look on the ftp site
+  extension cards used by all modern laptops), look on the FTP site
   (user: anonymous) ftp://cb-iris.stanford.edu/pub/pcmcia and say N
   here.
 
-  Laptop user want to read the Linux Laptop homepage at
+  Laptop users should read the Linux Laptop home page at
   http://www.cs.utexas.edu/users/kharker/linux-laptop/ (to browse the
   WWW, you need to have access to a machine on the Internet that has a
   program like lynx or netscape). 
@@ -4993,7 +5678,7 @@ AT-LAN-TEC/RealTek pocket adapter support
 CONFIG_ATP
   This is a network (Ethernet) device which attaches to your parallel
   port. Read drivers/net/atp.c as well as the Ethernet-HOWTO,
-  available via ftp (user: anonymous) from
+  available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/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 don't like each
@@ -5003,7 +5688,7 @@ D-Link DE600 pocket adapter support
 CONFIG_DE600
   This is a network (Ethernet) device which attaches to your parallel
   port. Read Documentation/networking/DLINK.txt as well as the
-  Ethernet-HOWTO, available via ftp (user: anonymous) from
+  Ethernet-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO if you want to use this.
   It is possible to have several devices share a single parallel port
   and it is safe to compile the corresponding drivers into the kernel.
@@ -5017,7 +5702,7 @@ D-Link DE620 pocket adapter support
 CONFIG_DE620
   This is a network (Ethernet) device which attaches to your parallel
   port. Read Documentation/networking/DLINK.txt as well as the
-  Ethernet-HOWTO, available via ftp (user: anonymous) from
+  Ethernet-HOWTO, available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO if you want to use this.
   It is possible to have several devices share a single parallel port
   and it is safe to compile the corresponding drivers into the kernel.
@@ -5035,7 +5720,7 @@ CONFIG_TR
   connected to such a Token Ring network and want to use your Token
   Ring card under Linux, say Y here and to the driver for your
   particular card below and read the Token-Ring mini-HOWTO, available
-  via ftp (user:anonymous) from
+  via FTP (user:anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. Most people can say N
   here.
 
@@ -5043,7 +5728,7 @@ IBM Tropic chipset based adapter support
 CONFIG_IBMTR
   This is support for all IBM Token Ring cards that don't use DMA. If
   you have such a beast, say Y and read the Token-Ring mini-HOWTO,
-  available via ftp (user:anonymous) from
+  available via FTP (user:anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   Warning: this driver will almost definitely fail if more than one
@@ -5054,13 +5739,27 @@ CONFIG_IBMTR
   The module will be called ibmtr.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
+SysKonnect adapter support
+CONFIG_SKTR
+  This is support for all SysKonnect Token Ring cards, specifically
+  SysKonnect TR4/16(+) ISA (SK-4190), SysKonnect TR4/16(+) PCI
+  (SK-4590), SysKonnect TR4/16 PCI (SK-4591) 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 via FTP (user: anonymous)
+  from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
+
+  Also read the file linux/Documentation/networking/sktr.txt or check
+  the Linux-SNA WWW site for the latest information at
+  http://samba.anu.edu.au/linux-sna/documents/drivers/SysKonnect/
+
 Traffic Shaper (EXPERIMENTAL)
 CONFIG_SHAPER
   The traffic shaper is a virtual network device that allows you to
   limit the rate of outgoing data flow over some other network
   device. See Documentation/networking/shaper.txt for more
   information.  To set up and configure shaper devices, you need the
-  shapecfg program, available via ftp (user: anonymous) from
+  shapecfg program, available via FTP (user: anonymous) from
   ftp://shadow.cabi.net/pub/Linux in the shaper package.  
 
   This driver is also available as a module ( = code which can be
@@ -5087,10 +5786,30 @@ SGI Seeq ethernet controller support
   This is a driver for the Seeq based Ethernet adapters used in many
   Silicon Graphics machines.
 
+Acorn Ether1 card
+CONFIG_ARM_ETHER1
+  If you have an Acorn system with one of these (AKA25) network cards,
+  you should say Y to this option if you wish to use it with Linux.
+
+Acorn/ANT Ether3 card
+CONFIG_ARM_ETHER3
+  If you have an Acorn system with one of these network cards, you
+  should say Y to this option if you wish to use it with Linux.
+
+I Cubed EtherH card
+CONFIG_ARM_ETHERH
+  If you have an Acorn system with one of these network cards, you
+  should say Y to this option if you wish to use it with Linux.
+
+EBSA-110 Ethernet interface
+CONFIG_AM79C961A
+  If you wish to compile a kernel for the EBSA-110, then you should
+  always answer Y to this.
+
 Support CDROM drives that are not SCSI or IDE/ATAPI
 CONFIG_CD_NO_IDESCSI
   If you have a CDROM drive that is neither SCSI nor IDE/ATAPI, say Y
-  here, otherwise N. Read the CDROM-HOWTO, available via ftp (user:
+  here, otherwise N. Read the CDROM-HOWTO, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. 
 
   Note that the answer to this question doesn't directly affect the
@@ -5111,8 +5830,9 @@ CONFIG_CD_NO_IDESCSI
   read Documentation/modules.txt. 
 
   If you want to use any of these CDROM drivers, you also have to say
-  Y to "ISO9660 cdrom filesystem support" below (this answer will get
-  "defaulted" for you if you enable any of the Linux CDROM drivers).
+  Y or M to "ISO 9660 CDROM filesystem support" below (this answer will
+  get "defaulted" for you if you enable any of the Linux CDROM
+  drivers).
 
 Sony CDU31A/CDU33A CDROM support
 CONFIG_CDU31A
@@ -5126,7 +5846,7 @@ CONFIG_CDU31A
   how to pass options to the kernel. The lilo procedure is also
   explained in the SCSI-HOWTO. 
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5151,7 +5871,7 @@ CONFIG_MCD
   If the driver doesn't work out of the box, you might want to have a
   look at drivers/cdrom/mcd.h.  
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5169,7 +5889,7 @@ CONFIG_MCDX
   able to support more than one drive, but each drive needs a separate
   interface card. Please read the file Documentation/cdrom/mcdx. 
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5181,11 +5901,11 @@ CONFIG_MCDX
 Matsushita/Panasonic/Creative, Longshine, TEAC CDROM support
 CONFIG_SBPCD
   This driver supports most of the drives which use the Panasonic or
-  SoundBlaster interface. Please read the file
+  Sound Blaster interface. Please read the file
   Documentation/cdrom/sbpcd.
 
   The Matsushita CR-521, CR-522, CR-523, CR-562, CR-563 drives
-  (sometimes labeled "Creative"), the CreativeLabs CD200, the
+  (sometimes labeled "Creative"), the Creative Labs CD200, the
   Longshine LCS-7260, the "IBM External ISA CDROM" (in fact a CR-56x
   model), the TEAC CD-55A fall under this category. Some other
   "electrically compatible" drives (Vertos, Genoa, some Funai models)
@@ -5207,7 +5927,7 @@ CONFIG_SBPCD
   module, only one controller card (but with up to four drives) is
   usable.
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5232,7 +5952,7 @@ CONFIG_AZTCD
   - is NOT for CDROM drives with IDE/ATAPI interfaces, such as Aztech
   CDA269-031SE. Please read the file Documentation/cdrom/aztcd. 
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs.
 
@@ -5246,7 +5966,7 @@ CONFIG_CDU535
   This is the driver for the older Sony CDU-535 and CDU-531 CDROM
   drives. Please read the file Documentation/cdrom/sonycd535.
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs.
 
@@ -5262,7 +5982,7 @@ CONFIG_GSCD
   in the file linux/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 to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5277,7 +5997,7 @@ CONFIG_CM206
   cm260 host adapter card, say Y here.  Please also read the file
   Documentation/cdrom/cm206. 
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5294,7 +6014,7 @@ CONFIG_OPTCD
   Optics Storage 8001 drive; use the IDE-ATAPI CDROM driver for that
   one. Please read the file Documentation/cdrom/optcd. 
 
-  If you say Y here, you should also say Y to "ISO9660 cdrom
+  If you say Y here, you should also say Y or M to "ISO 9660 CDROM
   filesystem support" below, because that's the filesystem used on
   CDROMs. 
 
@@ -5306,9 +6026,9 @@ CONFIG_OPTCD
 Sanyo CDR-H94A CDROM support
 CONFIG_SJCD
   If this is your CDROM drive, say Y here and read the file
-  Documentation/cdrom/sjcd. You should then also say Y to "ISO9660
-  cdrom filesystem support" below, because that's the filesystem used
-  on CDROMs. 
+  Documentation/cdrom/sjcd. You should then also say Y or M to
+  "ISO 9660 CDROM filesystem support" below, because that's the
+  filesystem used on CDROMs.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
@@ -5339,195 +6059,16 @@ CONFIG_ISP16_CDI
   The module will be called isp16.o. If you want to compile it as a
   module, say M here and read Documentation/modules.txt.
 
-Preload dcache
-CONFIG_DCACHE_PRELOAD
-  Preloading will create dcache entries when a directory is scanned
-  (e.g. because the ls command was used) for the *first* time. This
-  should speed up successive lookups of information about files in
-  that directory, but can also consume large amounts of memory.
-
-  Please report speedups (or slowdowns due to the memory usage if they
-  occur) to schoebel@informatik.uni-stuttgart.de .
-
-  If unsure, say N.
-
 Quota support
 CONFIG_QUOTA
   If you say Y here, you will be able to set per user limits for disk
   usage (also called disk quotas). Currently, it works only for the
   ext2 filesystem. You need additional software in order to use quota
-  support; for details, read the Quota mini-HOWTO, available via ftp
+  support; for details, read the Quota mini-HOWTO, available via FTP
   (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini. Probably the quota
   support is only useful for multi user systems. If unsure, say N.
 
-Online mirror support
-CONFIG_OMIRR
-  omirr is a package for _symmetric_ mirroring of files over the
-  Internet. In contrast to rdist, the online mirror daemon (omirrd) is
-  running all the time and transfers any changes on the file system as
-  soon as possible to all other servers. Symmetric means that all
-  servers have equal rights in changing a file: the last changer of a
-  file will win. This is the same behaviour as multiple processes
-  operating on a global file system. In effect, omirr can do the same
-  as NFS mounts, but will have better performance since the data is
-  stored on local disks. In contrast to a cache filesystem which has a
-  dedicated master copy, broken connections and/or servers are no
-  problem for continuing work on the remaining ones, because there is
-  no master copy. Every computer that wants to participate in the
-  mirroring needs to run the daemon omirrd, contained in the omirr
-  package which is available via ftp (user: anonymous) from
-  ftp://ftp.isa.de/pub/home/luik. You must say Y if you want to use
-  in.omirrd, but you should (but need not) say N if you don't (for
-  performance reasons).
-
-  Note that this is experimental code; use at your own risk.
-
-Filename translation support
-CONFIG_TRANS_NAMES
-  This is a useful feature if you have a pool of diskless Linux
-  clients which mount their root filesystems from a central
-  server. Depending on their hostnames, the clients can then see
-  different versions of certain files, which keeps maintenance at a
-  minimum when used for configuration files. The kernel running on the
-  clients should have this option enabled. If you don't administer a
-  pool of Linux clients, say N here, otherwise read on:
-
-  When you say Y here, filenames, directory names etc become
-  context-sensitive.  If you have a file named
-  "/etc/config#host=banana#", it will appear (by default) as
-  hardlinked to "/etc/config" on host "banana", while on host "mango"
-  another file "/etc/config#host=mango#" will appear as having been
-  hardlinked to "/etc/config".
-  This default behaviour can be changed by setting the _first_
-  environment variable NAMETRANS to a colon-separated list of suffixes
-  which are tried in the specified order. For example, in 
- 
-  'env - NAMETRANS=#host=mango#:#ktype=diskless# "`env`" command ...'
-   
-  the command will see the same files as if it had been executed on
-  host "mango" with a diskless kernel.
-
-  Using NAMETRANS supersedes _all_ default translations. Thus
-  translations can be completely switched off with an empty list,
-  e.g. 
-
-  'env - NAMETRANS= "`env`" command ...'  
-
-  Note that some system utilities like tar, dump, restore should be
-  used with translation switched off, in order to avoid doubled space
-  in archive files and when extracting from them. Also, make sure that
-  nfsd, mountd (and similar ones like samba daemons) run without
-  translation, in order to avoid doubled (or even wrong) translation
-  at the server and at the client.
-
-  You can automatically force the creation of context-dependent
-  filenames if there exists a template filename like
-  "/etc/mtab#host=CREATE#". As soon as a process running on "mango"
-  tries to create a file "/etc/mtab", the version
-  "/etc/mtab#host=mango#" is created instead (which appears in turn as
-  hardlinked to "/etc/mtab").  Note that if you want to make
-  "/etc/fstab" context-dependent, you should execute "touch
-  /etc/mtab#host=CREATE#" and "touch /etc/mtab.tmp#host=CREATE#",
-  because mount, umount and others running on different hosts would
-  otherwise try to create one shared /etc/mtab which would result in a
-  clash. Also one should execute "touch /etc/nologin#host=CREATE#" to
-  prevent global side effects from shutdown resp. runlevel.
-
-  Please read Documentation/transname.txt if you intend to say Y here.
-
-Restrict translation to gid
-CONFIG_TRANS_RESTRICT
-  If you say Y here, default filename translations are carried out
-  only if the parent directory of the context-sensitive file belongs
-  to a specific group id (gid). Trying to translate names everywhere
-  will decrease performance of file openings. Normally translations
-  are used only in system configuration files but not in ordinary user
-  filespace. So you should change the gid of directories containing
-  context-dependent files to some special group like "adm" (group id
-  4) and enable this option. As a result, users will not notice any
-  performance degradation resulting from filename translation.
-
-  Note that translations resulting from the first environment variable
-  "NAMETRANS=..." are always carried out regardless of the gid of
-  directories.
-
-  Beware: before turning on this option make sure that all directories
-  containing context-dependent files belong to the special group, or
-  system initialization may fail. If unsure, select N.
-
-Group id (gid) for translation restriction
-CONFIG_TRANS_GID
-  Default name translations will be carried out only inside directories
-  belonging to the group id (gid) that you specify here.
-  Default is 4 (group "adm").
-
-Nodename (hostname) translation
-CONFIG_TR_NODENAME
-  Enables translation of name suffixes like in
-  "/etc/config#host=banana#".  The syntax is
-  <filename>#host=<hostname>#. The hostname can be queried with the
-  command "uname -n". Normally this option is used heavily when
-  translation is enabled. If unsure, say Y.
-
-Kernelname translation
-CONFIG_TR_KERNNAME
-  Enables translation of name suffixes like in
-  "/etc/config#kname=default#".  The string is hard compiled into the
-  kernel by the following option.  Useful if your kernel does not know
-  the hostname at boot time, and there is no way to tell the hostname
-  by lilo or bootp. Please avoid using this option and prefer
-  "Nodename (hostname) translation" (CONFIG_TR_NODENAME) wherever
-  possible. When mounting the root over NFS, the own hostname must be
-  known at boot time anyway; this option is just for special use.
-  Note that the default translations are tried in the order as
-  occurring in the configuration, that is 1) host 2) kname 3) ktype 4)
-  machine 5) system. If unsure, say Y.
-
-String for kernelname translation
-CONFIG_KERNNAME
-  Enter the string you want to compile into the kernel. The string
-  will be used as context in context-dependent files like
-  "/etc/config#kname=<string>#".
-
-Kerneltype translation
-CONFIG_TR_KERNTYPE
-  Enables translation of name suffixes like in
-  "/etc/config#ktype=default#".  The syntax is
-  <filename>#ktype=<string>#. The string is hard compiled in the
-  kernel by the following option. Use if you want to create different
-  kernels with different behaviour. For example, use the string
-  "default" on your server, and use "diskless" on all your diskless
-  clients (and perhaps "dataless" on dataless clients). This way you
-  can avoid dozens of "config#host=<something># with same contents and
-  you have no effort when new machines are added. If unsure, say Y.
-
-String for kerneltype translation
-CONFIG_KERNTYPE
-  Enter the string you want to compile into the kernel. The string
-  will be used as context in context-dependent files like
-  "/etc/config#ktype=default#". If your kernel is to be used on a
-  server, you probably can use "default" here. If your kernel is
-  intended for a diskless client, you probably should enter "diskless"
-  here.
-
-Machine type translation
-CONFIG_TR_MACHINE
-  Enables translation of name suffixes like in
-  "/etc/config#machine=i486#".  The syntax is
-  <filename>#machine=<id>#. The machine types can be queried with the
-  command "uname -m". Normally used only on multi-architecture
-  installations. If unsure, say Y.
-
-System name translation
-CONFIG_TR_SYSNAME
-  Enables translation of name suffixes like in
-  "/etc/config#system=Linux#".  The syntax is
-  <filename>#system=<id>#. The system name can be queried with the
-  command "uname -s". Currently only supported by Linux, but hopefully
-  other operating systems will pick up the idea of context-dependent
-  translations. If unsure, say Y.
-
 Minix fs support
 CONFIG_MINIX_FS
   Minix is a simple operating system used in many classes about
@@ -5549,28 +6090,35 @@ CONFIG_MINIX_FS
 Second extended fs support
 CONFIG_EXT2_FS
   This is the de facto standard Linux filesystem (= method to organize
-  files on a storage device) for hard disks. You want to say Y, unless
-  you intend to use Linux exclusively from inside a DOS partition
-  using the umsdos filesystem. 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 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* Linux partition later. Another (rare) case
-  which doesn't require 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 filesystem support" below). Saying Y here will
-  enlarge your kernel by about 41 kB.
-
-  The Ext2fs-Undeletion mini-HOWTO, available via ftp (user:
+  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 filesystem. 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
+  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*
+  Linux partition later. Another (rare) case which doesn't require
+  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
+  filesystem support" below). Saying Y here will enlarge your kernel
+  by about 41 kB.
+
+  The Ext2fs-Undeletion mini-HOWTO, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini,
   gives information about how to retrieve deleted files on ext2fs
   filesystems.
 
-  To change the behavior of ext2fs filesystems, you can use the
-  tune2fs utility ("man tune2fs"). 
+  To change the behavior of ext2 filesystems, you can use the tune2fs
+  utility ("man tune2fs"). To modify attributes of files and
+  directories on ext2 filesystems, use chattr ("man chattr").
+  
+  Ext2fs partitions can be read from within DOS using the ext2tool
+  package available via FTP (user: anonymous) from
+  ftp://sunsite.unc.edu/pub/Linux/system/filesystems/ext2.
 
   If you want to compile this filesystem as a module ( = code which
   can be inserted in and removed from the running kernel whenever you
@@ -5579,7 +6127,7 @@ CONFIG_EXT2_FS
   root partition cannot be compiled as a module, and so this could be
   dangerous. Most everyone wants to say Y here.
 
-ISO9660 cdrom filesystem support
+ISO 9660 CDROM filesystem support
 CONFIG_ISO9660_FS
   This is the standard filesystem used on CDROMs. It was previously
   known as "High Sierra Filesystem" and is called "hsfs" on other Unix
@@ -5588,7 +6136,7 @@ CONFIG_ISO9660_FS
   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
-  via ftp (user: anonymous) from
+  via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO), thereby enlarging your
   kernel by about 27 kB; otherwise say N.
 
@@ -5599,7 +6147,7 @@ CONFIG_ISO9660_FS
 
 Microsoft Joliet cdrom extensions
 CONFIG_JOLIET
-  Joliet is a Microsoft extension for the ISO9660 CDROM filesystem
+  Joliet is a Microsoft extension for the ISO 9660 CDROM filesystem
   which allows for long filenames in unicode format (unicode is the
   new 16 bit character code, successor to ASCII, which encodes the
   characters of almost all languages of the world; see
@@ -5633,7 +6181,7 @@ CONFIG_MSDOS_FS
   This allows you to mount MSDOS partitions of your hard drive (unless
   they are compressed; to access compressed MSDOS partitions under
   Linux, you can either use the DOS emulator DOSEMU, described in the
-  DOSEMU-HOWTO, available via ftp (user: anonymous) at
+  DOSEMU-HOWTO, available via FTP (user: anonymous) at
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO, or try dmsdosfs in
   ftp://sunsite.unc.edu/pub/Linux/system/filesystems/dosfs. If you
   intend to use dosemu with a non-compressed MSDOS partition, say Y
@@ -5686,7 +6234,7 @@ CONFIG_UMSDOS_FS
   disadvantage is that Linux becomes susceptible to DOS viruses and
   that UMSDOS is somewhat slower than ext2fs.  Another use of umsdos
   is to write files with long unix filenames to MSDOS floppies; it
-  also allows unix style softlinks and owner/permissions of files on
+  also allows Unix-style softlinks 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. 
 
@@ -5730,9 +6278,12 @@ CONFIG_NFS_FS
   client's hard disk. For this to work, the server must run the
   programs nfsd and mountd (but does not need to have NFS filesystem
   support enabled in its kernel). NFS is explained in the Network
-  Administrator's Guide, available via ftp (user: anonymous) in
+  Administrator's Guide, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/LDP, on its man page: "man
   nfs", and in the NFS-HOWTO.
+  
+  An alternative to NFS is provided by the Coda filesystem; see "Coda
+  filesystem support" below.
 
   If you say Y here, you should have said Y to TCP/IP networking also.
   This option would enlarge your kernel by about 27 kB. 
@@ -5743,12 +6294,12 @@ CONFIG_NFS_FS
   say M here and read Documentation/modules.txt. 
 
   If you are configuring a diskless machine which will mount its root
-  filesystem over NFS (in order to do that, check out the netboot
-  package, available via ftp (user: anonymous) from
-  ftp://sunsite.unc.edu/pub/Linux/system/boot/ethernet/, extract with
-  "tar xzvf filename", and say Y to "Root file system on NFS" and to
-  "IP: kernel level autoconfiguration"), then you cannot compile this
-  driver as a module.
+  filesystem over NFS at boot time, say Y here and to "Root file
+  system on NFS" and to "IP: kernel level autoconfiguration". You
+  cannot compile this driver as a module in this case. There are two
+  packages designed for booting diskless machines over the net:
+  netboot and etherboot, both available via FTP (user: anonymous) from
+  ftp://sunsite.unc.edu/pub/Linux/system/boot/ethernet/ .
 
   If you don't know what all this is about, say N.
 
@@ -5774,7 +6325,7 @@ CONFIG_NFSD
   is that it is faster; it might not be completely stable yet, though.
   You will need the support software from the linux-nfs package
   available at ftp://ftp.mathematik.th-darmstadt.de/pub/linux/okir/.
-  Please read the NFS-HOWTO, available via ftp (user: anonymous) from
+  Please read the NFS-HOWTO, available via FTP (user: anonymous) from
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. 
 
   The NFS server is also available as a module ( = code which can be
@@ -5812,10 +6363,12 @@ CONFIG_NTFS_FS
 NTFS read-write support (experimental)
 CONFIG_NTFS_RW
   If you say Y here, you will (hopefully) be able to write to NTFS
-  file systems as well as to read from them.  The read-write support
+  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, be prepared to recover the NTFS volume from tape. If
-  unsure, say N.
+  enable this, back up your NTFS volume first since it may get
+  damaged.
+
+  If unsure, say N.
 
 System V and Coherent filesystem support
 CONFIG_SYSV_FS
@@ -5829,7 +6382,7 @@ CONFIG_SYSV_FS
   Binary Compatibility Standard] is a kernel module which lets you run
   SCO, Xenix, Wyse, UnixWare, Dell Unix and System V programs under
   Linux and is often needed to run commercial software that's only
-  available for those systems. It's available via ftp (user:
+  available for those systems. It's available via FTP (user:
   anonymous) from ftp://tsx-11.mit.edu/pub/linux/BETA).
 
   If you only intend to mount files from some other Unix over the
@@ -5852,12 +6405,7 @@ CONFIG_SYSV_FS
 Amiga FFS filesystem support
 CONFIG_AFFS_FS
   The Fast File System (FFS) is the common filesystem used on hard
-  disks by Amiga(tm) Systems since AmigaOS Version 1.3 (34.20). With
-  this driver you can also mount diskfiles used by Bernd Schmidt's
-  Un*X Amiga Emulator (http://www.freiburg.linux.de/~uae/; to browse
-  the WWW, you need to have access to a machine on the Internet that
-  has a program like lynx or netscape). If you want to do the latter,
-  you will also need to say Y to "Loop device support", above. Say Y
+  disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20). Say Y
   if you want to be able to read and write files from and to an Amiga
   FFS partition on your hard drive. Amiga floppies however cannot be
   read with this driver due to an incompatibility of the floppy
@@ -5865,6 +6413,13 @@ CONFIG_AFFS_FS
   PCs and workstations. Read Documentation/filesystems/affs.txt and
   fs/affs/Changes. 
 
+  With this driver you can also mount disk files used by Bernd
+  Schmidt's Un*X Amiga Emulator (http://www.freiburg.linux.de/~uae/;
+  to browse the WWW, you need to have access to a machine on the
+  Internet that has a program like lynx or netscape). If you want to
+  do this, you will also need to say Y or M to "Loop device support",
+  above.
+
   This filesystem 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 affs.o. If you want to compile it as a module,
@@ -5902,7 +6457,7 @@ CONFIG_AUTOFS_FS
   The automounter is a tool to automatically mount remote filesystems
   on demand.  This implementation is partially kernel-based to reduce
   overhead in the already-mounted case; this is unlike the BSD
-  automounter (amd), which is only in user space.  
+  automounter (amd), which is a pure user space daemon.
 
   To use the automounter you need the user-space tools from
   ftp://ftp.kernel.org/pub/linux/daemons/autofs; you also want to say Y to
@@ -5916,7 +6471,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.
 
-BSD UFS filesystem support (read only)
+UFS filesystem support (read only)
 CONFIG_UFS_FS
   BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
   OpenBSD and NeXTstep) use a filesystem called UFS. Some System V
@@ -5950,7 +6505,7 @@ CONFIG_BSD_DISKLABEL
   first sector a new partition table in disklabel format. Saying Y
   here allows you to read these disklabels and further mount FreeBSD
   partitions read-only from within Linux if you have also said Y to
-  "BSD ufs filesystem support", above. If you don't know what all this
+  "UFS filesystem support", above. If you don't know what all this
   is about, say N.
 
 SMD disklabel (Sun partition tables) support
@@ -5958,8 +6513,8 @@ CONFIG_SMD_DISKLABEL
   Like most systems, SunOS uses its own hard disk partition table
   format, incompatible with all others. Saying Y here allows you to
   read these partition tables and further mount SunOS disks read-only
-  from within Linux if you have also said Y to "BSD ufs filesystem
-  support", above. This is mainly used to carry data from a Sparc
+  from within Linux if you have also said Y to "UFS filesystem
+  support", above. This is mainly used to carry data from a SPARC
   under SunOS to your Linux box via a removable medium like
   magneto-optical or ZIP drives; note however that a good portable way
   to transport files and directories between unixes (and even other
@@ -5972,26 +6527,32 @@ CONFIG_SOLARIS_X86_PARTITION
   Like most systems, Solaris x86 uses its own hard disk partition
   table format, incompatible with all others. Saying Y here allows you
   to read these partition tables and further mount Solaris x86 disks
-  read-only from within Linux if you have also said Y to "BSD ufs
+  read-only from within Linux if you have also said Y to "UFS
   filesystem support", above.
 
 ADFS filesystem support (read only) (EXPERIMENTAL)
 CONFIG_ADFS_FS
-  Acorn Disc Filing System is the standard filesystem of the Risc OS
-  operating system which runs on Acorn's ARM based Risc PC computers.
-  If you say Y here, Linux will be able to read from ADFS partitions
-  on hard drives and from ADFS-formatted floppy disks. 
+  The Acorn Disc Filing System is the standard filesystem 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.
+
+  The ADFS partition should be the first partition (i.e.,
+  /dev/[hs]d?1) on each of your drives.
 
   This code is also available as a module called adfs.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.
 
+  If unsure, say N.
+
 /dev/pts filesystem (experimental)
 CONFIG_DEVPTS_FS
   If you say Y here, you'll get a virtual filesystem which can be
   mounted on /dev/pts with "mount -t devpts". This, together with the
-  pseudo terminal master multiplexer /dev/ptmx is used for pseudo
+  pseudo terminal master multiplexer /dev/ptmx, is used for pseudo
   terminal support as described in the Open Group's Unix98 standard:
   in order to acquire a pseudo terminal, a process opens /dev/ptmx;
   the number of the pseudo terminal is then made available to the
@@ -6000,10 +6561,7 @@ CONFIG_DEVPTS_FS
   /dev/pts/2, for example. The GNU C library glibc 2.1 contains the
   requisite support for this mode of operation.
 
-  This code is also available as a module called devpts.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.
+  Say Y here if you have enabled support for Unix98 PTYs.
 
 Macintosh partition map support
 CONFIG_MAC_PARTITION
@@ -6017,17 +6575,17 @@ CONFIG_SMB_FS
   (WfW), Windows 95, Windows NT and Lan Manager use to share files and
   printers over local networks. Saying Y here allows you to mount
   their filesystems (often called "shares" in this context) and access
-  them just like any other unix directory. Currently, this works only
+  them just like any other Unix directory. Currently, this works only
   if the Windows machines use TCP/IP as the underlying transport
-  protocol, and not Netbeui. For details, read
+  protocol, and not NetBEUI. For details, read
   Documentation/filesystems/smbfs.txt and the SMB-HOWTO, available via
-  ftp (user: anonymous) from
+  FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   Note: if you just want your box to act as an SMB *server* and make
   files and printing services available to Windows clients (which need
   to have a TCP/IP stack), you don't need to say Y here; you can use
-  the program samba (available via ftp (user: anonymous) in
+  the program samba (available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/system/network/samba) for that.
 
   General information about how to connect Linux, Windows machines and
@@ -6145,7 +6703,7 @@ CONFIG_NCPFS_NDS_DOMAINS
 
 nls: Native language codepages and Unicode support
 CONFIG_NLS
-  This is required by the FAT and NTFS filesystems and by the ISO9660
+  This is required by the FAT and NTFS filesystems and by the ISO 9660
   filesystem when it is compiled with Joliet support. Joliet is a
   Microsoft extension for CDROMs that supports Unicode. This allows
   translation between different character sets. 
@@ -6360,7 +6918,7 @@ CONFIG_NLS_ISO8859_2
   If you want to display filenames with native language characters
   from the Microsoft fat filesystem family or from JOLIET CDROMs
   correctly on the screen, you need to include the appropriate
-  input/output character sets. Say Y here for the the Latin 2 character
+  input/output character sets. Say Y here for the Latin 2 character
   set, which works for most Latin-written Slavic and Central European
   languages: Czech, German, Hungarian, Polish, Rumanian, Croatian,
   Slovak, Slovene.
@@ -6446,17 +7004,20 @@ CONFIG_NLS_KOI8_R
 
 Virtual terminal
 CONFIG_VT
-  This includes support for a terminal device with display and
-  keyboard devices. Only people using embedded systems want to say N
-  here; most everybody else says Y. If unsure, say Y, or else you
-  won't be able to do much with your new shiny Linux system :-)
+  If you say Y here, you will get support for a terminal device with
+  display and keyboard devices. These are called "virtual" because you
+  can run several virtual terminals on one physical terminal; however,
+  you need at least one virtual terminal device in order to make use
+  of a physical terminal. Only people using embedded systems want to
+  say N here; most everybody else says Y. If unsure, say Y, or else
+  you won't be able to do much with your new shiny Linux system :-)
 
 Support for console on virtual terminal
 CONFIG_VT_CONSOLE
   If you say Y here, by default all kernel messages will be sent to
-  the device /dev/tty0 which corresponds to the virtual terminal you
-  have visible on your display. You should say Y here unless you only
-  want to have the kernel messages output on a serial port (in which
+  the device /dev/tty0 which corresponds to the virtual terminal that
+  is visible on your display. You should say Y here unless you only
+  want to have the kernel messages output to a serial port (in which
   case you probably want to say Y to "Console on serial port", below).
 
 Software generated cursor
@@ -6471,7 +7032,7 @@ Standard/generic serial support
 CONFIG_SERIAL
   This selects whether you want to include the driver for the standard
   serial ports. The standard answer is Y. People who might say N here
-  are those that are setting up dedicated Ethernet WWW/ftp servers, or
+  are those that are setting up dedicated Ethernet WWW/FTP servers, or
   users that have one of the various bus mice instead of a serial
   mouse and don't intend to use their machine's standard serial port
   for anything. (Note that the Cyclades and Stallion multi serial port
@@ -6484,8 +7045,12 @@ CONFIG_SERIAL
   be lost when kerneld automatically unloads the driver. This
   limitation may be lifted in the future.] 
 
-  BTW: If you have a mouseman serial mouse which is not recognized by
+  BTW1: If you have a mouseman serial mouse which is not recognized by
   the X window system, try running gpm first. 
+  
+  BTW2: If you intend to connect a so-called Winmodem to your
+  machine's serial port, forget it. These modems require proprietary
+  drivers which are only available under Windows.
 
   Most people will say Y or M here, so that they can use serial mice,
   modems and similar devices connecting to the standard serial ports.
@@ -6498,7 +7063,7 @@ CONFIG_SERIAL_CONSOLE
   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 via ftp (user:
+  is also explained in the SCSI-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.) If you
   don't have a VGA card installed and you say Y here, the kernel will
   automatically use /dev/ttyS0 as system console.
@@ -6554,7 +7119,7 @@ CONFIG_RISCOM8
 
 Specialix IO8+ card support
 CONFIG_SPECIALIX
-  This is a driver for the Specialix IO8+ multiport card, that give 
+  This is a driver for the Specialix IO8+ multiport card which gives
   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 BBS. 
@@ -6566,9 +7131,9 @@ CONFIG_SPECIALIX
 
 Specialix DTR/RTS pin is RTS
 CONFIG_SPECIALIX_RTSCTS
-  The Specialix card can only support either RTS or DTR. When you say
+  The Specialix card can only support either RTS or DTR. If you say
   N here, the driver will use the pin as "DTR" when the tty is in
-  software handshake mode. When you say Y here or hardware handshake
+  software handshake mode. If you say Y here or hardware handshake
   is on, it will always be RTS. Read the file
   Documentation/specialix.txt for more information.
 
@@ -6623,8 +7188,8 @@ CONFIG_ISTALLION
 
 Hayes ESP serial port support
 CONFIG_ESPSERIAL
-  This is a driver which supports Hayes ESP serial ports.  It uses DMA
-  to transfer data to and from the host.  Make sure to read
+  This is a driver which supports Hayes ESP serial ports.  Both single
+  port cards and multiport cards are supported.  Make sure to read
   Documentation/hayes-esp.txt. 
 
   To compile this driver as a module ( = code which can be inserted in
@@ -6632,54 +7197,12 @@ CONFIG_ESPSERIAL
   and read Documentation/modules.txt. The module will be called esp.o.
   If unsure, say N.
 
-Hayes ESP serial port DMA channel
-CONFIG_ESPSERIAL_DMA_CHANNEL
-  This is the DMA channel to be used to transfer data to and from the
-  host.  One DMA channel is shared between all the ESP ports.  Valid
-  values are 1 and 3.
-
-Hayes ESP serial port receive trigger level
-CONFIG_ESPSERIAL_RX_TRIGGER
-  This is the trigger level (in bytes) of the receive FIFO. Larger
-  values may result in fewer interrupts and hence better performance;
-  however, a value too high could result in data loss. Valid values
-  are 1 through 1023.
-
-Hayes ESP serial port transmit trigger level
-CONFIG_ESPSERIAL_TX_TRIGGER
-  This is the trigger level (in bytes) of the transmit FIFO. Larger
-  values may result in fewer interrupts and hence better performance;
-  however, a value too high could result in degraded transmit
-  performance. Valid values are 1 through 1023.
-
-Hayes ESP serial port flow off level
-CONFIG_ESPSERIAL_FLOW_OFF
-  This is the level (in bytes) at which the ESP port will "flow off"
-  the remote transmitter (i.e. tell him to stop stop sending more
-  bytes).  Valid values are 1 through 1023.  This value should be
-  greater than the receive trigger level and the flow on level.
-
-Hayes ESP serial port flow on level
-CONFIG_ESPSERIAL_FLOW_ON
-  This is the level (in bytes) at which the ESP port will "flow on"
-  the remote transmitter (i.e. tell him to resume sending bytes) after
-  having flowed it off.  Valid values are 1 through 1023.  This value
-  should be less than the flow off level, but greater than the receive
-  trigger level.
-
-Hayes ESP serial port receiver timeout
-CONFIG_ESPSERIAL_RX_TMOUT
-  This is the amount of time that the ESP port will wait after
-  receiving the final character before signaling an interrupt.  Valid
-  values are 0 through 255.  A value too high will increase latency,
-  and a value too low will cause unnecessary interrupts.
-
 Parallel printer support
 CONFIG_PRINTER
   If you intend to attach a printer to the parallel port of your Linux
   box (as opposed to using a serial printer; if the connector at the
   printer has 9 or 25 holes ["female"], then it's serial), say Y. Also
-  read the Printing-HOWTO, available via ftp (user: anonymous) in
+  read the Printing-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   It is possible to share one parallel port among several devices
@@ -6694,7 +7217,7 @@ CONFIG_PRINTER
   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 via ftp (user: anonymous) in
+  SCSI-HOWTO, available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.) The standard base
   addresses as well as the syntax of the "lp" command line option can
   be found in drivers/char/lp.c.
@@ -6714,7 +7237,7 @@ CONFIG_MOUSE
   a serial mouse. Most people have a regular serial MouseSystem or
   Microsoft mouse (made by Logitech) that plugs into a COM port
   (rectangular with 9 or 25 pins). These people say N here. If you
-  have something else, read the Busmouse-HOWTO, available via ftp
+  have something else, read the Busmouse-HOWTO, available via FTP
   (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO and
   say Y here.
 
@@ -6732,7 +7255,7 @@ CONFIG_BUSMOUSE
   generally a round connector with 9 pins. Note that the newer mice
   made by Logitech don't use the Logitech protocol anymore; for those,
   you don't need this option. You want to read the Busmouse-HOWTO,
-  available via ftp (user: anonymous) in
+  available via FTP (user: anonymous) in
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -6751,7 +7274,7 @@ CONFIG_PSMOUSE
   machines. The trackballs of some laptops are PS/2 mice also. In
   particular, the C&T 82C710 mouse on TI Travelmates is a PS/2 mouse.
   Although PS/2 mice are not technically bus mice, they are explained
-  in detail in the Busmouse-HOWTO, available via ftp (user: anonymous)
+  in detail in the Busmouse-HOWTO, available via FTP (user: anonymous)
   in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. When using a PS/2
   mouse, you can get problems if you want to use the mouse both on the
   Linux console and under X. Using the "-R" option of the Linux mouse
@@ -6769,7 +7292,7 @@ C&T 82C710 mouse port support (as on TI Travelmate)
 CONFIG_82C710_MOUSE
   This is a certain kind of PS/2 mouse used on the TI Travelmate. If
   you are unsure, try first to say N here and come back if the mouse
-  doesn't work. Read the Busmouse-HOWTO, available via ftp (user:
+  doesn't work. Read the Busmouse-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
 PC110 digitizer pad support
@@ -6789,7 +7312,7 @@ Microsoft busmouse support
 CONFIG_MS_BUSMOUSE
   These animals (also called Inport mice) are connected to an
   expansion board using a round connector with 9 pins. If this is what
-  you have, say Y and read the Busmouse-HOWTO, available via ftp
+  you have, say Y and read the Busmouse-HOWTO, available via FTP
   (user: anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you are unsure, say N and read the HOWTO nevertheless: it will
@@ -6806,7 +7329,7 @@ ATIXL busmouse support
 CONFIG_ATIXL_BUSMOUSE
   This is a rare type of busmouse that is connected to the back of an
   ATI video card. Note that most ATI mice are actually Microsoft
-  busmice. Read the Busmouse-HOWTO, available via ftp (user:
+  busmice. Read the Busmouse-HOWTO, available via FTP (user:
   anonymous) in ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO.
 
   If you want to compile this as a module ( = code which can be
@@ -6820,10 +7343,10 @@ CONFIG_ATIXL_BUSMOUSE
 Support for user miscellaneous modules
 CONFIG_UMISC
   This option forces generic miscellaneous minor device support in the
-  kernel, and allows later loading of user miscellaneous device
-  modules, such as drivers for optic pens and touchscreens. Unless you
-  need such specific modules, or are willing to write/test one, just
-  say N.
+  kernel, and allows later loading of user miscellaneous character
+  device modules, such as drivers for optic pens and touchscreens.
+  Unless you need such specific modules, or are willing to write/test
+  one, just say N.
 
 QIC-02 tape support
 CONFIG_QIC02_TAPE
@@ -6837,7 +7360,7 @@ Do you want runtime configuration for QIC-02
 CONFIG_QIC02_DYNCONF
   You can either configure this driver once and for all by editing a
   header file (include/linux/tpqic02.h), in which case you should
-  say N, or you can fetch a program via anonymous ftp which is able
+  say N, or you can fetch a program via anonymous FTP which is able
   to configure this driver during runtime. The program to do this is
   called 'qic02conf' and it is part of the 'tpqic02-support-X.Y.tar.gz'
   support package.
@@ -7136,7 +7659,7 @@ CONFIG_FT_FDC_MAX_RATE
 
 MTRR control and configuration
 CONFIG_MTRR
-  On Intel Pentium Pro/Pentium II systems the Memory Type Range
+  On Intel Pentium Pro and Pentium II systems the Memory Type Range
   Registers (MTRRs) may be used to control processor access to memory
   ranges. This is most useful when you have a video (VGA) card on a
   PCI or AGP bus. Enabling write-combining allows bus write transfers
@@ -7147,12 +7670,16 @@ CONFIG_MTRR
   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.
-  This option also fixes a problem with buggy SMP BIOSes which only
+
+  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.
-  Compiling this as a module is not available because the BIOS fix
-  needs to be done early in the boot sequence, otherwise your machine
-  could lock up.
+
+  In general you should compile this into the kernel, rather than as a
+  loadable module, because the BIOS fix needs to be done early in the
+  boot sequence. If you compile this as a module, the BIOS fix will be
+  delayed until when you load the module. You do this at your own risk.
+
   See Documentation/mtrr.txt for more information.
 
 Main CPU frequency, only for DEC alpha machine
@@ -7176,7 +7703,7 @@ CONFIG_APM
   receive notification of APM "events" (e.g., battery status change).
 
   Supporting software is available; for more information, read the
-  Battery Powered Linux mini-HOWTO, available via ftp (user:
+  Battery Powered Linux mini-HOWTO, available via FTP (user:
   anonymous) from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini.
 
   This driver does not spin down disk drives (see the hdparm(8)
@@ -7191,7 +7718,7 @@ CONFIG_APM
   for the Linux kernel). 
 
   If you are running Linux on a laptop, you may also want to read the
-  Linux Laptop homepage on the WWW at
+  Linux Laptop home page on the WWW at
   http://www.cs.utexas.edu/users/kharker/linux-laptop/ (to browse the
   WWW, you need to have access to a machine on the Internet that has a
   program like lynx or netscape). 
@@ -7210,11 +7737,12 @@ CONFIG_APM
    3) passing the "floppy=nodma" option to the kernel
    4) passing the "mem=4M" option to the kernel (thereby disabling 
       all but the first 4M of RAM)
-   5) reading the sig11 FAQ at http://www.bitwizard.nl/sig11/
-   6) disabling the cache from your BIOS settings
-   7) installing a better fan
-   8) exchanging RAM chips 
-   9) exchanging the motherboard.
+   5) making sure that the CPU is not over clocked.
+   6) reading the sig11 FAQ at http://www.bitwizard.nl/sig11/
+   7) disabling the cache from your BIOS settings
+   8) installing a better fan
+   9) exchanging RAM chips 
+   10) exchanging the motherboard.
 
 Ignore USER SUSPEND
 CONFIG_APM_IGNORE_USER_SUSPEND
@@ -7295,7 +7823,7 @@ CONFIG_WATCHDOG
   kernel source.
 
   The watchdog is usually used together with the watchdog daemon which
-  is available via ftp (user: anonymous) from
+  is available via FTP (user: anonymous) from
   ftp://tsx-11.mit.edu/pub/linux/sources/sbin/. This daemon can also
   monitor NFS connections and can reboot the machine when the process
   table is full.
@@ -7440,13 +7968,24 @@ CONFIG_JOYSTICK
   The module will be called joystick.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
+  this option.  The driver can handle 1, 2, or 3 port cards.
+  If unsure, say N
+
+The Serial Port Dual Serial Port
+CONFIG_DUALSP_SERIAL
+  If you have the Serial Port's dual serial card for an Acorn system,
+  say Y to this option.  If unsure, say N
+
 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 via ftp (user: anonymous)
+  want to read the Sound-HOWTO, available via FTP (user: anonymous)
   from ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO. There is also some
   information in various README files in drivers/sound, esp. in
   Readme.cards which you should read first to find out whether your
@@ -7466,24 +8005,31 @@ 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 programs to do that are in the pcsndrv package on
-  sunsite.unc.edu:/pub/Linux/kernel/patches/console/.
+  ftp://sunsite.unc.edu/pub/Linux/kernel/patches/console/ and in the
+  pcsp patch at ftp://dwmw2.robinson.cam.ac.uk/pub/kernel/ .
+
+Support for Aztech Sound Galaxy (non-PnP) cards
+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.
 
 ProAudioSpectrum 16 support
-CONFIG_PAS
+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.
 
 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support
-CONFIG_SB
-  Answer Y if you have an original SoundBlaster card made by
+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). If your card was in the list of supported
   cards look at the card specific instructions in the
   drivers/sound/Readme.cards file before answering this question. For
   an unknown card you may answer Y if the card claims to be
-  SoundBlaster compatible. 
+  Sound Blaster-compatible. 
 
   Please read Documentation/sound/Soundblaster.
 
@@ -7491,16 +8037,8 @@ CONFIG_SB
   Y here and to "Additional lowlevel drivers" and to "SB32/AWE
   support" below.
 
-Are you using the IBM Mwave "emulation" of SB ?
-CONFIG_SB_MWAVE
-  The IBM Mwave can do what's loosely describable as emulation of an
-  8bit SoundBlaster card if you load the right firmware from DOS warm
-  boot and pray and your machine happens to like you. Say Y if you are
-  doing this as the IRQ test normally fails on the Mwave emulation.
-  Please read Documentation/sound/mwave.
-
 Generic OPL2/OPL3 FM synthesizer support
-CONFIG_ADLIB
+CONFIG_SOUND_ADLIB
   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
@@ -7508,19 +8046,19 @@ CONFIG_ADLIB
   cards, however). If unsure, say Y.
 
 #Loopback MIDI device support
-#CONFIG_VMIDI
+#CONFIG_SOUND_VMIDI
 ###
 ### somebody please fill this in.
 ###
 #
 Gravis Ultrasound support
-CONFIG_GUS
+CONFIG_SOUND_GUS
   Say Y here for any type of Gravis Ultrasound card, including
-  the GUS or GUS MAX. Please read Documentation/sound/ultrasound for
-  more information.
+  the GUS or GUS MAX. See also Documentation/sound/ultrasound for
+  more information on configuring this card with modules.
 
 MPU-401 support (NOT for SB16)
-CONFIG_MPU401
+CONFIG_SOUND_MPU401
   Be careful with this question. The MPU401 interface is supported by
   all sound cards. However, some natively supported cards have their
   own driver for MPU401. Enabling this MPU401 option with these cards
@@ -7531,13 +8069,13 @@ CONFIG_MPU401
   answer Y if you have a true MPU401 MIDI interface card.
 
 6850 UART Midi support
-CONFIG_UART6850
+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.
 
 PSS (AD1848, ADSP-2115, ESC614) support
-CONFIG_PSS
+CONFIG_SOUND_PSS
   Answer Y only if you have Orchid SW32, Cardinal DSP16 or some other
   card based on the PSS chipset (AD1848 codec + ADSP-2115 DSP chip +
   Echo ESC614 ASIC CHIP).
@@ -7548,18 +8086,27 @@ CONFIG_PSS
 ### Don't know what this is
 ###
 #
+Have DSPxxx.LD firmware file
+CONFIG_PSS_HAVE_BOOT
+  If you want to emulate the Sound Blaster card and you have a DSPxxx.LD
+  file, then answer Y here to include this file.
+
+Full pathname of DSPxxx.LD firmware file
+CONFIG_PSS_BOOT_FILE
+  Enter the full pathname of your DSPxxx.LD file, starting from /.
+
 16 bit sampling option of GUS (_NOT_ GUS MAX)
-CONFIG_GUS16
+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_GUSMAX
+CONFIG_SOUND_GUSMAX
   Answer Y only if you have a Gravis Ultrasound MAX.
 
 Microsoft Sound System support
-CONFIG_MSS
+CONFIG_SOUND_MSS
   Again think carefully before answering Y to this question.  It's
   safe to answer Y if you have the original Windows Sound System card
   made by Microsoft or Aztech SG 16 Pro (or NX16 Pro).  Also you may
@@ -7585,60 +8132,123 @@ CONFIG_MSS
   conflict.
 
 Ensoniq Soundscape support
-CONFIG_SSCAPE
+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).
 
 MediaTriX AudioTriX Pro support
-CONFIG_TRIX
+CONFIG_SOUND_TRIX
   Answer Y if you have the AudioTriX Pro sound card manufactured
   by MediaTrix.
 
+Have TRXPRO.HEX firmware file
+CONFIG_TRIX_HAVE_BOOT
+  The MediaTrix AudioTrix Pro has an on-board microcontroller which
+  needs to be initialized by downloading the code from the file
+  TRXPRO.HEX in the DOS driver directory. If you don't have the
+  TRXPRO.HEX file handy you may skip this step. However, the SB and
+  MPU-401 modes of AudioTrix Pro will not work without this file!
+
+Full pathname of TRXPRO.HEX firmware file
+CONFIG_TRIX_BOOT_FILE
+  Enter the full pathname of your TRXPRO.HEX file, starting from /.
+
 Support for OPTi MAD16 and/or Mozart based cards
-CONFIG_MAD16
+CONFIG_SOUND_MAD16
   Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
-  82C928 or 82C929 or 82C931) audio interface chip. Please read
-  Documentation/sound/MAD16. Please read Documentation/sound/Opti. For
-  the 82C931, additional information is in drivers/sound/README.C931.
-  These chips are currently quite common so it's possible that many
-  no-name cards have one of them. In addition the MAD16 chip is used
-  in some cards made by known manufacturers such as Turtle Beach
-  (Tropez), Reveal (some models) and Diamond (latest ones).
+  82C928 or 82C929 or 82C931) audio interface chip. For the 82C931,
+  please read drivers/sound/README.C931. These chips are currently
+  quite common so it's possible that many no-name cards have one of
+  them. In addition the MAD16 chip is used in some cards made by known
+  manufacturers such as Turtle Beach (Tropez), Reveal (some models)
+  and Diamond (latest ones). See also Documentation/sound/Opti for
+  more information on setting these cards up as modules.
 
 Support MIDI in older MAD16 based cards (requires SB)
 CONFIG_MAD16_OLDCARD
-  Answer Y (or M) if you have an older card based on the C928 or
-  Mozart chipset and you want to have MIDI support. If you enable this
-  option you also need to enable support for SoundBlaster.
+  Answer Y (or M) if you have an older card based on the C928
+  or Mozart chipset and you want to have  MIDI support. If you
+  enable this option you also need to enable support for Sound Blaster.
 
 Support for Crystal CS4232 based (PnP) cards
-CONFIG_CS4232
+CONFIG_SOUND_CS4232
   Say Y here if you have a card based on the Crystal CS4232 chip set,
-  which use the Plug and Play protocol. Please read
-  Documentation/sound/CS4232 for more info.
+  which uses its own Plug and Play protocol. See
+  Documentation/sound/CS4232 for more information on configuring this
+  card.
 
 Support for Turtle Beach Wave Front (Maui, Tropez) synthesizers
-CONFIG_MAUI
+CONFIG_SOUND_MAUI
   Say Y here if you have a Turtle Beach Wave Front, Maui, or 
   Tropez sound card.
 
+Have OSWF.MOT firmware file
+CONFIG_MAUI_HAVE_BOOT
+  Turtle Beach Maui and Tropez sound cards have a microcontroller which
+  needs to be initialized prior to use.  OSWF.MOT is a file distributed
+  with the card's DOS/Windows drivers.  Answer Y if you have this file.
+
+Full pathname of OSWF.MOT firmware file
+CONFIG_MAUI_BOOT_FILE
+  Enter the full pathname of your OSWF.MOT file, starting from /.
+
+Support for Turtle Beach MultiSound Classic, Tahiti, Monterey
+CONFIG_SOUND_MSNDCLAS
+  Say M here if you have a Turtle Beach MultiSound Classic, Tahiti or
+  Monterey (not for the Pinnacle or Fiji).  See
+  Documentation/sound/MultiSound for important information about this
+  driver.
+
+Full pathname of MSNDINIT.BIN firmware file
+CONFIG_MSNDCLAS_INIT_FILE
+  The MultiSound cards have two firmware files which are required for
+  operation, and are not currently included.  These files can be
+  obtained from Turtle Beach.  See Documentation/sound/MultiSound for
+  information on how to obtain this.
+
+Full pathname of MSNDPERM.BIN firmware file
+CONFIG_MSNDCLAS_PERM_FILE
+  The MultiSound cards have two firmware files which are required for
+  operation, and are not currently included.  These files can be
+  obtained from Turtle Beach.  See Documentation/sound/MultiSound for
+  information on how to obtain this.
+
+Support for Turtle Beach MultiSound Pinnacle, Fiji
+CONFIG_SOUND_MSNDPIN
+  Say M here if you have a Turtle Beach MultiSound Pinnacle or Fiji.
+  See Documentation/sound/MultiSound for important information about
+  this driver.
+
+Full pathname of PNDSPINI.BIN firmware file
+CONFIG_MSNDPIN_INIT_FILE
+  The MultiSound cards have two firmware files which are required for
+  operation, and are not currently included.  These files can be
+  obtained from Turtle Beach.  See Documentation/sound/MultiSound for
+  information on how to obtain this.
+
+Full pathname of PNDSPERM.BIN firmware file
+CONFIG_MSNDPIN_PERM_FILE
+  The MultiSound cards have two firmware files which are required for
+  operation, and are not currently included.  These files can be
+  obtained from Turtle Beach.  See Documentation/sound/MultiSound for
+  information on how to obtain this.
+
 /dev/dsp and /dev/audio support
-CONFIG_AUDIO
+CONFIG_SOUND_AUDIO
   Answering N disables /dev/dsp and /dev/audio, the A/D and D/A
   converter devices.  Answer N only if you know you will not need
   the option.  They are usually required.  Answer Y.
 
 MIDI interface support
-CONFIG_MIDI
+CONFIG_SOUND_MIDI
   Answering N disables /dev/midixx devices and access to any MIDI
   ports using /dev/sequencer and /dev/music. This option also affects
   any MPU401 and/or General MIDI compatible devices.  Answer Y.
 
 FM synthesizer (YM3812/OPL-3) support
-CONFIG_YM3812
-  Answer Y here, unless you know you will not need the option. For
-  OPL-3 cards, you may want to read Documentation/sound/OPL3.
+CONFIG_SOUND_YM3812
+  Answer Y here, unless you know you will not need the option.
 
 Sun Audio support
 CONFIG_SUN_AUDIO
@@ -7665,24 +8275,24 @@ CONFIG_ACI_MIXER
 
 SB32/AWE support
 CONFIG_AWE32_SYNTH
-  Say Y here if you have a SoundBlaster SB32, AWE32-PnP, SB AWE64 or
+  Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
   similar sound card. See drivers/sound/lowlevel/README.awe,
   Documentation/sound/AWE32 and the Soundblaster-AWE mini-HOWTO,
-  available via ftp (user: anonymous) from
+  available via FTP (user: anonymous) from
   ftp://sunsite.unc.edu/pub/Linux/docs/HOWTO/mini for more info.
 
 Gallant's Audio Excel DSP 16 support (SC-6000 and SC-6600)
 CONFIG_AEDSP16
   Answer Y if you have a Gallant's Audio Excel DSP 16 card. This card
   can emulate either an SBPro or a Microsoft Sound System card, so you
-  should have said Y to either "SoundBlaster (SB, SBPro, SB16, clones)
+  should have said Y to either "Sound Blaster (SB, SBPro, SB16, clones)
   support" or "Microsoft Sound System support", above, and you need to
   answer the "MSS emulation" and "SBPro emulation" questions below
   accordingly. You should say Y to one and only one of these two
   questions.  Read the drivers/sound/lowlevel/README.aedsp16 file and
   the head of drivers/sound/lowlevel/aedsp16.c to get more information
   about this driver and its configuration.  This driver supports Audio
-  Excel DSP 16 but not the III nor Pnp versions of this card. Read
+  Excel DSP 16 but not the III nor PnP versions of this card. Read
   drivers/sound/lowlevel/README.aedsp16 if you want to know something
   more on how to use the III version with this sound driver.
 
@@ -7701,28 +8311,38 @@ CONFIG_AEDSP16_MSS
 Audio Excel DSP 16 (SBPro emulation)
 CONFIG_AEDSP16_SBPRO
   Answer Y if you want your audio card to emulate Sound Blaster Pro.
-  You should then say Y to "SoundBlaster (SB, SBPro, SB16, clones)
+  You should then say Y to "Sound Blaster (SB, SBPro, SB16, clones)
   support" and N to "Audio Excel DSP 16 (MSS emulation)".
 
-Kernel profiling support
-CONFIG_PROFILE
-  This is for kernel hackers who want to know how much time the kernel
-  spends in the various procedures. The information is stored in
-  /proc/profile (say Y to "/proc filesystem support"!) and in order to
-  read it, you need the readprofile package from
-  sunsite.unc.edu:/pub/Linux/kernel. Its manpage gives information
-  regarding the format of profiling data. To become a kernel hacker,
-  you can start with the Kernel Hacker's Guide at
-  http://www.redhat.com:8080/HyperNews/get/khg.html (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape). Mere mortals say N.
-
-Profile shift count
-CONFIG_PROFILE_SHIFT
-  This is used to adjust the granularity with which the addresses of
-  executed instructions get recorded in /proc/profile. But since you
-  said Y to "Kernel profiling support", you must be a kernel hacker and
-  hence you know what this is about :-)
+Ensoniq ES1370 based PCI sound cards
+CONFIG_SOUND_ES1370
+  Say Y or M if you have a PCI sound card utilizing the Ensoniq
+  ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
+  out if your sound card uses an ES1370 without removing your
+  computer's cover, use lspci -n and look for the PCI ID 
+  1274:5000. Since Ensoniq was bought by Creative Labs,
+  Sound Blaster 64/PCI models are either ES1370 or ES1371 based.
+  This driver differs slightly from OSS/Free, so PLEASE READ
+  Documentation/sound/es1370.
+
+Ensoniq ES1371 based PCI sound cards
+CONFIG_SOUND_ES1371
+  Say Y or M if you have a PCI sound card utilizing the Ensoniq
+  ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
+  your sound card uses an ES1371 without removing your computer's
+  cover, use lspci -n and look for the PCI ID 1274:1371. Since
+  Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI
+  models are either ES1370 or ES1371 based. This driver differs
+  slightly from OSS/Free, so PLEASE READ Documentation/sound/es1371.
+
+S3 SonicVibes based PCI sound cards
+CONFIG_SOUND_SONICVIBES
+  Say Y or M if you have a PCI sound card utilizing the S3
+  SonicVibes chipset. To find out if your sound card uses a
+  SonicVibes chip without removing your computer's cover, use
+  lspci -n and look for the PCI ID 5333:CA00. This driver 
+  differs slightly from OSS/Free, so PLEASE READ
+  Documentation/sound/sonicvibes.
 
 Magic System Request Key support
 CONFIG_MAGIC_SYSRQ
@@ -7948,7 +8568,7 @@ CONFIG_HISAX_NICCY
 
 HiSax Support for Am7930 (EXPERIMENTAL)
 CONFIG_HISAX_AMD7930
-  This enables HiSax support for the AMD7930 chips on some sparcs.
+  This enables HiSax support for the AMD7930 chips on some SPARCs.
   This code is not finished yet.
 
 HiSax Support for EURO/DSS1
@@ -8049,20 +8669,26 @@ CONFIG_ISDN_DRV_ACT2000
 
 Support for AP1000 multicomputer
 CONFIG_AP1000
-  This enables support for a sparc based parallel multi-computer
+  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 (to browse the
   WWW, you need to have access to a machine on the Internet that has a
   program like lynx or netscape) or mail to hackers@cafe.anu.edu.au
 
-Sparc ESP SCSI support
+Support for Sun4 architecture
+CONFIG_SUN4
+  Use this option if, and only if, your machine is sun4. Note that
+  kernel compiled with this option will run on sun4 only.
+  (And in current version, it will probably work on sun4/330, only.)
+
+SPARC ESP SCSI support
 CONFIG_SCSI_SUNESP
   This is the driver for the Sun ESP SCSI host adapter. The ESP
   chipset is present in most SPARC-based computers.
 
-Sparc /dev/openprom compatibility driver
+SPARC /dev/openprom compatibility driver
 CONFIG_SUN_OPENPROMIO
-  This driver provides user programs with an interface to the Sparc
+  This driver provides user programs with an interface to the SPARC
   PROM device tree. The driver implements a SunOS-compatible
   interface and a NetBSD-compatible interface. 
 
@@ -8095,11 +8721,19 @@ CONFIG_ATARI
   this kernel on an Atari, say Y here and browse the material
   available in Documentation/m68k; otherwise say N.
 
+Hades support
+CONFIG_HADES
+  This option enables support for the Hades Atari clone. If you plan to
+  use this kernel on a Hades, say Y here; otherwise say N.
+
 Macintosh support
 CONFIG_MAC
-  This option enables support for the Apple Macintosh series of computers
-  (yes, there is experimental support now, at least for part of the series).  
-  Say N unless you're willing to code the remaining necessary support. ;)
+  This option enables support for the Apple Macintosh series of
+  computers (yes, there is experimental support now, at least for part
+  of the series).
+  
+  Say N unless you're willing to code the remaining necessary support.
+  ;)
 
 # CONFIG_APOLLO, etc. coming soon (?)
 
@@ -8231,6 +8865,18 @@ CONFIG_AMIGA_Z2RAM
   compile it as a module, say M here and read
   Documentation/modules.txt.
 
+Atari ST-RAM swap support
+CONFIG_STRAM_SWAP
+  This enables support for using (parts of) ST-RAM as swap space,
+  instead of as normal system memory. This can first enhance system
+  performace if you have lots of alternate RAM (compared to the size
+  of ST-RAM), because executable code always will reside in faster
+  memory. ST-RAM will remain as ultra-fast swap space. On the other
+  hand, it allows much improved dynamic allocations of ST-RAM buffers
+  for device driver modules (e.g. floppy, ACSI, SLM printer, DMA
+  sound). The probability that such allocations at module load time
+  fail is drastically reduced.
+
 Atari ACSI support
 CONFIG_ATARI_ACSI
   This enables support for the Atari ACSI interface. The driver
@@ -8343,6 +8989,14 @@ CONFIG_ATARI_SCSI_TOSHIBA_DELAY
   use a Toshiba CD-ROM drive; otherwise, the option is not needed and
   would impact performance a bit, so say N.
 
+Hades SCSI DMA emulator (EXPERIMENTAL)
+CONFIG_TT_DMA_EMUL
+  This option enables code which emulates the TT SCSI DMA chip on the
+  Hades. This increases the SCSI transfer rates at least ten times
+  compared to PIO transfers. Note that this code is experimental and
+  has only been tested on a Hades with a 68060 processor. Before you
+  use this, make backups of your entire hard disk.
+
 Ariadne support
 CONFIG_ARIADNE
   If you have a VillageTronics Ariadne Ethernet adapter, say Y.
@@ -8525,27 +9179,23 @@ CONFIG_MSDOS_PARTITION
   Say Y if you need this feature; users who are only using their
   system-native partitioning scheme can say N here.
 
-Build PowerMac Kernel (not PReP)
+Board Type
 CONFIG_PMAC
-  There are currently two different kinds of PowerPC-based machines
+  There are currently several different kinds of PowerPC-based machines
   available: Apple Power Macintoshes and clones (such as the Motorola
-  Starmax series, and PReP (PowerPC Reference Platform) machines such
-  as the Motorola PowerStack range.  Currently, a single kernel binary
-  only supports one type or the other.  Say Y here to compile a kernel
-  which will run on Power Macintoshes and clones.
-
-Build PReP Kernel (not PowerMac)
-CONFIG_PREP
-  Say Y here to compile a kernel which will run on PReP (PowerPC
-  Reference Platform) machines such as the Motorola PowerStack range.
-  For Power Macintosh clones, including the Motorola Starmaxes, you
-  should say N (and Y to the previous question).
-
-Processor type
-CONFIG_MCOMMON
-  If you are compiling a kernel to run on a specific machine, you can
-  indicate which type of PowerPC processor it has.  Currently this
-  option does very little.
+  Starmax series, PReP (PowerPC Reference Platform) machines such
+  as the Motorola PowerStack, Amiga Power-Up systems (APUS), CHRP and the
+  embedded MBX boards from Motorola.  Currently, a single kernel binary
+  only supports one type or the other.  However, there is very early work
+  on support CHRP, PReP and PowerMac's from a single binary.
+
+
+Processor Type
+CONFIG_6xx
+  There are two types of PowerPC chips supported.  The more common
+  types (601,603,604,740,750) and the embedded versions (821 and 860).
+  Unless you are building a kernel for one of the embedded boards using
+  the 821 or 860 choose 6xx.
 
 Support for Open Firmware device tree in /proc
 CONFIG_PROC_DEVICETREE
@@ -8605,15 +9255,103 @@ CONFIG_MACE
 
 Video For Linux
 CONFIG_VIDEO_DEV
-  Support for audio/video capture and overlay devices. The exact
-  capabilities of each device vary. User tools for this are available
-  from ftp://ftp.uk.linux.org/pub/linux/video4linux.  
+  Support for audio/video capture and overlay devices and FM radio
+  cards. The exact capabilities of each device vary. User tools for
+  this are available from
+  ftp://ftp.uk.linux.org/pub/linux/video4linux.
 
   This driver is also available as a module called videodev.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.
 
+AIMSlab RadioTrack (aka RadioReveal) support
+CONFIG_RADIO_RTRACK
+  Choose Y here if you have one of these FM radio cards, and then fill
+  in the port address below.
+
+  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.
+
+  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-aimslab.o.
+
+RadioTrack i/o port
+CONFIG_RADIO_RTRACK_PORT
+  Enter either 0x30f or 0x20f here.  The card default is 0x30f, if you
+  haven't changed the jumper setting on the card.
+
+Aztech/Packard Bell Radio
+CONFIG_RADIO_AZTECH
+  Choose Y here if you have one of these FM radio cards, and then fill
+  in the port address below.
+  
+  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.
+
+  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-aztech.o.
+
+Aztech/Packard Bell radio card i/o port
+CONFIG_RADIO_AZTECH_PORT
+  Enter either 0x350 or 0x358 here.  The card default is 0x350, if you
+  haven't changed the setting of jumper JP3 on the card.  Removing the
+  jumper sets the card to 0x358.
+
+SF16FMI Radio
+CONFIG_RADIO_SF16FMI
+  Choose Y here if you have one of these FM radio cards, and then fill
+  in the port address below.
+
+  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.
+
+  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-sf16fmi.o
+
+SF16FMI I/O port (0x284 or 0x384)
+CONFIG_RADIO_SF16FMI_PORT
+  Enter the I/O port of your SF16FMI radio card.
+
+Zoltrix Radio
+CONFIG_RADIO_ZOLTRIX
+  Choose Y here if you have one of these FM radio cards, and then fill
+  in the port address below.
+
+  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.
+
+  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-zoltrix.o
+
+ZOLTRIX I/O port (0x20c or 0x30c)
+CONFIG_RADIO_ZOLTRIX_PORT
+  Enter the I/O port of your Zoltrix radio card.
+
 BT848 Video For Linux
 CONFIG_VIDEO_BT848
   Support for BT848 based frame grabber/overlay boards. This includes
@@ -8659,33 +9397,65 @@ CONFIG_VIDEO_PMS
   from the running kernel whenever you want). If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
+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
+  also selects to some extent the CPU type.  If you are unsure what
+  to set this option to, please consult any information supplied with
+  your system.
+
+Build Tools Selection
+CONFIG_BINUTILS_NEW
+  Say Y here if you're using GCC 2.8.1/EGCS with a binutils 
+  version >= 2.8.1 to compile the kernel. Otherwise, say N.
+
+Compile kernel with frame pointer
+CONFIG_FRAME_POINTER
+  In order to give useful debugging/error results, say Y here, otherwise
+  say N.
+
+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.
+
 #
 # A couple of things I keep forgetting:
-#   capitalize: DMA, Internet, Intel, IRQ, Linux, NetWare, NFS, PCI, SCSI
-#   two words: hard drive, hard disk, sound card
-#   other: it's safe to save; daemon
+#   capitalize: AppleTalk, Ethernet, DMA, FTP, Internet, Intel, IRQ, 
+#               Linux, NetWare, NFS, PCI, SCSI, SPARC
+#   two words:  hard drive, hard disk, sound card, home page
+#   other:      it's safe to save; daemon
 #
 # This is used by Emacs' spell checker ispell.el:
 #
 # LocalWords:  CONFIG coprocessor DX Pentium SX lilo loadlin HOWTO ftp sunsite
 # 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 filesystem 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:  BINFMT Linkable http ac uk jo html GCC SPARC AVANTI CABRIOLET EB
 # LocalWords:  netscape gcc LD CC toplevel MODVERSIONS insmod rmmod modprobe IP
 # LocalWords:  genksyms INET loopback gatewaying ethernet PPP ARP Arp MEMSIZE
 # LocalWords:  howto multicasting MULTICAST MBONE firewalling ipfw ACCT resp ip
 # LocalWords:  proc acct IPIP encapsulator decapsulator klogd PCTCP RARP EXT PS
-# LocalWords:  telneting subnetted NAGLE rlogin NOSR ttyS TGA techinfo mbone nl
-# LocalWords:  Mb SKB IPX Novell dosemu Appletalk DDP ATALK tapedrive vmalloc
+# LocalWords:  telnetting subnetted NAGLE rlogin NOSR ttyS TGA techinfo mbone nl
+# LocalWords:  Mb SKB IPX Novell dosemu Appletalk DDP ATALK vmalloc visar ehome
 # LocalWords:  SD CHR scsi thingy SG CD LUNs LUN jukebox Adaptec BusLogic EATA
 # LocalWords:  buslogic DMA DPT ATT eata dma PIO UltraStor fdomain umsdos ext
 # LocalWords:  QLOGIC qlogic TMC seagate Trantor ultrastor FASST wd NETDEVICES
-# LocalWords:  unix BBS linux nullmodem CSLIP PLIP Kirch's LDP CSlip SL SCC IRQ
+# LocalWords:  unix BBS linux CSLIP PLIP Kirch's LDP CSlip SL SCC IRQ csustan
 # LocalWords:  Turbo Laplink plip NCSA port's ReQuest IRQs EQL SMC AMD PCnet NE
-# LocalWords:  COM ELPLUS Com EtherLinkIII VLB Arcnet arcnet Cabletron DEPCA DE
-# LocalWords:  depca EtherWorks EWRK ewrk SEEQ EtherExpressPro EEXPRESS NI xxx
+# LocalWords:  COM ELPLUS Com EtherLinkIII VLB Arcnet Cabletron DEPCA DE carlos
+# LocalWords:  depca EtherWorks EWRK ewrk SEEQ EtherExpress EEXPRESS NI xxx dia
 # LocalWords:  EtherExpress WaveLAN wavelan PCLAN HPLAN VG SK Ansel Xen de ZNET
 # LocalWords:  PCMCIA cb stanford pcmcia LAN TEC RealTek ATP atp DLINK NetTools
 # LocalWords:  TR Sony CDU caddyless cdu Mitsumi MCD cd mcd XA MultiSession CDA
@@ -8698,7 +9468,7 @@ CONFIG_VIDEO_PMS
 # LocalWords:  PSMOUSE Compaq trackballs Travelmate Inport ATIXL ATI busmice ld
 # LocalWords:  gpm config QIC DYNCONF FTAPE Stor Ftape ftape pcsndrv manpage NT
 # LocalWords:  readprofile diskdrives org com masq EtherTalk tcp netrom sunacm
-# LocalWords:  misc AIC aic pio nullmodems scc Portmaster eql GIS PhotoCDs MCDX
+# 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:  filesystems smbfs ATA ppp PCTech RZ www powerquest txt CMD ESDI
 # LocalWords:  chipset FB multicast MROUTE appletalk ifconfig IBMTR multiport
@@ -8710,14 +9480,14 @@ CONFIG_VIDEO_PMS
 # LocalWords:  dartmouth flowerpt MultiMaster FlashPoint tudelft etherexpress
 # LocalWords:  ICL EtherTeam ETH IDESCSI TXC SmartRAID SmartCache httpd sjc dlp
 # LocalWords:  thesphere TwoServers BOOTP DHCP ncpfs BPQETHER BPQ chipsets MG
-# LocalWords:  bsd comp Sparcstation le SunOS ie Gracilis PackeTwin PT pt LU FX
-# LocalWords:  FX TEAC SoundBlaster CR CreativeLabs LCS mS ramdisk IDETAPE cmd
+# LocalWords:  bsd comp SPARCstation le SunOS ie Gracilis PackeTwin PT pt LU FX
+# LocalWords:  FX TEAC CR LCS mS ramdisk IDETAPE cmd fperllo encis tcfs unisa
 # LocalWords:  Vertos Genoa Funai hsfs NCP NetWare tgz APM apm ioctls UltraLite
-# LocalWords:  TravelMate CDT LCD backlight VC RPC Mips DECStation AXP barlow
+# LocalWords:  TravelMate CDT LCD backlight VC RPC Mips AXP barlow cdrecord pg
 # LocalWords:  PMAX MILO Alphas Multia Tseng linuxelf endian mipsel mips drv HT
 # LocalWords:  KERNELD kerneld callouts AdvanSys advansys Admin WDT DataStor EP
 # LocalWords:  wdt hdb hdc bugfix SiS vlb Acculogic CSA DTC dtc Holtek ht QDI
-# LocalWords:  QD qd UMC umc ALI ali lena fnet fr homepage azstarnet axplinux
+# LocalWords:  QD qd UMC umc ALI ali lena fnet fr azstarnet axplinux cdr fb MDA
 # 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
@@ -8732,13 +9502,13 @@ CONFIG_VIDEO_PMS
 # LocalWords:  DIGI Xe Xeve digiboard UMISC touchscreens mtu ethernets HBAs MEX
 # LocalWords:  Shifflett netcom js jshiffle WIC DECchip ELCP EtherPower dst RTC
 # LocalWords:  rtc SMP lp Digi Intl RightSwitch DGRS dgrs AFFS Amiga UFS SDL AP
-# LocalWords:  Solaris RISCom riscom syncPPP PCBIT pcbit sparc anu au artoo ufs
+# LocalWords:  Solaris RISCom riscom syncPPP PCBIT pcbit sparc anu au artoo MFB
 # LocalWords:  hitchcock Crynwr cnam pktdrvr NCSA's CyDROM CyCDROM FreeBSD NeXT
 # LocalWords:  NeXTstep disklabel disklabels SMD FFS tm AmigaOS diskfiles Un IQ
 # LocalWords:  Bernd informatik rwth aachen uae affs multihosting bytecode java
 # LocalWords:  applets applet JDK ncsa cabi SNI Alphatronix readme LANs scarab
-# LocalWords:  winsock RNIS caltech OSPF honour Honouring Mbit Localtalk DEFRAG
-# LocalWords:  localtalk download Packetwin Baycom baycom interwork ascii JNT
+# LocalWords:  winsock RNIS caltech OSPF honour Honouring Mbit LocalTalk DEFRAG
+# LocalWords:  localtalk download Packetwin Baycom baycom interwork ASCII JNT
 # LocalWords:  Camtec proxying indyramp defragment defragmented UDP FAS FASXX
 # LocalWords:  FastSCSI SIO FDC qlogicfas QLogic qlogicisp setbaycom ife ee LJ
 # LocalWords:  ethz ch Travelmates ProAudioSpectrum ProAudio SoundMan SB SBPro
@@ -8751,14 +9521,14 @@ CONFIG_VIDEO_PMS
 # LocalWords:  setsync NEGO MPARITY autotuning prefetch PIIX cdwrite utils rc
 # LocalWords:  PCWATCHDOG berkprod bitgate boldt ucsb jf kyoto jp euc Tetsuyasu 
 # LocalWords:  YAMADA tetsu cauchy nslab ntt nevod perm su doc kaf kheops wsc
-# LocalWords:  traduc Bourgin dbourgin helptext menuconfig kfill READMEs HOWTOs
+# LocalWords:  traduc Bourgin dbourgin menuconfig kfill READMEs HOWTOs Virge WA
 # LocalWords:  IDEDISK IDEFLOPPY EIDE firewalls QMAGIC ZMAGIC LocalWords opti
 # LocalWords:  SVGATextMode vga svga Xterminal Xkernel syr jmwobus comfaqs dhcp
 # LocalWords:  IPv IPng interoperability ipng ipv radio's tapr pkthome PLP nano
 # LocalWords:  Ses Mhz sethdlc SOUNDMODEM WindowsSoundSystem smdiag pcf inka ES
 # LocalWords:  smmixer ptt circ soundmodem MKISS FDDI DEFEA DEFPA DEFXX redhat
 # LocalWords:  HyperNews khg mconv sed lina wuftpd MicroChannel netlink irc cum
-# LocalWords:  raudio realaudio PPROP NETBIOS GUI IBMMCA ELMC Racal Interlan fi
+# LocalWords:  raudio RealAudio PPROP NETBIOS GUI IBMMCA ELMC Racal Interlan fi
 # LocalWords:  eth shapecfg src esp PCWD PREVSTAT bootparam sig bitwizard SBC
 # LocalWords:  downloads AFSK TCM FP Karn KA FSK RUH LinkSys cron mouseman LLC
 # LocalWords:  SyQuest SyQuest's CCITT MicroSolutions BPCD bpcd ESPSERIAL PROM
@@ -8770,13 +9540,13 @@ CONFIG_VIDEO_PMS
 # LocalWords:  Rhotron BioData's Multiface AMIGAMOUSE COPCON Amiga's bitplanes
 # LocalWords:  ATARIMOUSE MFPSER SCC's MegaSTE ESCC Atari's GVPIOEXT DMASOUND
 # LocalWords:  fdutils cisco univercd rpcg htm iface lapb LAPBETHER tpqic qic
-# LocalWords:  SYNTH xd en binfmt aout ipip terra ipx fileserver sd sr sg wic
+# LocalWords:  SYNTH xd en binfmt aout ipip terra ipx sd sr sg wic framebuffer
 # LocalWords:  ibmmca lapbether mkiss dlci sdla fmv eepro eexpress ni hp ne es
 # LocalWords:  ibmtr isofs ROMFS romfs pcxx cyclades istallion psaux msbusmouse
 # LocalWords:  atixlmouse sbin softdog pcwd USS Lite ACI miroSOUND PCM miroPCM
 # LocalWords:  microcontroller miro Voxware downloading teles acsi slm gvp ltpc
 # LocalWords:  atari ariadne amigamouse atarimouse builtin IPDDP maths bradford
-# LocalWords:  LocalTalk AppleTalk Farallon PhoneNet Zubkoff lnz SCCB HAPN WANs
+# LocalWords:  AppleTalk Farallon PhoneNet Zubkoff lnz SCCB HAPN WANs vesafb nt
 # LocalWords:  wanrouter WANPIPE multiprotocol Mbps wanpipe EtherWORKS nodma SC
 # LocalWords:  smp HiSax SiemensChipSet Siemens AVM Elsa ITK hisax PCC MICROR
 # LocalWords:  Mircolink EURO DSS Spellcaster BRI sc spellcast Digiboards GPIO
@@ -8784,7 +9554,7 @@ CONFIG_VIDEO_PMS
 # LocalWords:  loader's PCnetPCI automounter AUTOFS amd autofs VT Gallant's Pnp
 # LocalWords:  AEDSP aedsp enskip tik Sysctl sysctl PARPORT parport pnp IDs EPP
 # LocalWords:  Autoprobe bart patrickr HDLS READBACK AB usr DAMA DS SparQ aten
-# LocalWords:  Symbios PCscsi tmscsim RoamAbout GHz Hinds's contrib mathematik
+# LocalWords:  Symbios PCscsi tmscsim RoamAbout GHz Hinds contrib mathematik ok
 # LocalWords:  darmstadt okir DIGIEPCA International's Xem digiepca epca bootup
 # LocalWords:  zorro CAPI AVMB capi avmb VP SYN syncookies EM em pc Ethertalk
 # LocalWords:  Dayna DL Daynatalk LT PhoneNET ATB Daystar queueing CMDS SCBs ls
@@ -8793,8 +9563,8 @@ CONFIG_VIDEO_PMS
 # 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:  KERNNAME kname ktype kernelname Kerneltype KERNTYPE Alt SCB's RX
-# LocalWords:  dataless kerneltype SYSNAME Netbeui Comtrol Rocketport palmtop
+# LocalWords:  KERNNAME kname ktype kernelname Kerneltype KERNTYPE Alt RX mdafb
+# LocalWords:  dataless kerneltype SYSNAME Comtrol Rocketport palmtop
 # LocalWords:  nvram SYSRQ SysRq PrintScreen sysrq NVRAMs NvRAM Shortwave RTTY
 # LocalWords:  HFMODEM shortwave Sitor Amtor Pactor GTOR hfmodem hayes TX TMOUT
 # LocalWords:  IDEPCI IDEDMA idedma PDC pdc TRM trm raidtools luthien nuclecu
@@ -8803,8 +9573,8 @@ CONFIG_VIDEO_PMS
 # LocalWords:  misconfigured autoconfiguration IPGRE ICMP tracert ipautofw PIM
 # LocalWords:  netis rlynch autofw ipportfw monmouth ipsubs portforwarding pimd
 # LocalWords:  portfw PIMSM netweb usc pim pf EUI aggregatable PB decapsulate
-# LocalWords:  ipddp Decapsulation DECAP bool HAMRADIO WAN's tcpdump af CD's tx
-# LocalWords:  ethertap multisession PPC MMIO GDT GDTH ICP gdth hamradio LAN's
+# LocalWords:  ipddp Decapsulation DECAP bool HAMRADIO tcpdump af CDs tx FBCON
+# LocalWords:  ethertap multisession PPC MMIO GDT GDTH ICP gdth hamradio  bpp
 # LocalWords:  lmh weejock AIMSlab RadioTrack RTRACK HZP OptoSCC TRX rx TRXECHO
 # LocalWords:  DMASCC paccomm dmascc addr cfg oevsv oe kib picpar FDX baudrate
 # LocalWords:  baudrates fdx HDX hdx PSK kanren frforum QoS SCHED CBQ SCH sched
@@ -8834,4 +9604,17 @@ CONFIG_VIDEO_PMS
 # LocalWords:  mwave OLDCARD isdnloop linklevel loopctrl Eicon Diehl DIEHLDIVA
 # LocalWords:  ASUSCOM AsusCom TELEINT semiactiv Sedlbauer Sportster TA MIC ITH
 # LocalWords:  NETjet NetJet Niccy Neuhaus sparcs AOC AOCD AOCE Microlink SAA
-# LocalWords:  teletext WinTV saa iproute tc
+# LocalWords:  teletext WinTV saa iproute tc Quadra Performa PowerBook tor AUN
+# LocalWords:  setserial compsoc steve Econet econet AUNUDP psched TEQL TLE CLS
+# LocalWords:  teql FW Ingres TwistedPair MTRR MTRRs mtrr cfs crypto TD ktti KT
+# LocalWords:  PHd ICS ipchains adelaide rustcorp syslog Cumana steganography
+# LocalWords:  AcornSCSI EcoSCSI EESOX EESOXSCSI Powertec POWERTECSCSI dec SF
+# LocalWords:  RadioReveal gatekeeper aimslab aztech FMI sf fmi RTL rtl cesdis
+# LocalWords:  Yellowfin gsfc nasa gov yellowfin pcnet Mylex LNE lne EtherH hs
+# LocalWords:  EBSA chattr RiscOS Winmodem AGP Atomwide DUALSP pcsp robinson
+# 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 sktr sna etherboot ufs NetBEUI MultiSound MSNDCLAS
+# LocalWords:  MSNDINIT MSNDPERM MSNDPIN PNDSPINI PNDSPERM Ensoniq's
+# LocalWords:  AudioPCI lspci SonicVibes sonicvibes SPARCs roadrunner
+# LocalWords:  swansea shtml Zoltrix zoltrix BINUTILS EGCS binutils VIDC DACs