o Merge with Linux 2.1.91.

 o First round of bugfixes for the SC/MC CPUs.
 o FPU context switch fixes.
 o Lazy context switches.
 o Faster syscalls.
 o Removed dead code.
 o Shitloads of other things I forgot ...

7 files changed, 1156 insertions, 879 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index eddc729b8..7380424fe 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -26,35 +26,36 @@
 # compile it and much more is contained in the Kernel-HOWTO, available
 # 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; they are listed
-# in Documentation/Changes.
+# 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 the question being documented is of type "choice", we list only
-# the first occurring config variable. The help texts must not contain
+# Format of this file: description<nl>variable<nl>helptext<nl><nl>. If
+# the question being documented is of type "choice", we list only the
+# first occurring config variable. The help texts must not contain
 # empty lines. Order of the help texts does not matter, however, no
 # variable should be documented twice: if it is, only the first
 # occurrence will be used by Configure. It is not absolutely necessary
 # that the one-line descriptions of the variables used here are
-# exactly the same as the ones in the corresponding Config.in
-# scripts. The lines in a help text should be indented two
-# positions. Lines starting with `#' are ignored. To be nice to
-# menuconfig, limit your lines to 70 characters. Use emacs' kfill.el
-# to edit this file or you lose.
+# exactly the same as the ones in the corresponding Config.in scripts.
+# The lines in a help text should be indented two positions. Lines
+# starting with `#' are ignored. To be nice to menuconfig, limit your
+# lines to 70 characters. Use emacs' kfill.el to edit and ispell.el to
+# spell check this file or you lose.
 #
 # If you add a help text to this file, please try to be as gentle as
 # possible. Don't use unexplained acronyms and generally write for the
 # hypothetical ignorant but intelligent user who has just bought a PC,
 # removed Windows, installed Linux and is now recompiling the kernel
-# for the first time. Tell them what to do if they're
-# unsure. Technical information should go in a README in the
-# Documentation directory. Mention all the relevant READMEs and HOWTOs
-# in the help text.
+# for the first time. Tell them what to do if they're unsure. Technical 
+# information should go in a README in the Documentation directory.
+# Mention all the relevant READMEs and HOWTOs in the help text.
 #
 # All this was shamelessly stolen from several different sources. Many
-# thanks to all the contributors.  Feel free to use these help texts
-# in your own kernel configuration tools. The texts are copyrighted
-# (c) 1995-1997 by Axel Boldt and others and governed by the GNU
+# thanks to all the contributors. Feel free to use these help texts in
+# your own kernel configuration tools. The texts are copyrighted (c)
+# 1995-1998 by Axel Boldt and many others and are governed by the GNU
 # Public License.
 
 Prompt for development and/or incomplete code/drivers
@@ -132,7 +133,7 @@ CONFIG_BLK_DEV_RAM
   Saying Y here will allow you to use a portion of your RAM memory as
   a block device, so that you can make filesystems on it, read and
   write to it and do all the other things that you can do with normal
-  block devices (such as harddrives).  It is usually used to load and
+  block devices (such as hard drives).  It is usually used to load and
   store a copy of a minimal root file system off of a floppy into RAM
   during the initial install of Linux.  Note that the kernel command
   line option "ramdisk=XX" is now obsolete.  For details, read
@@ -155,7 +156,7 @@ 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 one to mount a filesystem with
+  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.win.tue.nl/pub/linux/util/).  Note that this loop device has
@@ -182,35 +183,38 @@ CONFIG_BLK_DEV_IDE
   This will use the full-featured IDE driver to control up to four IDE
   interfaces, each being able to serve a "master" and a "slave"
   device, for a combination of up to eight IDE disk/cdrom/tape/floppy
-  drives.  Useful information about large (>540MB) IDE disks,
-  soundcard IDE ports, module support, and other topics, is 
-  contained in Documentation/ide.txt.  If you have one or more IDE
-  drives, say Y here.  If your system has no IDE drives, or if memory
+  drives. 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
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. If you have one or more IDE
+  drives, say Y here. If your system has no IDE drives, or if memory
   requirements are really tight, you could say N here, and select the
-  "Old harddisk driver" instead to save about 13kB of memory in the
-  kernel.  To fine-tune IDE drive/interface parameters for improved
+  "Old hard disk driver" instead to save about 13kB of memory in the
+  kernel. To fine-tune IDE drive/interface parameters for improved
   performance, look for the hdparm package at
   sunsite.unc.edu:/pub/Linux/kernel/patches/diskdrives/
 
-Old harddisk (MFM/RLL/IDE) driver
+Old hard disk (MFM/RLL/IDE) driver
 CONFIG_BLK_DEV_HD_ONLY
-  There are two drivers for MFM/RLL/IDE disks.  Most people use the
+  There are two drivers for MFM/RLL/IDE disks. Most people use the
   newer enhanced driver, but this old one is still around for two
-  reasons.  Some older systems have strange timing problems and seem
-  to work only with the old driver (which itself does not work with
-  some newer systems).  The other reason is that the old driver is
-  smaller, since it lacks the enhanced functionality of the new one.
-  This makes it a good choice for systems with very tight memory
-  restrictions, or 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.
+  reasons. Some older systems have strange timing problems and seem to
+  work only with the old driver (which itself does not work with some
+  newer systems). The other reason is that the old driver is smaller,
+  since it lacks the enhanced functionality of the new one. This makes
+  it a good choice for systems with very tight memory restrictions, or
+  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
+  (user: anonymous) from sunsite.unc.edu:/pub/Linux/docs/HOWTO.
 
 Use old disk-only driver on primary interface
 CONFIG_BLK_DEV_HD_IDE
   There are two drivers for MFM/RLL/IDE disks.  Most people use just
   the new enhanced driver by itself.  This option however installs the
-  old harddisk driver to control the primary IDE/disk interface in the
+  old hard disk driver to control the primary IDE/disk interface in the
   system, leaving the new enhanced IDE driver take care of only the
   2nd/3rd/4th IDE interfaces. Doing this will prevent you from having
   an IDE/ATAPI CDROM or tape drive connected to the primary IDE
@@ -222,9 +226,9 @@ CONFIG_BLK_DEV_HD_IDE
 
 Include IDE/ATA-2 DISK support
 CONFIG_BLK_DEV_IDEDISK
-  This will include enhanced support for MFM/RLL/IDE harddisks. If you
+  This will include enhanced support for MFM/RLL/IDE hard disks. If you
   have a MFM/RLL/IDE disk, and there is no special reason to use the
-  old harddisk driver instead, say Y.  If you want to compile this
+  old hard disk driver instead, say Y.  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 ide-disk.o. Do
@@ -240,11 +244,11 @@ CONFIG_BLK_DEV_IDECD
   NEC-260, Mitsumi FX400, Sony 55E, and just about all non-SCSI
   double(2X), quad(4X), and six(6X) speed drives.  At boot time, the
   CDROM drive will be identified along with other IDE devices, as
-  "hdb" or "hdc", or something similar.  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".  Read the CDROM-HOWTO,
-  available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO and the file
+  "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".  Read the CDROM-HOWTO, available via ftp (user:
+  anonymous) in 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
   install lilo-16 or higher, available from
@@ -260,11 +264,12 @@ CONFIG_BLK_DEV_IDETAPE
   to the SCSI protocol.  At boot time, the tape drive will be
   identified along with other IDE devices, as "hdb" or "hdc", or
   something similar, and will be mapped to a character device such as
-  "ht0".  Be sure to consult the drivers/block/ide-tape.c and
-  Documentation/ide.txt files for usage information.  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 ide-tape.o.
+  "ht0" (check the boot messages with dmesg).  Be sure to consult the
+  drivers/block/ide-tape.c and Documentation/ide.txt files for usage
+  information.  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 ide-tape.o.
 
 Include IDE/ATAPI FLOPPY support
 CONFIG_BLK_DEV_IDEFLOPPY
@@ -274,11 +279,11 @@ CONFIG_BLK_DEV_IDEFLOPPY
   and the ATAPI ZIP (ATAPI PD-CD/CDR drives are not supported by this
   driver; support for PD-CD/CDR drives is available through the SCSI
   emulation). At boot time, the FLOPPY drive will be identified along
-  with other IDE devices, as "hdb" or "hdc", or something similar. 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 ide-floppy.o.
+  with other IDE devices, as "hdb" or "hdc", or something similar
+  (check the boot messages with dmesg). 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 ide-floppy.o.
 
 SCSI emulation support
 CONFIG_BLK_DEV_IDESCSI
@@ -293,7 +298,7 @@ CONFIG_BLK_DEV_IDESCSI
 
 CMD640 chipset bugfix/support
 CONFIG_BLK_DEV_CMD640
-  The CMD-Technologies CMD640 chip is used on many common 486 and
+  The CMD-Technologies CMD640 IDE chip is used on many common 486 and
   Pentium motherboards, usually in combination with a "Neptune" or
   "SiS" chipset.  Unfortunately, it has a number of rather nasty
   design flaws that can cause severe data corruption under many common
@@ -303,9 +308,9 @@ CONFIG_BLK_DEV_CMD640
   systems.  This driver will work automatically in PCI based systems
   (most new systems have PCI slots).  But if your system uses VESA
   local bus (VLB) instead of PCI, you must also supply a kernel boot
-  parameter to enable the CMD640 bugfix/support: "ide0=cmd640_vlb" The
-  CMD640 chip is also used on add-in cards by Acculogic, and on the
-  "CSA-6400E PCI to IDE controller" that some people have. For
+  parameter to enable the CMD640 bugfix/support: "ide0=cmd640_vlb".
+  The CMD640 chip is also used on add-in cards by Acculogic, and on
+  the "CSA-6400E PCI to IDE controller" that some people have. For
   details, read Documentation/ide.txt. If unsure, say Y.
 
 CMD640 enhanced support
@@ -335,15 +340,17 @@ CONFIG_BLK_DEV_IDEPCI
 
 Generic PCI bus-master DMA support
 CONFIG_BLK_DEV_IDEDMA
-  If your PCI IDE controller is capable of bus-master DMA
-  (Direct Memory Access) transfers (most newer systems are),
-  then 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 were not enabled automatically.
-  You can get the latest version of the hdparm utility via anonymous
-  FTP from sunsite.unc.edu/pub/Linux/system/hardware/
+  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
+  were not enabled automatically.  You can get the latest version of
+  the hdparm utility via anonymous FTP from
+  sunsite.unc.edu/pub/Linux/system/hardware/. Read the comments at the
+  beginning of drivers/block/idedma.c and the file
+  Documentation/ide.txt for more information.
   It is safe to say Y to this question.
 
 Other IDE chipset support
@@ -427,7 +434,7 @@ CONFIG_BLK_DEV_ALI14XX
   I/O speeds to be set as well.  See the Documentation/ide.txt and
   ali14xx.c files for more info.
 
-XT harddisk support
+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
@@ -438,22 +445,25 @@ CONFIG_BLK_DEV_XD
 
 Parallel port IDE device support
 CONFIG_PARIDE
-  There are many external CD-ROM and disk devices that connect
-  through your computer's parallel port.  Most of them are actually
-  IDE devices using a parallel port IDE adapter.  This option enables
-  the PARIDE subsystem which contains drivers for many of these
-  external drives.  Read linux/Documentation/paride.txt for more
-  information.  If you have enabled the parallel port support general
-  configuration option, you may share a single port between your
-  printer and other parallel port devices.  Answer Y to build PARIDE 
-  support into your kernel, or M if you would like to build it as a 
-  loadable module.  If your parallel port support is in a loadable 
-  module, you must build PARIDE as a module.  If you built PARIDE
-  support into your kernel, you may still build the individual 
-  protocol modules and high-level drivers as loadable modules.  To
-  use the PARIDE support, you must have this module as well as at
-  least one protocol module and one high-level driver.  If you build
-  this support as a module, it will be called paride.o.
+  There are many external CD-ROM and disk devices that connect through
+  your computer's parallel port. Most of them are actually IDE devices
+  using a parallel port IDE adapter. This option enables the PARIDE
+  subsystem which contains drivers for many of these external drives.
+  Read linux/Documentation/paride.txt for more information. If you
+  have said Y to the "Parallel-port support" configuration option, you
+  may share a single port between your printer and other parallel port
+  devices. Answer Y to build PARIDE support into your kernel, or M if
+  you would like to build it as a loadable module. If your parallel
+  port support is in a loadable module, you must build PARIDE as a
+  module. If you built PARIDE support into your kernel, you may still
+  build the individual protocol modules and high-level drivers as
+  loadable modules. To use the PARIDE support, you must say Y or M
+  here and also to at least one high-level driver (e.g. "Parallel port
+  IDE disks", "Parallel port ATAPI CD-ROMs", "Parallel port ATAPI
+  disks" etc.) and to at least one protocol driver (e.g. "ATEN EH-100
+  protocol", "MicroSolutions backpack protocol", "DataStor Commuter
+  protocol" etc.). If you build this support as a module, it will be
+  called paride.o.
 
 Parallel port IDE disks
 CONFIG_PARIDE_PD 
@@ -465,22 +475,25 @@ CONFIG_PARIDE_PD
   must also have at least one parallel port protocol driver in your 
   system.  Among the devices supported by this driver are the SyQuest 
   EZ-135, EZ-230 and SparQ drives, the Avatar Shark and the backpack
-  hardrives from MicroSolutions.
+  hard drives from MicroSolutions.
 
 Parallel port ATAPI CD-ROMs
 CONFIG_PARIDE_PCD 
   This option enables the high-level driver for ATAPI CD-ROM devices
-  connected through a parallel port.  If you chose to build PARIDE
+  connected through a parallel port. If you chose to build PARIDE
   support into your kernel, you may answer Y here to build in the
-  parallel port ATAPI CD-ROM driver, otherwise you should answer M
-  to build it as a loadable module.  The module will be called pcd.o.
-  You 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.
+  parallel port ATAPI CD-ROM driver, otherwise you should answer M to
+  build it as a loadable module. The module will be called pcd.o. You
+  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
+  on CDROMs.
 
 Parallel port ATAPI disks
 CONFIG_PARIDE_PF 
-  This option enable the high-level driver for ATAPI disk devices
+  This option enables the high-level driver for ATAPI disk devices
   connected through a parallel port.  If you chose to build PARIDE
   support into your kernel, you may answer Y here to build in the
   parallel port ATAPI disk driver, otherwise you should answer M
@@ -492,7 +505,7 @@ CONFIG_PARIDE_PF
 
 Parallel port ATAPI tapes
 CONFIG_PARIDE_PT
-  This option enable the high-level driver for ATAPI tape devices
+  This option enables the high-level driver for ATAPI tape devices
   connected through a parallel port.  If you chose to build PARIDE
   support into your kernel, you may answer Y here to build in the
   parallel port ATAPI disk driver, otherwise you should answer M
@@ -584,7 +597,7 @@ CONFIG_PARIDE_KBIC
 OnSpec 90c20 protocol
 CONFIG_PARIDE_ON20 
   This option enables support for the (obsolete) 90c20 parallel port 
-  IDE protocol from OnSpec (often marketted under the ValuStore brand
+  IDE protocol from OnSpec (often marketed under the ValuStore brand
   name).  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 
@@ -594,7 +607,7 @@ CONFIG_PARIDE_ON20
 OnSpec 90c26 protocol
 CONFIG_PARIDE_ON26 
   This option enables support for the 90c26 parallel port IDE protocol 
-  from OnSpec Electronics (often marketted under the ValuStore brand
+  from OnSpec Electronics (often marketed under the ValuStore brand
   name).  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 
@@ -603,17 +616,18 @@ CONFIG_PARIDE_ON26
 
 Multiple devices driver support
 CONFIG_BLK_DEV_MD
-  This driver lets you combine several harddisk partitions into one
-  logical block device. Information about how and why to use it and the
-  necessary tools are available over ftp (user: anonymous) from
-  sweet-smoke.ufr-info-p7.ibp.fr/pub/Linux in the md package
-  and the md-FAQ. Please read drivers/block/README.md. If unsure, say
-  N.
+  This driver lets you combine several hard disk partitions into one
+  logical block device. Information about how and why to use it and
+  the necessary tools are available over ftp (user: anonymous) from
+  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
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. If unsure, say N.
 
 Linear (append) mode
 CONFIG_MD_LINEAR
   If you say Y here, then your multiple devices driver will be able to
-  use the so-called linear mode, i.e. it will combine the harddisk
+  use the so-called linear mode, i.e. it will combine the hard disk
   partitions by simply appending one to the other. If you want to
   compile this as a module ( = code which can be inserted in and
   removed from the running kernel whenever you want), say M here and
@@ -623,7 +637,7 @@ CONFIG_MD_LINEAR
 RAID-0 (striping) mode
 CONFIG_MD_STRIPED
   If you say Y here, then your multiple devices driver will be able to
-  use the so-called raid0 mode, i.e. it will combine the harddisk
+  use the so-called raid0 mode, i.e. it will combine the hard disk
   partitions into one logical device in such a fashion as to fill them
   up evenly, one chunk here and one chunk there. This will increase
   the throughput rate if the partitions reside on distinct disks.  If
@@ -736,60 +750,64 @@ CONFIG_BINFMT_IRIX
 
 Networking support
 CONFIG_NET
-  Unless you really know what you are doing, you should say Y
-  here. The reason is that some programs need kernel networking
-  support even if you configure a stand-alone machine that won't be
-  connected to any other computer.  If you are upgrading from an older
-  kernel, you should consider updating your networking tools too
-  because changes in the kernel and the tools often go hand in hand;
-  see http://www.inka.de/sites/lina/linux/NetTools/index_en.html for
-  details. 
+  Unless you really know what you are doing, you should say Y here.
+  The reason is that some programs need kernel networking support even
+  when running on a stand-alone machine that isn't connected to any
+  other computer. If you are upgrading from an older kernel, you
+  should consider updating your networking tools too because changes
+  in the kernel and the tools often go hand in hand. The tools are
+  contained in the package net-tools, the location and version number
+  of which is given in Documentation/Changes.
 
 Fast switching (read help!)
 CONFIG_NET_FASTROUTE
-  Enable direct NIC-to-NIC data transfers.
-  *** This option is NOT COMPATIBLE with several important ***
-  *** networking options: especially CONFIG*FIREWALL.      ***
+  Enables direct NIC-to-NIC data transfers, which is fast.
+    *** This option is NOT COMPATIBLE with several important ***
+    *** networking options: especially CONFIG*FIREWALL.      ***
   However, it will work with all options in CONFIG_IP_ADVANCED_ROUTER
-  section (except for CONFIG_IP_ROUTE_TOS). At the moment few of devices
-  supports it (tulip is one of them, modified 8390 can be found at
-  ftp://ftp.inr.ac.ru/ip-routing/fastroute-8390.tar.gz).
-  Remember, short cuts make long delays :-), say N.
+  section (except for CONFIG_IP_ROUTE_TOS). At the moment, few devices
+  support fast switching (tulip is one of them, modified 8390 can be
+  found at ftp://ftp.inr.ac.ru/ip-routing/fastroute-8390.tar.gz). If
+  unsure, say N.
 
 Forwarding between high speed interfaces
 CONFIG_NET_HW_FLOWCONTROL
   This option enables NIC hardware throttling during periods of
-  extremal congestion. At the moment only couple of device drivers
-  support it (really, one --- tulip, modified 8390 can be found
-  at ftp://ftp.inr.ac.ru/ip-routing/fastroute-8390.tar.gz).
-  Really, this option is applicable to any machine attached
-  to enough fast network, and even 10Mb NIC
-  is able to kill not very slow box, sort of 120MHz Pentium.
-  However, do not enable this option, if you did not experienced
+  extremal congestion. At the moment only a couple of device drivers
+  support it (really only one ---tulip, modified 8390 can be found at
+  ftp://ftp.inr.ac.ru/ip-routing/fastroute-8390.tar.gz).  Really, this
+  option is applicable to any machine attached to a fast enough
+  network, and even a 10Mb NIC is able to kill a not very slow box,
+  such as a 120MHz Pentium.
+  However, do not enable this option, if you did not experience
   any serious problems.
 
 Network aliasing
 CONFIG_NET_ALIAS
   This will allow you to set multiple network addresses on the same
   low-level network device driver. Typically used for services that
-  act differently based on the address they listen on
-  (e.g. "multihosting" or "virtual domains" on the web server apache
-  and the ftp server wuftpd) or for connecting to different logical
-  networks through the same physical interface (most commonly an
-  ethernet networking card).  This is the generic part, later when
-  configuring network protocol options you will be asked for
-  protocol-specific aliasing support, and you will have to say Y to at
-  least one of them.  See Documentation/networking/alias.txt for more
-  info.  If you need this feature (for any protocol, like IP) say Y;
-  if unsure, say N.
+  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 (user: anonymous) from
+  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). This is the generic part,
+  later when configuring network protocol options you will be asked
+  for protocol-specific aliasing support, and you will have to say Y
+  to at least one of them, most likely "IP: aliasing support". See
+  Documentation/networking/alias.txt for more info. If you need this
+  feature (for any protocol, like IP) say Y; if unsure, say N.
 
 Socket filtering
 CONFIG_FILTER
   The Linux Socket Filter is derived from the Berkeley Packet Filter.
-  Through Socket Filtering you can have the kernel decide whether the
-  data is good and to continue processing it. Linux Socket Filtering 
-  works on all socket types except TCP for now. See the text file
-  linux/Documentation/networking/filter.txt for more information.
+  If you say Y here, user-space programs can attach a filter onto any
+  socket and thereby tell the kernel that it should allow or disallow
+  certain types of data to get through the socket. Linux Socket
+  Filtering works on all socket types except TCP for now. See the text
+  file linux/Documentation/networking/filter.txt for more information.
+  If unsure, say N.
 
 Network firewalls
 CONFIG_FIREWALL
@@ -817,7 +835,7 @@ CONFIG_SYN_COOKIES
   Normal TCP/IP networking is open to an attack known as "SYN flooding".
   This denial-of-service attack prevents legitimate remote users from
   being able to connect to your computer and requires very little work
-  from the attacker, who can operate from anywhere on the internet.
+  from the attacker, who can operate from anywhere on the Internet.
   SYN cookies provide protection against this type of attack. With
   this option turned on, the TCP/IP stack will use a cryptographic
   challenge protocol known as SYN cookies to enable legitimate users
@@ -842,10 +860,12 @@ 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
-  http://www.azstarnet.com/~axplinux/ (To browse the WWW, you need to
+  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). For this question, it suffices to give a unique
-  prefix of the option you want to choose. The choices:
+  lynx or netscape) and also the Alpha-HOWTO, available via ftp (user:
+  anonymous) from 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:
   ** Avanti: This is for Mustang (AS200), M3 (AS250), Avanti (AS400)
      AlphaStations.  These usually come with a TGA graphics adapter,
      so you'll want to say Y to "TGA Console support", below, if you
@@ -915,11 +935,13 @@ CONFIG_SERIAL_EXTENDED
 Support more than 4 serial ports
 CONFIG_SERIAL_MANY_PORTS
   Enable this option 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, 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 say N here to save some
-  memory.
+  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
+  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 say N here
+  to save some memory.
 
 Support for sharing serial interrupts
 CONFIG_SERIAL_SHARE_IRQ
@@ -1006,6 +1028,12 @@ CONFIG_PCI_OPTIMIZE
   Y if you think it might help, but try turning it off if you
   experience any problems with the PCI bus. N is the safe answer.
 
+Backward-compatible /proc/pci
+CONFIG_PCI_OLD_PROC
+  If you say Y here and to the "/proc filesystem support" below, you
+  will get a directory /proc/pci with information about your PCI
+  hardware. If unsure, say Y.
+
 MCA support
 CONFIG_MCA
   MicroChannel Architecture is found in some IBM PS/2 machines and
@@ -1030,25 +1058,38 @@ CONFIG_SYSVIPC
   or with the program info ("man info"). Saying Y here enlarges
   your kernel by about 7kB. Just say Y.
 
+BSD Process Accounting
+CONFIG_BSD_PROCESS_ACCT
+  If you say Y here, a user level program will be able to instruct the
+  kernel (via a special system call) to write process accounting
+  information to a file: whenever a process exits, information about
+  that process will be appended to the file by the kernel. The
+  information includes things such as creation time, owning user,
+  command name, memory usage, controlling terminal etc. (the complete
+  list is in the struct acct in include/linux/acct.h). It is up to the
+  user level program to do useful things with this information. This
+  is generally a good idea, so say Y.
+  
 Sysctl support
 CONFIG_SYSCTL
-  The sysctl interface provides a means of dynamically changing certain
-  kernel parameters and variables on the fly without requiring a
-  recompile of the kernel or reboot of the system. The primary interface
-  consists of a system call, but if the /proc filesystem is enabled, a
-  tree of modifiable sysctl entries will be generated beneath the 
-  /proc/sys directory. Note that enabling this option will enlarge the 
-  kernel by at least 8kB. As it is generally a good thing, you probably
-  want to say Y here unless building a kernel for install/rescue disks
-  or your system is very limited in memory.
+  The sysctl interface provides a means of dynamically changing
+  certain kernel parameters and variables on the fly without requiring
+  a recompile of the kernel or reboot of the system. The primary
+  interface consists of a system call, but if the /proc filesystem is
+  enabled, a tree of modifiable sysctl entries will be generated
+  beneath the /proc/sys directory. They are explained in the files in
+  Documentation/sysctl/. Note that enabling this option will enlarge
+  the kernel by at least 8kB. As it is generally a good thing, you
+  probably want to say Y here unless building a kernel for
+  install/rescue disks or your system is very limited in memory.
 
 Kernel support for ELF binaries
 CONFIG_BINFMT_ELF
   ELF (Executable and Linkable Format) is a format for libraries and
   executables used across different architectures and operating
   systems. This option will enable your kernel to run ELF binaries and
-  enlarge it by about 2kB. ELF support under Linux is quickly
-  replacing the traditional Linux a.out formats (QMAGIC and ZMAGIC)
+  enlarge it by about 2kB. ELF support under Linux has now all but
+  replaced the traditional Linux a.out formats (QMAGIC and ZMAGIC)
   because it is portable (this does *not* mean that you will be able
   to run executables from different architectures or operating
   systems!) and makes building run-time libraries very easy. Many new
@@ -1115,9 +1156,9 @@ CONFIG_BINFMT_JAVA
   will be called binfmt_java.o. 
   The complete functionality of this Java support is also provided by
   the more general option "Kernel support for MISC binaries",
-  below. This option is therefore considered obsolete and you probably
-  want to say N here and Y to "Kernel support for MISC binaries" if
-  you're interested in Java.
+  below. This option is therefore considered obsolete and you should
+  say N here and Y to "Kernel support for MISC binaries" if you're 
+  interested in transparently executing Java programs.
 
 Kernel support for Linux/Intel ELF binaries
 CONFIG_BINFMT_EM86
@@ -1140,11 +1181,13 @@ CONFIG_BINFMT_MISC
   (CONFIG_BINFMT_JAVA) or "Kernel support for Linux/Intel ELF
   binaries" (CONFIG_BINFMT_EM86), as this is a more general solution.
   You can do other nice things, too. Read
-  Documentation/binfmt_misc.txt to learn how to use this feature.
+  Documentation/binfmt_misc.txt to learn how to use this feature, and
+  Documentation/java.txt for information about how to include Java
+  support. 
   You must enable the "proc filesystem support" (CONFIG_PROC_FS) to
   use this part of the kernel.
   You may answer M for module support and later load the module when
-  you have use for it.  
+  you have use for it; the module is called binfmt_misc.o.  
   If you don't know what to answer at this point, say Y.
 
 Solaris binary emulation
@@ -1166,10 +1209,21 @@ CONFIG_M386
   (=586) and Pentium Pro (=686). In rare cases, it can make sense to
   specify "Pentium" even if running on a 486: the kernel will be
   smaller but slower. 
-  If you have a multiple processor machine and want Linux to use all
-  the processors in parallel, set the SMP variable in the toplevel
-  kernel Makefile.
-  If you don't know what to do, say "386".
+  If you have a single processor machine, make sure that the line
+  "SMP=1" at the top of the toplevel kernel Makefile is commented out;
+  if you have a multi processor machine and want Linux to use all the
+  processors in parallel (Symmetric Multi Processing), make sure that
+  the line "SMP=1" is not commented out and read Documentation/smp and
+  Documentation/IO-APIC.txt and the SMP-FAQ on the WWW at
+  http://www.irisa.fr/prive/mentre/smp-faq/ (to browse the WWW, you
+  need to have access to a machine on the Internet that has a programs
+  like lynx or netscape). People using multiprocessor machines should
+  also say Y to "Enhanced Real Time Clock Support", below.
+  If you want to compile a kernel that should work on both single
+  processor and multi processor machines, it is possible to set
+  SMP=1. The "Advance Power Management" code (see configuration option
+  below) will not work in that scenario, though.
+  If you don't know what to do, choose "386".
 
 Video mode selection support
 CONFIG_VIDEO_SELECT
@@ -1189,9 +1243,11 @@ CONFIG_VIDEO_SELECT
 Parallel-port support
 CONFIG_PARPORT
   If you want to use devices connected to your parallel port (the
-  connector at the computers with 25 holes), e.g. printer, Zip drive,
-  PLIP link etc., then you need to enable this option; please read
-  Documentation/parport.txt and drivers/misc/BUGS-parport.  For
+  connector at the computer with 25 holes), e.g. printer, Zip drive,
+  PLIP link (Parallel Line Internet Protocol is mainly used to create
+  a mini network by connecting the parallel ports of two local
+  machines) etc., then you need to say Y here; please read
+  Documentation/parport.txt and drivers/misc/BUGS-parport. For
   extensive information about drivers for many devices attaching to
   the parallel port see http://www.torque.net/linux-pp.html on the WWW
   (To browse the WWW, you need to have access to a machine on the
@@ -1201,18 +1257,26 @@ CONFIG_PARPORT
   want to compile parallel port support as a module ( = code which can
   be inserted in and removed from the running kernel whenever you
   want), say M here and read Documentation/modules.txt. The module
-  will be called parport.o.  If you have more than one parallel port
-  and want to specify which port and IRQ to use by this driver at
+  will be called parport.o. If you have more than one parallel port
+  and want to specify which port and IRQ to be used by this driver at
   module load time, read Documentation/networking/net-modules.txt.
+  If unsure, say Y.
 
 PC-style hardware 
 CONFIG_PARPORT_PC
-  You should enable this option if you have a PC-style parallel
-  port. All IBM PC compatible computers and some Alphas have PC-style
-  parallel ports.  This code is also available as a module. If you
-  want to it as a module ( = code which can be inserted in and removed
-  from the running kernel whenever you want), say M here and read
+  You should say Y here if you have a PC-style parallel port. All IBM
+  PC compatible computers and some Alphas have PC-style parallel
+  ports. This code is also available as a module. If you want to it 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 parport_pc.o.
+  If unsure, say Y.
+
+Support foreign hardware
+CONFIG_PARPORT_OTHER
+  Say Y here if you want to be able to load driver modules to support
+  other non-standard types of parallel ports. This causes a
+  performance loss, so most people say N.
 
 Sun Ultra/AX-style hardware 
 CONFIG_PARPORT_AX
@@ -1220,25 +1284,6 @@ CONFIG_PARPORT_AX
   Ultra/AX machines.  This code is also available as a module (say M),
   called parport_ax.o.  If in doubt, saying N is the safe plan.
 
-Foreign parallel hardware
-CONFIG_PARPORT_OTHER
-  Say Y here if you want to be able to load driver modules to support
-  other types of parallel port.  This causes a performance loss, so most
-  people say N.
-
-Compile the kernel into the ELF object format 
-CONFIG_ELF_KERNEL
-  ELF (Executable and Linkable Format) is a format for libraries and
-  executables used across different architectures and operating
-  systems. This option will cause the resulting kernel to be in ELF
-  format, which is generally desirable, so say Y. However, it only
-  works if your compiler and linker can produce ELF code.
-
-Is your ELF compiler an extra compiler
-CONFIG_EXTRA_ELF_COMPILER
-  If you have a linuxelf-gcc as opposed to linux-gcc, say Y, otherwise
-  N.
-
 Generate little endian code
 CONFIG_CPU_LITTLE_ENDIAN
   If your compiler is mipsel-linux-gcc or mipsel-linuxelf-gcc (as
@@ -1260,7 +1305,7 @@ CONFIG_PNP
 
 Auto-probe for parallel devices
 CONFIG_PNP_PARPORT
-  Some IEEE-1284 conformant parallel-port devices can identify
+  Some IEEE-1284 conforming parallel-port devices can identify
   themselves when requested.  Say Y to enable this feature, or M to
   compile it as a module (parport_ieee1284.o).  If in doubt, say N.
 
@@ -1304,10 +1349,10 @@ CONFIG_PNP_ISA_COMPAT
 PnP Legacy device support
 CONFIG_PNP_LEGACY
   Before PnP ISA was standardized, several "jumperless", or
-  "soft-configurable" boards were finding there way onto the market.
+  "soft-configurable" boards were finding their way onto the market.
   These cards used somewhat proprietary mechanisms for configuring
   IRQs, DMAs, IO addresses, and memory ranges. These devices (mainly
-  network cards, but also some sound card) can be configured as any
+  network cards, but also some sound cards) can be configured as any
   other PnP device can by saying Y here, if appropriate drivers
   for these devices are available.
 
@@ -1325,20 +1370,21 @@ CONFIG_PNP_SYSCTL
 PnP auto-configures all devices on startup
 CONFIG_PNP_BOOTINIT
   This option will allow the PnP subsystem to automatically configure
-  all the   PnP devices it finds upon system startup (or at least
-  attempt to). This is useful if you have older driver which do not use
+  all the PnP devices it finds upon system startup (or at least
+  attempt to). This is useful if you have older drivers which do not use
   the Linux-PnP system to configure PnP devices, and which you need
-  configured by PnP in order to use.
+  to be configured by PnP before you can use them.
 
 Enable loadable module support
 CONFIG_MODULES
-  Kernel modules are small pieces of compiled code which can be 
-  inserted in or removed from the running kernel, using the
-  programs insmod and rmmod. This is described in the file 
-  Documentation/modules.txt. Modules can be device drivers, file 
-  systems, binary executable formats, and so on. If you think that 
-  you may want to make use of modules with this kernel in the future, 
-  then say Y here. If unsure, say Y.
+  Kernel modules are small pieces of compiled code which can be
+  inserted in or removed from the running kernel, using the programs
+  insmod and rmmod. This is described in the file
+  Documentation/modules.txt, including the fact that you have to say
+  "make modules" in order to compile the modules. Modules can be
+  device drivers, file systems, binary executable formats, and so
+  on. If you think that you may want to make use of modules with this
+  kernel in the future, then say Y here. If unsure, say Y.
 
 Set version information on all symbols for modules
 CONFIG_MODVERSIONS
@@ -1356,10 +1402,14 @@ CONFIG_MODVERSIONS
 
 Kernel module loader support
 CONFIG_KMOD
-  This feature allows the kernel to load modules for itself.  When
-  a part of the kernel needs a module, it runs modprobe with the
-  appropriate arguments.  Say Y here and read about configuring it
-  in Documentation/kmod.txt.  (this is a replacement of kerneld)
+  Normally when you have selected some drivers and/or filesystems to
+  be created as loadable modules, you also have the responsibility to
+  load the corresponding modules (using the programs insmod or
+  modprobe) before you can use them. If you say Y here however, the
+  kernel will be able to load modules for itself. When a part of the
+  kernel needs a module, it runs modprobe with the appropriate
+  arguments. (This is a replacement for kerneld.) Say Y here and read
+  about configuring it in Documentation/kmod.txt.
 
 ARP daemon support (EXPERIMENTAL)
 CONFIG_ARPD
@@ -1399,7 +1449,7 @@ CONFIG_IP_MULTICAST
   This is code for addressing several networked computers at once,
   enlarging your kernel by about 2 kB. You need multicasting if you
   intend to participate in the MBONE, a high bandwidth network on top
-  of the internet which carries audio and video broadcasts. More
+  of the Internet which carries audio and video broadcasts. More
   information about the MBONE is on the WWW at
   http://www.best.com/~prince/techinfo/mbone.html (to browse the WWW,
   you need to have access to a machine on the Internet that has a
@@ -1456,7 +1506,7 @@ CONFIG_IP_ROUTE_VERBOSE
   verbose messages regarding the routing, for example warnings about
   received packets which look strange and could be evidence of an
   attack or a misconfigured system somewhere. The information is
-  handled by the klogd demon which is responsible for kernel messages
+  handled by the klogd daemon which is responsible for kernel messages
   ("man klogd").
 
 IP: large routing tables
@@ -1492,10 +1542,17 @@ CONFIG_IP_FIREWALL
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. Also, you will need the
   ipfwadm tool (available via ftp (user: anonymous) from
   ftp.xos.nl/pub/linux/ipfwadm/) to allow selective blocking of
-  internet traffic based on type, origin and destination.  The
-  firewalling code will only work if you say Y to "/proc filesystem
-  support" below and IP forwarding is enabled in your kernel; do this
-  from within a boot-time script like so: 
+  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
+  closely and has knowledge about the higher level protocols, which
+  packet filters lack. Proxy-based firewalls don't need support by the
+  kernel, but they are often combined with a packet filter, which only
+  works if you say Y here.
+  The firewalling code will only work if you say Y to "/proc
+  filesystem support" below and IP forwarding is enabled in your
+  kernel; do this from within a boot-time script like so:
     echo "1" > /proc/sys/net/ipv4/ip_forwarding
   after the /proc filesystem has been mounted.  
   You need to say Y to "IP firewalling" in order to be able to use IP
@@ -1526,7 +1583,7 @@ 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
+  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:
@@ -1551,9 +1608,9 @@ CONFIG_IP_PNP_BOOTP
   say Y here. In case the boot ROM of your network card was designed
   for booting Linux and does BOOTP itself, providing all necessary
   information on the kernel command line, you can say N here.  If
-  unsure, say Y. Note that in case you want to use BOOTP, a BOOTP
-  server must be operating on your network. Read
-  Documentation/nfsroot.txt for details.
+  unsure, say Y. Note that if you want to use BOOTP, a BOOTP server
+  must be operating on your network. Read Documentation/nfsroot.txt
+  for details.
 
 RARP support
 CONFIG_IP_PNP_RARP
@@ -1561,8 +1618,8 @@ CONFIG_IP_PNP_RARP
   some other computer over the net via NFS and you want the IP address
   of your computer to be discovered automatically at boot time using
   the RARP protocol (an older protocol which is being obsoleted by
-  BOOTP and DHCP), say Y here. Note that in case you want to use RARP,
-  a RARP server must be operating on your network. Read
+  BOOTP and DHCP), say Y here. Note that if you want to use RARP, a
+  RARP server must be operating on your network. Read
   Documentation/nfsroot.txt for details.
 
 IP: tunneling
@@ -1588,23 +1645,23 @@ CONFIG_NET_IPGRE
   another protocol and sending it over a channel that understands the
   encapsulating protocol. This particular tunneling driver implements
   GRE (Generic Routing Encapsulation) and at this time allows
-  encapsulating of IPv4 or IPv6 over existing IPv4
-  infrastructure. This driver is useful if the other endpoint is a
-  Cisco router: Cisco likes GRE much better than the other Linux
-  tunneling driver ("IP: tunneling" above). In addition, GRE allows
-  multicast redistribution through the tunnel.
+  encapsulating of IPv4 or IPv6 over existing IPv4 infrastructure.
+  This driver is useful if the other endpoint is a Cisco router: Cisco
+  likes GRE much better than the other Linux tunneling driver ("IP:
+  tunneling" above). In addition, GRE allows multicast redistribution
+  through the tunnel.
 
 IP: broadcast GRE over IP
 CONFIG_NET_IPGRE_BROADCAST
   One application of GRE/IP is to construct a broadcast WAN (Wide Area
-  Network), which looks like a normal1 ethernet LAN (Local Area
+  Network), which looks like a normal Ethernet LAN (Local Area
   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 demon
+  packets it received. The information is handled by the klogd daemon
   which is responsible for kernel messages ("man klogd").
 
 IP: transparent proxying
@@ -1630,14 +1687,19 @@ CONFIG_IP_MASQUERADE
   local net are completely invisible to the outside world, even though
   they can reach the outside and can be reached. This makes it
   possible to have the computers on the local network participate on
-  the internet even if they don't have officially registered IP
-  addresses.  (This last problem can also be solved by connecting the
+  the Internet even if they don't have officially registered IP
+  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
-  ftp://sunsite.unc.edu/pub/Linux/system/network/serial/].)  Details
-  on how to set things up are contained in the IP Masquerading FAQ,
-  available at http://www.indyramp.com/masq/. If you say Y here, then
+  ftp://sunsite.unc.edu/pub/Linux/system/network/serial/].) The IP
+  masquerading code will only work if you say Y to "/proc filesystem
+  support" below and IP forwarding is enabled in your kernel; you can
+  do this from within a boot-time script like so: echo "1" >
+  /proc/sys/net/ipv4/ip_forwarding 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
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini. 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) will
@@ -1708,25 +1770,28 @@ CONFIG_IP_ALWAYS_DEFRAG
 IP: aliasing support
 CONFIG_IP_ALIAS
   Sometimes it is useful to give several IP addresses to a single
-  physical network interface (= serial port or ethernet card). The
+  physical network interface (= serial port or Ethernet card). The
   most common case is that you want to serve different WWW or ftp
   documents to the outside according to which of your host names was
   used to connect to you. This is called "multihosting" or "virtual
-  domains" and is explained in detail on 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). Another scenario would be that there are two
-  logical networks living on your local ethernet and you want to
-  access them both with the same ethernet card. The configuration of
-  these alias addresses is done with a special name syntax explained
-  in Documentation/networking/alias.txt. If you want this, say Y. Most
-  people don't need it and say N.
+  domains" or "virtual hosting services" and is explained in detail on
+  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
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Another scenario would be
+  that there are two logical networks living on your local Ethernet
+  and you want to access them both with the same Ethernet card. The
+  configuration of these alias addresses is done with a special name
+  syntax explained in Documentation/networking/alias.txt and in the
+  IP-Alias mini-HOWTO. If you want this, say Y. Most people don't need
+  it and say N.
 
 IP: multicast routing
 CONFIG_IP_MROUTE
   This is used if you want your machine to act as a router for IP
   packets that have several destination addresses. It is needed on the
-  MBONE, a high bandwidth network on top of the internet which carries
+  MBONE, a high bandwidth network on top of the Internet which carries
   audio and video broadcasts. In order to do that, you would most
   likely run the program mrouted. Information about the multicast
   capabilities of the various network cards is contained in
@@ -1755,14 +1820,14 @@ PC/TCP compatibility mode
 CONFIG_INET_PCTCP
   If you have been having difficulties telneting 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
+  versions up to OnNet 2.0) over your local Ethernet try saying Y
   here.  Everyone else says N. People having problems with NCSA telnet
   should see the file linux/Documentation/networking/ncsa-telnet.
 
 Reverse ARP
 CONFIG_INET_RARP
   Since you asked: if there are (usually diskless or portable)
-  machines on your local network that know their hardware ethernet
+  machines on your local network that know their hardware Ethernet
   addresses but don't know their IP addresses upon startup, they can
   send out a Reverse Address Resolution Protocol (RARP) request to
   find out their own IP addresses. Diskless Sun 3 machines use this
@@ -1850,7 +1915,7 @@ CONFIG_SKB_LARGE
   process can require a lot more memory for network buffers and thus this
   option is best only used on machines with 16Mb of memory or higher. 
   Unless you are using long links with end to end speeds of over 2Mbit
-  a second or   satellite links this option will make no difference to
+  a second or satellite links this option will make no difference to
   performance.
 
 Unix domain sockets
@@ -1869,17 +1934,16 @@ CONFIG_UNIX
 The IPv6 protocol
 CONFIG_IPV6
   This is experimental support for the next version of the Internet
-  Protocol IP version 6 (also called IPng "IP next
-  generation"). Features of this new protocol include: expanded
-  address space, authentication and privacy, and seamless
-  interoperability with the current version of IP (IP version 4). For
-  general information about IPv6, see
-  http://playground.sun.com/pub/ipng/html/ipng-main.html (to browse
-  the WWW, you need to have access to a machine on the Internet that
-  has a program like lynx or netscape); for specific information about
-  IPv6 under Linux read the HOWTO at http://www.terra.net/ipv6/ and
-  the file net/ipv6/README in the kernel source. If you want to use
-  IPv6, please upgrade to the newest net-tools as given in
+  Protocol: IP version 6 (also called IPng "IP next generation"). 
+  Features of this new protocol include: expanded address space,
+  authentication and privacy, and seamless interoperability with the
+  current version of IP (IP version 4). For general information about
+  IPv6, see http://playground.sun.com/pub/ipng/html/ipng-main.html (to
+  browse the WWW, you need to have access to a machine on the Internet
+  that has a program like lynx or netscape); for specific information
+  about IPv6 under Linux read the HOWTO at http://www.terra.net/ipv6/
+  and the file net/ipv6/README in the kernel source. If you want to
+  use IPv6, please upgrade to the newest net-tools as given in
   Documentation/Changes. The IPv6 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
@@ -1906,13 +1970,13 @@ The IPX protocol
 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
+  to access Novell NetWare file or print servers using the Linux
   Novell client ncpfs (available via ftp (user: anonymous) from
   sunsite.unc.edu:/pub/Linux/system/filesystems/) or from within the
   Linux DOS emulator dosemu (read the DOSEMU-HOWTO, available in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO). In order to do the former,
   you'll also have to say Y to "NCP filesystem support", below. To
-  turn your Linux box into a fully featured Netware file server and
+  turn your Linux box into a fully featured NetWare file server and
   IPX router, say Y here and fetch either lwared from
   sunsite.unc.edu:/pub/Linux/system/network/daemons/ or mars_nwe from
   ftp.gwdg.de:/pub/linux/misc/ncpfs. For more information, read the
@@ -1970,7 +2034,7 @@ CONFIG_ATALK
   http://artoo.hitchcock.org/~flowerpt/projects/linux-netatalk/ 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
+  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)
@@ -1988,7 +2052,7 @@ CONFIG_IPDDP
   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 a internet gateway for a
+  (e.g. if you want your Linux box to act as a Internet gateway for a
   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
@@ -2067,7 +2131,7 @@ CONFIG_AX25
   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 soundcard
+  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
@@ -2123,7 +2187,7 @@ AX.25 over Ethernet
 CONFIG_BPQETHER
   AX.25 is the protocol used for computer communication over amateur
   radio. If you say Y here, you will be able to send and receive AX.25
-  traffic over ethernet (also called "BPQ AX.25"), which could be
+  traffic over Ethernet (also called "BPQ AX.25"), which could be
   useful if some other computer on your local network has a direct
   amateur radio connection.
 
@@ -2168,9 +2232,9 @@ CONFIG_X25
   network either with a dedicated network card using the X.21 protocol
   (not yet supported by Linux) or one can do X.25 over a standard
   telephone line using an ordinary modem (say Y to "X.25 async driver"
-  below) or over ethernet using an ordinary ethernet card and either
+  below) or over Ethernet using an ordinary Ethernet card and either
   the 802.2 LLC protocol (say Y to "802.2 LLC" below) or LAPB over
-  ethernet (say Y to "LAPB Data Link Driver" and "LAPB over Ethernet
+  Ethernet (say Y to "LAPB Data Link Driver" and "LAPB over Ethernet
   driver" below).  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
@@ -2185,8 +2249,8 @@ CONFIG_LAPB
   it is used to transport higher level protocols (mostly X.25 Packet
   Layer, the higher part of X.25, but others are possible as
   well). Usually, LAPB is used with specialized X.21 network cards, but
-  Linux currently supports LAPB only over ethernet connections. If you
-  want to use LAPB connections over ethernet, say Y here and to "LAPB
+  Linux currently supports LAPB only over Ethernet connections. If you
+  want to use LAPB connections over Ethernet, say Y here and to "LAPB
   over Ethernet driver" below.  Read
   Documentation/networking/lapb-module.txt for technical details.  If
   you want to compile this driver as a module though ( = code which
@@ -2197,35 +2261,36 @@ CONFIG_LAPB
 802.2 LLC (VERY EXPERIMENTAL)
 CONFIG_LLC
   This is a Logical Link Layer protocol used for X.25 connections over
-  ethernet, using ordinary ethernet cards. 
+  Ethernet, using ordinary Ethernet cards. 
 
 Bridging (EXPERIMENTAL)
 CONFIG_BRIDGE
   If you say Y here, then your Linux box will be able to act as an
-  ethernet bridge, which means that the different ethernet segments it
-  is connected to will appear as one ethernet to the
-  participants. Several such bridges can work together to create even
-  larger networks of ethernets using the IEEE802.1 spanning tree
-  algorithm. As this is a standard, Linux bridges will interwork
-  properly with other third party bridge products. In order to use
-  this, you'll need the bridge configuration tools available via ftp
-  (user: anonymous) from shadow.cabi.net in /pub/Linux. 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) in sunsite.unc.edu:/pub/Linux/docs/HOWTO/. 
-  The Bridging code is still in test. If unsure, say N.
+  Ethernet bridge, which means that the different Ethernet segments it
+  is connected to will appear as one Ethernet to the participants.
+  Several such bridges can work together to create even larger
+  networks of Ethernets using the IEEE802.1 spanning tree algorithm.
+  As this is a standard, Linux bridges will interwork properly with
+  other third party bridge products. In order to use this, you'll need
+  the bridge configuration tools available via ftp (user: anonymous)
+  from shadow.cabi.net in /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) in sunsite.unc.edu:/pub/Linux/docs/HOWTO. The
+  Bridging code is still in test. If unsure, say N.
 
 Packet socket
 CONFIG_PACKET
   The Packet protocol is used by applications which communicate
   directly with network devices without an intermediate network
-  protocol implemented in the kernel, e.g. tcpdump. If you want that
-  they work, choose Y. This driver is also available as a module
-  called af_packet.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 Y.
+  protocol implemented in the kernel, e.g. tcpdump. If you want them
+  to work, choose Y. This driver is also available as a module called
+  af_packet.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 Y.
 
 Kernel/User network link driver
 CONFIG_NETLINK
@@ -2234,13 +2299,14 @@ CONFIG_NETLINK
   able to read from and write to character special files in the /dev
   directory having major mode 36. So far, the kernel uses it to
   publish some network related information if you say Y to "Routing
-  messages", below. It is also used by the firewall code if you say Y
-  to "Kernel/User network link driver" further down.  You also need to
-  say Y here if you want to use arpd, a daemon that helps keep the
-  internal ARP cache (a mapping between IP addresses and hardware
-  addresses on the local network) small. The ethertap device, which
-  lets user space programs read and write raw ethernet frames, also
-  needs the network link driver. If unsure, say Y.
+  messages", below. It is also used by the firewall code to publish
+  information about possible attacks if you say Y to "IP: firewall
+  packet netlink device" further down. You also need to say Y here if
+  you want to use arpd, a daemon that helps keep the internal ARP
+  cache (a mapping between IP addresses and hardware addresses on the
+  local network) small. The ethertap device, which lets user space
+  programs read and write raw Ethernet frames, also needs the network
+  link driver. If unsure, say Y.
 
 Routing messages
 CONFIG_RTNETLINK
@@ -2256,7 +2322,7 @@ CONFIG_NETLINK_DEV
 
 SCSI support?
 CONFIG_SCSI
-  If you want to use a SCSI harddisk, SCSI tapedrive, SCSI CDROM or
+  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
@@ -2274,18 +2340,19 @@ CONFIG_SCSI
 
 SCSI disk support
 CONFIG_BLK_DEV_SD
-  If you want to use a SCSI harddisk or the SCSI or parallel port
+  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, available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. This is NOT for SCSI
-  CDROMs. 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 sd_mod.o. If you want to compile it
-  as a module, say M here and read Documentation/modules.txt and
-  Documentation/scsi.txt. Do not compile this driver as a module if
-  your root filesystem (the one containing the directory /) is located
-  on a SCSI disk. In this case, do not compile the driver for your
-  SCSI host adapter (below) as a module either.
+  SCSI-HOWTO and the Disk-HOWTO, both available via ftp (user:
+  anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO. This is NOT for
+  SCSI CDROMs. 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 sd_mod.o. If you want
+  to compile it as a module, say M here and read
+  Documentation/modules.txt and Documentation/scsi.txt. Do not compile
+  this driver as a module if your root filesystem (the one containing
+  the directory /) is located on a SCSI disk. In this case, do not
+  compile the driver for your SCSI host adapter (below) as a module
+  either.
 
 SCSI tape support
 CONFIG_CHR_DEV_ST
@@ -2312,15 +2379,15 @@ 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 on with old NEC/TOSHIBA
-  cdrom drives (and HP Writers). If you have such a drive and get
-  the first session only, try to say Y here; everybody else says N.
+  required to support multisession CD's 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.
 
 SCSI generic support
 CONFIG_CHR_DEV_SG
   If you want to use SCSI scanners, synthesizers or CD-writers or just
-  about anything having "SCSI" in its name other than harddisks,
-  CDROMs or tapes, say Y here. Those won't be supported by the kernel
+  about anything having "SCSI" in its name other than hard disks,
+  CDROMs or tapes, say Y here. These won't be supported by the kernel
   directly, so you need some additional software which knows how to
   talk to these devices using the SCSI protocol. For CD-writers, you
   would need the program cdwrite, available via ftp (user: anonymous)
@@ -2360,7 +2427,7 @@ CONFIG_SCSI_LOGGING
   find them in the source: drivers/scsi/scsi.c), and this allows you
   to select the types of information you want, and the level allows
   you to select the level of verbosity.  If you say 'N' here, it may
-  be harder to track down some types of scsi problems.  If you say 'Y'
+  be harder to track down some types of SCSI problems.  If you say 'Y'
   here your kernel will be somewhat larger, but there should be no
   noticeable performance impact as long as you have logging turned off.
 
@@ -2426,8 +2493,8 @@ CONFIG_SCSI_AIC7XXX
 Enable tagged command queueing
 CONFIG_AIC7XXX_TAGGED_QUEUEING
   This option allows you to enable tagged command queueing for this
-  driver.  Some scsi devices do not properly support this
-  feature.  Tagged command queueing will improve performance.
+  driver. Some SCSI devices do not properly support this feature. 
+  Tagged command queueing will improve performance.
 
 Override driver defaults for commands per LUN
 CONFIG_OVERRIDE_CMDS
@@ -2532,7 +2599,7 @@ CONFIG_SCSI_EATA_PIO
   This driver supports all EATA-PIO protocol compliant SCSI Host
   Adapters like the DPT PM2001 and the PM2012A. EATA-DMA compliant
   host adapters could also use this driver but are discouraged from
-  doing so, since this driver only supports harddisks and lacks
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO.  If you want to compile this
@@ -2560,7 +2627,7 @@ CONFIG_SCSI_U14_34F_LINKED_COMMANDS
   This is a feature of SCSI-2 which improves performance: the host
   adapter can send a whole list of commands to a device in one
   batch. Some SCSI devices might not implement this properly, so the
-  save answer is N.
+  safe answer is N.
 
 maximum number of queued commands
 CONFIG_SCSI_U14_34F_MAX_TAGS
@@ -2596,7 +2663,7 @@ CONFIG_SCSI_GENERIC_NCR5380
 
 Enable NCR53c400 extensions
 CONFIG_SCSI_GENERIC_NCR53C400
-  This enables certain optimizations for the NCR53c400 scsi cards. You
+  This enables certain optimizations for the NCR53c400 SCSI cards. You
   might as well try it out. Note that this driver will only probe for
   the Trantor T130B in its default configuration; you might have to
   pass a command line option to the kernel at boot time if it doesn't
@@ -2651,28 +2718,28 @@ CONFIG_SCSI_NCR53C8XX
   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.
+  narrow SCSI devices and 40 MB/s with wide SCSI 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 
+  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
+  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 singled-ended
+  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 singled-ended scsi bus supports 10 MHz data
-  transfers.  Regardless 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:
+  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.
@@ -2684,16 +2751,16 @@ CONFIG_SCSI_NCR53C8XX_IOMAPPED
   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 loose nothing by using normal IO. The normal
+  is memory mapped) so you lose nothing by using normal IO. The normal
   answer therefore is N. Try Y only if you have problems.
 
 not allow targets to disconnect
 CONFIG_SCSI_NCR53C8XX_NO_DISCONNECT
-  This option is only provided for safety if you suspect some scsi
+  This option is only provided for safety if you suspect some SCSI
   device of yours to not support properly the target-disconnect
   feature. In that case, you would say Y here. In general however, to
   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.
+  than 1 device on a SCSI bus.  The normal answer therefore is N.
 
 detect and read serial NVRAMs
 CONFIG_SCSI_NCR53C8XX_NVRAM_DETECT
@@ -2717,7 +2784,7 @@ CONFIG_SCSI_NCR53C8XX_NVRAM_DETECT
 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
+  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
@@ -2742,16 +2809,16 @@ CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT
   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 singled-ended/differential
+  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
+  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,
+  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
@@ -2761,53 +2828,64 @@ CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT
 IBMMCA SCSI support
 CONFIG_SCSI_IBMMCA
   This is support for the IBM SCSI adapter found in many of the PS/2
-  series.  CONFIG_MCA must be set for this to work.  If the adapter
-  isn't found during boot (a common problem for models 56, 57, 76, and
-  77) you'll need to use the 'ibmmcascsi=<pun>', where <pun> is the id
-  of the SCSI subsystem (usually 7, but if that doesn't work check your
-  reference diskette). Owners of model 95 with a LED-matrix-display
-  can in addition activate some activity info like under OS/2, but more
-  informative, by setting 'ibmmcascsi=display' as additional kernel-
-  parameter.
+  series computers. These machines have an MCA bus, so you need to say
+  Y to "MCA support" as well and read Documentation/mca.txt.
+  If the adapter isn't found during boot (a common problem for models
+  56, 57, 76, and 77) you'll need to use the 'ibmmcascsi=<pun>' kernel
+  option, where <pun> is the id of the SCSI subsystem (usually 7, but
+  if that doesn't work check your reference diskette). Owners of model
+  95 with a LED-matrix-display can in addition activate some activity
+  info like under OS/2, but more informative, by setting
+  'ibmmcascsi=display' as an additional kernel parameter. Try "man
+  bootparam" or see the documentation of your boot loader about how to
+  pass options to the kernel. The lilo procedure is also explained in
+  the SCSI-HOWTO, available via ftp (user: anonymous) in
+  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. The module will be
+  called ibmmca.o.
 
 Standard SCSI-order
 CONFIG_IBMMCA_SCSI_ORDER_STANDARD
-  In the PC-world and in most modern SCSI-BIOS-setups, SCSI-harddisks
-  are assigned to the driveletters, starting with the lowest SCSI-id
+  In the PC-world and in most modern SCSI-BIOS-setups, SCSI-hard disks
+  are assigned to the drive letters, starting with the lowest SCSI-id
   (physical number - pun) to be drive C:, as seen from DOS and similar
-  operating systems. When looking into papers, describing the
+  operating systems. When looking into papers describing the
   ANSI-SCSI-standard, this assignment of drives appears to be wrong.
-  The SCSI-standard follows a hardware-hierarchy which says, that
+  The SCSI-standard follows a hardware-hierarchy which says that
   id 7 has the highest priority and id 0 the lowest. Therefore, the
-  hostadapters are still today everywhere placed as SCSI-id 7 by
-  default. In the SCSI-standard, the driveletters express the priority
-  of the disk. C: should be the harddisk or a partition on it, with the
+  host adapters are still today everywhere placed as SCSI-id 7 by
+  default. In the SCSI-standard, the drive letters express the priority
+  of the disk. C: should be the hard disk, or a partition on it, with the
   highest priority. This must therefore be the disk with the highest
   SCSI-id (e.g. 6) and not the one with the lowest! IBM-BIOS kept the
   original definition of the SCSI-standard as also industrial- and
   process-control-machines, like VME-CPUs running under realtime-OSs
   (e.g. LynxOS, OS9) do.
-  If you like to run Linux on your MCA-machine with the same assignment,
-  of harddisks, as seen from e.g. DOS or OS/2 on your machine, which
-  is in addition conform to the SCSI-standard, you must say 'y' here.
+  If you like to run Linux on your MCA-machine with the same assignment
+  of hard disks as seen from e.g. DOS or OS/2 on your machine, which
+  is in addition conformant to the SCSI-standard, you must say Y here.
   This is also necessary for MCA-Linux-users who want to keep downward-
   compatibility to older releases of the IBM-MCA-SCSI-driver (older than
   driver-release 2.00 and older than June 1997).
-  If you like to have the lowest SCSI-id assigned as drive C:, as modern
-  SCSI-BIOS do, which is not conform to the standard, but widely spread
-  and common in the PC-world of today, you must say 'n' here.
+  If you like to have the lowest SCSI-id assigned as drive C:, as
+  modern SCSI-BIOSes do, which does not conform to the standard, but
+  is widespread and common in the PC-world of today, you must say N
+  here.  If unsure, say Y.
 
-Reset SCSI-devices at boottime
+Reset SCSI-devices at boot time
 CONFIG_IBMMCA_SCSI_DEV_RESET
-  By default, SCSI-devices are reset, when the machine is powered on.
+  By default, SCSI-devices are reset when the machine is powered on.
   However, some devices exist, like special-control-devices,
-  SCSI-CNC-machines, SCSI-printer or scanners of older type, that
-  do not reset, when switched on. If you say 'y' here, each device
-  along your SCSI-bus will get a reset-command after it has been
-  probed, while the kernel is booting. Say always 'n' here, if you
-  have no such strange SCSI-devices on your bus. If you say 'y' and
-  some more modern devices, like harddisks, do not like too much
-  resets, your system will hang when booting.
+  SCSI-CNC-machines, SCSI-printer or scanners of older type, that do
+  not reset when switched on. If you say Y here, each device connected
+  to your SCSI-bus will be issued a reset-command after it has been
+  probed, while the kernel is booting. This may cause problems with
+  more modern devices, like hard disks, which do not appreciate these
+  reset commands, and can cause your system to hang. So say Y only if
+  you know that one of your older devices needs it; N is the safe
+  answer.
 
 Always IN2000 SCSI support
 CONFIG_SCSI_IN2000
@@ -2960,14 +3038,14 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE
   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 save answer is N.
+  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
   adapter can send a whole list of commands to a device in one
   batch. Some SCSI devices might not implement this properly, so the
-  save answer is N.
+  safe answer is N.
 
 maximum number of queued commands
 CONFIG_SCSI_EATA_MAX_TAGS
@@ -3059,12 +3137,12 @@ CONFIG_SCSI_DEBUG
   is that many hard to reproduce problems can be tested in a controlled
   environment where there is reduced risk of losing 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.
+  layers of the SCSI subsystem. If unsure, say N.
 
 Network device support?
 CONFIG_NETDEVICES
-  You can say N here in case you don't intend to connect to any other
-  computer at all or all your connections will be either via UUCP
+  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 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 sunsite.unc.edu:/pub/Linux/docs/HOWTO) or dialing up a
@@ -3073,20 +3151,22 @@ CONFIG_NETDEVICES
   dial up shell account on some Internet connected Unix computer. Read
   http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html (to browse
   the WWW, you need to have access to a machine on the Internet that
-  has a program like lynx or netscape)).  You'll have to say Y if your
+  has a program like lynx or netscape)). You'll have to say Y if your
   computer contains a network card that you want to use under linux
-  (make sure you know its name because you will be asked for it and read
-  the Ethernet-HOWTO in sunsite.unc.edu:/pub/Linux/docs/HOWTO; 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 (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 ports of two local machines) or AX.25/KISS (protocol for
-  sending internet traffic over radio links).  Make sure to read the
-  NET-2-HOWTO.  Eventually, you will have to read Olaf Kirch's
-  excellent book "Network Administrator's Guide", to be found in
-  sunsite.unc.edu:/pub/Linux/docs/LDP.  If unsure, say Y.
+  (make sure you know its name because you will be asked for it and
+  read the Ethernet-HOWTO (especially if you 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
+  (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
+  ports of two local machines) or AX.25/KISS (protocol for sending
+  Internet traffic over radio links). Make sure to read the
+  NET-2-HOWTO. Eventually, you will have to read Olaf Kirch's
+  excellent and free book "Network Administrator's Guide", to be found
+  in sunsite.unc.edu:/pub/Linux/docs/LDP. If unsure, say Y.
 
 Dummy net driver support
 CONFIG_DUMMY
@@ -3097,7 +3177,7 @@ CONFIG_DUMMY
   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: anonymous) from sunsite.unc.edu:/pub/Linux/docs/LDP. Since
-  this thing comes often handy, the default is Y. It won't enlarge
+  this thing often comes in handy, the default is Y. It won't enlarge
   your kernel either. What a deal.  If you want to compile this as a
   module ( = code which can be inserted in and removed from the
   running kernel whenever you want), say M here and read
@@ -3214,7 +3294,7 @@ Shortwave radio modem driver
 CONFIG_HFMODEM
   This experimental driver is used by a package (to be released)
   that implements the shortwave radio protocols RTTY, Sitor (Amtor),
-  Pactor 1 and GTOR using a standard PC soundcard. If unsure,
+  Pactor 1 and GTOR using a standard PC sound card. If unsure,
   say N.
 
 Shortwave radio modem driver support for SoundBlaster and compatible cards
@@ -3275,8 +3355,8 @@ LAPB over Ethernet driver
 CONFIG_LAPBETHER
   This is a driver for a pseudo device (typically called /dev/lapb0)
   which allows you to open an LAPB point-to-point connection to some
-  other computer on your ethernet network. In order to do this, you
-  need to say Y or M to the driver for your ethernet card as well as
+  other computer on your Ethernet network. In order to do this, you
+  need to say Y or M to the driver for your Ethernet card as well as
   to "LAPB Data Link Driver".  If you want to compile this driver as a
   module ( = code which can be inserted in and removed from the
   running kernel whenever you want), say M here and read
@@ -3319,7 +3399,7 @@ CONFIG_SCC_TRXECHO
 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
+  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
@@ -3395,10 +3475,10 @@ CONFIG_BAYCOM_SER_HDX
   Documentation/modules.txt. This is recommended. The module will be
   called baycom_ser_hdx.o.
 
-Soundcard modem driver for AX.25
+Sound card modem driver for AX.25
 CONFIG_SOUNDMODEM
   This experimental driver allows a standard SoundBlaster or
-  WindowsSoundSystem compatible soundcard to be used as a packet radio
+  WindowsSoundSystem compatible sound card to be used as a packet radio
   modem (NOT as a telephone modem!), to send digital traffic over
   amateur radio. To configure the driver, use the sethdlc, smdiag and
   smmixer utilities available in the standard ax25 utilities
@@ -3412,16 +3492,16 @@ CONFIG_SOUNDMODEM
   Documentation/modules.txt. This is recommended. The module will be
   called soundmodem.o.
 
-Soundcard modem support for SoundBlaster and compatible cards
+Sound card modem support for SoundBlaster and compatible cards
 CONFIG_SOUNDMODEM_SBC
   This option enables the soundmodem driver to use SoundBlaster 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
-  "Soundcard modem support for WSS and Crystal cards", below, because
+  "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.
 
-Soundcard modem support for WSS and Crystal cards
+Sound card modem support for WSS and Crystal cards
 CONFIG_SOUNDMODEM_WSS
   This option enables the soundmodem driver to use WindowsSoundSystem
   compatible cards. These cards feature a codec chip from either
@@ -3431,13 +3511,13 @@ CONFIG_SOUNDMODEM_WSS
   CS423x chips. If you don't need full duplex operation, do not enable
   it to save performance.
 
-Soundcard modem support for 1200 baud AFSK modulation
+Sound card modem support for 1200 baud AFSK modulation
 CONFIG_SOUNDMODEM_AFSK1200
   This option enables the soundmodem driver 1200 baud AFSK modem, 
   compatible to popular modems using TCM3105 or AM7911. The demodulator
   requires about 12% of the CPU power of a Pentium 75 CPU per channel.
 
-Soundcard modem support for 2400 baud AFSK modulation (7.3728MHz crystal)
+Sound card modem support for 2400 baud AFSK modulation (7.3728MHz crystal)
 CONFIG_SOUNDMODEM_AFSK2400_7
   This option enables the soundmodem driver 2400 baud AFSK modem,
   compatible to TCM3105 modems (over-)clocked with a 7.3728MHz
@@ -3448,7 +3528,7 @@ CONFIG_SOUNDMODEM_AFSK2400_7
   with many transceiver designs and the fact that the TCM3105 (if
   used) is operated widely outside its specifications.
 
-Soundcard modem support for 2400 baud AFSK modulation (8MHz crystal)
+Sound card modem support for 2400 baud AFSK modulation (8MHz crystal)
 CONFIG_SOUNDMODEM_AFSK2400_8
   This option enables the soundmodem driver 2400 baud AFSK modem,
   compatible to TCM3105 modems (over-)clocked with an 8MHz crystal.
@@ -3459,26 +3539,26 @@ CONFIG_SOUNDMODEM_AFSK2400_8
   with many transceiver designs and the fact that the TCM3105 (if
   used) is operated widely outside its specifications.
 
-Soundcard modem support for 2666 baud AFSK modulation
+Sound card modem support for 2666 baud AFSK modulation
 CONFIG_SOUNDMODEM_AFSK2666
   This option enables the soundmodem driver 2666 baud AFSK modem.
   This modem is experimental, and not compatible to anything
   else I know of.
 
-Soundcard modem support for 4800 baud 8PSK modulation
+Sound card modem support for 4800 baud 8PSK modulation
 CONFIG_SOUNDMODEM_PSK4800
   This option enables the soundmodem driver 4800 baud 8PSK modem.
   This modem is experimental, and not compatible to anything
   else I know of.
 
-Soundcard modem support for 4800 baud HAPN-1 modulation
+Sound card modem support for 4800 baud HAPN-1 modulation
 CONFIG_SOUNDMODEM_HAPN4800
   This option enables the soundmodem driver 4800 baud HAPN-1
   compatible modem. This modulation seems to be widely used 'down
   under' and in the Netherlands. Here, nobody uses it, so I could not
   test if it works.  It is compatible to itself, however :-)
 
-Soundcard modem support for 9600 baud FSK G3RUH modulation
+Sound card modem support for 9600 baud FSK G3RUH modulation
 CONFIG_SOUNDMODEM_FSK9600
   This option enables the soundmodem driver 9600 baud FSK modem,
   compatible to the G3RUH standard. The demodulator requires about 4%
@@ -3491,7 +3571,7 @@ Serial port KISS driver for AX.25
 CONFIG_MKISS
   KISS is the protocol used to send IP traffic over AX.25 radio
   connections, somewhat similar to SLIP for telephone lines. Say Y
-  here if you intend to send internet traffic over amateur radio,
+  here if you intend to send Internet traffic over amateur radio,
   using some device connected to your machine's serial port. In that
   case, you also have to say Y to "Amateur Radio AX.25 Level 2"
   support.  If you want to compile this driver as a module ( = code
@@ -3503,21 +3583,26 @@ PLIP (parallel port) support
 CONFIG_PLIP
   PLIP (Parallel Line Internet Protocol) is used to create a
   reasonably fast mini network consisting of two (or, rarely, more)
-  local machines. The PLIP driver has two modes, mode 0 and mode
-  1. The parallel ports (the connectors at the computers with 25
-  holes) are connected with "null printer" or "Turbo Laplink" cables
-  which can transmit 4 bits at a time (mode 0) or with special PLIP
-  cables, to be used on bidirectional parallel ports only, which can
-  transmit 8 bits at a time (mode 1); you can find the wiring of these
-  cables in Documentation/networking/PLIP.txt. The cables can be up to
-  15m long. Mode 0 works also if one of the machines runs DOS/Windows
-  and has some PLIP software installed, e.g. the Crynwr PLIP packet
-  driver (http://www.kanren.net/pktdrvr-info.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 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 sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini
-  as well as the NET-2-HOWTO in
+  local machines. A PLIP link from a Linux box is a popular means to
+  install a Linux distribution on a machine which doesn't have a CDROM
+  drive (a minimal system has to be transferred with floppies
+  first). The kernels on both machines need to have this PLIP option
+  enabled for this to work.
+  The PLIP driver has two modes, mode 0 and mode 1. The parallel ports
+  (the connectors at the computers with 25 holes) are connected with
+  "null printer" or "Turbo Laplink" cables which can transmit 4 bits
+  at a time (mode 0) or with special PLIP cables, to be used on
+  bidirectional parallel ports only, which can transmit 8 bits at a
+  time (mode 1); you can find the wiring of these cables in
+  Documentation/networking/PLIP.txt. The cables can be up to 15m
+  long. Mode 0 works also if one of the machines runs DOS/Windows and
+  has some PLIP software installed, e.g. the Crynwr PLIP packet driver
+  (http://www.kanren.net/pktdrvr-info.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 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 sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini as
+  well as the NET-2-HOWTO in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the PLIP protocol
   was changed and this PLIP driver won't work together with the PLIP
   support in Linux versions 1.0.x.  This option enlarges your kernel
@@ -3531,7 +3616,7 @@ EQL (serial line load balancing) support
 CONFIG_EQUALIZER
   If you have two serial connections to some other computer (this
   usually requires two modems and two telephone lines) and you use
-  SLIP (= the protocol for sending internet traffic over telephone
+  SLIP (= the protocol for sending Internet traffic over telephone
   lines) or PPP (= a better SLIP) on them, you can make them behave
   like one double speed connection using this driver. Naturally, this
   has to be supported at the other end as well, either with a similar
@@ -3548,14 +3633,14 @@ CONFIG_ETHERTAP
   driver", above) and create a character special file /dev/tap0 with
   major number 36 and minor number 16 using mknod ("man mknod"), you
   will be able to have a user space program read and write raw
-  ethernet frames from/to that special file. tap0 can be configured
-  with ifconfig and route like any other ethernet device but it is not
+  Ethernet frames from/to that special file. tap0 can be configured
+  with ifconfig and route like any other Ethernet device but it is not
   connected to any physical LAN; everything written by the user to
   /dev/tap0 is treated by the kernel as if it had come in from a LAN
   to the device tap0; everything the kernel wants to send out over the
   device tap0 can instead be read by the user from /dev/tap0: the user
   mode program replaces the LAN that would be attached to an ordinary
-  ethernet device.  Please read the file
+  Ethernet device.  Please read the file
   Documentation/networking/ethertap.txt for more information.  This
   driver is also available as a module ( = code which can be inserted
   in and removed from the running kernel whenever you want). The
@@ -3566,7 +3651,7 @@ CONFIG_ETHERTAP
 Frame Relay (DLCI) support
 CONFIG_DLCI
   This is support for the frame relay protocol; frame relay is a fast
-  low-cost way to connect to a remote internet access provider or to
+  low-cost way to connect to a remote Internet access provider or to
   form a private wide area network. The one physical line from your
   box to the local "switch" (i.e. the entry point to the frame relay
   network, usually at the phone company) can carry several logical
@@ -3606,6 +3691,28 @@ CONFIG_SDLA
   sdla.o. If you want to compile it as a module, say M here and read
   Documentation/modules.txt.
 
+WAN Router
+CONFIG_WAN_ROUTER
+  Wide Area Networks (WANs), such as X.25, frame relay and leased
+  lines, are used to interconnect Local Area Networks (LANs) over vast
+  distances with data transfer rates significantly higher than those
+  achievable with commonly used asynchronous modem connections.
+  Usually, a quite expensive external device called a `WAN router' is
+  needed to connect to a WAN.
+  As an alternative, WAN routing can be built into the Linux
+  kernel.  With relatively inexpensive WAN interface cards available
+  on the market, a perfectly usable router can be built for less than
+  half the price of an external router.  If you have one of those
+  cards (with appropriate WAN Link Driver) and wish to use your Linux
+  box as a WAN router, you may say 'Y' to this option.  You will also
+  need a wan-tools package available via FTP (user: anonymous) from
+  ftp.sangoma.com.  Read Documentation/networking/wan-router.txt for
+  more information.
+  WAN routing support is always built as a module ( = code which can
+  be inserted in and removed from the running kernel whenever you
+  want).  The module is called wanrouter.o.  For general information
+  about modules read Documentation/modules.txt.
+
 CPU is too slow to handle full bandwidth
 CONFIG_CPU_IS_SLOW
 ###
@@ -3618,7 +3725,7 @@ CONFIG_NET_SCHED
   devices, it has to make a decision which one to send first. This is
   especially important if some of the network devices are real time
   devices that need a certain minimum data flow rate.  There are
-  several different algorithms how to do this "fairly"; they are
+  several different algorithms for how to do this "fairly"; they are
   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
@@ -3709,82 +3816,78 @@ CONFIG_NET_SCH_PRIO
 ### schedulers?
 ###
 
-WAN Router
-CONFIG_WAN_ROUTER
-      Wide Area Networks (WANs), such as X.25, frame relay and leased
-  lines, are used to interconnect Local Area Networks (LANs) over vast
-  distances with data transfer rates significantly higher than those
-  achievable with commonly used asynchronous modem connections.
-  Usually, a quite expensive external device called `WAN router' is
-  needed to connect to WAN.
-      As an alternative, WAN router can be build into Linux kernel.
-  With relatively inexpensive WAN interface cards available on the
-  market, a perfectly usable router can be built for less than half a
-  price of an external router.  If you have one of those cards (with
-  appropriate WAN Link Driver) and wish to use your Linux box as a WAN
-  router, you may say 'Y' to this option.  You will also need a
-  wan-tools package available via FTP (user: anonymous) from
-  ftp.sangoma.com.  Read Documentation/networking/wan-router.txt for
-  more information.
-      WAN router is always built as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  For general information about modules read Documentation/modules.txt.
+Network code profiler
+CONFIG_NET_PROFILE
+  If you say Y here and to "/proc filesystem support" below, some
+  obscure and undocumented information about the network code's
+  performance will be written to /proc/net/profile. If you don't know
+  what it is about, you don't need it: say N.
 
 WAN Drivers
 CONFIG_WAN_DRIVERS
-      Say 'Y' to this option if you are planning to use your Linux box
-  as a WAN router ( = device used to interconnect local area networks
-  over wide area communication links, such as leased lines and public
-  data networks, e.g. X.25 and frame relay) and you will be offered a
-  list of WAN drivers currently available.  For more information, read
-  Documentation/networking/wan-router.txt.
+  Say Y to this option if you are planning to use your Linux box as a
+  WAN ( = Wide Area Network) router ( = device used to interconnect
+  local area networks over wide area communication links, such as
+  leased lines and public data networks, e.g. X.25 and frame relay)
+  and you will be offered a list of WAN drivers currently available.
+  For more information, read
+  Documentation/networking/wan-router.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 WAN
+  drivers. If unsure, say N.
 
 Sangoma WANPIPE(tm) multiprotocol cards
 CONFIG_VENDOR_SANGOMA
-      WANPIPE from Sangoma Technologies Inc. (http://www.sangoma.com)
-  is a family of intelligent multiprotocol WAN adapter with data
-  transfer rates up to T1 (1.544 Mbps).  They are also known as
-  Synchronous Data Link Adapters (SDLA) and designated S502E(A), S503
-  or S508.  If you have one of these cards, say 'Y' to this option.
-      WANPIPE driver is always built as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  For general information about modules read Documentation/modules.txt.
+  WANPIPE from Sangoma Technologies Inc. (http://www.sangoma.com; to
+  browse the WWW, you need to have access to a machine on the Internet
+  that has a program like lynx or netscape) is a family of intelligent
+  multiprotocol WAN adapters with data transfer rates up to T1 (1.544
+  Mbps).  They are also known as Synchronous Data Link Adapters (SDLA)
+  and designated S502E(A), S503 or S508. These cards support the X.25,
+  Frame Relay, and PPP protocols. If you have one or more of these
+  cards, say Y to this option and read
+  Documentation/networking/wanpipe.txt.  The next questions will ask
+  you about the protocols you want the driver to support. The driver
+  will be compiled as a module ( = code which can be inserted in and
+  removed from the running kernel whenever you want).  The module will
+  be called wanpipe.o.  For general information about modules read
+  Documentation/modules.txt.
 
 Maximum number of cards
 CONFIG_WANPIPE_CARDS
-      Enter number of WANPIPE adapters installed in your machine.  The
-  driver can support up to 8 cards.  You may enter more that you
+  Enter number of WANPIPE adapters installed in your machine.  The
+  driver can support up to 8 cards.  You may enter more than you
   actually have if you plan to add more cards in the future without
   re-compiling the driver, but remember that in this case you'll waste
   some kernel memory (about 1K per card).
 
 WANPIPE X.25 support
 CONFIG_WANPIPE_X25
-      Say 'Y' to this option, if you are planning to connect WANPIPE
-  card to an X.25 network.  If you say 'N', the X.25 support will not
-  be included in the driver (saves about 16K of kernel memory).
+  Say Y to this option if you are planning to connect a WANPIPE card
+  to an X.25 network. You should then also have said Y to "CCITT X.25
+  Packet Layer" and "LAPB Data Link Driver", above. If you say N, the
+  X.25 support will not be included in the driver (saves about 16K of
+  kernel memory).
 
 WANPIPE Frame Relay support
 CONFIG_WANPIPE_FR
-      Say 'Y' to this option, if you are planning to connect WANPIPE
-  card to a frame relay network.  If you say 'N', the frame relay
+  Say Y to this option if you are planning to connect a WANPIPE card
+  to a frame relay network. You should then also have said Y to "Frame
+  Relay (DLCI) support", above. If you say N, the frame relay
   support will not be included in the driver (saves about 16K of
   kernel memory).
 
 WANPIPE PPP support
 CONFIG_WANPIPE_PPP
-      Say 'Y' to this option, if you are planning to connect WANPIPE
-  card to a leased line using Point-to-Point protocol (PPP).  If you
-  say 'N', the PPP support will not be included in the driver (saves
+  Say Y to this option if you are planning to connect a WANPIPE card
+  to a leased line using Point-to-Point protocol (PPP). You should
+  then also have said Y to "PPP (point-to-point) support", above. If
+  you say N, the PPP support will not be included in the driver (saves
   about 16K of kernel memory).
 
-
- Sun LANCE Ethernet support
- CONFIG_SUN_LANCE
-   This is support for lance ethernet cards on Sun workstations such as
 Sun LANCE Ethernet support
 CONFIG_SUN_LANCE
-  This is support for lance ethernet cards on Sun workstations such as
+  This is support for lance Ethernet cards on Sun workstations such as
   the Sparcstation IPC (any Sparc with a network interface 'le0' under
   SunOS basically). This driver is also available as a module ( = code
   which can be inserted in and removed from the running kernel
@@ -3794,7 +3897,7 @@ CONFIG_SUN_LANCE
 
 Sun Intel Ethernet support
 CONFIG_SUN_INTEL
-  This is support for the intel ethernet cards on some Sun workstations
+  This is support for the Intel Ethernet cards on some Sun workstations
   (all those with a network interface 'ie0' under SunOS).
 
 Ethernet (10 or 100Mbit)
@@ -3804,9 +3907,9 @@ CONFIG_NET_ETHERNET
   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. If your
+  100-base-<whatever> (100 Mbps) are common types of Ethernet. 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
+  Ethernet network card installed in your computer, say Y here and
   read the Ethernet-HOWTO, available via ftp (user: anonymous) from
   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
@@ -3815,17 +3918,17 @@ CONFIG_NET_ETHERNET
 
 Western Digital/SMC cards
 CONFIG_NET_VENDOR_SMC
-  If you have a network (ethernet) card belonging to this class, say Y
+  If you have a network (Ethernet) card belonging to this class, say Y
   and read the Ethernet-HOWTO, available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the
-  answer to this question doesn't directly affect the kernel:
-  saying N will just cause this configure script to skip all the
-  questions about Western Digital cards. If you say Y, you will be
-  asked for your specific card in the following questions.
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the answer to this
+  question doesn't directly affect the kernel: saying N will just
+  cause this configure script to skip all the questions about Western
+  Digital cards. If you say Y, you will be asked for your specific
+  card in the following questions.
 
 WD80*3 support
 CONFIG_WD80x3
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -3836,14 +3939,14 @@ CONFIG_WD80x3
 
 SMC Ultra support
 CONFIG_ULTRA
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
-  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 smc-ultra.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. 
+  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
+  smc-ultra.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.
   Important: There have been many reports that, with some motherboards 
   mixing an SMC Ultra and an Adaptec AHA154x SCSI card (or compatible,
   such as some BusLogic models) causes corruption problems with many 
@@ -3851,8 +3954,8 @@ CONFIG_ULTRA
   but keep it in mind if you have such a SCSI card and have problems.
 
 SMC Ultra32 EISA support
-CONFIG_ULTRA
-  If you have a network (ethernet) card of this type, say Y and read
+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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO.  This driver is also
   available as a module ( = code which can be inserted in and removed
@@ -3877,18 +3980,18 @@ CONFIG_SMC9194
 
 Racal-Interlan (Micom) NI cards
 CONFIG_NET_VENDOR_RACAL
-  If you have a network (ethernet) card belonging to this class, such
+  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
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the answer 
-  to this question doesn't directly affect the kernel:
-  saying N will just cause this configure script to skip all the
-  questions about NI cards. If you say Y, you will be asked for your
-  specific card in the following questions.
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO.
+  Note that the answer to this question doesn't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about NI cards. If you say Y, you will be asked for
+  your specific card in the following questions.
 
 NI5010 support
 CONFIG_NI5010
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that this is still
   experimental code. This driver is also available
@@ -3900,46 +4003,46 @@ CONFIG_NI5010
 
 NI5210 support
 CONFIG_NI52
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
   ni52.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. 
+  Documentation/networking/net-modules.txt.
 
 NI6510 support
 CONFIG_NI65
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
   ni65.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. 
+  Documentation/networking/net-modules.txt.
 
 AMD LANCE and PCnet (AT1500 and NE2100) support
 CONFIG_LANCE
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
+  If you have a network (Ethernet) card belonging to this class, say Y
   and read the Ethernet-HOWTO, available via ftp (user: anonymous)
   in sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the answer to
   this question doesn't directly affect the kernel: saying N will just
   cause this configure script to skip all the questions about 3COM
   cards. If you say Y, you will be asked for your specific card in the
-  following questions. 
+  following questions.
 
 3c501 support
 CONFIG_EL1
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO.  Also, consider buying a new
   card, since the 3c501 is slow, broken, and obsolete: you will have
@@ -3953,7 +4056,7 @@ CONFIG_EL1
 
 3c503 support
 CONFIG_EL2
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -3964,7 +4067,7 @@ CONFIG_EL2
 
 3c505 support
 CONFIG_ELPLUS
-  Information about this network (ethernet) card can be found in
+  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:
   anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO.  If you want to
@@ -3976,7 +4079,7 @@ CONFIG_ELPLUS
 
 3c507 support
 CONFIG_EL16
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -3987,7 +4090,7 @@ CONFIG_EL16
 
 3c523 support 
 CONFIG_ELMC
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -3998,19 +4101,20 @@ CONFIG_ELMC
 
 3c509/3c579 support
 CONFIG_EL3
-  If you have a network (ethernet) card belonging to the 3Com
+  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 sunsite.unc.edu:/pub/Linux/docs/HOWTO.
   If you want to compile this as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want),
   say M here and read Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt. The module will be called
-  3c509.o. If your card is not working you may need to use the DOS setup
-  disk to disable Plug & Play mode, and to select the default media type.
+  3c509.o. If your card is not working you may need to use the DOS
+  setup disk to disable Plug & Play mode, and to select the default
+  media type.
 
 3c590 series (592/595/597) "Vortex" support
 CONFIG_VORTEX
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. More specific information is
   in Documentation/networking/vortex.txt and in the comments at the
@@ -4018,12 +4122,11 @@ CONFIG_VORTEX
   module ( = code which can be inserted in and removed from the
   running kernel whenever you want), say M here and read
   Documentation/modules.txt as well as
-  Documentation/networking/net-modules.txt. The module will be called
-  3c59x.o.
+  Documentation/networking/net-modules.txt. 
 
 Other ISA cards
 CONFIG_NET_ISA
-  If your network (ethernet) card hasn't been mentioned yet and its
+  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
@@ -4032,7 +4135,7 @@ CONFIG_NET_ISA
   directly affect the kernel: saying N will just cause this configure
   script to skip all the remaining ISA network card questions.  If you
   say Y, you will be asked for your specific card in the following
-  questions. 
+  questions.
 
 Generic ARCnet support
 CONFIG_ARCNET
@@ -4044,7 +4147,7 @@ CONFIG_ARCNET
   below.
   You might also want to have a look at the Ethernet-HOWTO, available
   via ftp (user: anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO
-  (even though ARCnet is not really ethernet). This driver is also
+  (even though ARCnet is not really Ethernet). 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 arcnet.o. If you want to compile it as a module, say M here
@@ -4053,7 +4156,7 @@ CONFIG_ARCNET
 
 Enable arc0e (ARCnet "ether-encap" packet format)
 CONFIG_ARCNET_ETH
-  This allows you to use "ethernet encapsulation" with your ARCnet
+  This allows you to use "Ethernet encapsulation" with your ARCnet
   card via the virtual arc0e device.  You only need arc0e if you want
   to talk to nonstandard ARCnet software, specifically,
   DOS/Windows-style "NDIS" drivers.  You do not need to say Y here to
@@ -4123,7 +4226,7 @@ CONFIG_ARCNET_COM20020
 
 Cabletron E21xx support
 CONFIG_E2100
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4134,8 +4237,8 @@ CONFIG_E2100
 
 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
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO as well as
   Documentation/networking/cs89x0.txt.  If you want to compile this as
@@ -4147,7 +4250,7 @@ CONFIG_CS89x0
 
 DEPCA support
 CONFIG_DEPCA
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO as well as
   drivers/net/depca.c.  If you want to compile this as a module ( =
@@ -4158,7 +4261,7 @@ CONFIG_DEPCA
 
 EtherWorks 3 support
 CONFIG_EWRK3
-  This driver supports the DE203, DE204 and DE205 network (ethernet)
+  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
@@ -4171,13 +4274,13 @@ CONFIG_EWRK3
 
 SEEQ8005 support
 CONFIG_SEEQ8005
-  This is a driver for the SEEQ 8005 network (ethernet) card. If this
+  This is a driver for the SEEQ 8005 network (Ethernet) card. If this
   is for you, read the Ethernet-HOWTO, available via ftp (user:
   anonymous) from 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
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4188,21 +4291,21 @@ CONFIG_AT1700
 
 FMV-181/182/183/184 support
 CONFIG_FMV18X
-  If you have a Fujitsu FMV-181/182/183/184 network (ethernet) card,
+  If you have a Fujitsu FMV-181/182/183/184 network (Ethernet) card,
   say Y and read the Ethernet-HOWTO, available via ftp (user:
   anonymous) in 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 fmv18x.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.  If you use FMV-183 or
+  Documentation/networking/net-modules.txt. If you use an FMV-183 or
   FMV-184 and it is not working, you may need to disable Plug & Play
   mode of the card.
 
 EtherExpressPro 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
+  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
   (user: anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO. This
   driver is also available as a module ( = code which can be inserted
@@ -4213,7 +4316,7 @@ CONFIG_EEXPRESS_PRO
 
 EtherExpress support
 CONFIG_EEXPRESS
-  If you have an EtherExpress16 network (ethernet) card, say Y and
+  If you have an EtherExpress16 network (Ethernet) card, say Y and
   read the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the Intel
   EtherExpress16 card used to be regarded as a very poor choice
@@ -4228,7 +4331,7 @@ CONFIG_EEXPRESS
 AT&T WaveLAN & DEC RoamAbout DS support
 CONFIG_WAVELAN
   The Lucent Wavelan (formerly NCR and AT&T ; or DEC RoamAbout DS) is
-  a Radio LAN (wireless ethernet-like Local Area Network) using the
+  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 driver
   for the pcmcia hardware is available in David Hinds's pcmcia
@@ -4248,7 +4351,7 @@ CONFIG_WAVELAN
 
 HP PCLAN+ (27247B and 27252A) support
 CONFIG_HPLAN_PLUS
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4259,7 +4362,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
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4270,7 +4373,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
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, 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 inserted in and removed from the
@@ -4281,9 +4384,9 @@ CONFIG_HP100
 
 NE2000/NE1000 support
 CONFIG_NE2000
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Many ethernet cards without a
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Many Ethernet cards without a
   specific driver are compatible with NE2000. 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
@@ -4293,7 +4396,7 @@ CONFIG_NE2000
 
 SK_G16 support
 CONFIG_SK_G16
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   sunsite.unc.edu:/pub/Linux/docs/HOWTO.
 
@@ -4302,22 +4405,21 @@ 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
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO. If you are 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 the questions about this class of network
-  cards. If you say Y, you will be asked for your specific card in the
-  following questions.
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Note that the answer to this
+  question doesn't directly affect the kernel: saying N will just
+  cause this configure script to skip all the questions about this
+  class of network cards. If you say Y, you will be asked for your
+  specific card in the following questions. If you are unsure, say Y.
 
 AMD PCnet32 (VLB and PCI) support
 CONFIG_PCNET32
-  If you have a PCnet32 or PCnetPCI based network (ethernet) card, say
+  If you have a PCnet32 or PCnetPCI based network (Ethernet) card, say
   Y here and read the Ethernet-HOWTO, available via ftp (user:
   anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO. 
 
 Ansel Communications EISA 3200 support
 CONFIG_AC3200
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4328,7 +4430,7 @@ CONFIG_AC3200
 
 Racal-Interlan EISA ES3210 support
 CONFIG_ES3210
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
@@ -4337,9 +4439,9 @@ CONFIG_ES3210
   Documentation/modules.txt as well as
   Documentation/networking/net-modules.txt.
 
-Apricot Xen-II on board ethernet
+Apricot Xen-II on board Ethernet
 CONFIG_APRICOT
-  If you have a network (ethernet) controller of this type, say Y and
+  If you have a network (Ethernet) controller of this type, say Y and
   read the Ethernet-HOWTO, 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 inserted in and removed from the
@@ -4350,7 +4452,7 @@ CONFIG_APRICOT
 
 Generic DECchip & DIGITAL EtherWORKS PCI/EISA
 CONFIG_DE4X5
-  This is support for the DIGITAL series of PCI/EISA ethernet
+  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
@@ -4364,7 +4466,7 @@ CONFIG_DE4X5
 
 DECchip Tulip (dc21x4x) PCI support
 CONFIG_DEC_ELCP
-  This driver is developed for the SMC EtherPower series ethernet
+  This driver is developed for the SMC EtherPower series Ethernet
   cards and also works with cards based on the DECchip
   21040/21041/21140 (Tulip series) chips. Some LinkSys PCI cards are
   of this type. (If your card is NOT SMC EtherPower 10/100 PCI
@@ -4383,7 +4485,7 @@ CONFIG_DEC_ELCP
 Digi Intl. RightSwitch support
 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
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO.  More specific information is
@@ -4392,29 +4494,29 @@ CONFIG_DGRS
   from the running kernel whenever you want). The module will be
   called dgrs.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.
+  Documentation/networking/net-modules.txt. 
 
 EtherExpressPro/100 support
 CONFIG_EEXPRESS_PRO100
-  If you have an Intel EtherExpressPro 100 PCI network (ethernet)
+  If you have an Intel EtherExpressPro 100 PCI network (Ethernet)
   card, say Y and read the Ethernet-HOWTO, available via ftp (user:
   anonymous) in 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 eepro100.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.
+  Documentation/networking/net-modules.txt. 
 
 ICL EtherTeam 16i/32 support
 CONFIG_ETH16I
-  If you have a network (ethernet) card of this type, say Y and read
+  If you have a network (Ethernet) card of this type, say Y and read
   the Ethernet-HOWTO, available via ftp (user: anonymous) in
   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
   eth16i.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.
+  Documentation/networking/net-modules.txt. 
 
 TI ThunderLAN support (EXPERIMENTAL)
 CONFIG_TLAN
@@ -4428,44 +4530,44 @@ CONFIG_TLAN
 Zenith Z-Note support
 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
+  (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:
   anonymous) in sunsite.unc.edu:/pub/Linux/docs/HOWTO.
 
 Pocket and portable adapters
 CONFIG_NET_POCKET
-  Cute little network (ethernet) devices which attach to the parallel
+  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
   (user: anonymous) from 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 in
-  cb-iris.stanford.edu:/pub/pcmcia and say N here.  Note that the
-  answer to this question doesn't directly affect the kernel: saying N
-  will just cause this configure script to skip all the questions
-  about this class of network devices.  If you say Y, you will be
-  asked for your specific device in the following questions.  If you
-  plan to use more than one network device under linux, read the
-  Multiple-Ethernet-mini-HOWTO, available from
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini.
+  used by all modern laptops), look on the ftp site (user: anonymous)
+  cb-iris.stanford.edu:/pub/pcmcia and say N here.  
+  Laptop user want to read the Linux Laptop homepage 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).
+  Note that the answer to this question doesn't directly affect the
+  kernel: saying N will just cause this configure script to skip all
+  the questions about this class of network devices.  If you say Y,
+  you will be asked for your specific device in the following
+  questions.
 
 AT-LAN-TEC/RealTek pocket adapter support
 CONFIG_ATP
-  This is a network (ethernet) device which attaches to your parallel
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO if you want to use this. If
-  you plan to use more than one network card under linux, read the
-  Multiple-Ethernet-mini-HOWTO, available from
-  sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini. 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 other.
+  you intend to use this driver, you should have said N to the
+  Parallel Printer support, because the two drivers don't like each
+  other.
 
 D-Link DE600 pocket adapter support
 CONFIG_DE600
-  This is a network (ethernet) device which attaches to your parallel
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO if you want to use this. It is
@@ -4478,7 +4580,7 @@ CONFIG_DE600
 
 D-Link DE620 pocket adapter support
 CONFIG_DE620
-  This is a network (ethernet) device which attaches to your parallel
+  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
   sunsite.unc.edu:/pub/Linux/docs/HOWTO if you want to use this. It is
@@ -4492,14 +4594,19 @@ CONFIG_DE620
 Token Ring driver support
 CONFIG_TR
   Token Ring is IBM's way of communication on a local network; the
-  rest of the world uses ethernet. If you are connected to a token
-  ring network and want to use your Token Ring card under Linux, say Y.
-  Most people can say N here.
+  rest of the world uses Ethernet. To participate on a Token Ring
+  network, you need a special Token ring network card. If you are
+  connected to such a Token Ring network and want to use your Token
+  Ring card under Linux, say Y here and read the Token-Ring
+  mini-HOWTO, available via ftp (user:anonymous) from
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Most people can say N here.
 
 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, otherwise N. Warning: this driver will
+  you have such a beast, say Y and read the Token-Ring mini-HOWTO,
+  available via ftp (user:anonymous) from
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. Warning: this driver will
   almost definitely fail if more than one active Token Ring card is
   present. This driver is also available as a module ( = code which
   can be inserted in and removed from the running kernel whenever you
@@ -4522,7 +4629,7 @@ CONFIG_SHAPER
 FDDI driver support
 CONFIG_FDDI
   Fiber Distributed Data Interface is a high speed local area network
-  design; essentially a replacement for high speed ethernet. FDDI can
+  design; essentially a replacement for high speed Ethernet. FDDI can
   run over copper or fiber. If you are connected to such a network and
   want a driver for the FDDI card in your computer, say Y here (and
   then also Y to the driver for your FDDI card, below). Most people
@@ -4656,12 +4763,12 @@ CONFIG_SBPCD2
   linux/include/linux/sbpcd.h before compiling the new kernel. Read
   the file Documentation/cdrom/sbpcd.
 
-Aztech/Orchid/Okano/Wearnes/TXC/CyDROM  CDROM support
+Aztech/Orchid/Okano/Wearnes/TXC/CyDROM CDROM support
 CONFIG_AZTCD
   This is your driver if you have an Aztech CDA268-01A, Orchid
   CD-3110, Okano or Wearnes CDD110, Conrad TXC, or CyCDROM CR520 or
   CR540 CDROM drive.  This driver - just like all these CDROM drivers
-  - is NOT for CDROM drives with IDE/ATAPI interface, such as Aztech
+  - is NOT for CDROM drives with IDE/ATAPI interfaces, such as Aztech
   CDA269-031SE. If you say Y here, you should also say Y to "ISO9660
   cdrom filesystem support" below, because that's the filesystem used
   on CDROMs. Please also read the file Documentation/cdrom/aztcd. This
@@ -4734,14 +4841,14 @@ Soft configurable cdrom interface card support
 CONFIG_CDI_INIT
   If you want to include boot-time initialization of any cdrom
   interface card that is software configurable, say Y here.  Currently
-  only the ISP16/MAD16/Mozart soundcards with built-in cdrom
+  only the ISP16/MAD16/Mozart sound cards with built-in cdrom
   interfaces are supported.  Note that the answer to this question
   doesn't directly affect the kernel: saying N will just cause this
   configure script to skip all the questions about these CDROM drives.
 
 ISP16/MAD16/Mozart soft configurable cdrom interface support
 CONFIG_ISP16_CDI
-  These are soundcards with with built-in cdrom interfaces using the
+  These are sound cards with with built-in cdrom interfaces using the
   OPTi 82C928 or 82C929 chips. Say Y here to have them detected and
   possibly configured at boot time. In addition, You'll have to say Y
   to a driver for the particular cdrom drive you have attached to the
@@ -4764,7 +4871,7 @@ CONFIG_DCACHE_PRELOAD
 Quota support
 CONFIG_QUOTA
   If you say Y here, you will be able to set per user limits for disk
-  usage (also called diskquotas). Currently, it works only for the
+  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
   (user: anonymous) in
@@ -4774,7 +4881,7 @@ CONFIG_QUOTA
 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)
+  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
@@ -4924,11 +5031,11 @@ CONFIG_TR_SYSNAME
 Minix fs support
 CONFIG_MINIX_FS
   Minix is a simple operating system used in many classes about
-  OS's. The minix filesystem (= method to organize files on a harddisk
+  OS's. The minix filesystem (= method to organize files on a hard disk
   partition or a floppy disk) was the original filesystem for Linux,
   has been superseded by the second extended filesystem ext2fs but is
   still used for root/boot and other floppies or ram disks since it is
-  leaner. You don't want to use it on your harddisk because of certain
+  leaner. You don't want to use it on your hard disk because of certain
   built-in restrictions. This option will enlarge your kernel by about
   25 kB. Everyone should say Y or M so that they are able to read this
   common floppy format.  If you want to compile this as a module ( =
@@ -4941,7 +5048,7 @@ 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 harddisks. You want to say Y, unless
+  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
@@ -4994,23 +5101,25 @@ CONFIG_JOLIET
 fat fs support
 CONFIG_FAT_FS
   If you want to use one of the FAT-based filesystems (the MS-DOS,
-  VFAT (Windows'95) and UMSDOS (used to run Linux on top of an
+  VFAT (Windows 95) and UMSDOS (used to run Linux on top of an
   ordinary DOS partition) filesystems), then you must include FAT
   support. This is not a filesystem in itself, but it provides the
-  foundation for the other filesystems. This option will enlarge your
-  kernel by about 24 kB. If unsure, say Y. If you want to compile this
-  as a module however ( = code which can be inserted in and removed
-  from the running kernel whenever you want), say M here and read
-  Documentation/modules.txt. The module will be called fat.o. Note
-  that if you compile the FAT support as a module, you cannot compile
-  any of the FAT-based filesystems into the kernel - they will have to
-  be modules as well.  The filesystem of your root partition cannot be
-  a module, so don't say M here if you intend to use UMSDOS as your
-  root filesystem.
+  foundation for the other filesystems. It is now also becoming
+  possible to read and write compressed FAT filesystems; read
+  Documentation/filesystems/fat_cvf.txt for details. This option will
+  enlarge your kernel by about 24 kB. If unsure, say Y. If you want to
+  compile this as a module however ( = code which can be inserted in
+  and removed from the running kernel whenever you want), say M here
+  and read Documentation/modules.txt. The module will be called fat.o.
+  Note that if you compile the FAT support as a module, you cannot
+  compile any of the FAT-based filesystems into the kernel - they will
+  have to be modules as well. The filesystem of your root partition
+  cannot be a module, so don't say M here if you intend to use UMSDOS
+  as your root filesystem.
 
 msdos fs support
 CONFIG_MSDOS_FS
-  This allows you to mount MSDOS partitions of your harddrive (unless
+  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
@@ -5024,10 +5133,10 @@ CONFIG_MSDOS_FS
   which doesn't require the msdos filesystem support.  If you want to
   use umsdos, the Unix-like filesystem on top of DOS, which allows you
   to run Linux from within a DOS partition without repartitioning,
-  you'll have to say Y or M here. If your have Windows'95 or Windows
+  you'll have to say Y or M here. If you have Windows 95 or Windows
   NT installed on your MSDOS partitions, you should use the VFAT
   filesystem instead, or you will not be able to see the long
-  filenames generated by Windows'95 / Windows NT. This option will
+  filenames generated by Windows 95 / Windows NT. This option will
   enlarge your kernel by about 7 kB. If unsure, say Y. This will only
   work if you said Y to "fat fs support" as well. If you want to
   compile this as a module however ( = code which can be inserted in
@@ -5037,10 +5146,10 @@ CONFIG_MSDOS_FS
 
 vfat fs support
 CONFIG_VFAT_FS
-  This allows you to mount MSDOS partitions of your harddrive. It
+  This allows you to mount MSDOS partitions of your hard drive. It
   will let you use filenames in a way compatible with the long 
-  filenames used by Windows'95 and Windows NT fat-based (not NTFS)
-  partitions. It does not support Windows'95 compressed filesystems.
+  filenames used by Windows 95 and Windows NT fat-based (not NTFS)
+  partitions. It does not support Windows 95 compressed filesystems.
   You cannot use the VFAT filesystem for your root partition; use
   UMSDOS instead. This option enlarges your kernel by about 10 kB and
   it only works if you said Y to the "fat fs support" above. Please read
@@ -5053,7 +5162,7 @@ CONFIG_VFAT_FS
 umsdos: Unix like fs on top of std MSDOS fs
 CONFIG_UMSDOS_FS
   Say Y here if you want to run Linux from within an existing DOS
-  partition of your harddrive. The advantage of this is that you can
+  partition of your hard drive. The advantage of this is that you can
   get away without repartitioning your hard drive (which often implies
   backing everything up and restoring afterwards) and hence you're
   able to quickly try out Linux or show it to your friends; the
@@ -5075,37 +5184,36 @@ CONFIG_UMSDOS_FS
 CONFIG_PROC_FS
   This is a virtual filesystem providing information about the status
   of the system. "Virtual" means that it doesn't take up any space on
-  your harddisk: the files are created on the fly when you access
-  them. Also, you cannot read the files with less: you need to use
-  more or cat. The filesystem is explained in the Kernel Hacker's
-  Guide at http://www.redhat.com:8080/HyperNews/get/khg.html on the
-  WWW (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 on the
-  proc(8) manpage ("man 8 proc").  This option will enlarge your
-  kernel by about 18 kB. It's totally cool; for example, "cat
-  /proc/interrupts" gives information about what the different IRQs
-  are used for at the moment (there is a small number of Interrupt
-  ReQuest lines in your computer that are used by the attached devices
-  to gain the CPU's attention - often a source of trouble if two
-  devices are mistakenly configured to use the same IRQ). Several
-  programs depend on this, so everyone should say Y here.
+  your hard disk: the files are created on the fly when you access
+  them. Also, you cannot read the files with older version of the
+  program less: you need to use more or cat. The filesystem is
+  explained in the Kernel Hacker's Guide at
+  http://www.redhat.com:8080/HyperNews/get/khg.html on the WWW (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 on the proc(8)
+  manpage ("man 8 proc").  This option will enlarge your kernel by
+  about 18 kB. It's totally cool; for example, "cat /proc/interrupts"
+  gives information about what the different IRQs are used for at the
+  moment (there is a small number of Interrupt ReQuest lines in your
+  computer that are used by the attached devices to gain the CPU's
+  attention - often a source of trouble if two devices are mistakenly
+  configured to use the same IRQ). Several programs depend on this, so
+  everyone should say Y here.
 
 NFS filesystem support
 CONFIG_NFS_FS
   If you are connected to some other (usually local) Unix computer
-  (using SLIP, PLIP, PPP or ethernet) and want to mount files residing
+  (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
   on that computer (the NFS server) using the Network File Sharing
   protocol, say Y. "Mounting files" means that the client can access
   the files with usual UNIX commands as if they were sitting on the
-  client's harddisk. For this to work, the server must run the
+  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). NFS is explained in the Network Administrator's
   Guide, available via ftp (user: anonymous) in
-  sunsite.unc.edu:/pub/Linux/docs/LDP, and on its man page: "man
-  nfs". There is also a NFS-FAQ in
-  sunsite.unc.edu:/pub/Linux/docs/faqs which presumes that you know
-  the basics of NFS already. If you say Y here, you should have said Y
-  to TCP/IP networking also. This option would enlarge your kernel by
+  sunsite.unc.edu:/pub/Linux/docs/LDP, on its man page: "man nfs", and
+  in the NFS-HOWTO. 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. 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 nfs.o. If you want to
@@ -5113,34 +5221,35 @@ CONFIG_NFS_FS
   Documentation/modules.txt. If you configure 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
-  sunsite.unc.edu in /pub/Linux/system/boot/ethernet/, extract with "tar
-  xzvf filename", and say Y to "Root file system on NFS" below), then
-  you cannot compile this driver as a module. If you don't know what
-  all this is about, say N.
+  sunsite.unc.edu in /pub/Linux/system/boot/ethernet/, extract with
+  "tar xzvf filename", and say Y to "Root file system on NFS" below),
+  then you cannot compile this driver as a module. If you don't know
+  what all this is about, say N.
 
 Root file system on NFS
 CONFIG_ROOT_NFS
   If you want your Linux box to mount its whole root filesystem from
   some other computer over the net via NFS (presumably because your
-  box doesn't have a harddisk), say Y. Read Documentation/nfsroot.txt
+  box doesn't have a hard disk), say Y. Read Documentation/nfsroot.txt
   for details. Most people say N here. 
 
 NFS server support
 CONFIG_NFSD
   If you want your Linux box to act as a NFS *server*, so that other
-  computers on your local network which support NFS can access files
-  on your box transparently, you have two options: you can use the
-  self-contained user space program nfsd, in which case you should say
-  N here, or you can say Y and use this new experimental kernel based
-  NFS server. The advantage of the kernel based solution 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/.  
-  The nfs server is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you
-  want). The module is called nfsd.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt. If unsure,
-  say N.
+  computers on your local network which support NFS can access certain
+  directories on your box transparently, you have two options: you can
+  use the self-contained user space program nfsd, in which case you
+  should say N here, or you can say Y and use this new experimental
+  kernel based NFS server. The advantage of the kernel based solution
+  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
+  sunsite.unc.edu:/pub/Linux/docs/HOWTO. The nfs server is also
+  available as a module ( = code which can be inserted in and removed
+  from the running kernel whenever you want). The module is called
+  nfsd.o. If you want to compile it as a module, say M here and read
+  Documentation/modules.txt. If unsure, say N.
 
 BOOTP support
 CONFIG_RNFS_BOOTP
@@ -5168,9 +5277,9 @@ CONFIG_RNFS_RARP
 OS/2 HPFS filesystem support (read only)
 CONFIG_HPFS_FS
   OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
-  is the filesystem used for organizing files on OS/2 harddisk
+  is the filesystem used for organizing files on OS/2 hard disk
   partitions. Say Y if you want to be able to read files from an OS/2
-  HPFS partition of your harddrive. OS/2 floppies however are in
+  HPFS partition of your hard drive. OS/2 floppies however are in
   regular MSDOS format, so you don't need this option in order to be
   able to read them. Read Documentation/filesystems/hpfs.txt. This
   filesystem is also available as a module ( = code which can be
@@ -5201,14 +5310,14 @@ CONFIG_NTFS_RW
 
 System V and Coherent filesystem support
 CONFIG_SYSV_FS
-  SCO, Xenix and Coherent are commercial Unix systems for intel
+  SCO, Xenix and Coherent are commercial Unix systems for Intel
   machines. Saying Y here would allow you to read and write to and
-  from their floppies and harddisk partitions. If you have a floppy or
-  harddisk partition like that, it is probable that they contain
+  from their floppies and hard disk partitions. If you have a floppy or
+  hard disk partition like that, it is probable that they contain
   binaries from those other Unix systems; in order to run these
   binaries, you will want to install iBCS2 (iBCS2 [Intel Binary
   Compatibility Standard] is a kernel module which lets you run SCO,
-  Xenix, Wyse, Unix Ware, Dell Unix and System V programs under Linux
+  Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux
   and is often needed to run commercial software, most prominently
   WordPerfect. It's in tsx-11.mit.edu:/pub/linux/BETA). If you only
   intend to mount files from some other Unix over the network using
@@ -5226,6 +5335,40 @@ CONFIG_SYSV_FS
   read Documentation/modules.txt. The module will be called sysv.o. If
   you haven't heard about all of this before, it's safe to say N.
 
+Amiga FFS filesystem support
+CONFIG_AFFS_FS
+  If you say Y here, you will be able to mount floppies and hard drive
+  partitions which were formatted with the Amiga FFS filesystem. Full
+  read-write support is available for most versions of FFS, see
+  Documentation/filesystems/affs.txt for details. This filesystem
+  support is also available as a module ( = code which can be inserted
+  in and removed from the running kernel whenever you want). The
+  module is called affs.o. If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+Apple Macintosh filesystem support (experimental)
+CONFIG_HFS_FS
+  If you say Y here, you will be able to mount Macintosh-formatted
+  floppy disks and hard drive partitions with full read-write access.
+  Please read fs/hfs/HFS.txt to learn about the available mount
+  options. This filesystem support is also available as a module ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). The module is called hfs.o. If you want to
+  compile it as a module, say M here and read
+  Documentation/modules.txt.
+
+ROM filesystem support
+CONFIG_ROMFS_FS
+  This is a very small read-only filesystem mainly intended for
+  initial ram disks of installation disks, but it could be used for
+  other read-only media as well. Read
+  Documentation/filesystems/romfs.txt for details. This filesystem
+  support is also available as a module ( = code which can be inserted
+  in and removed from the running kernel whenever you want). The
+  module is called romfs.o. If you want to compile it as a module, say
+  M here and read Documentation/modules.txt. If you don't know whether
+  you need it, then you don't need it: say N.
+
 Kernel automounter support (experimental)
 CONFIG_AUTOFS_FS
   The automounter is a tool to automatically mount remote filesystems
@@ -5245,7 +5388,7 @@ BSD UFS filesystem support (read only)
 CONFIG_UFS_FS
   BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD
   and NeXTstep) use a filesystem called UFS. Some System V Unixes can
-  create and mount harddisk partitions and diskettes using this
+  create and mount hard disk partitions and diskettes using this
   filesystem as well. Saying Y here allows you to mount these
   partitions and diskettes read-only. If you only intend to mount
   files from some other Unix over the network using NFS, you don't
@@ -5265,7 +5408,7 @@ CONFIG_UFS_FS
 
 BSD disklabel (FreeBSD partition tables) support
 CONFIG_BSD_DISKLABEL
-  FreeBSD uses its own harddisk partition scheme on your PC. It
+  FreeBSD uses its own hard disk partition scheme on your PC. It
   requires only one entry in the primary partition table of your disk
   and manages it similarly to DOS extended partitions, putting in its
   first sector a new partition table in disklabel format. Saying Y
@@ -5276,7 +5419,7 @@ CONFIG_BSD_DISKLABEL
 
 SMD disklabel (Sun partition tables) support
 CONFIG_SMD_DISKLABEL
-  Like most systems, SunOS uses its own harddisk partition table
+  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
@@ -5288,31 +5431,49 @@ CONFIG_SMD_DISKLABEL
   preferably "info tar"). If you don't know what all this is about,
   say N.
 
+Solaris (x86) partition table support
+CONFIG_SOLARIS_X86_PARTITION
+  Say Y here if you have a hard drive that will be accessed from Linux
+  and from Solaris x86. This is NOT for Solaris on the sparc
+  architecture. 
+
+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 StrongARM 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. 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.
+
 Macintosh partition map support
 CONFIG_MAC_PARTITION
-  Say Y here if you want your Linux system to be able to read
-  the partition tables of Macintosh hard drives, and thus use
-  partitions on those drives.
+  Say Y here if you want your Linux system to be able to read the
+  partition tables of Macintosh hard drives, and thus use partitions
+  on those drives.
 
 SMB filesystem support (to mount WfW shares etc..)
 CONFIG_SMB_FS
-  SMB (Server Message Buffer) is the protocol Windows for Workgroups
+  SMB (Server Message Block) is the protocol Windows for Workgroups
   (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
   if the Windows machines use TCP/IP as the underlying transport
-  protocol, and not Netbeui.  For details, read
-  Documentation/filesystems/smbfs.txt.  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
+  protocol, and not Netbeui. For details, read
+  Documentation/filesystems/smbfs.txt and the SMB-HOWTO, available via
+  ftp (user: anonymous) from 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
   sunsite.unc.edu:/pub/Linux/system/network/samba) for that. General
   information about how to connect Linux, Windows machines and Macs is
   on the WWW at http://eats.com/linux_mac_win.html (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 the SMB
+  program like lynx or netscape). If you want to compile the SMB
   support as a module ( = code which can be inserted in and removed
   from the running kernel whenever you want), say M here and read
   Documentation/modules.txt. The module will be called smbfs.o. Most
@@ -5320,22 +5481,23 @@ CONFIG_SMB_FS
 
 Coda filesystem support
 CONFIG_CODA_FS
-  CODA is an advanced network filesystem.  It has support for
-  disconnected operation for laptops, read/write server replication,
-  persistent client caches and write back caching.
-  By saying Y here you are compiling kernel support for Coda clients
-  into the Linux kernel.  You will need user level code as well, both
-  for the client and server. Servers are currently user level,
-  i.e. need no kernel support. For technical information, read
+  CODA is an advanced network filesystem, similar to NFS in that it
+  enables you to mount filesystems of a remote server and access them
+  with regular Unix commands as if they were sitting on your hard
+  disk. It has support for disconnected operation for laptops,
+  read/write server replication, persistent client caches and write
+  back caching. By saying Y here you are compiling kernel support for
+  Coda clients into the Linux kernel. You will need user level code as
+  well, both for the client and server. Servers are currently user
+  level, i.e. need no kernel support. For technical information, read
   Documentation/filesystems/coda.txt. 
   If you want to compile the coda client support as a module ( = code
   which can be inserted in and removed from the running kernel
-  whenever you want), say M here and read
-  Documentation/modules.txt. The module will be called coda.o. 
-  For further information see http://www.coda.cs.cmu.edu (to browse
-  the WWW, you need to have access to a machine on the Internet that
-  has a program like lynx or netscape) or contact Peter Braam
-  <braam@cs.cmu.edu>.
+  whenever you want), say M here and read Documentation/modules.txt.
+  The module will be called coda.o. For further information see
+  http://www.coda.cs.cmu.edu (to browse the WWW, you need to have
+  access to a machine on the Internet that has a program like lynx or
+  netscape) or contact Peter Braam <braam@cs.cmu.edu>.
 
 SMB Win95 bug work-around
 CONFIG_SMB_WIN95
@@ -5348,7 +5510,7 @@ NCP filesystem support (to mount NetWare volumes)
 CONFIG_NCP_FS
   NCP (NetWare Core Protocol) is a protocol that runs over IPX and is
   used by Novell NetWare clients to talk to file servers. It is to IPX
-  what nfs is to tcp/ip, if that helps. Saying Y here allows you to
+  what NFS is to TCP/IP, if that helps. Saying Y here allows you to
   mount NetWare file server volumes and to access them just like any
   other Unix directory. For details, please read the file
   Documentation/filesystems/ncpfs.txt in the kernel source and the
@@ -5360,84 +5522,71 @@ CONFIG_NCP_FS
 
 Packet signatures
 CONFIG_NCPFS_PACKET_SIGNING
-  NCP allows to sign packets for stronger security. If you want
+  NCP allows packets to be signed for stronger security. If you want
   security, say Y. Normal users can leave it off. To be able to use
   packet signing you must use ncpfs > 2.0.12.
 
 Proprietary file locking
 CONFIG_NCPFS_IOCTL_LOCKING
-  Allows locking of records on remote volumes. Say N unless you have special
-  applications which are able to utilize this locking scheme.
+  Allows locking of records on remote volumes. Say N unless you have
+  special applications which are able to utilize this locking scheme.
 
 Clear remove/delete inhibit when needed
 CONFIG_NCPFS_STRONG
-  Allows manipulation of files flagged as Delete or Rename Inhibit.
-  To use this feature you must mount volumes with the ncpmount parameter
+  Allows manipulation of files flagged as Delete or Rename Inhibit. To
+  use this feature you must mount volumes with the ncpmount parameter
   "-s" (ncpfs-2.0.12 and newer). Say Y unless you are not mounting
   volumes with -f 444.
 
 Use NFS namespace when available
 CONFIG_NCPFS_NFS_NS
-  Allows you to utilize NFS namespace on NetWare servers. It brings you
-  case sensitive filesystems. Say Y. You can disable it at mount-time with
-  the -N nfs parameter of ncpmount.
+  Allows you to utilize NFS namespace on NetWare servers. It brings
+  you case sensitive filenames. Say Y. You can disable it at
+  mount-time with the `-N nfs' parameter of ncpmount.
 
 Use OS2/LONG namespace when available
 CONFIG_NCPFS_OS2_NS
-  Allows you to utilize OS2/LONG namespace on NetWare servers. Filenames 
-  in this namespace are limited to 255 characters, they are case 
-  insensitive, and case in names is preserved. 
-  Say Y. You can disable it at mount time with the -N os2 parameter of 
-  ncpmount.
+  Allows you to utilize OS2/LONG namespace on NetWare servers.
+  Filenames in this namespace are limited to 255 characters, they are
+  case insensitive, and case in names is preserved. Say Y. You can
+  disable it at mount time with the -N os2 parameter of ncpmount.
 
 Allow mounting of volume subdirectories
 CONFIG_NCPFS_MOUNT_SUBDIR
-  Allows you to mount not only whole servers or whole volumes, but also
-  subdirectory from a volume. It can be used to reexport data and so on.
-  There is no reason why to say N, so Y is recommended unless you count
-  every byte. 
+  Allows you to mount not only whole servers or whole volumes, but
+  also subdirectories from a volume. It can be used to reexport data
+  and so on. There is no reason to say N, so Y is recommended unless
+  you count every byte.
   To utilize this feature you must use ncpfs-2.0.12 or newer.
 
 NDS interserver authentication domains
 CONFIG_NCPFS_NDS_DOMAINS
-  This allows storing NDS private keys into kernel space where it can be
-  used to authenticate another server as interserver NDS accesses need
-  it. You must use ncpfs-2.0.12.1 or newer to utilize this feature.
-  Say Y if you are using NDS connections to NetWare servers. Do not say Y
-  if security is primary for you because root can read your session
-  key (from /proc/kcore).
+  This allows storing NDS private keys in kernel space where they
+  can be used to authenticate another server as interserver NDS
+  accesses need it. You must use ncpfs-2.0.12.1 or newer to utilize
+  this feature. Say Y if you are using NDS connections to NetWare
+  servers. Do not say Y if security is primary for you because root
+  can read your session key (from /proc/kcore).
 
 Amiga FFS filesystem support
 CONFIG_AFFS_FS
-  The Fast File System (FFS) is the common filesystem used on
-  harddisks 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 if you want to be able to read and write files from and
-  to an Amiga FFS partition on your harddrive. Amiga floppies however
-  cannot be read with this driver due to an incompatibility of the
-  floppy controller used in an Amiga and the standard floppy
-  controller in PCs and workstations. Read
-  Documentation/filesystems/affs.txt and fs/affs/Changes. 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, say M here and read
-  Documentation/modules.txt.  If unsure, say N.
-
-ROM filesystem support
-CONFIG_ROMFS_FS
-  This is a very small read-only filesystem mainly intended for
-  initial ram disks of installation disk, but it could be used for
-  other read-only media as well. Read
-  Documentation/filesystems/romfs.txt for details. 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 romfs.o. If you want to compile it as a module, say M here
-  and read Documentation/modules.txt.  If you don't know whether you
-  need it, then you don't need it: say N.
+  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
+  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
+  controller used in an Amiga and the standard floppy controller in
+  PCs and workstations. Read Documentation/filesystems/affs.txt and
+  fs/affs/Changes. 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, say M here and read
+  Documentation/modules.txt. If unsure, say N.
 
 nls: Native language codepages and Unicode support
 CONFIG_NLS
@@ -5488,7 +5637,7 @@ CONFIG_NLS_CODEPAGE_775
   codepage if you want to be able to read/write these filenames on
   DOS/Windows partitions correctly. This does apply to the filenames
   only, not to the file contents. You can include several codepages;
-  say Y here if you want to include the DOS codepage that is used for
+  say Y here if you want to include the DOS codepage that is used
   for the Baltic Rim Languages. If unsure, say N.
 
 nls codepage 850
@@ -5754,15 +5903,16 @@ CONFIG_VT_CONSOLE
 Software generated cursor
 CONFIG_SOFTCURSOR
   If you say Y here, you'll be able to do lots of nice things with the
-  cursors of your virtual consoles -- for example to turn them into
-  non-blinking block cursors which are more visible on laptop screens.
+  cursors of your virtual consoles -- for example turn them into
+  non-blinking block cursors which are more visible on laptop screens,
+  or change their color depending on the virtual console you're on.
   See Documentation/VGA-softcursor.txt for more information.
 
 Standard/generic serial support
 CONFIG_SERIAL
   This selects whether you want to include the driver for the standard
   serial ports.  People who might say N here are those that are
-  setting up dedicated ethernet WWW/ftp servers, or users that have
+  setting up dedicated Ethernet WWW/ftp servers, or users that have
   one of the various bus mice instead of a serial mouse.  (Note that
   the Cyclades and Stallion multi serial port drivers do not need this
   driver built in for them to work.)  If you want to compile this
@@ -5950,16 +6100,16 @@ CONFIG_PRINTER
   you want to compile this driver as a module however ( = code which
   can be inserted in and removed from the running kernel whenever you
   want), say M here and read Documentation/modules.txt. The module
-  will be called lp.o.  If you have several parallel ports, you
-  should specify the base address for the port to use by the printer
-  with the "lp" kernel command line option. (Try "man bootparam" or
-  see the documentation of your boot loader (lilo or loadlin) about
-  how to pass options to the kernel at boot time. The lilo procedure
-  is also explained in the SCSI-HOWTO, available via ftp (user:
-  anonymous) in 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. If you have more than 3 printers,
-  you need to increase the LP_NO variable in lp.c.
+  will be called lp.o.  If you have several parallel ports, you should
+  specify the base address for the port to be used by the printer with
+  the "lp" kernel command line option. (Try "man bootparam" or see the
+  documentation of your boot loader (lilo or loadlin) about how to
+  pass options to the kernel at boot time. The lilo procedure is also
+  explained in the SCSI-HOWTO, available via ftp (user: anonymous) in
+  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. If you have more than 3 printers, you need to
+  increase the LP_NO variable in lp.c.
 
 CONFIG_PRINTER_READBACK
   If your printer conforms to IEEE 1284, it may be able to provide a
@@ -6136,11 +6286,11 @@ CONFIG_ZFTAPE
   Regardless of whether you say Y or M here, an additional runtime
   loadable module called `zft-compressor.o' which contains code to
   support user transparent on-the-fly compression based on Ross
-  William's lzrw3 algorithm will be produced. If you have enabled
-  the kernel module loader (i.e. have said `Y' to CONFIG_KMOD) then
-  `zft-compressor.o' will be loaded automatically by zftape when
-  needed.
-  Despite of its name zftape does NOT use compression by default. The
+  William's lzrw3 algorithm will be produced. If you have enabled the
+  kernel module loader (i.e. have said Y to "Kernel module loader
+  support", above) then `zft-compressor.o' will be loaded
+  automatically by zftape when needed.
+  Despite its name, zftape does NOT use compression by default. The
   file Documentation/ftape.txt contains a short description of the
   most important changes in the file system interface compared to
   previous versions of ftape. The ftape home page
@@ -6175,7 +6325,7 @@ Number of DMA buffers
 CONFIG_FT_NR_BUFFERS
   Please leave this at `3' unless you REALLY know what you are
   doing. It is not necessary to change this value. Values below 3 make
-  the proper use of ftape impossible, values greater than 3 are waste
+  the proper use of ftape impossible, values greater than 3 are a waste
   of memory. You can change the amount of DMA memory used by ftape at
   runtime with "mt -f /dev/qft0 setdrvbuffer #NUMBUFFERS". Each buffer
   wastes 32kb of memory. Please note that this memory cannot be
@@ -6183,8 +6333,8 @@ CONFIG_FT_NR_BUFFERS
 
 Procfs entry for ftape
 CONFIG_FT_PROC_FS
-  Optional. Saying `Y' will result in creation of a file
-  `/proc/ftape' under the proc file system. This files can be viewed
+  Optional. Saying `Y' will result in creation of a directory
+  `/proc/ftape' under the proc file system. The files can be viewed
   with your favorite pager (i.e. use "more /proc/ftape/history" or
   "less /proc/ftape/history" or simply "cat /proc/ftape/history"). The
   file will contain some status information about the inserted
@@ -6329,16 +6479,16 @@ CONFIG_FT_FDC_DMA
 FDC FIFO Threshold before requesting DMA service
 CONFIG_FT_FDC_THR
   Set the FIFO threshold of the FDC. If this is higher the DMA
-  controller may serve the FCD after a higher latency time. If this is
-  lower, less DMA transfers occur leading to less bus contention.
+  controller may serve the FDC after a higher latency time. If this is
+  lower, fewer DMA transfers occur leading to less bus contention.
   You may try to tune this if ftape annoys you with "reduced data
   rate because of excessive overrun errors" messages. However, this
-  doesn't seem to have too much an effect.
+  doesn't seem to have too much effect.
   If unsure, don't touch the initial value, i.e. leave it at "8".
 
 FDC maximum data rate
 CONFIG_FT_FDC_MAX_RATE
-  With some mother board/FDC combinations ftape will not be able to
+  With some motherboard/FDC combinations ftape will not be able to
   run your FDC/tape drive combination at the highest available
   speed. If this is the case you'll encounter "reduced data rate
   because of excessive overrun errors" messages and lots of retries
@@ -6369,20 +6519,25 @@ CONFIG_APM
   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:
-  anonymous) from sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini.
-  This driver does not spin down disk drives (see hdparm(8) for that);
-  and it doesn't turn off VESA-compliant "green" monitors.  This
-  driver does not support the TI 4000M TravelMate and the ACER
-  486/DX4/75 because they don't have compliant BIOSes.  Many "green"
-  desktop machines also don't have compliant BIOSes, and this driver
-  will cause those machines to panic during the boot phase (typically,
-  these machines are using a data segment of 0040, which is reserved
-  for the Linux kernel). Generally, if you don't have a battery in
-  your machine, there isn't much point in using this driver and you
-  should say N.  If you get random kernel OOPSes or reboots that don't
-  seem to be related to anything, try disabling/enabling this
-  option. Some other things to try when experiencing seemingly random,
-  "weird" problems:
+  anonymous) from sunsite.unc.edu:/pub/Linux/docs/HOWTO/mini.  This
+  driver does not spin down disk drives (see the hdparm(8) manpage
+  ("man 8 hdparm") for that), and it doesn't turn off VESA-compliant
+  "green" monitors.  This driver does not support the TI 4000M
+  TravelMate and the ACER 486/DX4/75 because they don't have compliant
+  BIOSes.  Many "green" desktop machines also don't have compliant
+  BIOSes, and this driver will cause those machines to panic during
+  the boot phase (typically, these machines are using a data segment
+  of 0040, which is reserved 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
+  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).
+  Generally, if you don't have a battery in your machine, there isn't
+  much point in using this driver and you should say N.  If you get
+  random kernel OOPSes or reboots that don't seem to be related to
+  anything, try disabling/enabling this option. Some other things to
+  try when experiencing seemingly random, "weird" problems:
    1) passing the "no-hlt" option to the kernel 
    2) passing the "no-387" option to the kernel 
    3) passing the "floppy=nodma" option to the kernel
@@ -6404,16 +6559,17 @@ Enable APM at boot time
 CONFIG_APM_DO_ENABLE
   Enable APM features at boot time.  From page 36 of the APM BIOS
   specification: "When disabled, the APM BIOS does not automatically
-  power manage devices, enter the Standby State, enter the Suspend State,
-  or take power saving steps in response to CPU Idle calls."  This driver
-  will make CPU Idle calls when Linux is idle (unless this feature is
-  turned off -- see below).  This should always save battery power, but
-  more complicated APM features will be dependent on your BIOS
-  implementation.  You may need to turn this option off if your computer
-  hangs at boot time when using APM support, or if it beeps continuously
-  instead of suspending.  Turn this off if you have a NEC UltraLite Versa
-  33/C or a Toshiba T400CDT.  This is off by default since most machines
-  do fine without this feature.
+  power manage devices, enter the Standby State, enter the Suspend
+  State, or take power saving steps in response to CPU Idle calls."
+  This driver will make CPU Idle calls when Linux is idle (unless this
+  feature is turned off -- see "Do CPU IDLE calls", below).  This
+  should always save battery power, but more complicated APM features
+  will be dependent on your BIOS implementation.  You may need to turn
+  this option off if your computer hangs at boot time when using APM
+  support, or if it beeps continuously instead of suspending.  Turn
+  this off if you have a NEC UltraLite Versa 33/C or a Toshiba
+  T400CDT.  This is off by default since most machines do fine without
+  this feature.
 
 Do CPU IDLE calls
 CONFIG_APM_CPU_IDLE
@@ -6428,20 +6584,21 @@ CONFIG_APM_CPU_IDLE
 Enable console blanking using APM
 CONFIG_APM_DISPLAY_BLANK
   Enable console blanking using the APM.  Some laptops can use this to
-  turn off the LCD backlight when the VC screen blanker blanks the
-  screen.  Note that this is only used by the VC screen blanker, and
-  won't turn off the backlight when using X11 (this also doesn't have
-  anything to do with your VESA-compliant power-saving monitor).
-  Further, this option doesn't work for all laptops -- it might not turn
-  off your backlight at all, or it might print a lot of errors to the
-  console, especially if you are using gpm.
+  turn off the LCD backlight when the screen blanker of the Linux
+  virtual console blanks the screen.  Note that this is only used by
+  the virtual console screen blanker, and won't turn off the backlight
+  when using the X Window system. This also doesn't have anything to
+  do with your VESA-compliant power-saving monitor.  Further, this
+  option doesn't work for all laptops -- it might not turn off your
+  backlight at all, or it might print a lot of errors to the console,
+  especially if you are using gpm.
 
 Power off on shutdown 
 CONFIG_APM_POWER_OFF
   Enable the ability to power off the computer after the Linux kernel
   is halted.  You will need software (e.g., a suitable version of the
-  halt(8) command) to cause the computer to power down.  Recent
-  versions of the sysvinit package available from
+  halt(8) command ("man 8 halt")) to cause the computer to power down.
+  Recent versions of the sysvinit package available from
   ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/ (user:
   anonymous) contain support for this ("halt -p" shuts down Linux and
   powers off the computer).  As with the other APM options, this
@@ -6449,10 +6606,11 @@ CONFIG_APM_POWER_OFF
 
 Ignore multiple suspend/standby events
 CONFIG_APM_IGNORE_MULTIPLE_SUSPEND
-  This option is necessary on the Thinkpad 560, but should work on all
-  other laptops.  When the APM BIOS returns multiple suspend or standby
-  events while one is already being processed they will be ignored.
-  Without this the Thinkpad 560 has troubles with apmd, and pcmcia-cs.
+  This option is necessary on the IBM Thinkpad 560, but should work on
+  all other laptops. When the APM BIOS returns multiple suspend or
+  standby events while one is already being processed they will be
+  ignored. Without this the Thinkpad 560 has troubles with the user
+  level daemon apmd, and with the PCMCIA package pcmcia-cs.
 
 Watchdog Timer Support 
 CONFIG_WATCHDOG
@@ -6552,11 +6710,17 @@ CONFIG_RTC
   generate signals from as low as 1Hz up to 8192Hz, and can also be
   used as a 24 hour alarm.  It reports status information via the file
   /proc/rtc and its behaviour is set by various ioctls on
-  /dev/rtc. People running SMP (= multiprocessor) versions of Linux
-  should say Y here to read and set the RTC clock in a SMP compatible
-  fashion. (They should also read Documentation/smp.) If you think you
-  have a use for such a device (such as periodic data sampling), then
-  say Y here, and go read the file Documentation/rtc.txt for details.
+  /dev/rtc. 
+  People running SMP (= multiprocessor) versions of Linux should say Y
+  here to read and set the RTC clock in a SMP compatible
+  fashion. (They should also Documentation/smp and
+  Documentation/IO-APIC.txt and the SMP-FAQ on the WWW at
+  http://www.irisa.fr/prive/mentre/smp-faq/ (to browse the WWW, you
+  need to have access to a machine on the Internet that has a programs
+  like lynx or netscape)).
+  If you think you have a use for such a device (such as periodic data
+  sampling), then say Y here, and go read the file
+  Documentation/rtc.txt for details.
 
 Tadpole ANA H8 Support
 CONFIG_H8
@@ -6599,30 +6763,39 @@ CONFIG_JOYSTICK
 
 Sound card support
 CONFIG_SOUND
-  If you have a Sound Card in your Computer, i.e. if it can say more
+  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)
   from sunsite.unc.edu:/pub/Linux/docs/HOWTO. There is also some
-  information in various README files in drivers/sound.  If you want
-  to compile this as a module ( = code which can be inserted in and
-  removed from the running kernel whenever you want), say M here and
-  read Documentation/modules.txt. 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 at
+  information in various README files in drivers/sound, esp. in
+  Readme.cards which you should read first to find out whether your
+  card is supported by Linux.
+  If you have a PnP sound card and you want to configure it at boot
+  time using the ISA PnP tools (read
+  http://www.roestock.demon.co.uk/isapnptools/ (to browse the WWW, you
+  need to have access to a machine on the Internet that has a program
+  like lynx or netscape)), then you need to compile the sound card
+  support as a module ( = code which can be inserted in and removed
+  from the running kernel whenever you want) and load that module
+  after the PnP configuration is finished. To do this, say M here and
+  read Documentation/modules.txt as well as
+  drivers/sound/Readme.modules; the module will be called sound.o.
+  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 at
   sunsite.unc.edu:/pub/Linux/kernel/patches/console/pcsndrv-X.X.tar.gz,
   to be extracted with "tar xzvf filename".
 
 ProAudioSpectrum 16 support
 CONFIG_PAS
   Answer Y only if you have a Pro Audio Spectrum 16, ProAudio Studio
-  16 or Logitech SoundMan 16.  Don't answer Y if you have some other
-  card made by Media Vision or Logitech since they are not PAS16
-  compatible.
+  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.
 
-SoundBlaster (SB, SBPro, SB16, clones) support
+100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support
 CONFIG_SB
   Answer Y if you have an original SoundBlaster card made by
   Creative Labs or a 100% hardware compatible clone (like the
@@ -6630,16 +6803,18 @@ CONFIG_SB
   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.
+  SoundBlaster compatible. If you have an SB AWE 32 or SB AWE 64, say
+  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 whats loosely describable as emulation of an 8bit
-  soundblaster 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. If you'd like real MWAVE
-  support phone IBM (425-556-8822) and ask them why they still haven't 
-  released any documentation.
+  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. If
+  you'd like real MWAVE support phone IBM (425-556-8822) and ask them
+  why they still haven't released any documentation.
   [http://204.200.238.31/cgi-bin/link.pl?co=i&cl=/ts/ibm/contact.html]
 
 Generic OPL2/OPL3 FM synthesizer support
@@ -6648,10 +6823,13 @@ CONFIG_ADLIB
   Answering Y is usually a safe and recommended choice, however some
   cards may have software (TSR) FM emulation. Enabling FM support with
   these cards may cause trouble (I don't currently know of any such
-  cards, however).
+  cards, however). If unsure, say Y.
 
 Loopback MIDI device support
 CONFIG_VMIDI
+###
+### somebody please fill this in.
+###
 
 Gravis Ultrasound support
 CONFIG_GUS
@@ -6661,7 +6839,7 @@ CONFIG_GUS
 MPU-401 support (NOT for SB16)
 CONFIG_MPU401
   Be careful with this question. The MPU401 interface is supported by
-  all soundcards. However, some natively supported cards have their
+  all sound cards. However, some natively supported cards have their
   own driver for MPU401. Enabling this MPU401 option with these cards
   will cause a conflict. Also, enabling MPU401 on a system that
   doesn't really have a MPU401 could cause some trouble. If your card
@@ -6717,7 +6895,7 @@ CONFIG_MSS
 
 Ensoniq Soundscape support
 CONFIG_SSCAPE
-  Answer Y if you have a soundcard based on the Ensoniq SoundScape
+  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).
 
@@ -6764,19 +6942,15 @@ CONFIG_YM3812
 
 Sun Audio support
 CONFIG_SUN_AUDIO
-  This is support for the soundcards on Sun workstations. The code
+  This is support for the sound cards on Sun workstations. The code
   does not exist yet, so you might as well say N here.
 
-SB32/AWE support
-CONFIG_AWE32_SYNTH
-  Say Y here if you have a SB32 or SB AWE soundcard. See
-  drivers/sound/lowlevel/README.awe for more info.
-
 Additional low level drivers
 CONFIG_LOWLEVEL_SOUND
-  If you need additional low level sound drivers which are not part
-  of USS/Lite (UNIX Sound System), say Y.  The only such driver at
-  present is the ACI driver for the miroSOUND PCM12 and PCM20.
+  If you need additional low level sound drivers which have not yet
+  appeared, say Y. The answer to this question does not directly
+  affect the kernel; saying Y will simply cause this configure script
+  to present you with more options. If unsure, say Y.
 
 ACI mixer (miroPCM12)
 CONFIG_ACI_MIXER
@@ -6789,6 +6963,13 @@ CONFIG_ACI_MIXER
   also controls the radio tuner on this card, however this is not
   yet supported in this software.
 
+SB32/AWE support
+CONFIG_AWE32_SYNTH
+  Say Y here if you have a SoundBlaster SB32, AWE32-PnP, SB AWE64 or
+  similar sound card. See drivers/sound/lowlevel/README.awe and the
+  Soundblaster-AWE mini-HOWTO, available via ftp (user: anonymous)
+  from 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
@@ -6941,7 +7122,7 @@ CONFIG_HISAX_16_0
   S0-8 and many compatibles.
   See Documentation/isdn/README.HiSax on how to configure it 
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for Teles 16.3 or PNP or PCMCIA
 CONFIG_HISAX_16_3
@@ -6949,14 +7130,14 @@ CONFIG_HISAX_16_3
   the Teles/Creatix PnP and the Teles PCMCIA.
   See Documentation/isdn/README.HiSax on how to configure it 
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for AVM A1 (Fritz)
 CONFIG_HISAX_AVM_A1
   This enables HiSax support for the AVM A1 (aka "Fritz").
   See Documentation/isdn/README.HiSax on how to configure it
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for Elsa ISA cards
 CONFIG_HISAX_ELSA_PCC
@@ -6964,21 +7145,21 @@ CONFIG_HISAX_ELSA_PCC
   for the Elsa Quickstep series cards.
   See Documentation/isdn/README.HiSax on how to configure it 
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for Elsa PCMCIA card
 CONFIG_HISAX_ELSA_PCMCIA
   This enables HiSax support for the Elsa PCMCIA cards.
   See Documentation/isdn/README.HiSax on how to configure it 
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for ITK ix1-micro Revision 2
 CONFIG_HISAX_IX1MICROR2
   This enables HiSax support for the ITK ix1-micro Revision 2 card.
   See Documentation/isdn/README.HiSax on how to configure it 
   using the different cards, a different D-channel protocol, or
-  non-standard irq/port/shmem settings.
+  non-standard IRQ/port/shmem settings.
 
 HiSax Support for EURO/DSS1
 CONFIG_HISAX_EURO
@@ -7319,7 +7500,7 @@ Atari native SCSI support
 CONFIG_ATARI_SCSI
   If you have an Atari with built-in NCR5380 SCSI controller (TT,
   Falcon, ...) say Y to get it supported. Of course also, if you have
-  an compatible SCSI controller (e.g. for Medusa). This driver is also
+  a compatible SCSI controller (e.g. for Medusa). This driver is also
   available as a module ( = code which can be inserted in and removed
   from the running kernel whenever you want). The module is called
   atari_scsi.o. If you want to compile it as a module, say M here and
@@ -7573,9 +7754,9 @@ CONFIG_SCSI_MAC53C94
   want). If you want to compile it as a module, say M here and read
   Documentation/modules.txt.
 
-MACE (Power Mac ethernet) support
+MACE (Power Mac Ethernet) support
 CONFIG_MACE
-  Power Macintoshes and clones with ethernet built-in on the
+  Power Macintoshes and clones with Ethernet built-in on the
   motherboard will usually use a MACE (Medium Access Control for
   Ethernet) interface.  Say Y to include support for the MACE chip.
 
@@ -7600,18 +7781,20 @@ CONFIG_VIDEO_BT848
 
 Quickcam BW Video For Linux
 CONFIG_VIDEO_BWQCAM
-  Say Y have if you have such a thing. This driver is also available
-  as a module called bw-qcam.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
+  Say Y have if you the black and white version of the QuickCam
+  camera. See the next option for the color version. This driver is
+  also available as a module called bw-qcam.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.
 
 Colour QuickCam Video For Linux
 CONFIG_VIDEO_CQCAM
-  This is the video4linux driver for the colour version of the Connectix
-  Quickcam.  If you have one of these cameras, say Y here, otherwise say N.
-  This driver does not work with the original monochrome Quickcam,
-  Quickcam VC or QuickClip.  It is also available as a module (c-qcam.o).
+  This is the video4linux driver for the colour version of the
+  Connectix Quickcam. If you have one of these cameras, say Y here,
+  otherwise say N. This driver does not work with the original
+  monochrome Quickcam, Quickcam VC or QuickClip. It is also available
+  as a module (c-qcam.o).
 
 Mediavision Pro Movie Studio Video For Linux
 CONFIG_VIDEO_PMS
@@ -7621,22 +7804,26 @@ CONFIG_VIDEO_PMS
   it as a module, say M here and read Documentation/modules.txt.
 
 # need an empty line after last entry, for sed script in Configure.
-
+#
+# A couple of things I keep forgetting:
+#   capitalize: Internet, Intel, SCSI, NetWare, PCI, IRQ, DMA
+#   two words: hard drive, hard disk, sound card
+#   other: it's safe to save.
 #
 # This is used by 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 harddisk diskless netboot nfs xzvf ATAPI MB harddrives ide
-# LocalWords:  HD harddisks CDROMs IDECD NEC MITSUMI filesystem XT XD PCI bios
+# 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:  ISA EISA Microchannel VESA BIOSes IPC SYSVIPC ipc Ctrl dmesg hlt
 # LocalWords:  BINFMT Linkable http ac uk jo html GCC Sparc AVANTI CABRIOLET EB
 # LocalWords:  netscape gcc LD CC toplevel MODVERSIONS insmod rmmod modprobe IP
-# LocalWords:  genksyms INET loopback gatewaying ethernet internet PPP ARP Arp
+# 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 Netware dosemu Appletalk DDP ATALK tapedrive
+# LocalWords:  Mb SKB IPX Novell dosemu Appletalk DDP ATALK tapedrive vmalloc
 # 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
@@ -7649,21 +7836,21 @@ CONFIG_VIDEO_PMS
 # LocalWords:  TR Sony CDU caddyless cdu Mitsumi MCD cd mcd XA MultiSession CDA
 # LocalWords:  Matsushita Panasonic SBPCD Soundblaster Longshine sbpcd Aztech
 # LocalWords:  Okano Wearnes AZTCD CDD SE aztcd sonycd Goldstar GSCD Philips fs
-# LocalWords:  LMS OPTCD Sanyo SJCD minix faqs xiafs XIA msdos harddrive mtools
+# LocalWords:  LMS OPTCD Sanyo SJCD minix faqs xiafs XIA msdos mtools Cichocki
 # LocalWords:  std softlinks umssync NetworkFileSharing nfsd mountd CDs HPFS TI
-# LocalWords:  hpfs SYSV SCO intel iBCS Wyse WordPerfect tsx mit unixes sysv NR
+# LocalWords:  hpfs SYSV SCO iBCS Wyse WordPerfect tsx mit unixes sysv NR irisa
 # LocalWords:  SMB WfW Cyclades async mux Logitech busmouse MouseSystem aka AST
 # 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:  mcdx gscd optcd sjcd ISP soundcard hdparm Workgroups Lan samba
+# 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
 # LocalWords:  Multisession STALDRV EasyIO EC EasyConnection ISTALLION ONboard
 # LocalWords:  Brumby pci TNC cis ohio faq usenet NETLINK dev hydra ca Tyne mem
 # LocalWords:  carleton Deskstation DECstation SUNFD JENSEN Noname XXXM SLiRP
-# LocalWords:  pppd Zilog ZS soundcards SRM bootloader ez mainmenu rarp ipfwadm
+# LocalWords:  pppd Zilog ZS SRM bootloader ez mainmenu rarp ipfwadm paride pcd
 # LocalWords:  RTNETLINK mknod xos MTU lwared Macs mac netatalk macs cs Wolff
 # LocalWords:  dartmouth flowerpt MultiMaster FlashPoint tudelft etherexpress
 # LocalWords:  ICL EtherTeam ETH IDESCSI TXC SmartRAID SmartCache httpd sjc dlp
@@ -7673,7 +7860,7 @@ CONFIG_VIDEO_PMS
 # LocalWords:  Vertos Genoa Funai hsfs NCP NetWare tgz APM apm ioctls UltraLite
 # LocalWords:  TravelMate CDT LCD backlight VC RPC Mips DECStation AXP barlow
 # LocalWords:  PMAX MILO Alphas Multia Tseng linuxelf endian mipsel mips drv HT
-# LocalWords:  KERNELD kerneld callouts AdvanSys advansys diskquotas Admin WDT
+# 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:  Avanti XL AlphaStations Jensen DECpc AXPpci UDB Cabriolet MCA RC
@@ -7741,7 +7928,7 @@ CONFIG_VIDEO_PMS
 # LocalWords:  SYMBIOS COMPAT SDMS rev ASUS Tekram HX VX API ibmmcascsi ASY asy
 # 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 conformant bart patrickr HDLS READBACK AB usr DAMA DS
+# LocalWords:  Autoprobe bart patrickr HDLS READBACK AB usr DAMA DS SparQ aten
 # LocalWords:  Symbios PCscsi tmscsim RoamAbout GHz Hinds's contrib mathematik
 # LocalWords:  darmstadt okir DIGIEPCA International's Xem digiepca epca bootup
 # LocalWords:  zorro CAPI AVMB capi avmb VP SYN syncookies EM em pc Ethertalk
@@ -7767,16 +7954,23 @@ CONFIG_VIDEO_PMS
 # 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
 # LocalWords:  sch cbq CSZ Shenker Zhang csz SFQ sfq TBF tbf PFIFO fifo PRIO RW
-# LocalWords:  prio Micom xIO dwmw rimi OMIRR omirr omirrd unicode ntfs cmu
+# LocalWords:  prio Micom xIO dwmw rimi OMIRR omirr omirrd unicode ntfs cmu NIC
 # LocalWords:  Braam braam Schmidt's freiburg nls codepages codepage Romanian
 # LocalWords:  Slovak Slovenian Sorbian Nordic iso Catalan Faeroese Galician SZ
 # LocalWords:  Valencian Slovene Esperanto Estonian Latvian Byelorussian KOI mt
 # LocalWords:  charset Inuit Greenlandic Sami Lappish koi SOFTCURSOR softcursor
-# LocalWords:  Specialix specialix DTR RTS RTSCTS cycladesZ Exabyte ftape's
+# LocalWords:  Specialix specialix DTR RTS RTSCTS cycladesZ Exabyte ftape's inr
 # LocalWords:  Iomega's LBFM claus ZFTAPE VFS zftape zft William's lzrw DFLT kb
 # LocalWords:  MTSETBLK MTIOCTOP qft setblk zftape's tar's afio's setdrvbuffer
 # LocalWords:  Procfs Exabyte's THR FCD sysvinit init PSC pscwdt VMIDI Euro SAB
 # LocalWords:  Mostek Fastlane PowerMac PReP PMAC PowerPC Macintoshes Starmax
 # LocalWords:  PowerStack Starmaxes MCOMMON DEVICETREE ATY IMS IMSTT videodev
 # LocalWords:  BT Hauppauge STB bttv Quickcam BW BWQCAM bw qcam Mediavision PMS
-# LocalWords:  pms
+# LocalWords:  pms Avatar Freecom Imation Superdisk BPCK bpck COMM comm DSTR ru
+# LocalWords:  dstr EPAT EPEZ epat EPIA epia FreeCom FRPW frpw KingByte KBIC HW
+# LocalWords:  KingByte's kbic OnSpec ValuStore FASTROUTE fastroute FLOWCONTROL
+# LocalWords:  struct APIC realtime OSs LynxOS CNC tmp cvf HFS hfs ADFS Risc os
+# LocalWords:  StrongARM adfs ncpmount namespace SUBDIR reexport NDS kcore FT
+# LocalWords:  interserver BLKSZ NUMBUFFERS apmd Tadpole ANA roestock QuickCam
+# LocalWords:  isapnptools Colour CQCAM colour Connectix QuickClip prive mentre
+# LocalWords:  KMOD kmod conformant utexas kharker UnixWare Mwave cgi cl ts ibm
diff --git a/Documentation/sound/CS4232 b/Documentation/sound/CS4232
new file mode 100644
index 000000000..b4906b148
--- /dev/null
+++ b/Documentation/sound/CS4232
@@ -0,0 +1,23 @@
+
+insmod sound
+insmod ad1848
+insmod uart401
+insmod cs4232 io=* irq=* dma=* dma2=*
+
+This configures the crystal CS423x sound chip and activates its DSP
+functions. On some cards the non PnP setup the board attempts to do fails.
+If you have problems use the kernel PnP facilities.
+
+io is the I/O address of the WSS (normally 0x534)
+irq is the IRQ of this device
+dma/dma2 are the DMA channels. DMA2 may well be 0
+
+
+To get midi synth facilities add
+
+insmod opl3 io=*
+
+io= I/O address of the OPL3 synthesizer. This will be shown in /proc/sys/pnp
+and is normally 0x388
+
+
diff --git a/Documentation/sound/OPL3 b/Documentation/sound/OPL3
new file mode 100644
index 000000000..2468ff827
--- /dev/null
+++ b/Documentation/sound/OPL3
@@ -0,0 +1,6 @@
+A pure OPL3 card is nice and easy to configure. Simply do
+
+insmod opl3 io=0x388
+
+Change the I/O address in the very unlikely case this card is differently
+configured
diff --git a/Documentation/sound/Soundblaster b/Documentation/sound/Soundblaster
new file mode 100644
index 000000000..9ca8db777
--- /dev/null
+++ b/Documentation/sound/Soundblaster
@@ -0,0 +1,38 @@
+
+insmod sound
+insmod uart401
+insmod sb ...
+
+This loads the driver for the soundblaster and assorted clones. Cards that
+are covered by other drivers should not be using with this driver.
+
+The soundblaster module takes the following arguments
+
+io		I/O address of the soundblaster chip
+irq		IRQ of the soundblaster chip
+dma     	8bit DMA channel for the soundblaster
+dma16   	16bit DMA channel for SB16 and equivalent cards
+mpu_io		I/O for MPU chip if present
+
+mad16=1 	Set when loading this as part of the MAD16 setup only
+trix=1  	Set when loading this as part of the Audiotrix setup only
+pas2=1		Set when loading this as part of the Pas2 setup only
+sm_games=1	Set if you have a Logitech soundman games
+acer=1		Set this to detect cards in some ACER notebooks
+mwave_bug=1	Set if you are trying to use this driver with mwave (see on)
+
+You may well want to load the opl3 driver for synth music on most SB and
+clone SB devices
+
+insmod opl3 io=0x388
+
+Using Mwave
+
+To make this driver work with Mwave you must set mwave_bug. You also need
+to warmboot from DOS/Windows with the required firmware loaded under this
+OS. IBM are being difficult about documenting how to load this firmware.
+
+Avance Logic ALS007
+
+This card isnt currently supported. I have patches to merge however that
+add limited support.
diff --git a/Documentation/stallion.txt b/Documentation/stallion.txt
index aff00034e..5f1a95977 100644
--- a/Documentation/stallion.txt
+++ b/Documentation/stallion.txt
@@ -4,8 +4,8 @@ Stallion Multiport Serial Driver Readme
 
 Copyright (C) 1994-1998,  Stallion Technologies (support@stallion.com).
 
-Version:   5.4.3
-Date:      04FEB98
+Version:   5.4.5
+Date:      23MAR98
 
 
 
@@ -31,12 +31,12 @@ the latest version of the driver utility package. Other sites that usually
 have the latest version are tsx-11.mit.edu, sunsite.unc.edu and their
 mirrors.
 
-ftp.stallion.com:/drivers/ata5/Linux/stallion-5.4.2.tar.gz
-tsx-11.mit.edu:/pub/linux/packages/stallion/stallion-5.4.2.tar.gz
-sunsite.unc.edu:/pub/Linux/kernel/patches/serial/stallion-5.4.2.tar.gz
+ftp.stallion.com:/drivers/ata5/Linux/v544.tar.gz
+tsx-11.mit.edu:/pub/linux/packages/stallion/stallion-5.4.4.tar.gz
+sunsite.unc.edu:/pub/Linux/kernel/patches/serial/stallion-5.4.4.tar.gz
 
 As of the printing of this document the latest version of the driver
-utility package is 5.4.2. If a later version is now available then you
+utility package is 5.4.4. If a later version is now available then you
 should use the latest version.
 
 If you are using the EasyIO, EasyConnection 8/32 or EasyConnection 8/64-PCI
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index b74141091..baf3f0700 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -25,10 +25,14 @@ Currently, these files are in /proc/sys/kernel:
 - inode-max
 - inode-nr
 - inode-state
+- kmod_unload_delay           ==> Documentation/kmod.txt
+- modprobe                    ==> Documentation/kmod.txt
 - osrelease
 - ostype
 - panic
 - printk
+- real-root-dev               ==> Documentation/initrd.txt
+- reboot-cmd                  ==> SPARC specific
 - securelevel
 - version
 
diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 818d00f40..f2ef26fff 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -19,6 +19,7 @@ Currently, these files are in /proc/sys/vm:
 - buffermem
 - freepages
 - overcommit_memory
+- pagecache
 - swapctl
 - swapout_interval
 
@@ -93,17 +94,16 @@ buffermem:
 
 The three values in this file correspond to the values in
 the struct buffer_mem. It controls how much memory should
-be used for buffer and cache memory. Note that memorymapped
-files are also counted as cache memory...
+be used for buffer memory.
 
 The values are:
 min_percent	-- this is the minumum percentage of memory
-		   that should be spent on buffer + page cache
-borrow_percent  -- when Linux is short on memory, and buffer
-                   and cache use more than this percentage of
-                   memory, free pages are stolen from them
+		   that should be spent on buffer memory
+borrow_percent  -- when Linux is short on memory, and the
+                   buffer cache uses more memory, free pages
+                   are stolen from it
 max_percent     -- this is the maximum amount of memory that
-                   can be used for buffer and cache memory 
+                   can be used for buffer memory 
 
 ==============================================================
 freepages:
@@ -176,6 +176,18 @@ static inline int vm_enough_memory(long pages)
 
 ==============================================================
 
+pagecache:
+
+This file does exactly the same as buffermem, only this
+file controls the struct page_cache, and thus controls
+the amount of memory allowed for memory mapping of files.
+
+You don't want the minimum level to be too low, otherwise
+your system might thrash when memory is tight or fragmentation
+is high...
+
+==============================================================
+
 swapctl:
 
 This file contains no less than 8 variables.